You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/12/06 11:07:41 UTC
svn commit: r1042560 - in
/directory/apacheds/branches/apacheds-kerberos-codec-2.0:
kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/
protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/
protocol-kerberos/s...
Author: elecharny
Date: Mon Dec 6 10:07:40 2010
New Revision: 1042560
URL: http://svn.apache.org/viewvc?rev=1042560&view=rev
Log:
Fixed many compilation failures by adding the EncKdcRepPart in AsRep and TgsRep
Modified:
directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsRep.java
directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsRep.java
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordReplyDecoder.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/AuthenticationServiceTest.java
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingEncryptionTypeTest.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/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsRep.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsRep.java?rev=1042560&r1=1042559&r2=1042560&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsRep.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsRep.java Mon Dec 6 10:07:40 2010
@@ -26,7 +26,11 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
+import org.apache.directory.shared.kerberos.KerberosTime;
+import org.apache.directory.shared.kerberos.components.EncKdcRepPart;
import org.apache.directory.shared.kerberos.components.KdcRep;
+import org.apache.directory.shared.kerberos.components.PrincipalName;
+import org.apache.directory.shared.kerberos.flags.TicketFlags;
/**
@@ -39,6 +43,9 @@ import org.apache.directory.shared.kerbe
*/
public class AsRep extends KdcRep
{
+ /** The decoded KDC-REP part */
+ private EncKdcRepPart encPart;
+
// Storage for computed lengths
private transient int kdcRepLength;
private transient int asRepLength;
@@ -51,8 +58,74 @@ public class AsRep extends KdcRep
super( KerberosMessageType.AS_REP );
}
+
+ /**
+ * Returns the end {@link KerberosTime}.
+ *
+ * @return The end {@link KerberosTime}.
+ */
+ public KerberosTime getEndTime()
+ {
+ return encPart.getEndTime();
+ }
+
/**
+ * Returns the {@link TicketFlags}.
+ *
+ * @return The {@link TicketFlags}.
+ */
+ public TicketFlags getFlags()
+ {
+ return encPart.getFlags();
+ }
+
+
+ /**
+ * Returns the nonce.
+ *
+ * @return The nonce.
+ */
+ public int getNonce()
+ {
+ return encPart.getNonce();
+ }
+
+
+ /**
+ * Returns the renew till {@link KerberosTime}.
+ *
+ * @return The renew till {@link KerberosTime}.
+ */
+ public KerberosTime getRenewTill()
+ {
+ return encPart.getRenewTill();
+ }
+
+
+ /**
+ * Returns the start {@link KerberosTime}.
+ *
+ * @return The start {@link KerberosTime}.
+ */
+ public KerberosTime getStartTime()
+ {
+ return encPart.getStartTime();
+ }
+
+
+ /**
+ * Returns the server {@link PrincipalName}.
+ *
+ * @return The server {@link PrincipalName}.
+ */
+ public PrincipalName getSName()
+ {
+ return encPart.getSName();
+ }
+
+
+ /**
* Compute the AS-REP length
* <pre>
* AS-REP :
Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsRep.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsRep.java?rev=1042560&r1=1042559&r2=1042560&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsRep.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsRep.java Mon Dec 6 10:07:40 2010
@@ -26,7 +26,11 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.kerberos.KerberosConstants;
import org.apache.directory.shared.kerberos.KerberosMessageType;
+import org.apache.directory.shared.kerberos.KerberosTime;
+import org.apache.directory.shared.kerberos.components.EncKdcRepPart;
import org.apache.directory.shared.kerberos.components.KdcRep;
+import org.apache.directory.shared.kerberos.components.PrincipalName;
+import org.apache.directory.shared.kerberos.flags.TicketFlags;
/**
@@ -39,6 +43,9 @@ import org.apache.directory.shared.kerbe
*/
public class TgsRep extends KdcRep
{
+ /** The decoded KDC-REP part */
+ private EncKdcRepPart encPart;
+
// Storage for computed lengths
private transient int kdcRepLength;
private transient int tgsRepLength;
@@ -51,6 +58,72 @@ public class TgsRep extends KdcRep
super( KerberosMessageType.TGS_REP );
}
+
+ /**
+ * Returns the end {@link KerberosTime}.
+ *
+ * @return The end {@link KerberosTime}.
+ */
+ public KerberosTime getEndTime()
+ {
+ return encPart.getEndTime();
+ }
+
+
+ /**
+ * Returns the {@link TicketFlags}.
+ *
+ * @return The {@link TicketFlags}.
+ */
+ public TicketFlags getFlags()
+ {
+ return encPart.getFlags();
+ }
+
+
+ /**
+ * Returns the nonce.
+ *
+ * @return The nonce.
+ */
+ public int getNonce()
+ {
+ return encPart.getNonce();
+ }
+
+
+ /**
+ * Returns the renew till {@link KerberosTime}.
+ *
+ * @return The renew till {@link KerberosTime}.
+ */
+ public KerberosTime getRenewTill()
+ {
+ return encPart.getRenewTill();
+ }
+
+
+ /**
+ * Returns the start {@link KerberosTime}.
+ *
+ * @return The start {@link KerberosTime}.
+ */
+ public KerberosTime getStartTime()
+ {
+ return encPart.getStartTime();
+ }
+
+
+ /**
+ * Returns the server {@link PrincipalName}.
+ *
+ * @return The server {@link PrincipalName}.
+ */
+ public PrincipalName getSName()
+ {
+ return encPart.getSName();
+ }
+
/**
* Compute the TGS-REP length
Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordReplyDecoder.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/ChangePasswordReplyDecoder.java?rev=1042560&r1=1042559&r2=1042560&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordReplyDecoder.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordReplyDecoder.java Mon Dec 6 10:07:40 2010
@@ -24,11 +24,9 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import org.apache.directory.server.changepw.messages.ChangePasswordReply;
-import org.apache.directory.server.changepw.messages.ChangePasswordReplyModifier;
-import org.apache.directory.server.kerberos.shared.io.decoder.ApplicationReplyDecoder;
import org.apache.directory.server.kerberos.shared.io.decoder.PrivateMessageDecoder;
-import org.apache.directory.server.kerberos.shared.messages.application.ApplicationReply;
import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage;
+import org.apache.directory.shared.kerberos.messages.ApRep;
/**
@@ -48,20 +46,14 @@ public class ChangePasswordReplyDecoder
*/
public ChangePasswordReply decode( ByteBuffer buf ) throws IOException
{
- ChangePasswordReplyModifier modifier = new ChangePasswordReplyModifier();
-
short messageLength = buf.getShort();
short protocolVersion = buf.getShort();
short encodedAppReplyLength = buf.getShort();
- modifier.setProtocolVersionNumber( protocolVersion );
-
byte[] encodedAppReply = new byte[encodedAppReplyLength];
buf.get( encodedAppReply );
- ApplicationReplyDecoder appDecoder = new ApplicationReplyDecoder();
- ApplicationReply applicationReply = appDecoder.decode( encodedAppReply );
- modifier.setApplicationReply( applicationReply );
+ ApRep applicationReply = KerberosDecoder.decodeApRep( encodedAppReply );
int privateBytesLength = messageLength - HEADER_LENGTH - encodedAppReplyLength;
byte[] encodedPrivateMessage = new byte[privateBytesLength];
@@ -69,8 +61,8 @@ public class ChangePasswordReplyDecoder
PrivateMessageDecoder privateDecoder = new PrivateMessageDecoder();
PrivateMessage privateMessage = privateDecoder.decode( encodedPrivateMessage );
- modifier.setPrivateMessage( privateMessage );
+ applicationReply.setPrivateMessage( privateMessage );
- return modifier.getChangePasswordReply();
+ return applicationReply.getChangePasswordReply();
}
}
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=1042560&r1=1042559&r2=1042560&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 Mon Dec 6 10:07:40 2010
@@ -255,7 +255,7 @@ public class AuthenticationEncryptionTyp
assertTrue( "PRE_AUTHENT flag", reply.getTicket().getEncTicketPart().getFlags().isPreAuth() );
assertEquals( "Encryption type", EncryptionType.AES128_CTS_HMAC_SHA1_96, reply.getEncPart().getEType() );
- assertEquals( "Nonce", nonce, reply.getEncPart().getNonce() );
+ assertEquals( "Nonce", nonce, reply.getNonce() );
}
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=1042560&r1=1042559&r2=1042560&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 Mon Dec 6 10:07:40 2010
@@ -31,7 +31,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.shared.kerberos.messages.AsRep;
import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
import org.apache.directory.shared.kerberos.KerberosTime;
import org.apache.directory.shared.kerberos.codec.options.KdcOptions;
@@ -388,8 +387,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", AuthenticationReply.class, msg.getClass() );
- AuthenticationReply reply = ( AuthenticationReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", AsRep.class, msg.getClass() );
+ AsRep reply = ( AsRep ) msg;
KerberosTime expectedStartTime = new KerberosTime( now );
boolean isClose = reply.getStartTime() == null
@@ -445,8 +444,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", AuthenticationReply.class, msg.getClass() );
- AuthenticationReply reply = ( AuthenticationReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", AsRep.class, msg.getClass() );
+ AsRep reply = ( AsRep ) msg;
KerberosTime expectedStartTime = new KerberosTime( now );
boolean isClose = reply.getStartTime() == null
@@ -502,8 +501,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", AuthenticationReply.class, msg.getClass() );
- AuthenticationReply reply = ( AuthenticationReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", AsRep.class, msg.getClass() );
+ AsRep reply = ( AsRep ) msg;
KerberosTime expectedStartTime = new KerberosTime( now );
boolean isClose = reply.getStartTime() == null
@@ -721,8 +720,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", AuthenticationReply.class, msg.getClass() );
- AuthenticationReply reply = ( AuthenticationReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", AsRep.class, msg.getClass() );
+ AsRep reply = ( AsRep ) msg;
assertTrue( "Requested start time", requestedStartTime.equals( reply.getStartTime() ) );
assertTrue( "Requested end time", requestedEndTime.equals( reply.getEndTime() ) );
@@ -780,8 +779,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", AuthenticationReply.class, msg.getClass() );
- AuthenticationReply reply = ( AuthenticationReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", AsRep.class, msg.getClass() );
+ AsRep reply = ( AsRep ) msg;
assertTrue( "Requested end time", requestedEndTime.equals( reply.getEndTime() ) );
@@ -832,8 +831,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", AuthenticationReply.class, msg.getClass() );
- AuthenticationReply reply = ( AuthenticationReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", AsRep.class, msg.getClass() );
+ AsRep reply = ( AsRep ) msg;
KerberosTime expectedEndTime = new KerberosTime( now + KerberosTime.DAY );
boolean isClose = Math.abs( reply.getEndTime().getTime() - expectedEndTime.getTime() ) < 5000;
@@ -879,8 +878,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", AuthenticationReply.class, msg.getClass() );
- AuthenticationReply reply = ( AuthenticationReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", AsRep.class, msg.getClass() );
+ AsRep reply = ( AsRep ) msg;
long now = System.currentTimeMillis();
KerberosTime expectedEndTime = new KerberosTime( now + KerberosTime.DAY );
@@ -927,8 +926,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", AuthenticationReply.class, msg.getClass() );
- AuthenticationReply reply = ( AuthenticationReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", AsRep.class, msg.getClass() );
+ AsRep reply = ( AsRep ) msg;
assertTrue( "INITIAL flag", reply.getFlags().isInitial() );
assertFalse( "INVALID flag", reply.getFlags().isInvalid() );
@@ -936,7 +935,7 @@ public class AuthenticationServiceTest e
assertTrue( "INITIAL flag", reply.getTicket().getEncTicketPart().getFlags().isInitial() );
assertFalse( "INVALID flag", reply.getTicket().getEncTicketPart().getFlags().isInvalid() );
- assertEquals( "Service principal name", reply.getServerPrincipal().getName(), servicePrincipalName );
+ assertEquals( "Service principal name", reply.getSName().getNameString(), servicePrincipalName );
assertEquals( "Service principal name", reply.getTicket().getSName().getNames(), servicePrincipalName );
}
@@ -988,8 +987,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", AuthenticationReply.class, msg.getClass() );
- AuthenticationReply reply = ( AuthenticationReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", AsRep.class, msg.getClass() );
+ AsRep reply = ( AsRep ) msg;
KerberosTime expectedEndTime = new KerberosTime( now + KerberosTime.DAY );
boolean isClose = Math.abs( reply.getEndTime().getTime() - expectedEndTime.getTime() ) < 5000;
@@ -1046,8 +1045,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", AuthenticationReply.class, msg.getClass() );
- AuthenticationReply reply = ( AuthenticationReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", AsRep.class, msg.getClass() );
+ AsRep reply = ( AsRep ) msg;
assertTrue( "FORWARDABLE flag", reply.getFlags().isForwardable() );
assertFalse( "INVALID flag", reply.getFlags().isInvalid() );
@@ -1099,8 +1098,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", AuthenticationReply.class, msg.getClass() );
- AuthenticationReply reply = ( AuthenticationReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", AsRep.class, msg.getClass() );
+ AsRep reply = ( AsRep ) msg;
assertTrue( "MAY_POSTDATE flag", reply.getFlags().isMayPosdate() );
assertFalse( "INVALID flag", reply.getFlags().isInvalid() );
@@ -1152,8 +1151,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", AuthenticationReply.class, msg.getClass() );
- AuthenticationReply reply = ( AuthenticationReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", AsRep.class, msg.getClass() );
+ AsRep reply = ( AsRep ) msg;
assertTrue( "PROXIABLE flag", reply.getFlags().isProxiable() );
assertFalse( "INVALID flag", reply.getFlags().isInvalid() );
@@ -1211,8 +1210,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", AuthenticationReply.class, msg.getClass() );
- AuthenticationReply reply = ( AuthenticationReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", AsRep.class, msg.getClass() );
+ AsRep reply = ( AsRep ) msg;
assertTrue( "RENEWABLE flag", reply.getFlags().isRenewable() );
assertFalse( "INVALID flag", reply.getFlags().isInvalid() );
@@ -1273,8 +1272,8 @@ public class AuthenticationServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", AuthenticationReply.class, msg.getClass() );
- AuthenticationReply reply = ( AuthenticationReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", AsRep.class, msg.getClass() );
+ AsRep reply = ( AsRep ) msg;
assertTrue( "RENEWABLE flag", reply.getFlags().isRenewable() );
assertFalse( "INVALID flag", reply.getFlags().isInvalid() );
Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingEncryptionTypeTest.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/TicketGrantingEncryptionTypeTest.java?rev=1042560&r1=1042559&r2=1042560&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingEncryptionTypeTest.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingEncryptionTypeTest.java Mon Dec 6 10:07:40 2010
@@ -33,7 +33,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.KerberosKeyFactory;
import org.apache.directory.server.kerberos.shared.crypto.encryption.RandomKeyFactory;
-import org.apache.directory.server.kerberos.shared.messages.TicketGrantReply;
import org.apache.directory.server.kerberos.shared.messages.components.EncTicketPartModifier;
import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
import org.apache.directory.shared.kerberos.KerberosTime;
@@ -42,6 +41,7 @@ import org.apache.directory.shared.kerbe
import org.apache.directory.shared.kerberos.components.EncryptionKey;
import org.apache.directory.shared.kerberos.components.KdcReq;
import org.apache.directory.shared.kerberos.components.KdcReqBody;
+import org.apache.directory.shared.kerberos.messages.TgsRep;
import org.apache.directory.shared.kerberos.messages.Ticket;
import org.junit.After;
import org.junit.Before;
@@ -133,8 +133,8 @@ public class TicketGrantingEncryptionTyp
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
assertEquals( "Encryption type", EncryptionType.DES_CBC_MD5, reply.getEncPart().getEType() );
}
@@ -186,8 +186,8 @@ public class TicketGrantingEncryptionTyp
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
assertEquals( "Encryption type", EncryptionType.DES_CBC_MD5, reply.getEncPart().getEType() );
assertEquals( "Encryption type", EncryptionType.AES128_CTS_HMAC_SHA1_96, reply.getTicket().getEncPart()
@@ -252,8 +252,8 @@ public class TicketGrantingEncryptionTyp
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
assertEquals( "Encryption type", EncryptionType.AES128_CTS_HMAC_SHA1_96, reply.getEncPart().getEType() );
assertEquals( "Encryption type", EncryptionType.AES128_CTS_HMAC_SHA1_96, reply.getTicket().getEncPart()
@@ -318,8 +318,8 @@ public class TicketGrantingEncryptionTyp
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
assertEquals( "Encryption type", EncryptionType.AES128_CTS_HMAC_SHA1_96, reply.getEncPart().getEType() );
assertEquals( "Encryption type", EncryptionType.AES128_CTS_HMAC_SHA1_96, reply.getTicket().getEncPart()
@@ -385,8 +385,8 @@ public class TicketGrantingEncryptionTyp
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
assertEquals( "Encryption type", EncryptionType.AES128_CTS_HMAC_SHA1_96, reply.getEncPart().getEType() );
assertEquals( "Encryption type", EncryptionType.AES128_CTS_HMAC_SHA1_96, reply.getTicket().getEncPart()
@@ -453,8 +453,8 @@ public class TicketGrantingEncryptionTyp
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
assertEquals( "Encryption type", EncryptionType.DES_CBC_MD5, reply.getEncPart().getEType() );
assertEquals( "Encryption type", EncryptionType.AES128_CTS_HMAC_SHA1_96, reply.getTicket().getEncPart()
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=1042560&r1=1042559&r2=1042560&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 Mon Dec 6 10:07:40 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.TicketGrantReply;
import org.apache.directory.server.kerberos.shared.messages.components.EncTicketPartModifier;
import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
import org.apache.directory.shared.kerberos.KerberosTime;
@@ -50,6 +49,7 @@ import org.apache.directory.shared.kerbe
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.TgsRep;
import org.apache.directory.shared.kerberos.messages.TgsReq;
import org.apache.directory.shared.kerberos.messages.Ticket;
import org.junit.After;
@@ -451,8 +451,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
KerberosTime expectedRenewTillTime = tgt.getEncTicketPart().getRenewTill();
boolean isClose = Math.abs( reply.getRenewTill().getTime() - expectedRenewTillTime.getTime() ) < 5000;
@@ -502,8 +502,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
KerberosTime expectedRenewTillTime = tgt.getEncTicketPart().getRenewTill();
boolean isClose = Math.abs( reply.getRenewTill().getTime() - expectedRenewTillTime.getTime() ) < 5000;
@@ -558,8 +558,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
assertTrue( "PROXY flag", reply.getFlags().isProxy() );
assertFalse( "INVALID flag", reply.getFlags().isInvalid() );
@@ -618,8 +618,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
assertTrue( "FORWARDED flag", reply.getFlags().isForwarded() );
assertFalse( "INVALID flag", reply.getFlags().isInvalid() );
@@ -773,8 +773,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
KerberosTime expectedEndTime = tgt.getEncTicketPart().getEndTime();
boolean isClose = Math.abs( reply.getEndTime().getTime() - expectedEndTime.getTime() ) < 5000;
@@ -826,8 +826,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
KerberosTime expectedEndTime = new KerberosTime( now + KerberosTime.DAY );
boolean isClose = Math.abs( reply.getEndTime().getTime() - expectedEndTime.getTime() ) < 5000;
@@ -960,8 +960,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
KerberosTime expectedStartTime = new KerberosTime( now );
boolean isClose = reply.getStartTime() == null
@@ -1018,8 +1018,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
KerberosTime expectedStartTime = new KerberosTime( now );
boolean isClose = reply.getStartTime() == null
@@ -1076,8 +1076,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
KerberosTime expectedStartTime = new KerberosTime( now );
boolean isClose = reply.getStartTime() == null
@@ -1310,8 +1310,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
assertTrue( "Requested start time", requestedStartTime.equals( reply.getStartTime() ) );
assertTrue( "Requested end time", requestedEndTime.equals( reply.getEndTime() ) );
@@ -1366,8 +1366,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
assertTrue( "PRE_AUTHENT flag", reply.getTicket().getEncTicketPart().getFlags().isPreAuth() );
}
@@ -1417,8 +1417,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
assertTrue( "Requested end time", requestedEndTime.equals( reply.getEndTime() ) );
}
@@ -1469,8 +1469,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
KerberosTime expectedEndTime = new KerberosTime( now + KerberosTime.DAY );
boolean isClose = Math.abs( reply.getEndTime().getTime() - expectedEndTime.getTime() ) < 5000;
@@ -1517,8 +1517,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
long now = System.currentTimeMillis();
KerberosTime expectedEndTime = new KerberosTime( now + KerberosTime.DAY );
@@ -1576,8 +1576,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
KerberosTime expectedEndTime = new KerberosTime( now + KerberosTime.DAY );
boolean isClose = Math.abs( reply.getEndTime().getTime() - expectedEndTime.getTime() ) < 5000;
@@ -1637,8 +1637,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
assertTrue( "FORWARDABLE flag", reply.getFlags().isForwardable() );
assertFalse( "INVALID flag", reply.getFlags().isInvalid() );
@@ -1693,8 +1693,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
assertTrue( "MAY_POSTDATE flag", reply.getFlags().isMayPosdate() );
assertFalse( "INVALID flag", reply.getFlags().isInvalid() );
@@ -1749,8 +1749,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
assertTrue( "PROXIABLE flag", reply.getFlags().isProxiable() );
assertFalse( "INVALID flag", reply.getFlags().isInvalid() );
@@ -1811,8 +1811,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
assertTrue( "RENEWABLE flag", reply.getFlags().isRenewable() );
assertFalse( "INVALID flag", reply.getFlags().isInvalid() );
@@ -1876,8 +1876,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
assertTrue( "RENEWABLE flag", reply.getFlags().isRenewable() );
assertFalse( "INVALID flag", reply.getFlags().isInvalid() );
@@ -1934,8 +1934,8 @@ public class TicketGrantingServiceTest e
handler.messageReceived( session, message );
Object msg = session.getMessage();
- assertEquals( "session.getMessage() instanceOf", TicketGrantReply.class, msg.getClass() );
- TicketGrantReply reply = ( TicketGrantReply ) msg;
+ assertEquals( "session.getMessage() instanceOf", TgsRep.class, msg.getClass() );
+ TgsRep reply = ( TgsRep ) msg;
assertFalse( "INVALID flag", reply.getFlags().isInvalid() );
assertFalse( "INVALID flag", reply.getTicket().getEncTicketPart().getFlags().isInvalid() );