From commits-return-18102-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Mon May 12 03:35:49 2008 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 82347 invoked from network); 12 May 2008 03:35:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 May 2008 03:35:48 -0000 Received: (qmail 9568 invoked by uid 500); 12 May 2008 03:35:50 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 9525 invoked by uid 500); 12 May 2008 03:35:50 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 9514 invoked by uid 99); 12 May 2008 03:35:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 11 May 2008 20:35:50 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 May 2008 03:35:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CB6F623889C4; Sun, 11 May 2008 20:35:27 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r655408 - in /directory/apacheds/trunk: protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/ server-unit/src/test/java/org/apache/directory/s... Date: Mon, 12 May 2008 03:35:27 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080512033527.CB6F623889C4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Sun May 11 20:35:26 2008 New Revision: 655408 URL: http://svn.apache.org/viewvc?rev=655408&view=rev Log: removing NtlmAuthenticationResult since we really never new to return anything but a boolean Removed: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmAuthenticationResult.java Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DefaultBindHandler.java directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmProvider.java directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/SaslBindITest.java Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DefaultBindHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DefaultBindHandler.java?rev=655408&r1=655407&r2=655408&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DefaultBindHandler.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DefaultBindHandler.java Sun May 11 20:35:26 2008 @@ -398,12 +398,15 @@ if ( ss.isComplete() ) { - /* - * There may be a token to return to the client. We set it here - * so it will be returned in a SUCCESS message, after an LdapContext - * has been initialized for the client. - */ - session.setAttribute( "saslCreds", tokenBytes ); + if ( tokenBytes != null ) + { + /* + * There may be a token to return to the client. We set it here + * so it will be returned in a SUCCESS message, after an LdapContext + * has been initialized for the client. + */ + session.setAttribute( "saslCreds", tokenBytes ); + } /* * If we got here, we're ready to try getting an initial LDAP context. Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmProvider.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmProvider.java?rev=655408&r1=655407&r2=655408&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmProvider.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmProvider.java Sun May 11 20:35:26 2008 @@ -49,7 +49,7 @@ * * @param session the MINA IoSession to store any state to be thread safe * @param type3response the Type 3 NTLM response from the client - * @return the result of the successful authentication from the server + * @return the result of the authentication from the server */ - NtlmAuthenticationResult authenticate( IoSession session, byte[] type3response ) throws Exception; + boolean authenticate( IoSession session, byte[] type3response ) throws Exception; } Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java?rev=655408&r1=655407&r2=655408&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java Sun May 11 20:35:26 2008 @@ -129,11 +129,10 @@ } break; case TYPE_3_RECEIVED: - NtlmAuthenticationResult result = null; + boolean result; try { result = provider.authenticate( session, response ); - retval = result.getResponse(); session.setAttribute( Context.SECURITY_PRINCIPAL, request.getName().toString() ); } catch ( Exception e ) @@ -141,7 +140,7 @@ throw new SaslException( "There was a failure during NTLM Type 3 message handling.", e ); } - if ( ! result.isSuccess() ) + if ( ! result ) { throw new SaslException( "Authentication occurred but the credentials were invalid." ); } Modified: directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/SaslBindITest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/SaslBindITest.java?rev=655408&r1=655407&r2=655408&view=diff ============================================================================== --- directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/SaslBindITest.java (original) +++ directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/SaslBindITest.java Sun May 11 20:35:26 2008 @@ -28,7 +28,6 @@ import org.apache.directory.server.core.partition.impl.btree.Index; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition; -import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmAuthenticationResult; import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler; import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmProvider; import org.apache.directory.server.unit.AbstractServerTest; @@ -539,7 +538,6 @@ assertEquals( 2, finalResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, finalResponse.getLdapResult().getResultCode() ); assertTrue( ArrayUtils.isEquals( "type3_test".getBytes(), provider.getType3Response() ) ); - assertTrue( ArrayUtils.isEquals( "results".getBytes(), finalResponse.getServerSaslCreds() ) ); } @@ -559,7 +557,6 @@ assertEquals( 2, finalResponse.getMessageId() ); assertEquals( ResultCodeEnum.SUCCESS, finalResponse.getLdapResult().getResultCode() ); assertTrue( ArrayUtils.isEquals( "type3_test".getBytes(), provider.getType3Response() ) ); - assertTrue( ArrayUtils.isEquals( "results".getBytes(), finalResponse.getServerSaslCreds() ) ); } @@ -569,10 +566,10 @@ private byte[] type3response; - public NtlmAuthenticationResult authenticate( IoSession session, byte[] type3response ) throws Exception + public boolean authenticate( IoSession session, byte[] type3response ) throws Exception { this.type3response = type3response; - return new NtlmAuthenticationResult( "results".getBytes(), true ); + return true; }