Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Return SslInfo only if X509Certificate[] present

Browse Source 
Issue: SPR-16842
This commit is contained in:
Rossen Stoyanchev
2018-05-23 14:56:55 -04:00
parent cb80eac9d7
commit 1e4a3a2370
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/src/main/java/org/springframework/http/server/reactive/DefaultSslInfo.java
View File

@@ -40,7 +40,7 @@ final class DefaultSslInfo implements SslInfo {
private final X509Certificate[] peerCertificates;
DefaultSslInfo(String sessionId, X509Certificate[] peerCertificates) {
DefaultSslInfo(@Nullable String sessionId, X509Certificate[] peerCertificates) {
Assert.notNull(peerCertificates, "No SSL certificates");
this.sessionId = sessionId;
this.peerCertificates = peerCertificates;

23
spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
View File

@@ -57,10 +57,6 @@ import org.springframework.util.StringUtils;
*/
class ServletServerHttpRequest extends AbstractServerHttpRequest {
private static final String X509_CERTIFICATE_ATTRIBUTE = "javax.servlet.request.X509Certificate";
private static final String SSL_SESSION_ID_ATTRIBUTE = "javax.servlet.request.ssl_session_id";
static final DataBuffer EOF_BUFFER = new DefaultDataBufferFactory().allocateBuffer(0);
@@ -178,12 +174,19 @@ class ServletServerHttpRequest extends AbstractServerHttpRequest {
@Nullable
protected SslInfo initSslInfo() {
if (!this.request.isSecure()) {
return null;
}
return new DefaultSslInfo(
(String) request.getAttribute(SSL_SESSION_ID_ATTRIBUTE),
(X509Certificate[]) request.getAttribute(X509_CERTIFICATE_ATTRIBUTE));
X509Certificate[] certificates = getX509Certificates();
return certificates != null ? new DefaultSslInfo(getSslSessionId(), certificates) : null;
}
@Nullable
private String getSslSessionId() {
return (String) this.request.getAttribute("javax.servlet.request.ssl_session_id");
}
@Nullable
private X509Certificate[] getX509Certificates() {
String name = "javax.servlet.request.X509Certificate";
return (X509Certificate[]) this.request.getAttribute(name);
}
@Override