Author: elecharny
Date: Sat Dec 4 01:24:42 2010
New Revision: 1042082
URL: http://svn.apache.org/viewvc?rev=1042082&view=rev
Log:
Renaming the ErrorMessage class by KrbError
Removed:
directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/ErrorMessage.java
directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/ErrorMessageModifier.java
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordErrorModifier.java
Modified:
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordErrorDecoder.java
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordErrorEncoder.java
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordError.java
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationEncryptionTypeTest.java
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationPolicyTest.java
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationServiceTest.java
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/PreAuthenticationTest.java
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java
Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordErrorDecoder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordErrorDecoder.java?rev=1042082&r1=1042081&r2=1042082&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordErrorDecoder.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordErrorDecoder.java Sat Dec 4 01:24:42 2010
@@ -24,8 +24,7 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import org.apache.directory.server.changepw.messages.ChangePasswordError;
-import org.apache.directory.server.changepw.messages.ChangePasswordErrorModifier;
-import org.apache.directory.server.kerberos.shared.messages.ErrorMessage;
+import org.apache.directory.shared.kerberos.messages.KrbError;
/**
@@ -62,7 +61,7 @@ public class ChangePasswordErrorDecoder
ByteBuffer errorBuffer = ByteBuffer.wrap( errorBytes );
ErrorMessageDecoder errorDecoder = new ErrorMessageDecoder();
- ErrorMessage errorMessage = errorDecoder.decode( errorBuffer );
+ KrbError errorMessage = errorDecoder.decode( errorBuffer );
modifier.setErrorMessage( errorMessage );
Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordErrorEncoder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordErrorEncoder.java?rev=1042082&r1=1042081&r2=1042082&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordErrorEncoder.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordErrorEncoder.java Sat Dec 4 01:24:42 2010
@@ -25,7 +25,7 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import org.apache.directory.server.changepw.messages.ChangePasswordError;
-import org.apache.directory.server.kerberos.shared.messages.ErrorMessage;
+import org.apache.directory.shared.kerberos.messages.KrbError;
/**
@@ -46,7 +46,7 @@ public class ChangePasswordErrorEncoder
public void encode( ByteBuffer buf, ChangePasswordError message ) throws IOException
{
// Build error message bytes
- ErrorMessage errorMessage = message.getErrorMessage();
+ KrbError errorMessage = message.getKrbError();
ErrorMessageEncoder errorEncoder = new ErrorMessageEncoder();
byte[] errorBytes = errorEncoder.encode( errorMessage );
Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordError.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordError.java?rev=1042082&r1=1042081&r2=1042082&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordError.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordError.java Sat Dec 4 01:24:42 2010
@@ -20,38 +20,39 @@
package org.apache.directory.server.changepw.messages;
-import org.apache.directory.server.kerberos.shared.messages.ErrorMessage;
+import org.apache.directory.shared.kerberos.messages.KrbError;
/**
+ *
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
public class ChangePasswordError extends AbstractPasswordMessage
{
- private ErrorMessage errorMessage;
+ private KrbError krbError;
/**
* Creates a new instance of ChangePasswordError.
*
* @param versionNumber
- * @param errorMessage
+ * @param krbError The KRB-ERROR
*/
- public ChangePasswordError( short versionNumber, ErrorMessage errorMessage )
+ public ChangePasswordError( short versionNumber, KrbError krbError )
{
super( versionNumber );
- this.errorMessage = errorMessage;
+ this.krbError = krbError;
}
/**
- * Returns the {@link ErrorMessage}.
+ * Returns the {@link KrbError}.
*
- * @return The {@link ErrorMessage}.
+ * @return The {@link KrbError}.
*/
- public ErrorMessage getErrorMessage()
+ public KrbError getKrbError()
{
- return errorMessage;
+ return krbError;
}
}
Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java?rev=1042082&r1=1042081&r2=1042082&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java Sat Dec 4 01:24:42 2010
@@ -31,16 +31,14 @@ import javax.security.auth.kerberos.Kerb
import org.apache.directory.server.changepw.ChangePasswordServer;
import org.apache.directory.server.changepw.exceptions.ChangePasswordException;
import org.apache.directory.server.changepw.exceptions.ErrorType;
-import org.apache.directory.server.changepw.messages.ChangePasswordErrorModifier;
import org.apache.directory.server.changepw.messages.ChangePasswordRequest;
import org.apache.directory.server.changepw.service.ChangePasswordContext;
import org.apache.directory.server.changepw.service.ChangePasswordService;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
-import org.apache.directory.server.kerberos.shared.messages.ErrorMessage;
-import org.apache.directory.server.kerberos.shared.messages.ErrorMessageModifier;
import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
import org.apache.directory.shared.kerberos.KerberosTime;
+import org.apache.directory.shared.kerberos.messages.KrbError;
import org.apache.mina.core.service.IoHandler;
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
@@ -150,7 +148,7 @@ public class ChangePasswordProtocolHandl
log.warn( ke.getLocalizedMessage() );
}
- ErrorMessage errorMessage = getErrorMessage( config.getServicePrincipal(), ke );
+ KrbError errorMessage = getErrorMessage( config.getServicePrincipal(), ke );
ChangePasswordErrorModifier modifier = new ChangePasswordErrorModifier();
modifier.setErrorMessage( errorMessage );
@@ -182,20 +180,20 @@ public class ChangePasswordProtocolHandl
}
- private ErrorMessage getErrorMessage( KerberosPrincipal principal, KerberosException exception )
+ private KrbError getErrorMessage( KerberosPrincipal principal, KerberosException exception )
{
- ErrorMessageModifier modifier = new ErrorMessageModifier();
+ KrbError krbError = new KrbError();
KerberosTime now = new KerberosTime();
- modifier.setErrorCode( exception.getErrorCode() );
- modifier.setExplanatoryText( exception.getLocalizedMessage() );
- modifier.setServerPrincipal( principal );
- modifier.setServerTime( now );
- modifier.setServerMicroSecond( 0 );
- modifier.setExplanatoryData( buildExplanatoryData( exception ) );
+ krbError.setErrorCode( ErrorType.getTypeByOrdinal( exception.getErrorCode() ) );
+ krbError.setEText( exception.getLocalizedMessage() );
+ krbError.setSName( principal );
+ krbError.setSTime( now );
+ krbError.setSusec( 0 );
+ krbError.setEData( buildExplanatoryData( exception ) );
- return modifier.getErrorMessage();
+ return krbError;
}
Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java?rev=1042082&r1=1042081&r2=1042082&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/test/java/org/apache/directory/server/changepw/protocol/ChangepwProtocolHandlerTest.java Sat Dec 4 01:24:42 2010
@@ -114,7 +114,7 @@ public class ChangepwProtocolHandlerTest
handler.messageReceived( session, message );
ChangePasswordError reply = ( ChangePasswordError ) session.getMessage();
- ErrorMessage error = reply.getErrorMessage();
+ ErrorMessage error = reply.getKrbError();
assertEquals( "Protocol version unsupported", 6, error.getErrorCode() );
}
@@ -132,7 +132,7 @@ public class ChangepwProtocolHandlerTest
handler.messageReceived( session, message );
ChangePasswordError reply = ( ChangePasswordError ) session.getMessage();
- ErrorMessage error = reply.getErrorMessage();
+ ErrorMessage error = reply.getKrbError();
assertEquals( "Request failed due to an error in authentication processing", 3, error.getErrorCode() );
}
@@ -184,7 +184,7 @@ public class ChangepwProtocolHandlerTest
handler.messageReceived( session, message );
ChangePasswordError reply = ( ChangePasswordError ) session.getMessage();
- ErrorMessage error = reply.getErrorMessage();
+ ErrorMessage error = reply.getKrbError();
assertEquals( "Initial flag required", 7, error.getErrorCode() );
//ChangePasswordReply reply = ( ChangePasswordReply ) session.getMessage();
@@ -260,7 +260,7 @@ public class ChangepwProtocolHandlerTest
handler.messageReceived( session, message );
ChangePasswordError reply = ( ChangePasswordError ) session.getMessage();
- ErrorMessage error = reply.getErrorMessage();
+ ErrorMessage error = reply.getKrbError();
assertEquals( "Protocol version unsupported", 6, error.getErrorCode() );
}
Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationEncryptionTypeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationEncryptionTypeTest.java?rev=1042082&r1=1042081&r2=1042082&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationEncryptionTypeTest.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationEncryptionTypeTest.java Sat Dec 4 01:24:42 2010
@@ -35,7 +35,6 @@ import org.apache.directory.server.kerbe
import org.apache.directory.server.kerberos.shared.crypto.encryption.KerberosKeyFactory;
import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
import org.apache.directory.server.kerberos.shared.messages.AuthenticationReply;
-import org.apache.directory.server.kerberos.shared.messages.ErrorMessage;
import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
import org.apache.directory.shared.kerberos.KerberosMessageType;
@@ -49,6 +48,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.KdcReqBody;
import org.apache.directory.shared.kerberos.components.PaData;
import org.apache.directory.shared.kerberos.components.PaEncTsEnc;
+import org.apache.directory.shared.kerberos.messages.KrbError;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -276,8 +276,8 @@ public class AuthenticationEncryptionTyp
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC has no support for encryption type", 14, error.getErrorCode() );
}
Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationPolicyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationPolicyTest.java?rev=1042082&r1=1042081&r2=1042082&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationPolicyTest.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationPolicyTest.java Sat Dec 4 01:24:42 2010
@@ -24,13 +24,13 @@ import static org.junit.Assert.assertEqu
import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.shared.KerberosConstants;
-import org.apache.directory.server.kerberos.shared.messages.ErrorMessage;
import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
import org.apache.directory.shared.kerberos.KerberosMessageType;
import org.apache.directory.shared.kerberos.KerberosTime;
import org.apache.directory.shared.kerberos.codec.options.KdcOptions;
import org.apache.directory.shared.kerberos.components.KdcReqBody;
+import org.apache.directory.shared.kerberos.messages.KrbError;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -104,8 +104,8 @@ public class AuthenticationPolicyTest ex
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC policy rejects request", 12, error.getErrorCode() );
}
@@ -142,8 +142,8 @@ public class AuthenticationPolicyTest ex
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC policy rejects request", 12, error.getErrorCode() );
}
@@ -180,8 +180,8 @@ public class AuthenticationPolicyTest ex
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC policy rejects request", 12, error.getErrorCode() );
}
@@ -218,8 +218,8 @@ public class AuthenticationPolicyTest ex
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC policy rejects request", 12, error.getErrorCode() );
}
@@ -256,8 +256,8 @@ public class AuthenticationPolicyTest ex
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC policy rejects request", 12, error.getErrorCode() );
}
@@ -297,8 +297,8 @@ public class AuthenticationPolicyTest ex
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC policy rejects request", 12, error.getErrorCode() );
}
@@ -337,8 +337,8 @@ public class AuthenticationPolicyTest ex
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC policy rejects request", 12, error.getErrorCode() );
}
}
Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationServiceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationServiceTest.java?rev=1042082&r1=1042081&r2=1042082&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationServiceTest.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AuthenticationServiceTest.java Sat Dec 4 01:24:42 2010
@@ -32,7 +32,6 @@ import javax.security.auth.kerberos.Kerb
import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
import org.apache.directory.server.kerberos.shared.messages.AuthenticationReply;
-import org.apache.directory.server.kerberos.shared.messages.ErrorMessage;
import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
import org.apache.directory.shared.kerberos.KerberosMessageType;
@@ -41,6 +40,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.shared.kerberos.components.KdcReqBody;
import org.apache.directory.shared.kerberos.components.PaData;
+import org.apache.directory.shared.kerberos.messages.KrbError;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -105,7 +105,7 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
- ErrorMessage error = ( ErrorMessage ) session.getMessage();
+ KrbError error = ( KrbError ) session.getMessage();
assertEquals( "Additional pre-authentication required", 25, error.getErrorCode() );
}
@@ -128,8 +128,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "Requested protocol version number not supported", 3, error.getErrorCode() );
}
@@ -146,8 +146,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "Incorrect message direction", 47, error.getErrorCode() );
message = new KdcRequest( 5, KerberosMessageType.TGS_REP, null, null );
@@ -155,8 +155,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ error = ( KrbError ) msg;
assertEquals( "Incorrect message direction", 47, error.getErrorCode() );
}
@@ -182,8 +182,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "Client not found in Kerberos database", 6, error.getErrorCode() );
}
@@ -227,8 +227,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC has no support for encryption type", 14, error.getErrorCode() );
}
@@ -257,8 +257,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "Server not found in Kerberos database", 7, error.getErrorCode() );
}
@@ -281,8 +281,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "The client or server has a null key", 9, error.getErrorCode() );
}
@@ -312,8 +312,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "The client or server has a null key", 9, error.getErrorCode() );
}
@@ -508,8 +508,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "Requested start time is later than end time", 11, error.getErrorCode() );
}
@@ -553,8 +553,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "Requested start time is later than end time", 11, error.getErrorCode() );
}
@@ -597,8 +597,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "Ticket not eligible for postdating", 10, error.getErrorCode() );
}
@@ -845,7 +845,7 @@ public class AuthenticationServiceTest e
assertFalse( "INVALID flag", reply.getTicket().getEncTicketPart().getFlags().isInvalid() );
assertEquals( "Service principal name", reply.getServerPrincipal().getName(), servicePrincipalName );
- assertEquals( "Service principal name", reply.getTicket().getServerPrincipal().getName(), servicePrincipalName );
+ assertEquals( "Service principal name", reply.getTicket().getSName().getNames(), servicePrincipalName );
}
@@ -1193,8 +1193,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC cannot accommodate requested option", 13, error.getErrorCode() );
}
@@ -1232,8 +1232,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC cannot accommodate requested option", 13, error.getErrorCode() );
}
@@ -1271,8 +1271,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC cannot accommodate requested option", 13, error.getErrorCode() );
}
@@ -1310,8 +1310,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC cannot accommodate requested option", 13, error.getErrorCode() );
}
@@ -1349,8 +1349,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC cannot accommodate requested option", 13, error.getErrorCode() );
}
}
Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java?rev=1042082&r1=1042081&r2=1042082&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java Sat Dec 4 01:24:42 2010
@@ -27,7 +27,6 @@ import javax.security.auth.kerberos.Kerb
import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.protocol.AbstractAuthenticationServiceTest.KrbDummySession;
import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
-import org.apache.directory.server.kerberos.shared.messages.ErrorMessage;
import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
import org.apache.directory.server.kerberos.shared.messages.components.EncTicketPartModifier;
import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
@@ -35,6 +34,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.codec.options.KdcOptions;
import org.apache.directory.shared.kerberos.components.EncryptionKey;
import org.apache.directory.shared.kerberos.components.KdcReqBody;
+import org.apache.directory.shared.kerberos.messages.KrbError;
import org.apache.directory.shared.kerberos.messages.Ticket;
import org.junit.After;
import org.junit.Before;
@@ -143,8 +143,8 @@ public class EncTktInSkeyTest extends Ab
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC cannot accommodate requested option", 13, error.getErrorCode() );
}
}
Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/PreAuthenticationTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/PreAuthenticationTest.java?rev=1042082&r1=1042081&r2=1042082&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/PreAuthenticationTest.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/PreAuthenticationTest.java Sat Dec 4 01:24:42 2010
@@ -27,7 +27,6 @@ import javax.security.auth.kerberos.Kerb
import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
import org.apache.directory.server.kerberos.shared.crypto.encryption.KeyUsage;
-import org.apache.directory.server.kerberos.shared.messages.ErrorMessage;
import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
import org.apache.directory.shared.kerberos.KerberosMessageType;
@@ -39,6 +38,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.KdcReqBody;
import org.apache.directory.shared.kerberos.components.PaData;
import org.apache.directory.shared.kerberos.components.PaEncTsEnc;
+import org.apache.directory.shared.kerberos.messages.KrbError;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -106,8 +106,8 @@ public class PreAuthenticationTest exten
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "Additional pre-authentication required", 25, error.getErrorCode() );
}
@@ -149,8 +149,8 @@ public class PreAuthenticationTest exten
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "Integrity check on decrypted field failed", 31, error.getErrorCode() );
}
@@ -189,8 +189,8 @@ public class PreAuthenticationTest exten
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "Pre-authentication information was invalid", 24, error.getErrorCode() );
}
@@ -227,8 +227,8 @@ public class PreAuthenticationTest exten
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC has no support for padata type", 16, error.getErrorCode() );
}
Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java?rev=1042082&r1=1042081&r2=1042082&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingPolicyTest.java Sat Dec 4 01:24:42 2010
@@ -30,7 +30,6 @@ import javax.security.auth.kerberos.Kerb
import org.apache.directory.server.kerberos.kdc.KdcServer;
import org.apache.directory.server.kerberos.protocol.AbstractAuthenticationServiceTest.KrbDummySession;
import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
-import org.apache.directory.server.kerberos.shared.messages.ErrorMessage;
import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
import org.apache.directory.server.kerberos.shared.messages.components.EncTicketPartModifier;
import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
@@ -41,6 +40,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.HostAddresses;
import org.apache.directory.shared.kerberos.components.KdcReqBody;
import org.apache.directory.shared.kerberos.flags.TicketFlag;
+import org.apache.directory.shared.kerberos.messages.KrbError;
import org.apache.directory.shared.kerberos.messages.Ticket;
import org.junit.After;
import org.junit.Before;
@@ -136,8 +136,8 @@ public class TicketGrantingPolicyTest ex
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC policy rejects request", 12, error.getErrorCode() );
}
@@ -187,8 +187,8 @@ public class TicketGrantingPolicyTest ex
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC policy rejects request", 12, error.getErrorCode() );
}
@@ -243,8 +243,8 @@ public class TicketGrantingPolicyTest ex
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC policy rejects request", 12, error.getErrorCode() );
}
@@ -294,8 +294,8 @@ public class TicketGrantingPolicyTest ex
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC policy rejects request", 12, error.getErrorCode() );
}
@@ -350,8 +350,8 @@ public class TicketGrantingPolicyTest ex
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC policy rejects request", 12, error.getErrorCode() );
}
@@ -406,8 +406,8 @@ public class TicketGrantingPolicyTest ex
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC policy rejects request", 12, error.getErrorCode() );
}
@@ -457,8 +457,8 @@ public class TicketGrantingPolicyTest ex
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC policy rejects request", 12, error.getErrorCode() );
}
@@ -508,8 +508,8 @@ public class TicketGrantingPolicyTest ex
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC policy rejects request", 12, error.getErrorCode() );
}
@@ -559,8 +559,8 @@ public class TicketGrantingPolicyTest ex
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC policy rejects request", 12, error.getErrorCode() );
}
@@ -603,8 +603,8 @@ public class TicketGrantingPolicyTest ex
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC policy rejects request", 12, error.getErrorCode() );
}
@@ -654,8 +654,8 @@ public class TicketGrantingPolicyTest ex
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC policy rejects request", 12, error.getErrorCode() );
}
@@ -708,8 +708,8 @@ public class TicketGrantingPolicyTest ex
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC policy rejects request", 12, error.getErrorCode() );
}
}
Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java?rev=1042082&r1=1042081&r2=1042082&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java Sat Dec 4 01:24:42 2010
@@ -36,7 +36,6 @@ import org.apache.directory.server.kerbe
import org.apache.directory.server.kerberos.shared.crypto.encryption.CipherTextHandler;
import org.apache.directory.server.kerberos.shared.crypto.encryption.RandomKeyFactory;
import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
-import org.apache.directory.server.kerberos.shared.messages.ErrorMessage;
import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
import org.apache.directory.server.kerberos.shared.messages.TicketGrantReply;
import org.apache.directory.server.kerberos.shared.messages.components.EncTicketPartModifier;
@@ -51,6 +50,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.KdcReqBody;
import org.apache.directory.shared.kerberos.crypto.checksum.ChecksumType;
import org.apache.directory.shared.kerberos.flags.TicketFlag;
+import org.apache.directory.shared.kerberos.messages.KrbError;
import org.apache.directory.shared.kerberos.messages.Ticket;
import org.junit.After;
import org.junit.Before;
@@ -157,8 +157,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "Requested protocol version number not supported", 3, error.getErrorCode() );
}
@@ -196,8 +196,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "Server not found in Kerberos database", 7, error.getErrorCode() );
}
@@ -246,8 +246,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "KDC has no support for padata type", 16, error.getErrorCode() );
}
@@ -287,8 +287,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "Inappropriate type of checksum in message", 50, error.getErrorCode() );
}
@@ -368,8 +368,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "Integrity check on decrypted field failed", 31, error.getErrorCode() );
}
@@ -407,8 +407,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "The ticket isn't for us", 35, error.getErrorCode() );
}
@@ -670,8 +670,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "Ticket expired", 32, error.getErrorCode() );
}
@@ -720,8 +720,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) msg;
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) msg;
assertEquals( "Ticket expired", 32, error.getErrorCode() );
}
@@ -865,8 +865,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) session.getMessage();
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) session.getMessage();
assertEquals( "KDC has no support for encryption type", 14, error.getErrorCode() );
}
@@ -905,8 +905,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) session.getMessage();
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) session.getMessage();
assertEquals( "The client or server has a null key", 9, error.getErrorCode() );
}
@@ -1131,8 +1131,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) session.getMessage();
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) session.getMessage();
assertEquals( "Requested start time is later than end time", 11, error.getErrorCode() );
}
@@ -1186,8 +1186,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) session.getMessage();
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) session.getMessage();
assertEquals( "Requested start time is later than end time", 11, error.getErrorCode() );
}
@@ -1239,8 +1239,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) session.getMessage();
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) session.getMessage();
assertEquals( "Ticket not eligible for postdating", 10, error.getErrorCode() );
}
@@ -1973,8 +1973,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", ErrorMessage.class, msg.getClass() );
- ErrorMessage error = ( ErrorMessage ) session.getMessage();
+ assertEquals( "session.getMessage() instanceOf", KrbError.class, msg.getClass() );
+ KrbError error = ( KrbError ) session.getMessage();
assertEquals( "KDC cannot accommodate requested option", 13, error.getErrorCode() );
}
}
|