[java-opensaml COMMIT] /trunk/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/TrustEngineT...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Nov 19 20:58:25 2014
New Revision: 4159

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4159&view=rev
Log:
Add missing return.
Simplify conditional logic.

Modified:
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/TrustEngineTLSSocketFactory.java

Modified: trunk/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/TrustEngineTLSSocketFactory.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/TrustEngineTLSSocketFactory.java?rev=4159&r1=4158&r2=4159&view=diff
==============================================================================
--- trunk/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/TrustEngineTLSSocketFactory.java (original)
+++ trunk/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/TrustEngineTLSSocketFactory.java Wed Nov 19 20:58:25 2014
@@ -161,27 +161,27 @@
                 HttpClientSecurityConstants.CONTEXT_KEY_CRITERIA_SET);
         if (criteriaSet == null) {
             log.debug("No criteria set supplied by caller, skipping trust eval");
+            return;
         } else {
             log.trace("Saw CriteriaSet: {}", criteriaSet);
         }
 
         X509Credential credential = extractCredential(sslSocket);
         
-        boolean trusted = false;
         try {
-            trusted = trustEngine.validate(credential, criteriaSet);
+            if (trustEngine.validate(credential, criteriaSet)) {
+                log.debug("Credential evaluated as trusted");
+                context.setAttribute(HttpClientSecurityConstants.CONTEXT_KEY_SERVER_TLS_CREDENTIAL_TRUSTED, 
+                        Boolean.TRUE);
+            } else {
+                log.debug("Credential evaluated as untrusted");
+                context.setAttribute(HttpClientSecurityConstants.CONTEXT_KEY_SERVER_TLS_CREDENTIAL_TRUSTED, 
+                        Boolean.FALSE);
+                throw new SSLPeerUnverifiedException("Trust engine could not establish trust of server TLS credential");
+            }
         } catch (SecurityException e) {
             log.error("Trust engine error evaluating credential", e);
             throw new IOException("Trust engine error evaluating credential", e);
-        }
-        
-        if (trusted) {
-            log.debug("Credential evaluated as trusted");
-            context.setAttribute(HttpClientSecurityConstants.CONTEXT_KEY_SERVER_TLS_CREDENTIAL_TRUSTED, Boolean.TRUE);
-        } else {
-            log.debug("Credential evaluated as untrusted");
-            context.setAttribute(HttpClientSecurityConstants.CONTEXT_KEY_SERVER_TLS_CREDENTIAL_TRUSTED, Boolean.FALSE);
-            throw new SSLPeerUnverifiedException("Trust engine could not establish trust of TLS server credential");
         }
         
     }