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

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

Author: anil.saldhana at jboss.com
Date: 2012-01-20 17:48:24 -0500 (Fri, 20 Jan 2012)
New Revision: 301

Modified:
   trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault/SecurityVaultUnitTestCase.java
   trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultUtil.java
Log:
SECURITY-642: avoid NPE

Modified: trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault/SecurityVaultUnitTestCase.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault/SecurityVaultUnitTestCase.java	2012-01-20 22:29:47 UTC (rev 300)
+++ trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault/SecurityVaultUnitTestCase.java	2012-01-20 22:48:24 UTC (rev 301)
@@ -40,6 +40,7 @@
 import org.jboss.security.vault.SecurityVault;
 import org.jboss.security.vault.SecurityVaultException;
 import org.jboss.security.vault.SecurityVaultFactory;
+import org.jboss.security.vault.SecurityVaultUtil;
 import org.junit.Before;
 import org.junit.Test;
 import org.picketbox.plugins.vault.PicketBoxSecurityVault;
@@ -166,6 +167,13 @@
       assertFalse(vault.exists(vaultBlock+"1", attributeName+"2"));
    }
    
+   @Test
+   public void testUtil() throws Exception
+   {
+	   assertFalse(SecurityVaultUtil.isVaultFormat((String)null));
+	   assertFalse(SecurityVaultUtil.isVaultFormat((char[])null));
+   }
+   
    private String getMaskedPassword(String pwd, String salt, int iterationCount) throws Exception
    {
       String algo = "PBEwithMD5andDES";

Modified: trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultUtil.java
===================================================================
--- trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultUtil.java	2012-01-20 22:29:47 UTC (rev 300)
+++ trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultUtil.java	2012-01-20 22:48:24 UTC (rev 301)
@@ -44,6 +44,10 @@
 	 */
 	public static boolean isVaultFormat(char[] chars) 
 	{
+		if(chars == null) 
+		{
+			return false;
+		}
 		String str = new String(chars);
 		return str.startsWith(VAULT_PREFIX);
 	}
@@ -56,7 +60,7 @@
 	 */
 	public static boolean isVaultFormat(String str) 
 	{
-		return str.startsWith(VAULT_PREFIX);
+		return str != null && str.startsWith(VAULT_PREFIX);
 	}
 
 	/**
@@ -118,6 +122,8 @@
 	public static char[] getValue(char[] chars)
 			throws SecurityVaultException 
 	{
+		if(chars == null)
+			return null;
 		String vaultString = new String(chars);
 		return getValue(vaultString);
 	}