You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by er...@apache.org on 2006/04/22 22:28:19 UTC
svn commit: r396159 - in
/directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service:
DesStringToKey.java ErrorMessageHandler.java GetPrincipalStoreEntry.java
VerifyAuthHeader.java VerifyTicket.java
Author: erodriguez
Date: Sat Apr 22 13:28:17 2006
New Revision: 396159
URL: http://svn.apache.org/viewcvs?rev=396159&view=rev
Log:
Updated kerberos-shared to use MINA IoHandlerChain, replacing protocol-common chain.
Removed:
directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/ErrorMessageHandler.java
Modified:
directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/DesStringToKey.java
directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/GetPrincipalStoreEntry.java
directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/VerifyAuthHeader.java
directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/VerifyTicket.java
Modified: directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/DesStringToKey.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/DesStringToKey.java?rev=396159&r1=396158&r2=396159&view=diff
==============================================================================
--- directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/DesStringToKey.java (original)
+++ directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/DesStringToKey.java Sat Apr 22 13:28:17 2006
@@ -19,7 +19,7 @@
import java.io.UnsupportedEncodingException;
-import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
+import org.apache.mina.handler.chain.IoHandlerCommand;
import org.bouncycastle.crypto.engines.DESEngine;
import org.bouncycastle.crypto.modes.CBCBlockCipher;
import org.bouncycastle.crypto.params.DESParameters;
@@ -27,8 +27,10 @@
import org.bouncycastle.crypto.params.ParametersWithIV;
-public abstract class DesStringToKey extends CommandBase
+public abstract class DesStringToKey implements IoHandlerCommand
{
+ private String contextKey = "context";
+
public byte[] getKey( String passPhrase )
{
return generateKey( passPhrase );
@@ -39,6 +41,12 @@
public byte[] getKey( String password, String realmName, String userName )
{
return generateKey( password + realmName + userName );
+ }
+
+
+ public String getContextKey()
+ {
+ return ( this.contextKey );
}
Modified: directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/GetPrincipalStoreEntry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/GetPrincipalStoreEntry.java?rev=396159&r1=396158&r2=396159&view=diff
==============================================================================
--- directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/GetPrincipalStoreEntry.java (original)
+++ directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/GetPrincipalStoreEntry.java Sat Apr 22 13:28:17 2006
@@ -23,11 +23,13 @@
import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry;
-import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
+import org.apache.mina.handler.chain.IoHandlerCommand;
-public abstract class GetPrincipalStoreEntry extends CommandBase
+public abstract class GetPrincipalStoreEntry implements IoHandlerCommand
{
+ private String contextKey = "context";
+
public PrincipalStoreEntry getEntry( KerberosPrincipal principal, PrincipalStore store, ErrorType errorType )
throws Exception
{
@@ -48,5 +50,11 @@
}
return entry;
+ }
+
+
+ public String getContextKey()
+ {
+ return ( this.contextKey );
}
}
Modified: directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/VerifyAuthHeader.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/VerifyAuthHeader.java?rev=396159&r1=396158&r2=396159&view=diff
==============================================================================
--- directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/VerifyAuthHeader.java (original)
+++ directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/VerifyAuthHeader.java Sat Apr 22 13:28:17 2006
@@ -32,14 +32,16 @@
import org.apache.directory.server.kerberos.shared.messages.value.KerberosTime;
import org.apache.directory.server.kerberos.shared.messages.value.TicketFlags;
import org.apache.directory.server.kerberos.shared.replay.ReplayCache;
-import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
+import org.apache.mina.handler.chain.IoHandlerCommand;
/*
* Shared by TGS and Changepw
*/
-public abstract class VerifyAuthHeader extends CommandBase
+public abstract class VerifyAuthHeader implements IoHandlerCommand
{
+ private String contextKey = "context";
+
// RFC 1510 A.10. KRB_AP_REQ verification
public Authenticator verifyAuthHeader( ApplicationRequest authHeader, Ticket ticket, EncryptionKey serverKey,
long clockSkew, ReplayCache replayCache, boolean emptyAddressesAllowed, InetAddress clientAddress,
@@ -136,5 +138,11 @@
authHeader.setOption( ApOptions.MUTUAL_REQUIRED );
return authenticator;
+ }
+
+
+ public String getContextKey()
+ {
+ return ( this.contextKey );
}
}
Modified: directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/VerifyTicket.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/VerifyTicket.java?rev=396159&r1=396158&r2=396159&view=diff
==============================================================================
--- directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/VerifyTicket.java (original)
+++ directory/trunks/apacheds/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/VerifyTicket.java Sat Apr 22 13:28:17 2006
@@ -22,19 +22,27 @@
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.messages.components.Ticket;
-import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
+import org.apache.mina.handler.chain.IoHandlerCommand;
/*
* Shared by TGS and Changepw
*/
-public abstract class VerifyTicket extends CommandBase
+public abstract class VerifyTicket implements IoHandlerCommand
{
+ private String contextKey = "context";
+
public void verifyTicket( Ticket ticket, String primaryRealm, KerberosPrincipal serverPrincipal ) throws Exception
{
if ( !ticket.getRealm().equals( primaryRealm ) && !ticket.getServerPrincipal().equals( serverPrincipal ) )
{
throw new KerberosException( ErrorType.KRB_AP_ERR_NOT_US );
}
+ }
+
+
+ public String getContextKey()
+ {
+ return ( this.contextKey );
}
}