Skip to content

Early decode x509 certificate when connection established #15259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 3.2
Choose a base branch
from
Open

Early decode x509 certificate when connection established #15259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
230 changes: 230 additions & 0 deletions dubbo-common/src/main/java/org/apache/dubbo/common/ssl/DubboX509Certificate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,230 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dubbo.common.ssl;

import javax.security.auth.x500.X500Principal;

import java.io.ByteArrayInputStream;
import java.math.BigInteger;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.security.Principal;
import java.security.Provider;
import java.security.PublicKey;
import java.security.SignatureException;
import java.security.cert.CertificateEncodingException;
import java.security.cert.CertificateException;
import java.security.cert.CertificateExpiredException;
import java.security.cert.CertificateFactory;
import java.security.cert.CertificateNotYetValidException;
import java.security.cert.CertificateParsingException;
import java.security.cert.X509Certificate;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Set;

public class DubboX509Certificate extends X509Certificate {

static final CertificateFactory X509_CERT_FACTORY;

static {
CertificateFactory certificateFactory = null;
try {
certificateFactory = CertificateFactory.getInstance("X.509");
} catch (CertificateException e) {
// throw new ExceptionInInitializerError(e);
}
X509_CERT_FACTORY = certificateFactory;
}

private final X509Certificate wrapped;

public DubboX509Certificate(byte[] bytes) {
try {
this.wrapped = (X509Certificate) X509_CERT_FACTORY.generateCertificate(new ByteArrayInputStream(bytes));
} catch (CertificateException e) {
throw new IllegalStateException(e);
}
}

@Override
public void checkValidity() throws CertificateExpiredException, CertificateNotYetValidException {
wrapped.checkValidity();
}

@Override
public void checkValidity(Date date) throws CertificateExpiredException, CertificateNotYetValidException {
wrapped.checkValidity(date);
}

@Override
public X500Principal getIssuerX500Principal() {
return wrapped.getIssuerX500Principal();
}

@Override
public X500Principal getSubjectX500Principal() {
return wrapped.getSubjectX500Principal();
}

@Override
public List<String> getExtendedKeyUsage() throws CertificateParsingException {
return wrapped.getExtendedKeyUsage();
}

@Override
public Collection<List<?>> getSubjectAlternativeNames() throws CertificateParsingException {
return wrapped.getSubjectAlternativeNames();
}

@Override
public Collection<List<?>> getIssuerAlternativeNames() throws CertificateParsingException {
return wrapped.getIssuerAlternativeNames();
}

@Override
public void verify(PublicKey key, Provider sigProvider)
throws CertificateException, NoSuchAlgorithmException, InvalidKeyException, SignatureException {
wrapped.verify(key, sigProvider);
}

@Override
public int getVersion() {
return wrapped.getVersion();
}

@Override
public BigInteger getSerialNumber() {
return wrapped.getSerialNumber();
}

@Override
public Principal getIssuerDN() {
return wrapped.getIssuerDN();
}

@Override
public Principal getSubjectDN() {
return wrapped.getSubjectDN();
}

@Override
public Date getNotBefore() {
return wrapped.getNotBefore();
}

@Override
public Date getNotAfter() {
return wrapped.getNotAfter();
}

@Override
public byte[] getTBSCertificate() throws CertificateEncodingException {
return wrapped.getTBSCertificate();
}

@Override
public byte[] getSignature() {
return wrapped.getSignature();
}

@Override
public String getSigAlgName() {
return wrapped.getSigAlgName();
}

@Override
public String getSigAlgOID() {
return wrapped.getSigAlgOID();
}

@Override
public byte[] getSigAlgParams() {
return wrapped.getSigAlgParams();
}

@Override
public boolean[] getIssuerUniqueID() {
return wrapped.getIssuerUniqueID();
}

@Override
public boolean[] getSubjectUniqueID() {
return wrapped.getSubjectUniqueID();
}

@Override
public boolean[] getKeyUsage() {
return wrapped.getKeyUsage();
}

@Override
public int getBasicConstraints() {
return wrapped.getBasicConstraints();
}

@Override
public byte[] getEncoded() throws CertificateEncodingException {
return wrapped.getEncoded();
}

@Override
public void verify(PublicKey key)
throws CertificateException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException,
SignatureException {
wrapped.verify(key);
}

@Override
public void verify(PublicKey key, String sigProvider)
throws CertificateException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException,
SignatureException {
wrapped.verify(key, sigProvider);
}

@Override
public String toString() {
return wrapped.toString();
}

@Override
public PublicKey getPublicKey() {
return wrapped.getPublicKey();
}

@Override
public boolean hasUnsupportedCriticalExtension() {
return wrapped.hasUnsupportedCriticalExtension();
}

@Override
public Set<String> getCriticalExtensionOIDs() {
return wrapped.getCriticalExtensionOIDs();
}

@Override
public Set<String> getNonCriticalExtensionOIDs() {
return wrapped.getNonCriticalExtensionOIDs();
}

@Override
public byte[] getExtensionValue(String oid) {
return wrapped.getExtensionValue(oid);
}
}
16 changes: 16 additions & 0 deletions ...in/java/org/apache/dubbo/remoting/transport/netty4/NettyPortUnificationServerHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.ssl.CertManager;
import org.apache.dubbo.common.ssl.DubboX509Certificate;
import org.apache.dubbo.common.ssl.ProviderCert;
import org.apache.dubbo.remoting.ChannelHandler;
import org.apache.dubbo.remoting.Constants;
Expand All @@ -31,6 +32,8 @@

