Skip to content

fix: replace deprecated X509Certificate.getSubjectDN() and getIssuerDN() with X500Principal equivalents #3283

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
itsmohitnarayan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: replace deprecated X509Certificate.getSubjectDN() and getIssuerDN() with X500Principal equivalents #3283

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
15 changes: 10 additions & 5 deletions ...ava/org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.security.Principal;
import java.security.PublicKey;
import java.security.SignatureException;
import java.security.cert.CertificateEncodingException;
Expand Down Expand Up @@ -320,9 +319,12 @@ public int getBasicConstraints() {
return this.origCertificate.getBasicConstraints();
}

// Suppressing deprecation warning: We must override this deprecated abstract method,
// but we return X500Principal (non-deprecated) via getIssuerX500Principal()
@SuppressWarnings("deprecation")
@Override
public Principal getIssuerDN() {
return this.origCertificate.getIssuerDN();
public X500Principal getIssuerDN() {
return this.origCertificate.getIssuerX500Principal();
}

@Override
Expand Down Expand Up @@ -370,9 +372,12 @@ public byte[] getSignature() {
return this.origCertificate.getSignature();
}

// Suppressing deprecation warning: We must override this deprecated abstract method,
// but we return X500Principal (non-deprecated) via getSubjectX500Principal()
@SuppressWarnings("deprecation")
@Override
public Principal getSubjectDN() {
return this.origCertificate.getSubjectDN();
public X500Principal getSubjectDN() {
return this.origCertificate.getSubjectX500Principal();
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...org/apache/kafka/common/security/ssl/CommonNameLoggingTrustManagerFactoryWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ void testNeverExpiringX509Certificate() throws Exception {
wrappedCert.hasUnsupportedCriticalExtension());
// We have just generated a valid test certificate, it should still be valid now
assertEquals(cert.getBasicConstraints(), wrappedCert.getBasicConstraints());
assertEquals(cert.getIssuerDN(), wrappedCert.getIssuerDN());
assertEquals(cert.getIssuerX500Principal(), wrappedCert.getIssuerDN());
assertEquals(cert.getIssuerUniqueID(), wrappedCert.getIssuerUniqueID());
assertEquals(cert.getKeyUsage(), wrappedCert.getKeyUsage());
assertEquals(cert.getNotAfter(), wrappedCert.getNotAfter());
Expand All @@ -132,7 +132,7 @@ void testNeverExpiringX509Certificate() throws Exception {
assertEquals(cert.getSigAlgOID(), wrappedCert.getSigAlgOID());
assertArrayEquals(cert.getSigAlgParams(), wrappedCert.getSigAlgParams());
assertArrayEquals(cert.getSignature(), wrappedCert.getSignature());
assertEquals(cert.getSubjectDN(), wrappedCert.getSubjectDN());
assertEquals(cert.getSubjectX500Principal(), wrappedCert.getSubjectDN());
assertEquals(cert.getSubjectUniqueID(), wrappedCert.getSubjectUniqueID());
assertArrayEquals(cert.getTBSCertificate(), wrappedCert.getTBSCertificate());
assertEquals(cert.getVersion(), wrappedCert.getVersion());
Expand Down
Loading