[jboss-cvs] Picketbox SVN: r256 - in trunk: security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault and 1 other directories.

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

Author: anil.saldhana at jboss.com
Date: 2011-09-21 14:38:32 -0400 (Wed, 21 Sep 2011)
New Revision: 256

Modified:
   trunk/security-jboss-sx/jbosssx/src/main/java/org/picketbox/plugins/vault/PicketBoxSecurityVault.java
   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/SecurityVault.java
Log:
SECURITY-620: vault exists method

Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/picketbox/plugins/vault/PicketBoxSecurityVault.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/picketbox/plugins/vault/PicketBoxSecurityVault.java	2011-09-21 18:36:35 UTC (rev 255)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/picketbox/plugins/vault/PicketBoxSecurityVault.java	2011-09-21 18:38:32 UTC (rev 256)
@@ -360,7 +360,15 @@
          throw new SecurityVaultException("Decryption of value failed:",e);
       } 
    }
-    
+   /**
+    * @see org.jboss.security.vault.SecurityVault#exists(String, String)
+    */
+   public boolean exists(String vaultBlock, String attributeName) throws SecurityVaultException
+   { 
+      String mapKey = vaultBlock + "_" + attributeName;
+      return theContent.get(mapKey) != null;
+   }
+   
    private String decode(String maskedString, String salt, int iterationCount) throws Exception
    {
       String pbeAlgo = "PBEwithMD5andDES";

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	2011-09-21 18:36:35 UTC (rev 255)
+++ trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault/SecurityVaultUnitTestCase.java	2011-09-21 18:38:32 UTC (rev 256)
@@ -153,6 +153,7 @@
       
       vault.store(vaultBlock, attributeName, attributeValue , sharedKey);
       
+      assertTrue(vault.exists(vaultBlock, attributeName));
       //Now retrieve 
       assertEquals(new String(attributeValue), new String(vault.retrieve(vaultBlock, attributeName, sharedKey))); 
       

Modified: trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVault.java
===================================================================
--- trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVault.java	2011-09-21 18:36:35 UTC (rev 255)
+++ trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVault.java	2011-09-21 18:38:32 UTC (rev 256)
@@ -59,6 +59,16 @@
    Set<String> keyList() throws SecurityVaultException;
    
    /**
+    * Check whether an attribute value exists in the vault
+    * @param vaultBlock
+    * @param attributeName
+    * @return
+    * @throws SecurityVaultException
+    * @since v4.0.3
+    */
+   boolean exists(String vaultBlock, String attributeName) throws SecurityVaultException;
+   
+   /**
     * Store an attribute value
     * @param vaultBlock a string value that brings in the uniqueness
     * @param attributeName name of the attribute