From 6288c675b018c8ea7692ec25729c6e9ed84bd011 Mon Sep 17 00:00:00 2001 From: ivassile Date: Fri, 7 Oct 2016 11:16:09 -0400 Subject: [PATCH] [ELY-654] Ensure that negative values are converted to zero when setting sessionCacheSize and sessionTimeout in SSLSessionContext. --- .../java/org/wildfly/security/ssl/SSLContextBuilder.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/wildfly/security/ssl/SSLContextBuilder.java b/src/main/java/org/wildfly/security/ssl/SSLContextBuilder.java index 4bdf697148b..a621122b778 100644 --- a/src/main/java/org/wildfly/security/ssl/SSLContextBuilder.java +++ b/src/main/java/org/wildfly/security/ssl/SSLContextBuilder.java @@ -52,6 +52,9 @@ * @author David M. Lloyd */ public final class SSLContextBuilder { + private static final int DEFAULT_SESSION_CACHE_SIZE = 0; + private static final int DEFAULT_SESSION_TIMEOUT = 0; + private SecurityDomain securityDomain; private CipherSuiteSelector cipherSuiteSelector = CipherSuiteSelector.openSslDefault(); private ProtocolSelector protocolSelector = ProtocolSelector.DEFAULT_SELECTOR; @@ -271,8 +274,8 @@ public SecurityFactory build() { final Supplier providerSupplier = this.providerSupplier; final boolean clientMode = this.clientMode; final boolean authenticationOptional = this.authenticationOptional; - final int sessionCacheSize = this.sessionCacheSize; - final int sessionTimeout = this.sessionTimeout; + final int sessionCacheSize = (this.sessionCacheSize < 0) ? DEFAULT_SESSION_CACHE_SIZE : this.sessionCacheSize; + final int sessionTimeout = (this.sessionTimeout < 0) ? DEFAULT_SESSION_TIMEOUT : this.sessionTimeout; final boolean wantClientAuth = this.wantClientAuth; final boolean needClientAuth = this.needClientAuth; return new OneTimeSecurityFactory(() -> {