directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r570743 - in /directory/shared/trunk/ldap/src: main/java/org/apache/directory/shared/ldap/codec/actions/ main/java/org/apache/directory/shared/ldap/codec/search/ test/java/org/apache/directory/shared/ldap/codec/search/
Date Wed, 29 Aug 2007 10:40:09 GMT
Author: elecharny
Date: Wed Aug 29 03:40:06 2007
New Revision: 570743

URL: http://svn.apache.org/viewvc?rev=570743&view=rev
Log:
o Added constants for "*", "+" and "1.1" special attributes
o Modified the code to use those constants
o Added a workaround for clients who are sending empty parameters
o Correctly handling the "1.1" special attribute mixed with other attributes (=> ignoring
it) 

Modified:
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/AttributeDescAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/AttributeDescAction.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/AttributeDescAction.java?rev=570743&r1=570742&r2=570743&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/AttributeDescAction.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/AttributeDescAction.java
Wed Aug 29 03:40:06 2007
@@ -20,6 +20,8 @@
 package org.apache.directory.shared.ldap.codec.actions;
 
 
+import javax.naming.directory.Attributes;
+
 import org.apache.directory.shared.asn1.ber.IAsn1Container;
 import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
 import org.apache.directory.shared.asn1.ber.tlv.TLV;
@@ -62,20 +64,11 @@
         TLV tlv = ldapMessageContainer.getCurrentTLV();
         String attributeDescription = null;
 
-        byte[] value = null;
-
-        if ( tlv.getLength() == 0 )
+        if ( tlv.getLength() != 0 )
         {
-            value = new byte[]
-                { '*' };
+            attributeDescription = StringTools.utf8ToString( tlv.getValue().getData() );
+            searchRequest.addAttribute( attributeDescription );
         }
-        else
-        {
-            value = tlv.getValue().getData();
-        }
-
-        attributeDescription = StringTools.utf8ToString( value );
-        searchRequest.addAttribute( attributeDescription );
 
         // We can have an END transition
         ldapMessageContainer.grammarEndAllowed( true );

Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java?rev=570743&r1=570742&r2=570743&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequest.java
Wed Aug 29 03:40:06 2007
@@ -412,7 +412,7 @@
                 
                 // We have a special case with PresentFilter, which has not been 
                 // pushed on the stack, so we need to get its parent's parent
-                if ( localFilter instanceof Filter )
+                if ( localFilter instanceof PresentFilter )
                 {
                     filterParent = filterParent.getParent();
                 }

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java?rev=570743&r1=570742&r2=570743&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java
(original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java
Wed Aug 29 03:40:06 2007
@@ -383,12 +383,7 @@
 
         Attributes attributes = sr.getAttributes();
 
-        assertEquals( 1, attributes.size() );
-
-        for ( int i = 0; i < attributes.size(); i++ )
-        {
-            assertNotNull( attributes.get( "*" ) );
-        }
+        assertEquals( 0, attributes.size() );
     }
 
 
@@ -670,11 +665,6 @@
 
         Attributes attributes = sr.getAttributes();
 
-        assertEquals( 1, attributes.size() );
-
-        for ( int i = 0; i < attributes.size(); i++ )
-        {
-            assertNull( attributes.get( "" ) );
-        }
+        assertEquals( 0, attributes.size() );
     }
 }

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java?rev=570743&r1=570742&r2=570743&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java
(original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java
Wed Aug 29 03:40:06 2007
@@ -679,6 +679,172 @@
         }
     }
 
