Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 42634 invoked from network); 21 Mar 2007 12:52:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Mar 2007 12:52:52 -0000 Received: (qmail 56815 invoked by uid 500); 21 Mar 2007 12:53:00 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 56754 invoked by uid 500); 21 Mar 2007 12:53:00 -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 56743 invoked by uid 99); 21 Mar 2007 12:52:59 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Mar 2007 05:52:59 -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, 21 Mar 2007 05:52:51 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 091CB1A983E; Wed, 21 Mar 2007 05:52:30 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r520867 - in /directory/shared/trunk/asn1/src: main/java/org/apache/directory/shared/asn1/primitives/OID.java test/java/org/apache/directory/shared/asn1/primitives/OIDTest.java Date: Wed, 21 Mar 2007 12:52:29 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070321125230.091CB1A983E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Wed Mar 21 05:52:29 2007 New Revision: 520867 URL: http://svn.apache.org/viewvc?view=rev&rev=520867 Log: Fixed DIRSERVER-875. The OID migh be sometime seen as correct, due to incorrectly handling a final '.'. Fixed the tests whcich were not detecting such a bug... Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/OIDTest.java Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java?view=diff&rev=520867&r1=520866&r2=520867 ============================================================================== --- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java (original) +++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/primitives/OID.java Wed Mar 21 05:52:29 2007 @@ -583,7 +583,7 @@ } // We must have a dot - if ( bytes[pos++] != '.' ) + if ( ( pos + 1 >= bytes.length ) || ( bytes[++pos] != '.' ) ) { return false; } @@ -630,6 +630,6 @@ } } - return true; + return !dotSeen; } } Modified: directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/OIDTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/OIDTest.java?view=diff&rev=520867&r1=520866&r2=520867 ============================================================================== --- directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/OIDTest.java (original) +++ directory/shared/trunk/asn1/src/test/java/org/apache/directory/shared/asn1/primitives/OIDTest.java Wed Mar 21 05:52:29 2007 @@ -262,99 +262,16 @@ */ public void testOidStringBad() { - - OID oid = new OID(); - - try - { - oid.setOID( "0" ); - } - catch ( DecoderException de ) - { - Assert.assertTrue( true ); - } - - try - { - oid.setOID( "0." ); - } - catch ( DecoderException de ) - { - Assert.assertTrue( true ); - } - - try - { - oid.setOID( "." ); - } - catch ( DecoderException de ) - { - Assert.assertTrue( true ); - } - - try - { - oid.setOID( "0.1.2." ); - } - catch ( DecoderException de ) - { - Assert.assertTrue( true ); - } - - try - { - oid.setOID( "3.1" ); - } - catch ( DecoderException de ) - { - Assert.assertTrue( true ); - } - - try - { - oid.setOID( "0..1" ); - } - catch ( DecoderException de ) - { - Assert.assertTrue( true ); - } - - try - { - oid.setOID( "0..12" ); - } - catch ( DecoderException de ) - { - Assert.assertTrue( true ); - } - - try - { - oid.setOID( "0.a.2" ); - } - catch ( DecoderException de ) - { - Assert.assertTrue( true ); - } - - try - { - oid.setOID( "0.123456" ); - } - catch ( DecoderException de ) - { - Assert.assertTrue( true ); - } - - try - { - oid.setOID( "1.123456" ); - } - catch ( DecoderException de ) - { - Assert.assertTrue( true ); - } - + assertFalse( OID.isOID( "0" ) ); + assertFalse( OID.isOID( "0." ) ); + assertFalse( OID.isOID( "." ) ); + assertFalse( OID.isOID( "0.1.2." ) ); + assertFalse( OID.isOID( "3.1" ) ); + assertFalse( OID.isOID( "0..1" ) ); + assertFalse( OID.isOID( "0..12" ) ); + assertFalse( OID.isOID( "0.a.2" ) ); + assertFalse( OID.isOID( "0.123456" ) ); + assertFalse( OID.isOID( "1.123456" ) ); }