mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-23 17:10:53 +01:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander 2018-06-17 15:44:33 +02:00
commit 1d0046437b
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/includes/functions.php
View File

@ -54,23 +54,27 @@ function phpbb_load_extensions_autoloaders($phpbb_root_path)
/**
* Generates an alphanumeric random string of given length
*
* @param int $num_chars Length of random string, defaults to 8
*
* @return string
*/
function gen_rand_string($num_chars = 8)
{
// [a, z] + [0, 9] = 36
return substr(strtoupper(base_convert(unique_id(), 16, 36)), 0, $num_chars);
return substr(strtoupper(base_convert(bin2hex(random_bytes($num_chars)), 16, 36)), 0, $num_chars);
}
/**
* Generates a user-friendly alphanumeric random string of given length
* We remove 0 and O so users cannot confuse those in passwords etc.
*
* @param int $num_chars Length of random string, defaults to 8
*
* @return string
*/
function gen_rand_string_friendly($num_chars = 8)
{
$rand_str = unique_id();
$rand_str = bin2hex(random_bytes($num_chars));
// Remove Z and Y from the base_convert(), replace 0 with Z and O with Y
// [a, z] + [0, 9] - {z, y} = [a, z] + [0, 9] - {0, o} = 34

10
tests/random/gen_rand_string_test.php
View File

@ -40,7 +40,10 @@ class phpbb_random_gen_rand_string_test extends phpbb_test_case
$random_string_length = strlen($random_string);
$this->assertTrue($random_string_length >= self::MIN_STRING_LENGTH);
$this->assertTrue($random_string_length <= $num_chars);
$this->assertTrue(
$random_string_length == $num_chars,
sprintf('Failed asserting that random string length matches expected length. Expected %1$u, Actual %2$u', $num_chars, $random_string_length)
);
$this->assertRegExp('#^[A-Z0-9]+$#', $random_string);
}
}
@ -56,7 +59,10 @@ class phpbb_random_gen_rand_string_test extends phpbb_test_case
$random_string_length = strlen($random_string);
$this->assertTrue($random_string_length >= self::MIN_STRING_LENGTH);
$this->assertTrue($random_string_length <= $num_chars);
$this->assertTrue(
$random_string_length == $num_chars,
sprintf('Failed asserting that random string length matches expected length. Expected %1$u, Actual %2$u', $num_chars, $random_string_length)
);
$this->assertRegExp('#^[A-NP-Z1-9]+$#', $random_string);
}
}