Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 59021 invoked from network); 5 Dec 2010 12:52:44 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 5 Dec 2010 12:52:44 -0000 Received: (qmail 17320 invoked by uid 500); 5 Dec 2010 12:52:44 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 17267 invoked by uid 500); 5 Dec 2010 12:52:43 -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 17260 invoked by uid 99); 5 Dec 2010 12:52:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Dec 2010 12:52:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Dec 2010 12:52:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5941023889E7; Sun, 5 Dec 2010 12:52:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1042340 - in /directory/apacheds/branches/apacheds-kerberos-codec-2.0: kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/ kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages... Date: Sun, 05 Dec 2010 12:52:22 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101205125222.5941023889E7@eris.apache.org> Author: kayyagari Date: Sun Dec 5 12:52:21 2010 New Revision: 1042340 URL: http://svn.apache.org/viewvc?rev=1042340&view=rev Log: o replaced KdcReply with KdcRep o fixed the debug logging methods and removed KdcReplyDecoder Removed: directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/io/decoder/KdcReplyDecoder.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/KdcReply.java Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationService.java directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationService.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationService.java?rev=1042340&r1=1042339&r2=1042340&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationService.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationService.java Sun Dec 5 12:52:21 2010 @@ -40,7 +40,6 @@ import org.apache.directory.server.kerbe 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.exceptions.KerberosException; -import org.apache.directory.server.kerberos.shared.messages.KdcReply; import org.apache.directory.server.kerberos.shared.store.PrincipalStore; import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry; import org.apache.directory.shared.asn1.codec.EncoderException; @@ -582,7 +581,7 @@ public class AuthenticationService if ( LOG.isDebugEnabled() ) { monitorContext( authContext ); - monitorReply( ( KdcContext ) authContext ); + monitorReply( reply, encKdcRepPart ); } EncryptionKey clientKey = authContext.getClientKey(); @@ -679,31 +678,27 @@ public class AuthenticationService } - private static void monitorReply( KdcContext kdcContext ) + private static void monitorReply( AsRep reply, EncKdcRepPart part ) { - Object reply = kdcContext.getReply(); - - if ( LOG.isDebugEnabled() && reply instanceof KdcReply ) + if ( LOG.isDebugEnabled() ) { - KdcReply success = ( KdcReply ) reply; - try { StringBuffer sb = new StringBuffer(); sb.append( "Responding with " + SERVICE_NAME + " reply:" ); - sb.append( "\n\t" + "messageType: " + success.getMessageType() ); - sb.append( "\n\t" + "protocolVersionNumber: " + success.getProtocolVersionNumber() ); - sb.append( "\n\t" + "nonce: " + success.getNonce() ); - sb.append( "\n\t" + "clientPrincipal: " + success.getClientPrincipal() ); - sb.append( "\n\t" + "client realm: " + success.getClientRealm() ); - sb.append( "\n\t" + "serverPrincipal: " + success.getServerPrincipal() ); - sb.append( "\n\t" + "server realm: " + success.getServerRealm() ); - sb.append( "\n\t" + "auth time: " + success.getAuthTime() ); - sb.append( "\n\t" + "start time: " + success.getStartTime() ); - sb.append( "\n\t" + "end time: " + success.getEndTime() ); - sb.append( "\n\t" + "renew-till time: " + success.getRenewTill() ); - sb.append( "\n\t" + "hostAddresses: " + success.getClientAddresses() ); + sb.append( "\n\t" + "messageType: " + reply.getMessageType() ); + sb.append( "\n\t" + "protocolVersionNumber: " + reply.getProtocolVersionNumber() ); + sb.append( "\n\t" + "nonce: " + part.getNonce() ); + sb.append( "\n\t" + "clientPrincipal: " + reply.getCName() ); + sb.append( "\n\t" + "client realm: " + reply.getCRealm() ); + sb.append( "\n\t" + "serverPrincipal: " + part.getSName() ); + sb.append( "\n\t" + "server realm: " + part.getSRealm() ); + sb.append( "\n\t" + "auth time: " + part.getAuthTime() ); + sb.append( "\n\t" + "start time: " + part.getStartTime() ); + sb.append( "\n\t" + "end time: " + part.getEndTime() ); + sb.append( "\n\t" + "renew-till time: " + part.getRenewTill() ); + sb.append( "\n\t" + "hostAddresses: " + part.getClientAddresses() ); LOG.debug( sb.toString() ); } Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java?rev=1042340&r1=1042339&r2=1042340&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java (original) +++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java Sun Dec 5 12:52:21 2010 @@ -39,7 +39,6 @@ import org.apache.directory.server.kerbe import org.apache.directory.server.kerberos.shared.exceptions.KerberosException; import org.apache.directory.server.kerberos.shared.io.decoder.ApplicationRequestDecoder; import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest; -import org.apache.directory.server.kerberos.shared.messages.KdcReply; import org.apache.directory.server.kerberos.shared.messages.components.EncTicketPartModifier; import org.apache.directory.server.kerberos.shared.replay.ReplayCache; import org.apache.directory.server.kerberos.shared.store.PrincipalStore; @@ -398,7 +397,7 @@ public class TicketGrantingService if ( LOG.isDebugEnabled() ) { monitorContext( tgsContext ); - monitorReply( tgsContext ); + monitorReply( reply, encKdcRepPart ); } EncTgsRepPart encTgsRepPart = new EncTgsRepPart(); @@ -482,39 +481,32 @@ public class TicketGrantingService } - private static void monitorReply( KdcContext kdcContext ) + private static void monitorReply( TgsRep success, EncKdcRepPart part ) { - Object reply = kdcContext.getReply(); - - if ( reply instanceof KdcReply ) + try { - KdcReply success = ( KdcReply ) reply; - - try - { - StringBuffer sb = new StringBuffer(); - - sb.append( "Responding with " + SERVICE_NAME + " reply:" ); - sb.append( "\n\t" + "messageType: " + success.getMessageType() ); - sb.append( "\n\t" + "protocolVersionNumber: " + success.getProtocolVersionNumber() ); - sb.append( "\n\t" + "nonce: " + success.getNonce() ); - sb.append( "\n\t" + "clientPrincipal: " + success.getClientPrincipal() ); - sb.append( "\n\t" + "client realm: " + success.getClientRealm() ); - sb.append( "\n\t" + "serverPrincipal: " + success.getServerPrincipal() ); - sb.append( "\n\t" + "server realm: " + success.getServerRealm() ); - sb.append( "\n\t" + "auth time: " + success.getAuthTime() ); - sb.append( "\n\t" + "start time: " + success.getStartTime() ); - sb.append( "\n\t" + "end time: " + success.getEndTime() ); - sb.append( "\n\t" + "renew-till time: " + success.getRenewTill() ); - sb.append( "\n\t" + "hostAddresses: " + success.getClientAddresses() ); - - LOG.debug( sb.toString() ); - } - catch ( Exception e ) - { - // This is a monitor. No exceptions should bubble up. - LOG.error( I18n.err( I18n.ERR_155 ), e ); - } + StringBuffer sb = new StringBuffer(); + + sb.append( "Responding with " + SERVICE_NAME + " reply:" ); + sb.append( "\n\t" + "messageType: " + success.getMessageType() ); + sb.append( "\n\t" + "protocolVersionNumber: " + success.getProtocolVersionNumber() ); + sb.append( "\n\t" + "nonce: " + part.getNonce() ); + sb.append( "\n\t" + "clientPrincipal: " + success.getCName() ); + sb.append( "\n\t" + "client realm: " + success.getCRealm() ); + sb.append( "\n\t" + "serverPrincipal: " + part.getSName() ); + sb.append( "\n\t" + "server realm: " + part.getSRealm() ); + sb.append( "\n\t" + "auth time: " + part.getAuthTime() ); + sb.append( "\n\t" + "start time: " + part.getStartTime() ); + sb.append( "\n\t" + "end time: " + part.getEndTime() ); + sb.append( "\n\t" + "renew-till time: " + part.getRenewTill() ); + sb.append( "\n\t" + "hostAddresses: " + part.getClientAddresses() ); + + LOG.debug( sb.toString() ); + } + catch ( Exception e ) + { + // This is a monitor. No exceptions should bubble up. + LOG.error( I18n.err( I18n.ERR_155 ), e ); } }