Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 51346 invoked from network); 6 Jun 2007 04:11:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Jun 2007 04:11:43 -0000 Received: (qmail 20486 invoked by uid 500); 6 Jun 2007 04:11:47 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 20429 invoked by uid 500); 6 Jun 2007 04:11:47 -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 20418 invoked by uid 99); 6 Jun 2007 04:11:47 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jun 2007 21:11:47 -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; Tue, 05 Jun 2007 21:11:42 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id B8DCF1A981C; Tue, 5 Jun 2007 21:11:22 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r544724 - in /directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos: kdc/authentication/ kdc/preauthentication/ protocol/ Date: Wed, 06 Jun 2007 04:11:22 -0000 To: commits@directory.apache.org From: erodriguez@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070606041122.B8DCF1A981C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: erodriguez Date: Tue Jun 5 21:11:21 2007 New Revision: 544724 URL: http://svn.apache.org/viewvc?view=rev&rev=544724 Log: Improved exception handling in protocol-kerberos. Modified: directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifySam.java directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java Modified: directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java?view=diff&rev=544724&r1=544723&r2=544724 ============================================================================== --- directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java (original) +++ directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java Tue Jun 5 21:11:21 2007 @@ -105,7 +105,10 @@ { // TODO - possibly allow req.from range if ( !config.isPostdateAllowed() ) + { throw new KerberosException( ErrorType.KDC_ERR_POLICY ); + } + newTicketBody.setFlag( TicketFlags.INVALID ); newTicketBody.setStartTime( request.getFrom() ); } Modified: directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java?view=diff&rev=544724&r1=544723&r2=544724 ============================================================================== --- directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java (original) +++ directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifyEncryptedTimestamp.java Tue Jun 5 21:11:21 2007 @@ -110,11 +110,11 @@ } catch ( IOException ioe ) { - throw new KerberosException( ErrorType.KRB_AP_ERR_BAD_INTEGRITY ); + throw new KerberosException( ErrorType.KRB_AP_ERR_BAD_INTEGRITY, ioe ); } catch ( ClassCastException cce ) { - throw new KerberosException( ErrorType.KRB_AP_ERR_BAD_INTEGRITY ); + throw new KerberosException( ErrorType.KRB_AP_ERR_BAD_INTEGRITY, cce ); } timestamp = ( EncryptedTimeStamp ) cipherTextHandler.unseal( EncryptedTimeStamp.class, Modified: directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifySam.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifySam.java?view=diff&rev=544724&r1=544723&r2=544724 ============================================================================== --- directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifySam.java (original) +++ directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/preauthentication/VerifySam.java Tue Jun 5 21:11:21 2007 @@ -80,7 +80,8 @@ if ( preAuthData == null || preAuthData.length == 0 ) { - throw new KerberosException( ErrorType.KDC_ERR_PREAUTH_REQUIRED, preparePreAuthenticationError( config.getEncryptionTypes() ) ); + throw new KerberosException( ErrorType.KDC_ERR_PREAUTH_REQUIRED, preparePreAuthenticationError( config + .getEncryptionTypes() ) ); } try @@ -98,7 +99,7 @@ } catch ( SamException se ) { - throw new KerberosException( ErrorType.KRB_ERR_GENERIC, se.getMessage() ); + throw new KerberosException( ErrorType.KRB_ERR_GENERIC, se ); } authContext.setClientKey( clientKey ); Modified: directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java?view=diff&rev=544724&r1=544723&r2=544724 ============================================================================== --- directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java (original) +++ directory/apacheds/trunk/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java Tue Jun 5 21:11:21 2007 @@ -189,7 +189,7 @@ { if ( log.isDebugEnabled() ) { - log.debug( ke.getMessage(), ke ); + log.warn( ke.getMessage(), ke ); } else {