Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix to manual version of ldap_escape() #90

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix to manual version of ldap_escape() #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d87b034
Added tweaks to escapeManual() and escapeManualWithFlags() in src/Con…
Darthpbal Jul 30, 2015
1b975ff
Added comment change inside testEscapeManualBothFilterAndDn() test me…
Darthpbal Jul 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/Connections/Ldap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,8 @@ protected function escapeManual($value, $ignore = '', $flags = 0)

// Go through each character to ignore
foreach ($ignores as $charToIgnore) {
// Avoid accidentally removing backslashes on line 752 by skipping blank ignores chars
if(!$charToIgnore) continue;
// Convert the character to ignore to a hex
$hexed = bin2hex($charToIgnore);

Expand Down Expand Up @@ -783,8 +785,12 @@ protected function escapeManualWithFlags($value, $ignore = '', $flags = 0)
$escapes = $escapeDn;
break;
case 3:
// If both LDAP_ESCAPE_FILTER and LDAP_ESCAPE_DN are used
$escapes = array_merge($escapeFilter, $escapeDn);
// If both LDAP_ESCAPE_FILTER and LDAP_ESCAPE_DN are used.
/*
* array_slice was added here to remove the first '\' in escapeDn
* which would escape all of the characters from $escapeFilter
*/
$escapes = array_merge($escapeFilter, array_slice($escapeDn, 1));
break;
default:
return false;
Expand Down
120 changes: 117 additions & 3 deletions tests/ConnectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,125 @@ public function testEscapeManualBothFilterAndDn()
$ldap = $this->mock('Adldap\Connections\Ldap')->makePartial();

$ldap->shouldAllowMockingProtectedMethods(true);

$expected = 'testing\3d\2b\3c\3e\22\22\3b:\23\5c28\5c29*\5c5cx00';

// echo ldap_escape('testing=+<>"";:#()*\x00');
// results in 'testing\3d\2b\3c\3e\22\22\3b:\23\28\29*\5cx00'
$expected = 'testing\3d\2b\3c\3e\22\22\3b:\23\28\29*\5cx00';

$result = $ldap->escapeManual('testing=+<>"";:#()*\x00', '*', 3);

$this->assertEquals($expected, $result);
}
}

/**
* Where tests specific to manually
* escaping strings if ldap_escape()
* is not available.
*
* Edits made to src/Connections/Ldap.php
* lines 747 & 793
*/
public function testEscapeManualNoIgnoreFlag0()
{
$stringToEscape = 'abc123\*(),=+<>;"#';
$expectedOutput = '\61\62\63\31\32\33\5c\2a\28\29\2c\3d\2b\3c\3e\3b\22\23';
$flags =0;
$ignore = '';

$ldap = $this->mock('Adldap\Connections\Ldap')->makePartial();
$ldap->shouldAllowMockingProtectedMethods(true);
$result = $ldap->escapeManual($stringToEscape, $ignore, $flags);
$this->assertEquals($expectedOutput, $result);
}

public function testEscapeManualNoIgnoreFlag1()
{
$stringToEscape = 'abc123\*(),=+<>;"#';
$expectedOutput = 'abc123\5c\2a\28\29,=+<>;"#';
$flags =1;
$ignore = '';

$ldap = $this->mock('Adldap\Connections\Ldap')->makePartial();
$ldap->shouldAllowMockingProtectedMethods(true);
$result = $ldap->escapeManual($stringToEscape, $ignore, $flags);
$this->assertEquals($expectedOutput, $result);
}

public function testEscapeManualNoIgnoreFlag2()
{
$stringToEscape = 'abc123\*(),=+<>;"#';
$expectedOutput = 'abc123\5c*()\2c\3d\2b\3c\3e\3b\22\23';
$flags =2;
$ignore = '';

$ldap = $this->mock('Adldap\Connections\Ldap')->makePartial();
$ldap->shouldAllowMockingProtectedMethods(true);
$result = $ldap->escapeManual($stringToEscape, $ignore, $flags);
$this->assertEquals($expectedOutput, $result);
}

public function testEscapeManualNoIgnoreFlag3()
{
$stringToEscape = 'abc123\*(),=+<>;"#';
$expectedOutput = 'abc123\5c\2a\28\29\2c\3d\2b\3c\3e\3b\22\23';
$flags =3;
$ignore = '';

$ldap = $this->mock('Adldap\Connections\Ldap')->makePartial();
$ldap->shouldAllowMockingProtectedMethods(true);
$result = $ldap->escapeManual($stringToEscape, $ignore, $flags);
$this->assertEquals($expectedOutput, $result);
}

public function testEscapeManualIgnore321Flag0()
{
$stringToEscape = 'abc123\*(),=+<>;"#';
$expectedOutput = '\61\62\63123\5c\2a\28\29\2c\3d\2b\3c\3e\3b\22\23';
$flags =0;
$ignore = '321';

$ldap = $this->mock('Adldap\Connections\Ldap')->makePartial();
$ldap->shouldAllowMockingProtectedMethods(true);
$result = $ldap->escapeManual($stringToEscape, $ignore, $flags);
$this->assertEquals($expectedOutput, $result);
}

public function testEscapeManualIgnore321Flag1()
{
$stringToEscape = 'abc123\*(),=+<>;"#';
$expectedOutput = 'abc123\5c\2a\28\29,=+<>;"#';
$flags =1;
$ignore = '321';

$ldap = $this->mock('Adldap\Connections\Ldap')->makePartial();
$ldap->shouldAllowMockingProtectedMethods(true);
$result = $ldap->escapeManual($stringToEscape, $ignore, $flags);
$this->assertEquals($expectedOutput, $result);
}

public function testEscapeManualIgnore321Flag2()
{
$stringToEscape = 'abc123\*(),=+<>;"#';
$expectedOutput = 'abc123\5c*()\2c\3d\2b\3c\3e\3b\22\23';
$flags =2;
$ignore = '321';

$ldap = $this->mock('Adldap\Connections\Ldap')->makePartial();
$ldap->shouldAllowMockingProtectedMethods(true);
$result = $ldap->escapeManual($stringToEscape, $ignore, $flags);
$this->assertEquals($expectedOutput, $result);
}

public function testEscapeManualIgnore321Flag3()
{
$stringToEscape = 'abc123\*(),=+<>;"#';
$expectedOutput = 'abc123\5c\2a\28\29\2c\3d\2b\3c\3e\3b\22\23';
$flags =3;
$ignore = '321';

$ldap = $this->mock('Adldap\Connections\Ldap')->makePartial();
$ldap->shouldAllowMockingProtectedMethods(true);
$result = $ldap->escapeManual($stringToEscape, $ignore, $flags);
$this->assertEquals($expectedOutput, $result);
}
}