Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 37335 invoked from network); 20 Nov 2010 11:20:43 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 20 Nov 2010 11:20:43 -0000 Received: (qmail 86239 invoked by uid 500); 20 Nov 2010 11:21:14 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 86213 invoked by uid 500); 20 Nov 2010 11:21:14 -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 86206 invoked by uid 99); 20 Nov 2010 11:21:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Nov 2010 11:21:13 +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; Sat, 20 Nov 2010 11:21:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9E46D23889D7; Sat, 20 Nov 2010 11:19:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1037169 - in /directory/apacheds/trunk/kerberos-codec/src: main/java/org/apache/directory/shared/kerberos/codec/etypeInfoEntry/actions/ main/java/org/apache/directory/shared/kerberos/components/ test/java/org/apache/directory/shared/kerber... Date: Sat, 20 Nov 2010 11:19:53 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101120111953.9E46D23889D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Sat Nov 20 11:19:53 2010 New Revision: 1037169 URL: http://svn.apache.org/viewvc?rev=1037169&view=rev Log: o Addd the tests for ETYPE-INFO-ENTRY o Fixed some errors in the grammar and data structure o Renamed the EncryptedDecoderTest Added: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoEntryDecoderTest.java directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptedDataDecoderTest.java - copied, changed from r1036986, directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptedDecoderTest.java Removed: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptedDecoderTest.java Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfoEntry/actions/StoreSalt.java directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfoEntry/actions/StoreSalt.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfoEntry/actions/StoreSalt.java?rev=1037169&r1=1037168&r2=1037169&view=diff ============================================================================== --- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfoEntry/actions/StoreSalt.java (original) +++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/etypeInfoEntry/actions/StoreSalt.java Sat Nov 20 11:19:53 2010 @@ -71,7 +71,7 @@ public class StoreSalt extends GrammarAc Value value = tlv.getValue(); // The encrypted data may be null - if ( value.getData() == null ) + if ( value.getData() != null ) { etypeInfoEntry.setSalt( value.getData() ); } Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java?rev=1037169&r1=1037168&r2=1037169&view=diff ============================================================================== --- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java (original) +++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java Sat Nov 20 11:19:53 2010 @@ -188,10 +188,13 @@ public class ETypeInfoEntry extends Abst buffer.put( TLV.getBytes( etypeTagLength ) ); Value.encode( buffer, etype.getValue() ); - // The salt, first the tag, then the value - buffer.put( ( byte ) KerberosConstants.ETYPE_INFO_ENTRY_SALT_TAG ); - buffer.put( TLV.getBytes( saltTagLength ) ); - Value.encode( buffer, salt ); + // The salt, first the tag, then the value, if salt is not null + if ( salt != null ) + { + buffer.put( ( byte ) KerberosConstants.ETYPE_INFO_ENTRY_SALT_TAG ); + buffer.put( TLV.getBytes( saltTagLength ) ); + Value.encode( buffer, salt ); + } } catch ( BufferOverflowException boe ) { @@ -213,19 +216,19 @@ public class ETypeInfoEntry extends Abst /** * @see Object#toString() */ - public String toString( String tabs ) + public String toString() { StringBuilder sb = new StringBuilder(); - sb.append( tabs ).append( "ETYPE-INFO-ENTRY : {\n" ); - sb.append( tabs ).append( " etype: " ).append( etype ).append( '\n' ); + sb.append( "ETYPE-INFO-ENTRY : {\n" ); + sb.append( " etype: " ).append( etype ).append( '\n' ); if ( salt != null ) { - sb.append( tabs + " salt:" ).append( StringTools.dumpBytes( salt ) ).append( '\n' ); + sb.append( " salt: " ).append( StringTools.dumpBytes( salt ) ).append( '\n' ); } - sb.append( tabs + "}\n" ); + sb.append( "}\n" ); return sb.toString(); } Added: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoEntryDecoderTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoEntryDecoderTest.java?rev=1037169&view=auto ============================================================================== --- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoEntryDecoderTest.java (added) +++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoEntryDecoderTest.java Sat Nov 20 11:19:53 2010 @@ -0,0 +1,434 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +package org.apache.directory.shared.kerberos.codec; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.nio.ByteBuffer; +import java.util.Arrays; + +import org.apache.directory.shared.asn1.ber.Asn1Decoder; +import org.apache.directory.shared.asn1.codec.DecoderException; +import org.apache.directory.shared.asn1.codec.EncoderException; +import org.apache.directory.shared.kerberos.codec.etypeInfoEntry.ETypeInfoEntryContainer; +import org.apache.directory.shared.kerberos.codec.types.EncryptionType; +import org.apache.directory.shared.kerberos.components.ETypeInfoEntry; +import org.apache.directory.shared.ldap.util.StringTools; +import org.junit.Test; + +/** + * Test cases for ETYPE-INFO-ENTRY codec. + * + * @author Apache Directory Project + */ +public class ETypeInfoEntryDecoderTest +{ + /** + * Test the decoding of a full ETYPE-INFO-ENTRY + */ + @Test + public void testDecodeETypeInfoEntry() + { + Asn1Decoder krbDecoder = new Asn1Decoder(); + + ByteBuffer stream = ByteBuffer.allocate( 0x0F ); + + stream.put( new byte[] + { + 0x30, 0x0D, + (byte)0xA0, 0x03, // etype + 0x02, 0x01, 0x05, + (byte)0xA1, 0x06, // salt + 0x04, 0x04, 0x31, 0x32, 0x33, 0x34 + } ); + + String decodedPdu = StringTools.dumpBytes( stream.array() ); + stream.flip(); + + ETypeInfoEntryContainer container = new ETypeInfoEntryContainer(); + + try + { + krbDecoder.decode( stream, container ); + } + catch ( DecoderException de ) + { + de.printStackTrace(); + + fail( de.getMessage() ); + } + + ETypeInfoEntry etypeInforEntry = container.getETypeInfoEntry(); + + assertEquals( EncryptionType.DES3_CBC_MD5, etypeInforEntry.getEType() ); + assertTrue( Arrays.equals( StringTools.getBytesUtf8( "1234" ), etypeInforEntry.getSalt() ) ); + + ByteBuffer bb = ByteBuffer.allocate( etypeInforEntry.computeLength() ); + + try + { + bb = etypeInforEntry.encode( bb ); + + // Check the length + assertEquals( 0x0F, bb.limit() ); + + String encodedPdu = StringTools.dumpBytes( bb.array() ); + + assertEquals( encodedPdu, decodedPdu ); + } + catch ( EncoderException ee ) + { + fail(); + } + } + + + /** + * Test the decoding of a ETYPE-INFO-ENTRY with no salt + */ + @Test + public void testDecodeETypeInfoEntryNoSalt() + { + Asn1Decoder krbDecoder = new Asn1Decoder(); + + ByteBuffer stream = ByteBuffer.allocate( 0x07 ); + + stream.put( new byte[] + { + 0x30, 0x05, + (byte)0xA0, 0x03, // etype + 0x02, 0x01, 0x05 + } ); + + String decodedPdu = StringTools.dumpBytes( stream.array() ); + stream.flip(); + + ETypeInfoEntryContainer container = new ETypeInfoEntryContainer(); + + try + { + krbDecoder.decode( stream, container ); + } + catch ( DecoderException de ) + { + de.printStackTrace(); + + fail( de.getMessage() ); + } + + ETypeInfoEntry etypeInforEntry = container.getETypeInfoEntry(); + + assertEquals( EncryptionType.DES3_CBC_MD5, etypeInforEntry.getEType() ); + assertNull( etypeInforEntry.getSalt() ); + + ByteBuffer bb = ByteBuffer.allocate( etypeInforEntry.computeLength() ); + + try + { + bb = etypeInforEntry.encode( bb ); + + // Check the length + assertEquals( 0x07, bb.limit() ); + + String encodedPdu = StringTools.dumpBytes( bb.array() ); + + assertEquals( encodedPdu, decodedPdu ); + } + catch ( EncoderException ee ) + { + fail(); + } + } + + + /** + * Test the decoding of a ETYPE-INFO-ENTRY with an empty salt + */ + @Test( expected = DecoderException.class ) + public void testDecodeETypeInfoEntryEmptySalt() throws DecoderException + { + Asn1Decoder krbDecoder = new Asn1Decoder(); + + ByteBuffer stream = ByteBuffer.allocate( 0x09 ); + + stream.put( new byte[] + { + 0x30, 0x07, + (byte)0xA0, 0x03, // etype + 0x02, 0x01, 0x05, + (byte)0xA1, 0x00 // salt + } ); + + stream.flip(); + + ETypeInfoEntryContainer container = new ETypeInfoEntryContainer(); + + krbDecoder.decode( stream, container ); + fail(); + } + + + /** + * Test the decoding of a ETYPE-INFO-ENTRY with an null salt + */ + @Test + public void testDecodeETypeInfoEntryNullSalt() + { + Asn1Decoder krbDecoder = new Asn1Decoder(); + + ByteBuffer stream = ByteBuffer.allocate( 0x0B ); + + stream.put( new byte[] + { + 0x30, 0x09, + (byte)0xA0, 0x03, // etype + 0x02, 0x01, 0x05, + (byte)0xA1, 0x02, // salt + 0x04, 0x00 + } ); + + stream.flip(); + + ETypeInfoEntryContainer container = new ETypeInfoEntryContainer(); + + try + { + krbDecoder.decode( stream, container ); + } + catch ( DecoderException de ) + { + de.printStackTrace(); + + fail( de.getMessage() ); + } + + ETypeInfoEntry etypeInforEntry = container.getETypeInfoEntry(); + + assertEquals( EncryptionType.DES3_CBC_MD5, etypeInforEntry.getEType() ); + assertNull( etypeInforEntry.getSalt() ); + + ByteBuffer bb = ByteBuffer.allocate( etypeInforEntry.computeLength() ); + + try + { + bb = etypeInforEntry.encode( bb ); + + // Check the length + assertEquals( 0x07, bb.limit() ); + + String encodedPdu = StringTools.dumpBytes( bb.array() ); + + ByteBuffer stream2 = ByteBuffer.allocate( 0x07 ); + + stream2.put( new byte[] + { + 0x30, 0x05, + (byte)0xA0, 0x03, // etype + 0x02, 0x01, 0x05 + } ); + + String decodedPdu2 = StringTools.dumpBytes( stream2.array() ); + + assertEquals( encodedPdu, decodedPdu2 ); + } + catch ( EncoderException ee ) + { + fail(); + } + } + + + /** + * Test the decoding of an empty ETYPE-INFO-ENTRY + * @throws DecoderException + */ + @Test( expected = DecoderException.class ) + public void testDecodeEmptyETypeInforEntry() throws DecoderException + { + Asn1Decoder krbDecoder = new Asn1Decoder(); + + ByteBuffer stream = ByteBuffer.allocate( 0x02 ); + + stream.put( new byte[] + { + 0x30, 0x00 + } ); + + stream.flip(); + + ETypeInfoEntryContainer container = new ETypeInfoEntryContainer(); + + krbDecoder.decode( stream, container ); + fail(); + } + + + /** + * Test the decoding of an ETYPE-INFO-ENTRY with no etype + * @throws DecoderException + */ + @Test( expected = DecoderException.class ) + public void testDecodeEmptyETypeInfoEntryNoEType() throws DecoderException + { + Asn1Decoder krbDecoder = new Asn1Decoder(); + + ByteBuffer stream = ByteBuffer.allocate( 0x06 ); + + stream.put( new byte[] + { + 0x30, 0x04, + (byte)0xA2, 0x04, + 0x04, 0x00 + } ); + + stream.flip(); + + ETypeInfoEntryContainer container = new ETypeInfoEntryContainer(); + + krbDecoder.decode( stream, container ); + fail(); + } + + + /** + * Test the decoding of an ETYPE-INFO-ENTRY with an empty etype + * @throws DecoderException + */ + @Test( expected = DecoderException.class ) + public void testDecodeEmptyETypeInfoEntryEmptyEType() throws DecoderException + { + Asn1Decoder krbDecoder = new Asn1Decoder(); + + ByteBuffer stream = ByteBuffer.allocate( 0x06 ); + + stream.put( new byte[] + { + 0x30, 0x04, + (byte)0xA0, 0x00 + } ); + + stream.flip(); + + ETypeInfoEntryContainer container = new ETypeInfoEntryContainer(); + + krbDecoder.decode( stream, container ); + fail(); + } + + + /** + * Test the decoding of an ETYPE-INFO-ENTRY with a empty etype tag + * @throws DecoderException + */ + @Test( expected = DecoderException.class ) + public void testDecodeEmptyETypeInfoEntryEmptyETypeTag() throws DecoderException + { + Asn1Decoder krbDecoder = new Asn1Decoder(); + + ByteBuffer stream = ByteBuffer.allocate( 0x06 ); + + stream.put( new byte[] + { + 0x30, 0x04, + (byte)0xA0, 0x02, + 0x02, 0x00 + } ); + + stream.flip(); + + ETypeInfoEntryContainer container = new ETypeInfoEntryContainer(); + + krbDecoder.decode( stream, container ); + fail(); + } + + + /** + * Test the decoding of an ETYPE-INFO-ENTRY with a bad etype + * @throws DecoderException + */ + @Test + public void testDecodeEmptyETypeInfoEntryBadEType() throws DecoderException + { + Asn1Decoder krbDecoder = new Asn1Decoder(); + + ByteBuffer stream = ByteBuffer.allocate( 0x07 ); + + stream.put( new byte[] + { + 0x30, 0x05, + (byte)0xA0, 0x03, + 0x02, 0x01, 0x40 + } ); + + String decodedPdu = StringTools.dumpBytes( stream.array() ); + stream.flip(); + + ETypeInfoEntryContainer container = new ETypeInfoEntryContainer(); + + try + { + krbDecoder.decode( stream, container ); + } + catch ( DecoderException de ) + { + de.printStackTrace(); + + fail( de.getMessage() ); + } + + ETypeInfoEntry etypeInforEntry = container.getETypeInfoEntry(); + + assertEquals( EncryptionType.UNKNOWN, etypeInforEntry.getEType() ); + assertNull( etypeInforEntry.getSalt() ); + + ByteBuffer bb = ByteBuffer.allocate( etypeInforEntry.computeLength() ); + + try + { + bb = etypeInforEntry.encode( bb ); + + // Check the length + assertEquals( 0x07, bb.limit() ); + + String encodedPdu = StringTools.dumpBytes( bb.array() ); + + ByteBuffer stream2 = ByteBuffer.allocate( 0x07 ); + + stream2.put( new byte[] + { + 0x30, 0x05, + (byte)0xA0, 0x03, // etype + 0x02, 0x01, (byte)0xFF + } ); + + String decodedPdu2 = StringTools.dumpBytes( stream2.array() ); + assertEquals( decodedPdu2, encodedPdu ); + } + catch ( EncoderException ee ) + { + fail(); + } + } +} Copied: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptedDataDecoderTest.java (from r1036986, directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptedDecoderTest.java) URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptedDataDecoderTest.java?p2=directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptedDataDecoderTest.java&p1=directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptedDecoderTest.java&r1=1036986&r2=1037169&rev=1037169&view=diff ============================================================================== --- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptedDecoderTest.java (original) +++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptedDataDecoderTest.java Sat Nov 20 11:19:53 2010 @@ -49,7 +49,7 @@ import org.junit.runner.RunWith; */ @RunWith(ConcurrentJunitRunner.class) @Concurrent() -public class EncryptedDecoderTest +public class EncryptedDataDecoderTest { /** * Test the decoding of a EncryptedData