From commits-return-9503-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Wed Jul 12 21:38:47 2006 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 23616 invoked from network); 12 Jul 2006 21:38:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 12 Jul 2006 21:38:46 -0000 Received: (qmail 72693 invoked by uid 500); 12 Jul 2006 21:38:46 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 72663 invoked by uid 500); 12 Jul 2006 21:38:46 -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 72652 invoked by uid 99); 12 Jul 2006 21:38:46 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Jul 2006 14:38:46 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Jul 2006 14:38:45 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 952C31A981C; Wed, 12 Jul 2006 14:38:24 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r421422 - in /directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authn: AuthenticationService.java SimpleAuthenticator.java Date: Wed, 12 Jul 2006 21:38:24 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060712213824.952C31A981C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: akarasulu Date: Wed Jul 12 14:38:23 2006 New Revision: 421422 URL: http://svn.apache.org/viewvc?rev=421422&view=rev Log: adding next interceptor calls to AuthenticationService which were missing :( Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java?rev=421422&r1=421421&r2=421422&view=diff ============================================================================== --- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java (original) +++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authn/AuthenticationService.java Wed Jul 12 14:38:23 2006 @@ -421,6 +421,7 @@ { ctx.removeFromEnvironment( Context.SECURITY_CREDENTIALS ); } + next.bind( bindDn, credentials, mechanisms, saslAuthId ); return; } @@ -447,6 +448,7 @@ .getAuthenticationLevel( ctx.getEnvironment() ) ) ) ); // remove creds so there is no security risk ctx.removeFromEnvironment( Context.SECURITY_CREDENTIALS ); + next.bind( bindDn, credentials, mechanisms, saslAuthId ); return; } @@ -462,6 +464,7 @@ ctx.setPrincipal( new TrustedPrincipalWrapper( authorizationId ) ); // remove creds so there is no security risk ctx.removeFromEnvironment( Context.SECURITY_CREDENTIALS ); + next.bind( bindDn, credentials, mechanisms, saslAuthId ); return; } catch ( LdapAuthenticationException e ) Modified: directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java URL: http://svn.apache.org/viewvc/directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?rev=421422&r1=421421&r2=421422&view=diff ============================================================================== --- directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java (original) +++ directory/branches/apacheds/optimization/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java Wed Jul 12 14:38:23 2006 @@ -87,6 +87,11 @@ */ public LdapPrincipal authenticate( ServerContext ctx ) throws NamingException { + /* + * OPTIMIZE + * @TODO pass already normalized LdapDN in as an argument to authenticate + */ + // ---- extract password from JNDI environment Object creds = ctx.getEnvironment().get( Context.SECURITY_CREDENTIALS );