You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ka...@apache.org on 2010/12/06 18:22:23 UTC
svn commit: r1042729 - in
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol:
AbstractTicketGrantingServiceTest.java EncTktInSkeyTest.java
Author: kayyagari
Date: Mon Dec 6 17:22:22 2010
New Revision: 1042729
URL: http://svn.apache.org/viewvc?rev=1042729&view=rev
Log:
o fixed few more compiler errors
Modified:
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java
directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/EncTktInSkeyTest.java
Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.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/AbstractTicketGrantingServiceTest.java?rev=1042729&r1=1042728&r2=1042729&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java (original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java Mon Dec 6 17:22:22 2010
@@ -23,6 +23,7 @@ package org.apache.directory.server.kerb
import java.io.IOException;
import java.nio.ByteBuffer;
import java.security.SecureRandom;
+import java.text.ParseException;
import javax.security.auth.kerberos.KerberosKey;
import javax.security.auth.kerberos.KerberosPrincipal;
@@ -31,9 +32,9 @@ 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.KeyUsage;
import org.apache.directory.server.kerberos.shared.crypto.encryption.RandomKeyFactory;
-import org.apache.directory.server.kerberos.shared.messages.components.EncTicketPartModifier;
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.kerberos.KerberosTime;
+import org.apache.directory.shared.kerberos.KerberosUtils;
import org.apache.directory.shared.kerberos.codec.options.ApOptions;
import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
import org.apache.directory.shared.kerberos.codec.types.PaDataType;
@@ -114,29 +115,28 @@ public abstract class AbstractTicketGran
* @throws KerberosException
*/
protected Ticket getTicket( KerberosPrincipal clientPrincipal, KerberosPrincipal serverPrincipal,
- EncryptionKey serverKey ) throws KerberosException
+ EncryptionKey serverKey ) throws KerberosException, ParseException
{
- EncTicketPartModifier encTicketModifier = new EncTicketPartModifier();
+ EncTicketPart encTicketPart = new EncTicketPart();
TicketFlags ticketFlags = new TicketFlags();
ticketFlags.setFlag( TicketFlag.RENEWABLE );
- encTicketModifier.setFlags( ticketFlags );
+ encTicketPart.setFlags( ticketFlags );
EncryptionKey sessionKey = RandomKeyFactory.getRandomKey( EncryptionType.DES_CBC_MD5 );
- encTicketModifier.setSessionKey( sessionKey );
- encTicketModifier.setClientPrincipal( clientPrincipal );
- encTicketModifier.setTransitedEncoding( new TransitedEncoding() );
- encTicketModifier.setAuthTime( new KerberosTime() );
+ encTicketPart.setKey( sessionKey );
+ encTicketPart.setCName( new PrincipalName( clientPrincipal.getName(), PrincipalNameType.KRB_NT_PRINCIPAL ) );
+ encTicketPart.setCRealm( clientPrincipal.getRealm() );
+ encTicketPart.setTransited( new TransitedEncoding() );
+ encTicketPart.setAuthTime( new KerberosTime() );
long now = System.currentTimeMillis();
KerberosTime endTime = new KerberosTime( now + KerberosTime.DAY );
- encTicketModifier.setEndTime( endTime );
+ encTicketPart.setEndTime( endTime );
KerberosTime renewTill = new KerberosTime( now + KerberosTime.WEEK );
- encTicketModifier.setRenewTill( renewTill );
-
- EncTicketPart encTicketPart = encTicketModifier.getEncTicketPart();
+ encTicketPart.setRenewTill( renewTill );
EncryptedData encryptedTicketPart = lockBox.seal( serverKey, encTicketPart, KeyUsage.NUMBER2 );
@@ -151,41 +151,42 @@ public abstract class AbstractTicketGran
}
- protected EncTicketPartModifier getTicketArchetype( KerberosPrincipal clientPrincipal ) throws KerberosException
+ protected EncTicketPart getTicketArchetype( KerberosPrincipal clientPrincipal ) throws KerberosException, ParseException
{
- EncTicketPartModifier encTicketModifier = new EncTicketPartModifier();
+ EncTicketPart encTicketPart = new EncTicketPart();
TicketFlags ticketFlags = new TicketFlags();
ticketFlags.setFlag( TicketFlag.RENEWABLE );
- encTicketModifier.setFlags( ticketFlags );
+ encTicketPart.setFlags( ticketFlags );
EncryptionKey sessionKey = RandomKeyFactory.getRandomKey( EncryptionType.DES_CBC_MD5 );
- encTicketModifier.setSessionKey( sessionKey );
- encTicketModifier.setClientPrincipal( clientPrincipal );
- encTicketModifier.setTransitedEncoding( new TransitedEncoding() );
- encTicketModifier.setAuthTime( new KerberosTime() );
+ encTicketPart.setKey( sessionKey );
+ encTicketPart.setCName( new PrincipalName( clientPrincipal.getName(), PrincipalNameType.KRB_NT_PRINCIPAL ) );
+ encTicketPart.setCRealm( clientPrincipal.getRealm() );
+ encTicketPart.setTransited( new TransitedEncoding() );
+ encTicketPart.setAuthTime( new KerberosTime() );
long now = System.currentTimeMillis();
KerberosTime endTime = new KerberosTime( now + KerberosTime.DAY );
- encTicketModifier.setEndTime( endTime );
+ encTicketPart.setEndTime( endTime );
KerberosTime renewTill = new KerberosTime( now + KerberosTime.WEEK );
- encTicketModifier.setRenewTill( renewTill );
+ encTicketPart.setRenewTill( renewTill );
- return encTicketModifier;
+ return encTicketPart;
}
protected Ticket getTicket( EncTicketPart encTicketPart, KerberosPrincipal serverPrincipal,
- EncryptionKey serverKey ) throws KerberosException
+ EncryptionKey serverKey ) throws KerberosException, ParseException
{
EncryptedData encryptedTicketPart = lockBox.seal( serverKey, encTicketPart, KeyUsage.NUMBER2 );
Ticket ticket = new Ticket();
ticket.setTktVno( 5 );
- ticket.setSName( serverPrincipal );
- ticket.setRealm( realm );
+ ticket.setSName( new PrincipalName( serverPrincipal.getName(), PrincipalNameType.KRB_NT_PRINCIPAL ) );
+ ticket.setRealm( serverPrincipal.getRealm() );
ticket.setEncPart( encryptedTicketPart );
ticket.setEncTicketPart( encTicketPart );
@@ -213,7 +214,7 @@ public abstract class AbstractTicketGran
sequenceNumber = random.nextInt();
now = new KerberosTime();
- EncryptedData authenticator = getAuthenticator( tgt.getEncTicketPart().getCName(), kdcReqBody, checksumType );
+ EncryptedData authenticator = getAuthenticator( KerberosUtils.getKerberosPrincipal( tgt.getEncTicketPart().getCName(), tgt.getEncTicketPart().getCRealm() ), kdcReqBody, checksumType );
PaData[] paDatas = getPreAuthenticationData( tgt, authenticator );
@@ -224,6 +225,8 @@ public abstract class AbstractTicketGran
{
message.addPaData( paData );
}
+
+ return message;
}
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=1042729&r1=1042728&r2=1042729&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 Mon Dec 6 17:22:22 2010
@@ -27,10 +27,10 @@ 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.components.EncTicketPartModifier;
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;
+import org.apache.directory.shared.kerberos.components.EncTicketPart;
import org.apache.directory.shared.kerberos.components.EncryptionKey;
import org.apache.directory.shared.kerberos.components.KdcReq;
import org.apache.directory.shared.kerberos.components.KdcReqBody;
@@ -110,7 +110,7 @@ public class EncTktInSkeyTest extends Ab
{
// Get the mutable ticket part.
KerberosPrincipal clientPrincipal = new KerberosPrincipal( "hnelson@EXAMPLE.COM" );
- EncTicketPartModifier encTicketPartModifier = getTicketArchetype( clientPrincipal );
+ EncTicketPart encTicketPartModifier = getTicketArchetype( clientPrincipal );
// Make changes to test.