[jboss-cvs] Picketbox SVN: r443 - in trunk: security-spi/common/src/main/java/org/jboss/security and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: sguilhen at redhat.com
Date: 2013-08-30 10:23:00 -0400 (Fri, 30 Aug 2013)
New Revision: 443

Modified:
   trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/JBossJSSESecurityDomain.java
   trunk/security-spi/common/src/main/java/org/jboss/security/PicketBoxMessages.java
Log:
SECURITY-751 Fixed message that would incorrectly report an invalid KeyStore type when the KeyStore URL is null



Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/JBossJSSESecurityDomain.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/JBossJSSESecurityDomain.java	2013-08-28 11:20:06 UTC (rev 442)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/JBossJSSESecurityDomain.java	2013-08-30 14:23:00 UTC (rev 443)
@@ -460,13 +460,14 @@
          is = null;
          try
          {
-        	 if ((!"PKCS11".equalsIgnoreCase(keyStoreType) || !"PKCS11IMPLKS".equalsIgnoreCase(keyStoreType))
-        			 && keyStoreURL != null)
-        	 {
-        		 is = keyStoreURL.openStream();
+        	 if ((!"PKCS11".equalsIgnoreCase(keyStoreType) && !"PKCS11IMPLKS".equalsIgnoreCase(keyStoreType)))
+             {
+                 // not a PKCS11 keystore: we need a URL
+                 if (keyStoreURL != null)
+        		    is = keyStoreURL.openStream();
+                 else
+                     throw PicketBoxMessages.MESSAGES.invalidNullKeyStoreURL(keyStoreType);
         	 }
-        	 else
-                 throw PicketBoxMessages.MESSAGES.invalidKeyStoreType(keyStoreType);
 
         	 keyStore.load(is, keyStorePassword);
          }
@@ -513,13 +514,14 @@
          is = null;
          try
          {
-        	 if ((!"PKCS11".equalsIgnoreCase(trustStoreType) || !"PKCS11IMPLKS".equalsIgnoreCase(trustStoreType))
-        			 && trustStoreURL != null)
+        	 if ((!"PKCS11".equalsIgnoreCase(trustStoreType) && !"PKCS11IMPLKS".equalsIgnoreCase(trustStoreType)))
         	 {
-        		 is = trustStoreURL.openStream();
+                 // not a PKCS11 truststore: we need a URL
+                 if (trustStoreURL != null)
+        		    is = trustStoreURL.openStream();
+                 else
+                    throw PicketBoxMessages.MESSAGES.invalidNullKeyStoreURL(trustStoreType);
         	 }
-        	 else
-                 throw PicketBoxMessages.MESSAGES.invalidKeyStoreType(trustStoreType);
 
         	 trustStore.load(is, trustStorePassword);
          }

Modified: trunk/security-spi/common/src/main/java/org/jboss/security/PicketBoxMessages.java
===================================================================
--- trunk/security-spi/common/src/main/java/org/jboss/security/PicketBoxMessages.java	2013-08-28 11:20:06 UTC (rev 442)
+++ trunk/security-spi/common/src/main/java/org/jboss/security/PicketBoxMessages.java	2013-08-30 14:23:00 UTC (rev 443)
@@ -385,8 +385,8 @@
     @Message(id = 116, value = "Service authentication token verification failed")
     SecurityException failedToVerifyServiceAuthToken();
 
-    @Message(id = 117, value = "Invalid KeyStore type: %s")
-    RuntimeException invalidKeyStoreType(String keystoreType);
+    @Message(id = 117, value = "Cannot load KeyStore of type %s: required keyStoreURL is null")
+    RuntimeException invalidNullKeyStoreURL(String keystoreType);
 
     @Message(id = 118, value = "Invalid password command type: %s")
     IllegalArgumentException invalidPasswordCommandType(String type);