maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

pure-ftpd compatible password hashes for ftp users

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-10-30 11:11:12 +01:00
parent 85e3b6af0e
commit 1f43f5d514
11 changed files with 171 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Froxlor/System/Crypt.php
View File

@@ -207,24 +207,23 @@ class Crypt
* @param string $password
* Password to be encrypted
* @param bool $htpasswd
* optional whether to generate a SHA1 password for directory protection
* optional whether to generate a SHA1 password for directory protection, if this and $openssl is set, outputs sha1-hash
* @param bool $openssl
* optional generates $htpasswd like strings but for proftpd
*
* @return string encrypted password)
*
* 0 - default crypt (depends on system configuration)
* 1 - MD5 $1$
* 2 - BLOWFISH $2y$07$
* 3 - SHA-256 $5$ (default)
* 4 - SHA-512 $6$
* optional generates $htpasswd like strings but for proftpd {algo}base64encoded_hash, if this and $htpasswd is set, outputs sha1-hash
*
* @return string encrypted password
*/
public static function makeCryptPassword($password, $htpasswd = false, $openssl = false)
{
if ($htpasswd || $openssl) {
if ($htpasswd && $openssl) {
// sha1 compatible for pure-ftpd (not encoded)
return sha1($password);
}
// sha1 hash for either dir-protection or (if openssl=1) for proftpd
return '{SHA' . ($openssl ? '1' : '') . '}' . base64_encode(sha1($password, true));
}
// crypt using the specified crypt-algorithm or system default
$algo = Settings::Get('system.passwordcryptfunc') !== null ? Settings::Get('system.passwordcryptfunc') : PASSWORD_DEFAULT;
return password_hash($password, $algo);
}