use getUsername rather than getPrincipal

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1433464 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
index da249dd54b7cf9224d45cdbbc25d6a88545bcf12..a291345a943c9c757ce08bbbb043d27f44f02d95 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
@@ -106,14 +106,14 @@ public class ArchivaUserManagerAuthenticator
             try
             {
                 log.debug( "Authenticate: {} with userManager: {}", source, userManager.getId() );
-                User user = userManager.findUser( source.getPrincipal() );
+                User user = userManager.findUser( source.getUsername() );
                 username = user.getUsername();
 
                 if ( user.isLocked() )
                 {
-                    //throw new AccountLockedException( "Account " + source.getPrincipal() + " is locked.", user );
+                    //throw new AccountLockedException( "Account " + source.getUsername() + " is locked.", user );
                     AccountLockedException e =
-                        new AccountLockedException( "Account " + source.getPrincipal() + " is locked.", user );
+                        new AccountLockedException( "Account " + source.getUsername() + " is locked.", user );
                     log.warn( "{}", e.getMessage() );
                     resultException = e;
                     authnResultErrors.add(
@@ -138,7 +138,7 @@ public class ArchivaUserManagerAuthenticator
                 boolean isPasswordValid = encoder.isPasswordValid( user.getEncodedPassword(), source.getPassword() );
                 if ( isPasswordValid )
                 {
-                    log.debug( "User {} provided a valid password", source.getPrincipal() );
+                    log.debug( "User {} provided a valid password", source.getUsername() );
 
                     try
                     {
@@ -156,7 +156,7 @@ public class ArchivaUserManagerAuthenticator
                             }
                         }
 
-                        return new AuthenticationResult( true, source.getPrincipal(), null );
+                        return new AuthenticationResult( true, source.getUsername(), null );
                     }
                     catch ( MustChangePasswordException e )
                     {
@@ -169,11 +169,11 @@ public class ArchivaUserManagerAuthenticator
                 }
                 else
                 {
-                    log.warn( "Password is Invalid for user {} and userManager '{}'.", source.getPrincipal(),
+                    log.warn( "Password is Invalid for user {} and userManager '{}'.", source.getUsername(),
                               userManager.getId() );
                     authnResultErrors.add( new AuthenticationFailureCause( AuthenticationConstants.AUTHN_NO_SUCH_USER,
                                                                            "Password is Invalid for user "
-                                                                               + source.getPrincipal() + "." ) );
+                                                                               + source.getUsername() + "." ) );
 
                     try
                     {
@@ -189,23 +189,23 @@ public class ArchivaUserManagerAuthenticator
                         }
                     }
 
-                    //return new AuthenticationResult( false, source.getPrincipal(), null, authnResultExceptionsMap );
+                    //return new AuthenticationResult( false, source.getUsername(), null, authnResultExceptionsMap );
                 }
             }
             catch ( UserNotFoundException e )
             {
-                log.warn( "Login for user {} failed. user not found.", source.getPrincipal() );
+                log.warn( "Login for user {} failed. user not found.", source.getUsername() );
                 resultException = e;
                 authnResultErrors.add( new AuthenticationFailureCause( AuthenticationConstants.AUTHN_NO_SUCH_USER,
-                                                                       "Login for user " + source.getPrincipal()
+                                                                       "Login for user " + source.getUsername()
                                                                            + " failed. user not found." ) );
             }
             catch ( UserManagerException e )
             {
-                log.warn( "Login for user {} failed, message: {}", source.getPrincipal(), e.getMessage() );
+                log.warn( "Login for user {} failed, message: {}", source.getUsername(), e.getMessage() );
                 resultException = e;
                 authnResultErrors.add( new AuthenticationFailureCause( AuthenticationConstants.AUTHN_RUNTIME_EXCEPTION,
-                                                                       "Login for user " + source.getPrincipal()
+                                                                       "Login for user " + source.getUsername()
                                                                            + " failed, message: " + e.getMessage() ) );
             }
         }

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
index 8b8d58ee74dc5a4087737f2f8e22bd08e7786023..4b3bec808bc7016dd63ef7cbf3801bba9cba02ee 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/web/rss/SecuritySystemStub.java
@@ -68,19 +68,19 @@ public class SecuritySystemStub
         AuthenticationResult result = null;
         SecuritySession session = null;
 
-        if ( users.get( source.getPrincipal() ) != null )
+        if ( users.get( source.getUsername() ) != null )
         {
-            result = new AuthenticationResult( true, source.getPrincipal(), null );
+            result = new AuthenticationResult( true, source.getUsername(), null );
 
             User user = new JdoUser();
-            user.setUsername( source.getPrincipal() );
-            user.setPassword( users.get( source.getPrincipal() ) );
+            user.setUsername( source.getUsername() );
+            user.setPassword( users.get( source.getUsername() ) );
 
             session = new DefaultSecuritySession( result, user );
         }
         else
         {
-            result = new AuthenticationResult( false, source.getPrincipal(), null );
+            result = new AuthenticationResult( false, source.getUsername(), null );
             session = new DefaultSecuritySession( result );
         }
         return session;

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java
index 63e11c5b6fe90f51dc5971792b6142f9842ce22e..7eefdd65e50cef949124e24cc96ad6bc5bb3c5ef 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/BypassSecuritySystem.java
@@ -63,7 +63,7 @@ public class BypassSecuritySystem
     public SecuritySession authenticate( AuthenticationDataSource source )
         throws AuthenticationException, UserNotFoundException, AccountLockedException
     {
-        AuthenticationResult result = new AuthenticationResult( true, source.getPrincipal(), null );
+        AuthenticationResult result = new AuthenticationResult( true, source.getUsername(), null );
         return new DefaultSecuritySession( result );
     }