com php-src: Make LDAP_ESCAPE_DN compliant with RFC 4514: ext/ldap/ldap.c ext/ldap/tests/bug7 2021.phpt

From: Date: Sun, 26 Jun 2016 02:16:45 +0000
Subject: com php-src: Make LDAP_ESCAPE_DN compliant with RFC 4514: ext/ldap/ldap.c ext/ldap/tests/bug7 2021.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-92864@lists.php.net to get a copy of this message
Commit: 63427c176854b19c78f00f0cb2c8476a16511bbb Author: Chad Sikorra <Chad.Sikorra@gmail.com> Sat, 25 Jun 2016 21:16:45 -0500 Parents: c9a538cdb441437181913c09bdc4425596e51f46 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=63427c176854b19c78f00f0cb2c8476a16511bbb Log: Make LDAP_ESCAPE_DN compliant with RFC 4514 Changed paths: M ext/ldap/ldap.c A ext/ldap/tests/bug72021.phpt Diff: diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap..c index 60436e5..6b74785 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -2823,7 +2823,7 @@ PHP_FUNCTION(ldap_set_rebind_proc) /* }}} */ #endif -static zend_string* php_ldap_do_escape(const zend_bool *map, const char *value, size_t valuelen) +static zend_string* php_ldap_do_escape(const zend_bool *map, const char *value, size_t valuelen, zend_long flags) { char hex[] = "0123456789abcdef"; size_t i, p = 0; @@ -2833,13 +2833,20 @@ static zend_string* php_ldap_do_escape(const zend_bool *map, const char *value, for (i = 0; i < valuelen; i++) { len += (map[(unsigned char) value[i]]) ? 3 : 1; } + /* Per RFC 4514, a leading and trailing space must be escaped */ + if (flags & PHP_LDAP_ESCAPE_DN && value[0] == ' ') { + len += 2; + } + if (flags & PHP_LDAP_ESCAPE_DN && valuelen && value[valuelen] == ' ') { + len += 2; + } ret = zend_string_alloc(len, 0); for (i = 0; i < valuelen; i++) { unsigned char v = (unsigned char) value[i]; - if (map[v]) { + if (map[v] || (flags & PHP_LDAP_ESCAPE_DN && (i == 0 || i + 1 == valuelen ) && v == ' ')) { ZSTR_VAL(ret)[p++] = '\\'; ZSTR_VAL(ret)[p++] = hex[v >> 4]; ZSTR_VAL(ret)[p++] = hex[v & 0x0f]; @@ -2884,7 +2891,7 @@ PHP_FUNCTION(ldap_escape) if (flags & PHP_LDAP_ESCAPE_DN) { havecharlist = 1; - php_ldap_escape_map_set_chars(map, "\\,=+<>;\"#", sizeof("\\,=+<>;\"#") - 1, 1); + php_ldap_escape_map_set_chars(map, "\\,=+<>;\"#\r", sizeof("\\,=+<>;\"#\r") - 1, 1); } if (!havecharlist) { @@ -2897,7 +2904,7 @@ PHP_FUNCTION(ldap_escape) php_ldap_escape_map_set_chars(map, ignores, ignoreslen, 0); } - RETURN_NEW_STR(php_ldap_do_escape(map, value, valuelen)); + RETURN_NEW_STR(php_ldap_do_escape(map, value, valuelen, flags)); } #ifdef STR_TRANSLATION diff --git a/ext/ldap/tests/bug72021.phpt b/ext/ldap/tests/bug72021.phpt new file mode 100644 index 0000000..6dfcf44 --- /dev/null +++ b/ext/ldap/tests/bug72021.phpt @@ -0,0 +1,14 @@ +--TEST-- +Bug #72021 (ldap_escape() with DN flag is not RFC compliant) +--CREDITS-- +Chad Sikorra <Chad.Sikorra@gmail.com> +--SKIPIF-- +<?php require_once('skipif.inc'); ?> +--FILE-- +<?php +$subject = " Joe,= \rSmith "; + +var_dump(ldap_escape($subject, null, LDAP_ESCAPE_DN)); +?> +--EXPECT-- +string(24) "\20Joe\2c\3d \0dSmith\20"

« previous php.cvs (#92864) next »