From commits-return-9024-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Fri May 05 05:24:07 2006 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 83417 invoked from network); 5 May 2006 05:24:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 5 May 2006 05:24:07 -0000 Received: (qmail 74510 invoked by uid 500); 5 May 2006 05:24:06 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 74466 invoked by uid 500); 5 May 2006 05:24:06 -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 74455 invoked by uid 99); 5 May 2006 05:24:06 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 May 2006 22:24:06 -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: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 04 May 2006 22:24:05 -0700 Received: (qmail 83287 invoked by uid 65534); 5 May 2006 05:23:45 -0000 Message-ID: <20060505052345.83286.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r399969 - in /directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication: AuthenticationServiceChain.java VerifyPolicy.java Date: Fri, 05 May 2006 05:23:44 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: akarasulu Date: Thu May 4 22:23:44 2006 New Revision: 399969 URL: http://svn.apache.org/viewcvs?rev=399969&view=rev Log: checking in merged changes from commit revision 399966 on 1.0 apacheds branch Added: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/VerifyPolicy.java - copied, changed from r399966, directory/branches/apacheds/1.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/VerifyPolicy.java Modified: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationServiceChain.java Modified: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationServiceChain.java URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationServiceChain.java?rev=399969&r1=399968&r2=399969&view=diff ============================================================================== --- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationServiceChain.java (original) +++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationServiceChain.java Thu May 4 22:23:44 2006 @@ -29,6 +29,7 @@ addLast( "monitorRequest", new MonitorRequest() ); addLast( "configureAuthenticationChain", new ConfigureAuthenticationChain() ); addLast( "getClientEntry", new GetClientEntry() ); + addLast( "verifyPolicy", new VerifyPolicy() ); addLast( "preAuthenticationChain", new PreAuthenticationChain() ); addLast( "getServerEntry", new GetServerEntry() ); addLast( "getSessionKey", new GetSessionKey() ); Copied: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/VerifyPolicy.java (from r399966, directory/branches/apacheds/1.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/VerifyPolicy.java) URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/VerifyPolicy.java?p2=directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/VerifyPolicy.java&p1=directory/branches/apacheds/1.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/VerifyPolicy.java&r1=399966&r2=399969&rev=399969&view=diff ============================================================================== --- directory/branches/apacheds/1.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/VerifyPolicy.java (original) +++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/VerifyPolicy.java Thu May 4 22:23:44 2006 @@ -5,20 +5,21 @@ import org.apache.directory.server.kerberos.shared.exceptions.ErrorType; import org.apache.directory.server.kerberos.shared.exceptions.KerberosException; import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry; -import org.apache.directory.server.protocol.shared.chain.Context; -import org.apache.directory.server.protocol.shared.chain.impl.CommandBase; +import org.apache.mina.common.IoSession; +import org.apache.mina.handler.chain.IoHandlerCommand; //import org.slf4j.Logger; //import org.slf4j.LoggerFactory; -public class VerifyPolicy extends CommandBase +public class VerifyPolicy implements IoHandlerCommand { /** the log for this class */ // private static final Logger log = LoggerFactory.getLogger( VerifyPolicy.class ); + private String contextKey = "context"; + - - public boolean execute( Context context ) throws Exception + public void execute( NextCommand next, IoSession session, Object message ) throws Exception { - AuthenticationContext authContext = ( AuthenticationContext ) context; + AuthenticationContext authContext = ( AuthenticationContext ) session.getAttribute( getContextKey() ); PrincipalStoreEntry entry = authContext.getClientEntry(); if ( entry.isDisabled() ) @@ -35,7 +36,12 @@ { throw new KerberosException( ErrorType.KDC_ERR_CLIENT_REVOKED ); } + next.execute( session, message ); + } + - return CONTINUE_CHAIN; + public String getContextKey() + { + return ( this.contextKey ); } }