mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8674 from nextcloud/stable12-8634 

[stable12] do not create empty userid when attribute does not have allowed chars
This commit is contained in:
Morris Jobke 2018-03-06 12:03:27 +01:00 committed by GitHub
parent ac8d572102 763a7c114f
commit 72dc7520a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 58 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
apps/user_ldap/lib/Access.php
View File

@ -562,7 +562,19 @@ class Access extends LDAPUtility implements IUserTools {
} else { } else {
$username = $uuid; $username = $uuid;
} }
$intName = $this->sanitizeUsername($username); try {
$intName = $this->sanitizeUsername($username);
} catch (\InvalidArgumentException $e) {
\OC::$server->getLogger()->logException($e, [
'app' => 'user_ldap',
'level' => Util::WARN,
]);
// we don't attempt to set a username here. We can go for
// for an alternative 4 digit random number as we would append
// otherwise, however it's likely not enough space in bigger
// setups, and most importantly: this is not intended.
return false;
}
} else { } else {
$intName = $ldapName; $intName = $ldapName;
} }
@ -1252,16 +1264,22 @@ class Access extends LDAPUtility implements IUserTools {
/** /**
* @param string $name * @param string $name
* @return bool|mixed|string * @return string
* @throws \InvalidArgumentException
*/ */
public function sanitizeUsername($name) { public function sanitizeUsername($name) {
$name = trim($name);
if($this->connection->ldapIgnoreNamingRules) { if($this->connection->ldapIgnoreNamingRules) {
return $name; return $name;
} }
// Transliteration // Transliteration to ASCII
// latin characters to ASCII $transliterated = @iconv('UTF-8', 'ASCII//TRANSLIT', $name);
$name = iconv('UTF-8', 'ASCII//TRANSLIT', $name); if($transliterated !== false) {
// depending on system config iconv can work or not
$name = $transliterated;
}
// Replacements // Replacements
$name = str_replace(' ', '_', $name); $name = str_replace(' ', '_', $name);
@ -1269,6 +1287,10 @@ class Access extends LDAPUtility implements IUserTools {
// Every remaining disallowed characters will be removed // Every remaining disallowed characters will be removed
$name = preg_replace('/[^a-zA-Z0-9_.@-]/u', '', $name); $name = preg_replace('/[^a-zA-Z0-9_.@-]/u', '', $name);
if($name === '') {
throw new \InvalidArgumentException('provided name template for username does not contain any allowed characters');
}
return $name; return $name;
} }

31
apps/user_ldap/tests/AccessTest.php
View File

@ -428,4 +428,35 @@ class AccessTest extends \Test\TestCase {
$this->assertTrue($this->access->setPassword('CN=foo', 'MyPassword')); $this->assertTrue($this->access->setPassword('CN=foo', 'MyPassword'));
} }
public function intUsernameProvider() {
// system dependent :-/
$translitExpected = @iconv('UTF-8', 'ASCII//TRANSLIT', 'fränk') ? 'frank' : 'frnk';
return [
['alice', 'alice'],
['b/ob', 'bob'],
['charly🐬', 'charly'],
['debo rah', 'debo_rah'],
['epost@poste.test', 'epost@poste.test'],
['fränk', $translitExpected],
[' gerda ', 'gerda'],
['🕱🐵🐘🐑', null]
];
}
/**
* @dataProvider intUsernameProvider
*
* @param $name
* @param $expected
*/
public function testSanitizeUsername($name, $expected) {
if($expected === null) {
$this->expectException(\InvalidArgumentException::class);
}
$sanitizedName = $this->access->sanitizeUsername($name);
$this->assertSame($expected, $sanitizedName);
}
} }