+    /**
+     * Test the decoding of a SearchRequest with an empty attribute. The search
+     * filter is : (objectclass=*)
+     */
+    public void testDecodeSearchRequestOneEmptyAttribute()
+    {
+        Asn1Decoder ldapDecoder = new LdapDecoder();
+
+        ByteBuffer stream = ByteBuffer.allocate( 0x3F );
+        stream.put( new byte[]
+            { 0x30, 0x3D,                // LDAPMessage ::=SEQUENCE {
+                0x02, 0x01, 0x03,        // messageID MessageID
+                0x63, 0x38,              // CHOICE { ..., searchRequest SearchRequest, ...
+                                         // SearchRequest ::= APPLICATION[3] SEQUENCE {
+                  0x04, 0x12,            // baseObject LDAPDN,
+                    'o', 'u', '=', 'u', 's', 'e', 'r', 's', ',', 'o', 'u', '=', 's', 'y',
's', 't', 'e', 'm', 
+                  0x0A, 0x01, 0x00,      // scope ENUMERATED {
+                                         // baseObject (0),
+                                         // singleLevel (1),
+                                         // wholeSubtree (2) },
+                  0x0A, 0x01, 0x03,      // derefAliases ENUMERATED {
+                                         // neverDerefAliases (0),
+                                         // derefInSearching (1),
+                                         // derefFindingBaseObj (2),
+                                         // derefAlways (3) },
+                                         // sizeLimit INTEGER (0 .. maxInt), (infinite)
+                  0x02, 0x01, 0x00,      // timeLimit INTEGER (0 .. maxInt), (infinite)
+                  0x02, 0x01, 0x00, 
+                  0x01, 0x01,0x00,       // typesOnly
+                                         // BOOLEAN,
+                                         // (FALSE)
+                                         // filter Filter,
+                                         // Filter ::= CHOICE {
+                  ( byte ) 0x87, 0x0B,   // present [7] AttributeDescription,
+                    'o', 'b', 'j', 'e', 'c', 't', 'C', 'l', 'a', 's', 's',
+                                         // attributes AttributeDescriptionList }
+                  0x30, 0x06,            // AttributeDescriptionList ::= SEQUENCE OF
+                                         // AttributeDescription
+                    0x04, 0x02,          // Request for sn
+                      's', 'n', 
+                    0x04, 0x00           // Empty attribute
+            } );
+
+        stream.flip();
+
+        // Allocate a BindRequest Container
+        IAsn1Container ldapMessageContainer = new LdapMessageContainer();
+
+        try
+        {
+            ldapDecoder.decode( stream, ldapMessageContainer );
+        }
+        catch ( DecoderException de )
+        {
+            de.printStackTrace();
+            fail( de.getMessage() );
+        }
+
+        assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() );
+        
+        LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
+        SearchRequest sr = message.getSearchRequest();
+
+        assertEquals( 3, message.getMessageId() );
+        assertEquals( "ou=users,ou=system", sr.getBaseObject().toString() );
+        assertEquals( ScopeEnum.BASE_OBJECT, sr.getScope() );
+        assertEquals( LdapConstants.DEREF_ALWAYS, sr.getDerefAliases() );
+        assertEquals( 0, sr.getSizeLimit() );
+        assertEquals( 0, sr.getTimeLimit() );
+        assertEquals( false, sr.isTypesOnly() );
+
+        // (objectClass = *)
+        PresentFilter presentFilter = ( PresentFilter ) sr.getFilter();
+        assertNotNull( presentFilter );
+        assertEquals( "objectClass", presentFilter.getAttributeDescription() );
+
+        // The attributes
+        Attributes attributes = sr.getAttributes();
+
+        assertEquals( 1, attributes.size() );
+    }
+
+    /**
+     * Test the decoding of a SearchRequest with a star and an attribute. The search
+     * filter is : (objectclass=*)
+     */
+    public void testDecodeSearchRequestWithStarAndAttr()
+    {
+        Asn1Decoder ldapDecoder = new LdapDecoder();
+
+        ByteBuffer stream = ByteBuffer.allocate( 0x40 );
+        stream.put( new byte[]
+            { 0x30, 0x3E,                // LDAPMessage ::=SEQUENCE {
+                0x02, 0x01, 0x03,        // messageID MessageID
+                0x63, 0x39,              // CHOICE { ..., searchRequest SearchRequest, ...
+                                         // SearchRequest ::= APPLICATION[3] SEQUENCE {
+                  0x04, 0x12,            // baseObject LDAPDN,
+                    'o', 'u', '=', 'u', 's', 'e', 'r', 's', ',', 'o', 'u', '=', 's', 'y',
's', 't', 'e', 'm', 
+                  0x0A, 0x01, 0x00,      // scope ENUMERATED {
+                                         // baseObject (0),
+                                         // singleLevel (1),
+                                         // wholeSubtree (2) },
+                  0x0A, 0x01, 0x03,      // derefAliases ENUMERATED {
+                                         // neverDerefAliases (0),
+                                         // derefInSearching (1),
+                                         // derefFindingBaseObj (2),
+                                         // derefAlways (3) },
+                                         // sizeLimit INTEGER (0 .. maxInt), (infinite)
+                  0x02, 0x01, 0x00,      // timeLimit INTEGER (0 .. maxInt), (infinite)
+                  0x02, 0x01, 0x00, 
+                  0x01, 0x01,0x00,       // typesOnly
+                                         // BOOLEAN,
+                                         // (FALSE)
+                                         // filter Filter,
+                                         // Filter ::= CHOICE {
+                  ( byte ) 0x87, 0x0B,   // present [7] AttributeDescription,
+                    'o', 'b', 'j', 'e', 'c', 't', 'C', 'l', 'a', 's', 's',
+                                         // attributes AttributeDescriptionList }
+                  0x30, 0x07,            // AttributeDescriptionList ::= SEQUENCE OF
+                                         // AttributeDescription
+                    0x04, 0x02,          // Request for sn
+                      's', 'n', 
+                    0x04, 0x01, '*'      // * attribute
+            } );
+
+        stream.flip();
+
+        // Allocate a BindRequest Container
+        IAsn1Container ldapMessageContainer = new LdapMessageContainer();
+
+        try
+        {
+            ldapDecoder.decode( stream, ldapMessageContainer );
+        }
+        catch ( DecoderException de )
+        {
+            de.printStackTrace();
+            fail( de.getMessage() );
+        }
+
+        assertEquals( TLVStateEnum.PDU_DECODED, ldapMessageContainer.getState() );
+        
+        LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
+        SearchRequest sr = message.getSearchRequest();
+
+        assertEquals( 3, message.getMessageId() );
+        assertEquals( "ou=users,ou=system", sr.getBaseObject().toString() );
+        assertEquals( ScopeEnum.BASE_OBJECT, sr.getScope() );
+        assertEquals( LdapConstants.DEREF_ALWAYS, sr.getDerefAliases() );
+        assertEquals( 0, sr.getSizeLimit() );
+        assertEquals( 0, sr.getTimeLimit() );
+        assertEquals( false, sr.isTypesOnly() );
+
+        // (objectClass = *)
+        PresentFilter presentFilter = ( PresentFilter ) sr.getFilter();
+        assertNotNull( presentFilter );
+        assertEquals( "objectClass", presentFilter.getAttributeDescription() );
+
+        // The attributes
+        Attributes attributes = sr.getAttributes();
+
+        assertEquals( 2, attributes.size() );
+        assertNotNull( attributes.get( "sn" ) );
+        assertNotNull( attributes.get( "*" ) );
+    }        
+
 
     /**
      * Tests an search request decode with a simple equality match filter.
@@ -2459,14 +2625,26 @@
     public void testDecodeSearchRequestEmptyGreaterOrEqualEmptyAttrValueEmpty()
     {
         byte[] asn1BER = new byte[]
-            { 0x30, 0x43, 0x02, 0x01, 0x04, // messageID
-                0x63, 0x3E, 0x04, 0x1F, // baseObject LDAPDN,
-                'u', 'i', 'd', '=', 'a', 'k', 'a', 'r', 'a', 's', 'u', 'l', 'u', ',', 'd',
'c', '=', 'e', 'x', 'a',
-                'm', 'p', 'l', 'e', ',', 'd', 'c', '=', 'c', 'o', 'm', 0x0A, 0x01, 0x01,
0x0A, 0x01, 0x03, 0x02, 0x01,
-                0x00, 0x02, 0x01, 0x00, 0x01, 0x01, ( byte ) 0xFF, ( byte ) 0xA5, 0x08, 0x04,
0x04, 't', 'e', 's', 't',
-                0x04, 0x00, 0x30, 0x02, // AttributeDescriptionList ::= SEQUENCE
-                                        // OF AttributeDescription
-                0x04, 0x00 };
+            { 
+            0x30, 0x43, 
+              0x02, 0x01, 0x04, // messageID
+              0x63, 0x3E, 
+                0x04, 0x1F,     // baseObject LDAPDN,
+                  'u', 'i', 'd', '=', 'a', 'k', 'a', 'r', 'a', 's', 'u', 'l', 'u', ',', 'd',
'c', '=', 'e', 'x', 'a',
+                  'm', 'p', 'l', 'e', ',', 'd', 'c', '=', 'c', 'o', 'm', 
+                0x0A, 0x01, 0x01, 
+                0x0A, 0x01, 0x03, 
+                0x02, 0x01, 0x00, 
+                0x02, 0x01, 0x00, 
+                0x01, 0x01, (byte) 0xFF, 
+                (byte) 0xA5, 0x08, 
+                0x04, 0x04, 
+                  't', 'e', 's', 't',
+                0x04, 0x00, 
+                0x30, 0x02,     // AttributeDescriptionList ::= SEQUENCE
+                                // OF AttributeDescription
+                  0x04, 0x00 
+            };
 
         Asn1Decoder ldapDecoder = new LdapDecoder();
 
@@ -2512,12 +2690,7 @@
 
         Attributes attributes = sr.getAttributes();
 
-        assertEquals( 1, attributes.size() );
-
-        for ( int i = 0; i < attributes.size(); i++ )
-        {
-            assertNotNull( attributes.get( "*" ) );
-        }
+        assertEquals( 0, attributes.size() );
     }
 
 



Mime
View raw message