svn commit: r784356 - /directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java

[el...@apache.org]

Author: elecharny
Date: Sat Jun 13 09:49:22 2009
New Revision: 784356

URL: http://svn.apache.org/viewvc?rev=784356&view=rev
Log:
Added a test for DIRSERVER-1375

Modified:
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java?rev=784356&r1=784355&r2=784356&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java Sat Jun 13 09:49:22 2009
@@ -353,6 +353,62 @@
         assertNotNull( attrs );
         assertTrue( attrs.get( "uid" ).contains( "akarasulu" ) );
     }
+    
+    
+    @Test
+    public void testSSHA4BytesSalt() throws Exception
+    {
+        apply( service, getUserAddLdif() );
+        String userDn = "uid=akarasulu,ou=users,ou=system";
+        LdapContext ctx = new ServerLdapContext( service, 
+            service.getSession( new LdapDN( userDn ), "test".getBytes() ), new LdapDN( userDn ) );
+
+        // Check that we can get the attributes
+        Attributes attrs = ctx.getAttributes( "" );
+        assertNotNull( attrs );
+        assertTrue( attrs.get( "uid" ).contains( "akarasulu" ) );
+
+        // now modify the password for akarasulu : 'test123', encrypted using SHA with a 4 bytes salt
+        BasicAttribute userPasswordAttribute = new BasicAttribute( "userPassword", "{SSHA}0TT388zsWzHKtMEpIU/8/W68egchNEWp" );
+        ctx.modifyAttributes( "", new ModificationItem[] {
+            new ModificationItem( DirContext.REPLACE_ATTRIBUTE, userPasswordAttribute ) } );
+
+        // close and try with old password (should fail)
+        ctx.close();
+
+        try
+        {
+            ctx = new ServerLdapContext( service, 
+                service.getSession( new LdapDN( userDn ), "test".getBytes() ), new LdapDN( userDn ) );
+            fail( "Authentication with old password should fail" );
+        }
+        catch ( Exception e )
+        {
+            // we should fail
+        }
+        finally
+        {
+            if ( ctx != null )
+            {
+                ctx.close();
+            }
+        }
+
+        // try again now with new password (should be successful)
+        ctx = new ServerLdapContext( service, 
+            service.getSession( new LdapDN( userDn ), "test123".getBytes() ), new LdapDN( userDn ) );
+        attrs = ctx.getAttributes( "" );
+        assertNotNull( attrs );
+        assertTrue( attrs.get( "uid" ).contains( "akarasulu" ) );
+
+        // close and try again now with new password, to check that the
+        // cache is updated (should be successfull)
+        ctx = new ServerLdapContext( service, 
+            service.getSession( new LdapDN( userDn ), "test123".getBytes() ), new LdapDN( userDn ) );
+        attrs = ctx.getAttributes( "" );
+        assertNotNull( attrs );
+        assertTrue( attrs.get( "uid" ).contains( "akarasulu" ) );
+    }
 
 
     @Test
@@ -424,7 +480,7 @@
         assertNotNull( attrs );
         assertTrue( attrs.get( "uid" ).contains( "akarasulu" ) );
 
-        // now modify the password for akarasulu : 'secret', encrypted using SHA
+        // now modify the password for akarasulu : 'secret', encrypted using SMD5
         Attribute userPasswordAttribute = new BasicAttribute( "userPassword", "{SMD5}tQ9wo/VBuKsqBtylMMCcORbnYOJFMyDJ" );
         ctx.modifyAttributes( "", new ModificationItem[] {
             new ModificationItem( DirContext.REPLACE_ATTRIBUTE, userPasswordAttribute ) } );
@@ -450,7 +506,7 @@
             }
         }
 
-        // try again now with new password (should be successfull)
+        // try again now with new password (should be successful)
         ctx = new ServerLdapContext( service, 
             service.getSession( new LdapDN( userDn ), "secret".getBytes() ), new LdapDN( userDn ) );
         attrs = ctx.getAttributes( "" );