import javax.net.ssl.SSLSession;

import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -92,6 +95,7 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
SSLSession session =
ctx.pipeline().get(SslHandler.class).engine().getSession();
LOGGER.info("TLS negotiation succeed with session: " + session);
tryExactCerts(session);
ctx.channel().attr(SSL_SESSION_KEY).set(session);
} else {
LOGGER.error(
Expand All @@ -106,6 +110,18 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
super.userEventTriggered(ctx, evt);
}

private static void tryExactCerts(SSLSession session) {
try {
Certificate[] originCerts = session.getPeerCertificates();
X509Certificate[] decodedCerts = new X509Certificate[originCerts.length];
for (int i = 0; i < originCerts.length; i++) {
decodedCerts[i] = new DubboX509Certificate(originCerts[i].getEncoded());
}
session.putValue("decodedCerts", decodedCerts);
} catch (Throwable ignore) {
}
}

@Override
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
NettyChannel channel = NettyChannel.getOrAddChannel(ctx.channel(), url, handler);
Expand Down
17 changes: 17 additions & 0 deletions ...ty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/ssl/SslClientTlsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,15 @@
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.ssl.DubboX509Certificate;
import org.apache.dubbo.remoting.Constants;

import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLSession;

import java.security.cert.Certificate;
import java.security.cert.X509Certificate;

import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.handler.ssl.SslContext;
Expand Down Expand Up @@ -61,6 +65,7 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
SSLSession session =
ctx.pipeline().get(SslHandler.class).engine().getSession();
logger.info("TLS negotiation succeed with: " + session.getPeerHost());
tryExactCerts(session);
ctx.pipeline().remove(this);
ctx.channel().attr(SSL_SESSION_KEY).set(session);
} else {
Expand All @@ -74,4 +79,16 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
}
}
}

private static void tryExactCerts(SSLSession session) {
try {
Certificate[] originCerts = session.getPeerCertificates();
X509Certificate[] decodedCerts = new X509Certificate[originCerts.length];
for (int i = 0; i < originCerts.length; i++) {
decodedCerts[i] = new DubboX509Certificate(originCerts[i].getEncoded());
}
session.putValue("decodedCerts", decodedCerts);
} catch (Throwable ignore) {
}
}
}
16 changes: 16 additions & 0 deletions ...ty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/ssl/SslServerTlsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.ssl.AuthPolicy;
import org.apache.dubbo.common.ssl.CertManager;
import org.apache.dubbo.common.ssl.DubboX509Certificate;
import org.apache.dubbo.common.ssl.ProviderCert;
import org.apache.dubbo.remoting.Constants;

import javax.net.ssl.SSLSession;

import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
import java.util.List;

import io.netty.buffer.ByteBuf;
Expand Down Expand Up @@ -75,6 +78,7 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
SSLSession session =
ctx.pipeline().get(SslHandler.class).engine().getSession();
logger.info("TLS negotiation succeed with: " + session.getPeerHost());
tryExactCerts(session);
// Remove after handshake success.
ctx.pipeline().remove(this);
ctx.channel().attr(SSL_SESSION_KEY).set(session);
Expand All @@ -91,6 +95,18 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
super.userEventTriggered(ctx, evt);
}

private static void tryExactCerts(SSLSession session) {
try {
Certificate[] originCerts = session.getPeerCertificates();
X509Certificate[] decodedCerts = new X509Certificate[originCerts.length];
for (int i = 0; i < originCerts.length; i++) {
decodedCerts[i] = new DubboX509Certificate(originCerts[i].getEncoded());
}
session.putValue("decodedCerts", decodedCerts);
} catch (Throwable ignore) {
}
}

@Override
protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List<Object> list)
throws Exception {
Expand Down
Loading