You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2023/10/16 16:44:01 UTC

[directory-ldap-api] branch master updated: Pushed Hiroyuki Wada patch for IBM Directory Server (DIRAPI-395)

This is an automated email from the ASF dual-hosted git repository.

elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-ldap-api.git


The following commit(s) were added to refs/heads/master by this push:
     new 5bc4743d1 Pushed Hiroyuki Wada patch for IBM Directory Server (DIRAPI-395)
5bc4743d1 is described below

commit 5bc4743d18f2b0e87156015b1ff9f938b4810c0a
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Mon Oct 16 18:43:35 2023 +0200

    Pushed Hiroyuki Wada patch for IBM Directory Server (DIRAPI-395)
---
 .../model/schema/parsers/OpenLdapSchemaParser.java | 87 +++++++++++++++-----
 .../syntaxes/parser/SchemaParserTestUtils.java     | 95 ++++++++++++++++++++++
 2 files changed, 160 insertions(+), 22 deletions(-)

diff --git a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/OpenLdapSchemaParser.java b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/OpenLdapSchemaParser.java
index d7d1d7131..d801fa7ae 100644
--- a/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/OpenLdapSchemaParser.java
+++ b/ldap/model/src/main/java/org/apache/directory/api/ldap/model/schema/parsers/OpenLdapSchemaParser.java
@@ -147,6 +147,8 @@ public class OpenLdapSchemaParser
     
     private class PosSchema
     {
+        final boolean isQuirksModeEnabled;
+        
         /** The line number in the file */
         int lineNumber;
         
@@ -156,6 +158,11 @@ public class OpenLdapSchemaParser
         /** The line being processed */
         String line;
         
+        PosSchema( boolean isQuirksModeEnabled )
+        {
+            this.isQuirksModeEnabled = isQuirksModeEnabled;
+        }
+        
         /**
          * {@inheritDoc} 
          */
@@ -941,7 +948,32 @@ public class OpenLdapSchemaParser
     {
         return Character.isDigit( pos.line.charAt( pos.start ) );
     }
+    
+    private static boolean isEscape( PosSchema pos ) throws LdapSchemaException
+    {
+        return isEscape( pos, pos.start );
+    }
 
+    private static boolean isEscape( PosSchema pos, int index ) throws LdapSchemaException
+    {
+        if ( ( pos.line == null ) || ( pos.line.length() - index < 2 ) || pos.line.charAt( index ) != ESCAPE )
+        {
+            return false;
+        }
+
+        char c1 = pos.line.charAt( index + 1 );
+        char c2 = Character.toUpperCase( pos.line.charAt( index + 2 ) );
+
+        boolean isEscape = c1 > '0' && c1 <= '7' && c2 >= '0' && c2 <= 'F';
+
+        if ( !pos.isQuirksModeEnabled && !isEscape )
+        {
+            throw new LdapSchemaException( I18n.err( I18n.ERR_13308_NOT_A_VALID_ESCAPED_VALUE,
+                    pos.lineNumber, pos.start ) );
+        }
+
+        return isEscape;
+    }
     
     /**
      * 
@@ -1775,7 +1807,25 @@ public class OpenLdapSchemaParser
      * UTF4     ::= %xF0 %x90-BF UTF0 UTF0 | %xF1-F3 UTF0 UTF0 UTF0 | %xF4 %x80-8F UTF0 UTF0
      * ESC      ::= %x5C                            ; backslash ("\")
      * </pre>
-     * 
+     *
+     * In quirksMode :
+     *
+     * <pre>
+     * qdstring ::== SQUOTE dstring SQUOTE
+     * dstring  ::= ( QS | QQ | QUTF8 | ESC )+      ; escaped UTF-8 string or backslash
+     * QS       ::= ESC %x35 ( %x43 | %x63 )        ; "\5C" | "\5c", escape char
+     * QQ       ::= ESC %x32 %x37                   ; "\27", simple quote char
+     * QUTF8    ::= QUTF1 | UTFMB
+     * QUTF1    ::= %x00-26 | %x28-5B | %x5D-7F     ; All ascii but ' and \
+     * UTFMB    ::= UTF2 | UTF3 | UTF4
+     * UTF0     ::= %x80-BF
+     * UTF2     ::= %xC2-DF UTF0
+     * UTF3     ::= %xE0 %xA0-BF UTF0 | %xE1-EC UTF0 UTF0 | %xED %x80-9F UTF0 | %xEE-EF UTF0 UTF0
+     * UTF4     ::= %xF0 %x90-BF UTF0 UTF0 | %xF1-F3 UTF0 UTF0 UTF0 | %xF4 %x80-8F UTF0 UTF0
+     * ESC      ::= %x5C                            ; backslash ("\")
+     * </pre>
+     *
+      * 
      * @param reader The stream reader
      * @param pos The position in the Schema
      * @return The QDString
@@ -1798,7 +1848,7 @@ public class OpenLdapSchemaParser
         while ( !isEmpty( pos ) && !startsWith( pos, SQUOTE ) )
         {
             // At the moment, just swallow anything
-            if ( startsWith( pos, ESCAPE ) )
+            if ( isEscape( pos ) )
             {
                 nbEscapes++;
             }
@@ -1820,15 +1870,8 @@ public class OpenLdapSchemaParser
             {
                 char c = pos.line.charAt( i );
                 
-                if ( c == ESCAPE )
+                if ( isEscape( pos, i ) )
                 {
-                    if ( i + 2 > pos.start )
-                    {
-                        // Error : not enough hex value
-                        throw new LdapSchemaException( I18n.err( I18n.ERR_13792_SIMPLE_QUOTE_EXPECTED_AT_END, 
-                            pos.lineNumber, pos.start ) );
-                    }
-                    
                     int u = Character.digit( pos.line.charAt( i + 1 ), 16 );
                     int l = Character.digit( pos.line.charAt( i + 2 ), 16 );
 
@@ -2804,7 +2847,7 @@ public class OpenLdapSchemaParser
         
         try ( Reader reader = new BufferedReader( new StringReader( attributeTypeDescription ) ) )
         {
-            PosSchema pos = new PosSchema();
+            PosSchema pos = new PosSchema( isQuirksModeEnabled );
 
             if ( isQuirksModeEnabled )
             {
@@ -3319,7 +3362,7 @@ public class OpenLdapSchemaParser
         
         try ( Reader reader = new BufferedReader( new StringReader( ditContentRuleDescription ) ) )
         {
-            PosSchema pos = new PosSchema();
+            PosSchema pos = new PosSchema( isQuirksModeEnabled );
 
             if ( isQuirksModeEnabled )
             {
@@ -3692,7 +3735,7 @@ public class OpenLdapSchemaParser
         
         try ( Reader reader = new BufferedReader( new StringReader( ditStructureRuleDescription ) ) )
         {
-            PosSchema pos = new PosSchema();
+            PosSchema pos = new PosSchema( isQuirksModeEnabled );
 
             if ( isQuirksModeEnabled )
             {
@@ -4028,7 +4071,7 @@ public class OpenLdapSchemaParser
         
         try ( Reader reader = new BufferedReader( new StringReader( ldapComparatorDescription ) ) )
         {
-            PosSchema pos = new PosSchema();
+            PosSchema pos = new PosSchema( isQuirksModeEnabled );
 
             if ( isQuirksModeEnabled )
             {
@@ -4322,7 +4365,7 @@ public class OpenLdapSchemaParser
         
         try ( Reader reader = new BufferedReader( new StringReader( ldapSyntaxDescription ) ) )
         {
-            PosSchema pos = new PosSchema();
+            PosSchema pos = new PosSchema( isQuirksModeEnabled );
 
             if ( isQuirksModeEnabled )
             {
@@ -4543,7 +4586,7 @@ public class OpenLdapSchemaParser
         
         try ( Reader reader = new BufferedReader( new StringReader( matchingRuleDescription ) ) )
         {
-            PosSchema pos = new PosSchema();
+            PosSchema pos = new PosSchema( isQuirksModeEnabled );
 
             if ( isQuirksModeEnabled )
             {
@@ -4840,7 +4883,7 @@ public class OpenLdapSchemaParser
         
         try ( Reader reader = new BufferedReader( new StringReader( matchingRuleUseDescription ) ) )
         {
-            PosSchema pos = new PosSchema();
+            PosSchema pos = new PosSchema( isQuirksModeEnabled );
 
             if ( isQuirksModeEnabled )
             {
@@ -5139,7 +5182,7 @@ public class OpenLdapSchemaParser
         
         try ( Reader reader = new BufferedReader( new StringReader( nameFormDescription ) ) )
         {
-            PosSchema pos = new PosSchema();
+            PosSchema pos = new PosSchema( isQuirksModeEnabled );
 
             if ( isQuirksModeEnabled )
             {
@@ -5500,7 +5543,7 @@ public class OpenLdapSchemaParser
         
         try ( Reader reader = new BufferedReader( new StringReader( normalizerDescription ) ) )
         {
-            PosSchema pos = new PosSchema();
+            PosSchema pos = new PosSchema( isQuirksModeEnabled );
 
             if ( isQuirksModeEnabled )
             {
@@ -5802,7 +5845,7 @@ public class OpenLdapSchemaParser
         
         try ( Reader reader = new BufferedReader( new StringReader( objectClassDescription ) ) )
         {
-            PosSchema pos = new PosSchema();
+            PosSchema pos = new PosSchema( isQuirksModeEnabled );
 
             if ( isQuirksModeEnabled )
             {
@@ -6202,7 +6245,7 @@ public class OpenLdapSchemaParser
         
         try ( Reader reader = new BufferedReader( new StringReader( syntaxCheckerDescription ) ) )
         {
-            PosSchema pos = new PosSchema();
+            PosSchema pos = new PosSchema( isQuirksModeEnabled );
 
             if ( isQuirksModeEnabled )
             {
@@ -6558,7 +6601,7 @@ public class OpenLdapSchemaParser
      */
     public void parse( Reader reader ) throws LdapSchemaException, IOException
     {
-        PosSchema pos = new PosSchema();
+        PosSchema pos = new PosSchema( isQuirksModeEnabled );
 
         while ( true )
         {
diff --git a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java
index c0dca16f6..a8804ab70 100644
--- a/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java
+++ b/ldap/model/src/test/java/org/apache/directory/api/ldap/model/schema/syntaxes/parser/SchemaParserTestUtils.java
@@ -718,6 +718,101 @@ public class SchemaParserTestUtils
         value = "( " + oid + " " + required + " DESC '\\5C\\27\\5c' )";
         asd = parser.parse( value );
         assertEquals( "\\'\\", asd.getDescription() );
+        value = "( " + oid + " " + required + " DESC 'test\\";
+        
+        try
+        {
+            asd = parser.parse( value );
+            fail( "Exception expected, DESC should have simple quote at the end of it\\" );
+        }
+        catch ( ParseException pe )
+        {
+            pe.printStackTrace();
+            // expected
+        }
+
+        if ( parser.isQuirksMode() )
+        {
+            value = "( " + oid + " " + required + " DESC 'test\\23test' )";
+            asd = parser.parse( value );
+            assertEquals( "test#test", asd.getDescription() );
+
+            value = "( " + oid + " " + required + " DESC 'test\\24test' )";
+            asd = parser.parse( value );
+            assertEquals( "test$test", asd.getDescription() );
+
+            value = "( " + oid + " " + required + " DESC 'test\\27test' )";
+            asd = parser.parse( value );
+            assertEquals( "test'test", asd.getDescription() );
+
+            value = "( " + oid + " " + required + " DESC 'test\\5c' )";
+            asd = parser.parse( value );
+            assertEquals( "test\\", asd.getDescription() );
+
+            value = "( " + oid + " " + required + " DESC 'test\\' )";
+            asd = parser.parse( value );
+            assertEquals( "test\\", asd.getDescription() );
+
+            value = "( " + oid + " " + required + " DESC 'test\\.' )";
+            asd = parser.parse( value );
+            assertEquals( "test\\.", asd.getDescription() );
+
+            value = "( " + oid + " " + required + " DESC 'test\\test' )";
+            asd = parser.parse( value );
+            assertEquals( "test\\test", asd.getDescription() );
+        }
+
+        if ( !parser.isQuirksMode() )
+        {
+            value = "( " + oid + " " + required + " DESC 'test\\23test' )";
+            asd = parser.parse( value );
+            assertEquals( "test#test", asd.getDescription() );
+
+            value = "( " + oid + " " + required + " DESC 'test\\24test' )";
+            asd = parser.parse( value );
+            assertEquals( "test$test", asd.getDescription() );
+
+            value = "( " + oid + " " + required + " DESC 'test\\27test' )";
+            asd = parser.parse( value );
+            assertEquals( "test'test", asd.getDescription() );
+
+            value = "( " + oid + " " + required + " DESC 'test\\5c' )";
+            asd = parser.parse( value );
+            assertEquals( "test\\", asd.getDescription() );
+
+            value = "( " + oid + " " + required + " DESC 'test\\' )";
+            try
+            {
+                parser.parse( value );
+                fail( "Exception expected, unescaped DESC not allowed.)" );
+            }
+            catch ( ParseException pe )
+            {
+                // expected
+            }
+
+            value = "( " + oid + " " + required + " DESC 'test\\.' )";
+            try
+            {
+                parser.parse( value );
+                fail( "Exception expected, unescaped DESC not allowed.)" );
+            }
+            catch ( ParseException pe )
+            {
+                // expected
+            }
+
+            value = "( " + oid + " " + required + " DESC 'test\\test' )";
+            try
+            {
+                parser.parse( value );
+                fail( "Exception expected, unescaped DESC not allowed.)" );
+            }
+            catch ( ParseException pe )
+            {
+                // expected
+            }
+        }
 
         // lowercase DESC
         value = "( " + oid + " " + required + " desc 'Descripton' )";