Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 21279 invoked from network); 14 Jun 2007 05:41:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Jun 2007 05:41:29 -0000 Received: (qmail 91895 invoked by uid 500); 14 Jun 2007 05:41:32 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 91862 invoked by uid 500); 14 Jun 2007 05:41:32 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 91844 invoked by uid 99); 14 Jun 2007 05:41:32 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Jun 2007 22:41:32 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Jun 2007 22:41:28 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id D5CF31A981C; Wed, 13 Jun 2007 22:41:07 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r547131 - in /directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared: io/encoder/ messages/components/ Date: Thu, 14 Jun 2007 05:41:07 -0000 To: commits@directory.apache.org From: erodriguez@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070614054107.D5CF31A981C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: erodriguez Date: Wed Jun 13 22:41:06 2007 New Revision: 547131 URL: http://svn.apache.org/viewvc?view=rev&rev=547131 Log: Improvements to kerberos-shared, driven by client-side: o Added capability to use KerberosPrincipal's when creating new Authenticators and Tickets. o Some Javadocs. Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/encoder/EncKrbPrivPartEncoder.java directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/AuthenticatorModifier.java directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/EncTicketPartModifier.java directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/TicketModifier.java Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/encoder/EncKrbPrivPartEncoder.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/encoder/EncKrbPrivPartEncoder.java?view=diff&rev=547131&r1=547130&r2=547131 ============================================================================== --- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/encoder/EncKrbPrivPartEncoder.java (original) +++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/encoder/EncKrbPrivPartEncoder.java Wed Jun 13 22:41:06 2007 @@ -61,6 +61,21 @@ } + /** + * Encodes an {@link EncKrbPrivPart} into a {@link DERSequence}. + * + * EncKrbPrivPart ::= [APPLICATION 28] SEQUENCE { + * user-data [0] OCTET STRING, + * timestamp [1] KerberosTime OPTIONAL, + * usec [2] Microseconds OPTIONAL, + * seq-number [3] UInt32 OPTIONAL, + * s-address [4] HostAddress -- sender's addr --, + * r-address [5] HostAddress OPTIONAL -- recip's addr + * } + * + * @param message + * @return The {@link DERSequence}; + */ private DERSequence encodePrivatePartSequence( EncKrbPrivPart message ) { DERSequence sequence = new DERSequence(); Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/AuthenticatorModifier.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/AuthenticatorModifier.java?view=diff&rev=547131&r1=547130&r2=547131 ============================================================================== --- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/AuthenticatorModifier.java (original) +++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/AuthenticatorModifier.java Wed Jun 13 22:41:06 2007 @@ -38,6 +38,7 @@ { private int versionNumber; private KerberosPrincipalModifier clientModifier = new KerberosPrincipalModifier(); + private KerberosPrincipal clientPrincipal; private Checksum checksum; private int clientMicroSecond; private KerberosTime clientTime; @@ -53,7 +54,10 @@ */ public Authenticator getAuthenticator() { - KerberosPrincipal clientPrincipal = clientModifier.getKerberosPrincipal(); + if ( clientPrincipal == null ) + { + clientPrincipal = clientModifier.getKerberosPrincipal(); + } return new Authenticator( versionNumber, clientPrincipal, checksum, clientMicroSecond, clientTime, subSessionKey, sequenceNumber, authorizationData ); @@ -90,6 +94,17 @@ public void setClientRealm( String realm ) { clientModifier.setRealm( realm ); + } + + + /** + * Sets the client {@link KerberosPrincipal}. + * + * @param clientPrincipal + */ + public void setClientPrincipal( KerberosPrincipal clientPrincipal ) + { + this.clientPrincipal = clientPrincipal; } Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/EncTicketPartModifier.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/EncTicketPartModifier.java?view=diff&rev=547131&r1=547130&r2=547131 ============================================================================== --- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/EncTicketPartModifier.java (original) +++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/EncTicketPartModifier.java Wed Jun 13 22:41:06 2007 @@ -95,11 +95,11 @@ /** * Sets the client {@link KerberosPrincipal}. * - * @param principal + * @param clientPrincipal */ - public void setClientPrincipal( KerberosPrincipal principal ) + public void setClientPrincipal( KerberosPrincipal clientPrincipal ) { - clientPrincipal = principal; + this.clientPrincipal = clientPrincipal; } Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/TicketModifier.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/TicketModifier.java?view=diff&rev=547131&r1=547130&r2=547131 ============================================================================== --- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/TicketModifier.java (original) +++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/components/TicketModifier.java Wed Jun 13 22:41:06 2007 @@ -35,6 +35,7 @@ { private int ticketVersionNumber; private KerberosPrincipalModifier serverModifier = new KerberosPrincipalModifier(); + private KerberosPrincipal serverPrincipal; private EncryptedData encPart; @@ -45,7 +46,11 @@ */ public Ticket getTicket() { - KerberosPrincipal serverPrincipal = serverModifier.getKerberosPrincipal(); + if ( serverPrincipal == null ) + { + serverPrincipal = serverModifier.getKerberosPrincipal(); + } + return new Ticket( ticketVersionNumber, serverPrincipal, encPart ); } @@ -91,5 +96,16 @@ public void setServerRealm( String realm ) { serverModifier.setRealm( realm ); + } + + + /** + * Sets the server {@link KerberosPrincipal}. + * + * @param serverPrincipal + */ + public void setServerPrincipal( KerberosPrincipal serverPrincipal ) + { + this.serverPrincipal = serverPrincipal; } }