dokuwiki/dokuwiki
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4294 from dokuwiki/woltlab

Browse source 
Support Woltlab password hashes
This commit is contained in:
Andreas Gohr 2024-08-05 13:46:19 +02:00 committed by GitHub
commit a09f9f21cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
_test/tests/inc/auth_password.test.php
View file

@ -143,4 +143,8 @@ class auth_password_test extends DokuWikiTest {
}
}
function test_verifyPassword_Woltlab()
{
$this->assertTrue(auth_verifyPassword('zQ9ZwsTvgufN', 'Bcrypt:$2y$12$ygz.4TeGn/NXEcXIE0pyge4lJyuSMqRdDPT5dW469lODb.HswSzjW'));
}
}

20
inc/PassHash.php
View file

@ -79,7 +79,10 @@ class PassHash
$salt = $m[1];
} elseif (preg_match('/^\$2([abxy])\$(.{2})\$/', $hash, $m)) {
$method = 'bcrypt';
$salt = $hash;
$salt = $hash;
} elseif (str_starts_with($hash, 'Bcrypt:$2')) {
$method = 'woltlab';
$salt = substr($hash, 7);
} elseif (str_starts_with($hash, '{SSHA}')) {
$method = 'ssha';
$salt = substr(base64_decode(substr($hash, 6)), 20);
@ -685,6 +688,21 @@ class PassHash
return crypt($clear, $salt);
}
/**
* Password hashing method 'woltlab'
*
* Woltlab forums use a bcrypt hash with a custom prefix.
*
* @param $clear
* @param $salt
* @return string
* @throws \Exception
*/
public function hash_woltlab($clear, $salt = null)
{
return 'Bcrypt:' . $this->hash_bcrypt($clear, $salt);
}
/**
* Password hashing method SHA-2
*