directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r678755 - /directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/NewBindHandler.java
Date Tue, 22 Jul 2008 13:18:16 GMT
Author: elecharny
Date: Tue Jul 22 06:18:16 2008
New Revision: 678755

URL: http://svn.apache.org/viewvc?rev=678755&view=rev
Log:
Handle exceptions when we get some. The previous code was not generating any response if an
error occurred.

Modified:
    directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/NewBindHandler.java

Modified: directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/NewBindHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/NewBindHandler.java?rev=678755&r1=678754&r2=678755&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/NewBindHandler.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/NewBindHandler.java
Tue Jul 22 06:18:16 2008
@@ -24,6 +24,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.naming.Name;
 import javax.security.auth.Subject;
 import javax.security.auth.kerberos.KerberosKey;
 import javax.security.auth.kerberos.KerberosPrincipal;
@@ -44,10 +45,14 @@
 import org.apache.directory.server.newldap.handlers.bind.MechanismHandler;
 import org.apache.directory.server.protocol.shared.ServiceConfigurationException;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
+import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.BindRequest;
 import org.apache.directory.shared.ldap.message.BindResponse;
 import org.apache.directory.shared.ldap.message.LdapResult;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.util.ExceptionUtils;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -100,20 +105,65 @@
         // Stores the request controls into the operation context
         LdapProtocolUtils.setRequestControls( opContext, bindRequest );
         
-        // And call the OperationManager bind operation.
-        getLdapServer().getDirectoryService().getOperationManager().bind( opContext );
-        
-        // As a result, store the created session in the Core Session
-        session.setCoreSession( opContext.getSession() );
-        
-        // Return the successful response
-        BindResponse response = ( BindResponse ) bindRequest.getResultResponse();
-        response.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
-        LdapProtocolUtils.setResponseControls( opContext, response );
-        
-        // Write it back to the client
-        session.getIoSession().write( response );
-        LOG.debug( "Returned SUCCESS message: {}.", response );
+        try
+        {
+	        // And call the OperationManager bind operation.
+	        getLdapServer().getDirectoryService().getOperationManager().bind( opContext );
+	        
+	        // As a result, store the created session in the Core Session
+	        session.setCoreSession( opContext.getSession() );
+	        
+	        // Return the successful response
+	        BindResponse response = ( BindResponse ) bindRequest.getResultResponse();
+	        response.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
+	        LdapProtocolUtils.setResponseControls( opContext, response );
+	        
+	        // Write it back to the client
+	        session.getIoSession().write( response );
+	        LOG.debug( "Returned SUCCESS message: {}.", response );
+        }
+        catch ( Exception e )
+        {
+        	// Something went wrong. Write back an error message        	
+            ResultCodeEnum code = null;
+            LdapResult result = bindRequest.getResultResponse().getLdapResult();
+
+            if ( e instanceof LdapException )
+            {
+                code = ( ( LdapException ) e ).getResultCode();
+                result.setResultCode( code );
+            }
+            else
+            {
+                code = ResultCodeEnum.getBestEstimate( e, bindRequest.getType() );
+                result.setResultCode( code );
+            }
+
+            String msg = "Bind failed: " + e.getMessage();
+
+            if ( LOG.isDebugEnabled() )
+            {
+                msg += ":\n" + ExceptionUtils.getStackTrace( e );
+                msg += "\n\nBindRequest = \n" + bindRequest.toString();
+            }
+
+            Name name = null;
+            
+            if ( e instanceof LdapAuthenticationException )
+            {
+            	name = ((LdapAuthenticationException)e).getResolvedName();
+            }
+            
+            if ( ( name != null )
+                && ( ( code == ResultCodeEnum.NO_SUCH_OBJECT ) || ( code == ResultCodeEnum.ALIAS_PROBLEM
)
+                    || ( code == ResultCodeEnum.INVALID_DN_SYNTAX ) || ( code == ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM
) ) )
+            {
+                result.setMatchedDn( new LdapDN( name ) );
+            }
+
+            result.setErrorMessage( msg );
+            session.getIoSession().write( bindRequest.getResultResponse() );
+        }
     }
     
     



Mime
View raw message