Skip to content

Removed deprecated usages of getPeerCertificateChain #2151

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

Merged
merged 2 commits into from
Dec 10, 2021
Merged

Removed deprecated usages of getPeerCertificateChain #2151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2a8748
Issue #2145 Removed deprecated calls, added new methods to SSLSupport
dmatej Dec 8, 2021
4219b55
Issue #2145 Minimal JDK required for grizzly 3 should be 11
dmatej Dec 10, 2021
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
2 changes: 1 addition & 1 deletion boms/bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
<configuration>
<rules>
<requireJavaVersion>
<version>[1.8,)</version>
<version>[11,)</version>
</requireJavaVersion>
<requireMavenVersion>
<version>3.5.4</version>
Expand Down
30 changes: 25 additions & 5 deletions modules/grizzly/src/main/java/org/glassfish/grizzly/ssl/SSLSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.glassfish.grizzly.ssl;

import java.io.IOException;
import java.security.cert.Certificate;

/**
* SSLSupport
Expand Down Expand Up @@ -51,16 +52,35 @@ public interface SSLSupport {
String getCipherSuite() throws IOException;

/**
* The client certificate chain (if any).
* @return The client certificate chain (if any).
* @deprecated use {@link #getPeerCertificates()} instead.
*/
Object[] getPeerCertificateChain() throws IOException;
@Deprecated(forRemoval = true)
default Object[] getPeerCertificateChain() throws IOException {
return getPeerCertificates();
}

/**
* @return The client certificate chain (if any).
* @throws IOException
*/
Certificate[] getPeerCertificates() throws IOException;

/**
* @param force If <tt>true</tt>, then re-negotiate the connection if necessary.
* @return The client certificate chain (if any).
* @deprecated use {@link #getPeerCertificates(boolean)} instead.
*/
@Deprecated(forRemoval = true)
default Object[] getPeerCertificateChain(boolean force) throws IOException {
return getPeerCertificates(force);
}

/**
* The client certificate chain (if any).
*
* @param force If <tt>true</tt>, then re-negotiate the connection if necessary.
* @return The client certificate chain (if any).
*/
Object[] getPeerCertificateChain(boolean force) throws IOException;
Certificate[] getPeerCertificates(boolean force) throws IOException;

