[jboss-cvs] Picketbox SVN: r262 - 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-27 10:06:53 -0400 (Tue, 27 Sep 2011)
New Revision: 262

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-624: remove method in vault

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-22 13:56:56 UTC (rev 261)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/picketbox/plugins/vault/PicketBoxSecurityVault.java	2011-09-27 14:06:53 UTC (rev 262)
@@ -369,6 +369,24 @@
       return theContent.get(mapKey) != null;
    }
    
+   /*
+    * @see org.jboss.security.vault.SecurityVault#remove(java.lang.String, java.lang.String, byte[])
+    */
+   public boolean remove(String vaultBlock, String attributeName, byte[] sharedKey)
+		   throws SecurityVaultException 
+   {
+	   String mapKey = vaultBlock + "_" + attributeName;
+	   try
+	   {
+		   theContent.remove(mapKey);
+	   }
+	   catch(Exception e)
+	   {
+		   return false;
+	   }
+	   return true;
+	}
+   
    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-22 13:56:56 UTC (rev 261)
+++ trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault/SecurityVaultUnitTestCase.java	2011-09-27 14:06:53 UTC (rev 262)
@@ -161,6 +161,9 @@
       assertEquals(new String(attributeValue), new String(vault.retrieve(vaultBlock+"1", attributeName+"2", sharedKey))); 
       
       System.out.println("Currently storing:" + vault.keyList());
+      
+      assertTrue(vault.remove(vaultBlock+"1", attributeName+"2", sharedKey));
+      assertFalse(vault.exists(vaultBlock+"1", attributeName+"2"));
    }
    
    private String getMaskedPassword(String pwd, String salt, int iterationCount) throws Exception

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-22 13:56:56 UTC (rev 261)
+++ trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVault.java	2011-09-27 14:06:53 UTC (rev 262)
@@ -86,5 +86,16 @@
     * @return
     * @throws SecurityVaultException
     */
-   char[] retrieve(String vaultBlock, String attributeName, byte[] sharedKey) throws SecurityVaultException; 
+   char[] retrieve(String vaultBlock, String attributeName, byte[] sharedKey) throws SecurityVaultException;
+   
+   /**
+    * Remove an existing attribute value
+    * @param vaultBlock
+    * @param attributeName
+    * @param sharedKey
+    * @return true if remove was successful, false otherwise
+    * @throws SecurityVaultException
+    * @since v4.0.4.final
+    */
+   boolean remove(String vaultBlock, String attributeName, byte[] sharedKey) throws SecurityVaultException;
 }
\ No newline at end of file