You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2012/01/24 16:32:29 UTC
svn commit: r1235300 [2/2] - in /directory/apacheds/trunk:
installers-maven-plugin/src/main/java/org/apache/directory/server/installers/
installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/
installers-maven-plugin/src/m...
Modified: directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/StrongAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/StrongAuthenticator.java?rev=1235300&r1=1235299&r2=1235300&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/StrongAuthenticator.java (original)
+++ directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/StrongAuthenticator.java Tue Jan 24 15:32:28 2012
@@ -55,10 +55,11 @@ public class StrongAuthenticator extends
public LdapPrincipal authenticate( BindOperationContext bindContext ) throws LdapAuthenticationException
{
// Possibly check if user account is disabled, other account checks.
- LdapPrincipal principal = new LdapPrincipal( getDirectoryService().getSchemaManager(), bindContext.getDn(), AuthenticationLevel.STRONG );
-
+ LdapPrincipal principal = new LdapPrincipal( getDirectoryService().getSchemaManager(), bindContext.getDn(),
+ AuthenticationLevel.STRONG );
+
IoSession session = bindContext.getIoSession();
-
+
if ( session != null )
{
SocketAddress clientAddress = session.getRemoteAddress();
@@ -66,7 +67,7 @@ public class StrongAuthenticator extends
SocketAddress serverAddress = session.getServiceAddress();
principal.setServerAddress( serverAddress );
}
-
+
return principal;
}
}
Modified: directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/ppolicy/PpolicyConfigContainer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/ppolicy/PpolicyConfigContainer.java?rev=1235300&r1=1235299&r2=1235300&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/ppolicy/PpolicyConfigContainer.java (original)
+++ directory/apacheds/trunk/interceptors/authn/src/main/java/org/apache/directory/server/core/authn/ppolicy/PpolicyConfigContainer.java Tue Jan 24 15:32:28 2012
@@ -67,8 +67,8 @@ public class PpolicyConfigContainer
{
return ( !ppolicyConfigMap.isEmpty() );
}
-
-
+
+
/**
* Get the password policy configuration defined at a given Dn
*
@@ -100,7 +100,7 @@ public class PpolicyConfigContainer
this.defaultPolicy = defaultPolicy;
}
-
+
/**
* deactivate an existing password policy.
*
Modified: directory/apacheds/trunk/interceptors/authn/src/test/java/org/apache/directory/server/core/authn/LdapPrincipalTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authn/src/test/java/org/apache/directory/server/core/authn/LdapPrincipalTest.java?rev=1235300&r1=1235299&r2=1235300&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/authn/src/test/java/org/apache/directory/server/core/authn/LdapPrincipalTest.java (original)
+++ directory/apacheds/trunk/interceptors/authn/src/test/java/org/apache/directory/server/core/authn/LdapPrincipalTest.java Tue Jan 24 15:32:28 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.server.core.authn;
+
import static org.junit.Assert.assertEquals;
import java.io.ByteArrayInputStream;
@@ -53,6 +54,7 @@ public class LdapPrincipalTest
/** The schema manager instance */
private static SchemaManager schemaManager;
+
@BeforeClass
public static void setUp() throws Exception
{
@@ -81,15 +83,16 @@ public class LdapPrincipalTest
assertEquals( principal.getAuthenticationLevel(), readPrincipal.getAuthenticationLevel() );
assertEquals( principal.getName(), readPrincipal.getName() );
}
-
-
+
+
/**
* Test the serialization of an empty LdapPrincipal
*/
@Test
public void testStaticSerializeLdapPrincipalWithSchemaManager() throws Exception
{
- LdapPrincipal principal = new LdapPrincipal( schemaManager, new Dn( schemaManager, "uid=admin,ou=system" ), AuthenticationLevel.STRONG );
+ LdapPrincipal principal = new LdapPrincipal( schemaManager, new Dn( schemaManager, "uid=admin,ou=system" ),
+ AuthenticationLevel.STRONG );
ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream( baos );
Modified: directory/apacheds/trunk/interceptors/authn/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/authn/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java?rev=1235300&r1=1235299&r2=1235300&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/authn/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java (original)
+++ directory/apacheds/trunk/interceptors/authn/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java Tue Jan 24 15:32:28 2012
@@ -55,15 +55,15 @@ public class SimpleAuthenticatorOneWayEn
public void testGetAlgorithmForHashedPassword()
{
String digestetValue = "{SHA}LhkDrSoM6qr0fW6hzlfOJQW61tc=";
- assertEquals( "SHA", auth.getAlgorithmForHashedPassword( Strings.getBytesUtf8(digestetValue) ) );
+ assertEquals( "SHA", auth.getAlgorithmForHashedPassword( Strings.getBytesUtf8( digestetValue ) ) );
assertEquals( "SHA", auth.getAlgorithmForHashedPassword( digestetValue.getBytes() ) );
String noAlgorithm = "Secret1!";
- assertEquals( null, auth.getAlgorithmForHashedPassword( Strings.getBytesUtf8(noAlgorithm) ) );
+ assertEquals( null, auth.getAlgorithmForHashedPassword( Strings.getBytesUtf8( noAlgorithm ) ) );
assertEquals( null, auth.getAlgorithmForHashedPassword( noAlgorithm.getBytes() ) );
String unknownAlgorithm = "{XYZ}LhkDrSoM6qr0fW6hzlfOJQW61tc=";
- assertEquals( null, auth.getAlgorithmForHashedPassword( Strings.getBytesUtf8(unknownAlgorithm) ) );
+ assertEquals( null, auth.getAlgorithmForHashedPassword( Strings.getBytesUtf8( unknownAlgorithm ) ) );
assertEquals( null, auth.getAlgorithmForHashedPassword( unknownAlgorithm.getBytes() ) );
}
@@ -73,7 +73,7 @@ public class SimpleAuthenticatorOneWayEn
{
String pwd = "Secret1!";
String expected = "{SHA}znbJr3+tymFoQD4+Njh4ITtI7Cc=";
- String digested = auth.createDigestedPassword( "SHA", Strings.getBytesUtf8(pwd) );
+ String digested = auth.createDigestedPassword( "SHA", Strings.getBytesUtf8( pwd ) );
assertEquals( expected, digested );
}