You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2009/03/06 17:08:13 UTC
svn commit: r750953 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security:
ArchivaServletAuthenticator.java DefaultUserRepositories.java
Author: brett
Date: Fri Mar 6 16:08:12 2009
New Revision: 750953
URL: http://svn.apache.org/viewvc?rev=750953&view=rev
Log:
[MNG-1106] guard against NPE which can be generated by the LDAP user manager if misconfigured
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaServletAuthenticator.java
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/DefaultUserRepositories.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaServletAuthenticator.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaServletAuthenticator.java?rev=750953&r1=750952&r2=750953&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaServletAuthenticator.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaServletAuthenticator.java Fri Mar 6 16:08:12 2009
@@ -105,6 +105,10 @@
}
User user = securitySystem.getUserManager().findUser( principal );
+ if ( user == null )
+ {
+ throw new UnauthorizedException( "The security system had an internal error - please check your system logs" );
+ }
if ( user.isLocked() )
{
throw new UnauthorizedException( "User account is locked." );
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/DefaultUserRepositories.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/DefaultUserRepositories.java?rev=750953&r1=750952&r2=750953&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/DefaultUserRepositories.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/DefaultUserRepositories.java Fri Mar 6 16:08:12 2009
@@ -77,6 +77,10 @@
try
{
User user = securitySystem.getUserManager().findUser( principal );
+ if ( user == null )
+ {
+ throw new ArchivaSecurityException( "The security system had an internal error - please check your system logs" );
+ }
if ( user.isLocked() )
{
@@ -145,6 +149,10 @@
try
{
User user = securitySystem.getUserManager().findUser( principal );
+ if ( user == null )
+ {
+ throw new ArchivaSecurityException( "The security system had an internal error - please check your system logs" );
+ }
if ( user.isLocked() )
{