/**
* Get the keysize.
Expand Down
46 changes: 22 additions & 24 deletions modules/grizzly/src/main/java/org/glassfish/grizzly/ssl/SSLSupportImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2021 Contributors to the Eclipse Foundation
* Copyright (c) 2009, 2020 Oracle and/or its affiliates. All rights reserved.
* Copyright 2004 The Apache Software Foundation
*
Expand All @@ -19,14 +20,14 @@

import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.security.cert.Certificate;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.util.logging.Level;
import java.util.logging.Logger;

import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLSession;
import javax.security.cert.X509Certificate;

import org.glassfish.grizzly.Connection;
import org.glassfish.grizzly.Grizzly;

Expand Down Expand Up @@ -72,29 +73,29 @@ public String getCipherSuite() throws IOException {
}

@Override
public Object[] getPeerCertificateChain() throws IOException {
return getPeerCertificateChain(false);
public Certificate[] getPeerCertificates() throws IOException {
return getPeerCertificates(false);
}

protected java.security.cert.X509Certificate[] getX509Certificates(SSLSession session) throws IOException {
X509Certificate jsseCerts[] = null;
protected Certificate[] getCertificates(SSLSession session) throws IOException {
Certificate jsseCerts[] = null;
try {
jsseCerts = session.getPeerCertificateChain();
jsseCerts = session.getPeerCertificates();
} catch (Throwable ex) {
// Get rid of the warning in the logs when no Client-Cert is
// available
}

if (jsseCerts == null) {
jsseCerts = new X509Certificate[0];
jsseCerts = new Certificate[0];
}
java.security.cert.X509Certificate[] x509Certs = new java.security.cert.X509Certificate[jsseCerts.length];
X509Certificate[] x509Certs = new X509Certificate[jsseCerts.length];
for (int i = 0; i < x509Certs.length; i++) {
try {
byte buffer[] = jsseCerts[i].getEncoded();
CertificateFactory cf = CertificateFactory.getInstance("X.509");
ByteArrayInputStream stream = new ByteArrayInputStream(buffer);
x509Certs[i] = (java.security.cert.X509Certificate) cf.generateCertificate(stream);
x509Certs[i] = (X509Certificate) cf.generateCertificate(stream);
if (logger.isLoggable(Level.FINE)) {
logger.log(Level.FINE, "Cert #" + i + " = " + x509Certs[i]);
}
Expand All @@ -111,7 +112,7 @@ protected java.security.cert.X509Certificate[] getX509Certificates(SSLSession se
}

@Override
public Object[] getPeerCertificateChain(boolean force) throws IOException {
public Certificate[] getPeerCertificates(boolean force) throws IOException {
// Look up the current SSLSession
/*
* SJSAS 6439313 SSLSession session = ssl.getSession();
Expand All @@ -121,14 +122,14 @@ public Object[] getPeerCertificateChain(boolean force) throws IOException {
}

// Convert JSSE's certificate format to the ones we need
X509Certificate[] jsseCerts = null;
Certificate[] jsseCerts = null;
try {
jsseCerts = session.getPeerCertificateChain();
jsseCerts = session.getPeerCertificates();
} catch (Exception bex) {
// ignore.
}
if (jsseCerts == null) {
jsseCerts = new X509Certificate[0];
jsseCerts = new Certificate[0];
}
if (jsseCerts.length <= 0 && force) {
session.invalidate();
Expand All @@ -140,7 +141,7 @@ public Object[] getPeerCertificateChain(boolean force) throws IOException {
session = engine.getSession();
// END SJSAS 6439313
}
return getX509Certificates(session);
return getCertificates(session);
}

/**
Expand All @@ -149,10 +150,7 @@ public Object[] getPeerCertificateChain(boolean force) throws IOException {
@Override
public Integer getKeySize() throws IOException {
// Look up the current SSLSession
/*
* SJSAS 6439313 SSLSession session = ssl.getSession();
*/
SSLSupport.CipherData c_aux[] = ciphers;
// SJSAS 6439313 SSLSession session = ssl.getSession();
if (session == null) {
return null;
}
Expand All @@ -161,9 +159,9 @@ public Integer getKeySize() throws IOException {
int size = 0;
String cipherSuite = session.getCipherSuite();

for (int i = 0; i < c_aux.length; i++) {
if (cipherSuite.contains(c_aux[i].phrase)) {
size = c_aux[i].keySize;
for (CipherData element : ciphers) {
if (cipherSuite.contains(element.phrase)) {
size = element.keySize;
break;
}
}
Expand All @@ -188,8 +186,8 @@ public String getSessionId() throws IOException {
return null;
}
StringBuilder buf = new StringBuilder("");
for (int x = 0; x < ssl_session.length; x++) {
String digit = Integer.toHexString(ssl_session[x]);
for (byte element : ssl_session) {
String digit = Integer.toHexString(element);
if (digit.length() < 2) {
buf.append('0');
}
Expand Down
2 changes: 1 addition & 1 deletion modules/http-server/src/main/java/org/glassfish/grizzly/http/server/Request.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1779,7 +1779,7 @@ public static StringBuffer appendRequestURL(final Request request, final StringB
public Principal getUserPrincipal() {
if (userPrincipal == null) {
if (getRequest().isSecure()) {
X509Certificate certs[] = (X509Certificate[]) getAttribute(Globals.CERTIFICATES_ATTR);
X509Certificate[] certs = (X509Certificate[]) getAttribute(Globals.CERTIFICATES_ATTR);
if (FORCE_CLIENT_AUTH_ON_GET_USER_PRINCIPAL && (certs == null || certs.length < 1)) {
// Force SSL re-handshake and request client auth
certs = (X509Certificate[]) getAttribute(Globals.SSL_CERTIFICATE_ATTR);
Expand Down