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

fix ftp user passwords

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-10-07 17:56:51 +02:00
parent fb163f8006
commit 0757cc25ce
9 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Froxlor/Api/Commands/Ftps.php
View File

@@ -172,7 +172,7 @@ class Ftps extends ApiCommand implements ResourceEntity
Response::standardError('passwordshouldnotbeusername', '', true); Response::standardError('passwordshouldnotbeusername', '', true);
} else { } else {
$path = FileDir::makeCorrectDir($customer['documentroot'] . '/' . $path); $path = FileDir::makeCorrectDir($customer['documentroot'] . '/' . $path);
$cryptPassword = Crypt::makeCryptPassword($password); $cryptPassword = Crypt::makeCryptPassword($password, false, true);
$stmt = Database::prepare("INSERT INTO `" . TABLE_FTP_USERS . "` $stmt = Database::prepare("INSERT INTO `" . TABLE_FTP_USERS . "`
(`customerid`, `username`, `description`, `password`, `homedir`, `login_enabled`, `uid`, `gid`, `shell`) (`customerid`, `username`, `description`, `password`, `homedir`, `login_enabled`, `uid`, `gid`, `shell`)
@@ -441,7 +441,7 @@ class Ftps extends ApiCommand implements ResourceEntity
if ($password == $result['username']) { if ($password == $result['username']) {
Response::standardError('passwordshouldnotbeusername', '', true); Response::standardError('passwordshouldnotbeusername', '', true);
} }
$cryptPassword = Crypt::makeCryptPassword($password); $cryptPassword = Crypt::makeCryptPassword($password, false, true);
$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "` $stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
SET `password` = :password SET `password` = :password

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

@@ -206,11 +206,10 @@ class Crypt
* Password to be encrypted * Password to be encrypted
* @param bool $htpasswd * @param bool $htpasswd
* optional whether to generate a SHA1 password for directory protection * optional whether to generate a SHA1 password for directory protection
* @param bool $openssl
* optional generates $htpasswd like strings but for proftpd
* *
* @return string encrypted password * @return string encrypted password)
* @author Michal Wojcik <m.wojcik@sonet3.pl>
* @author Michael Kaufmann <mkaufmann@nutime.de>
* @author Froxlor team <team@froxlor.org> (2010-)
* *
* 0 - default crypt (depends on system configuration) * 0 - default crypt (depends on system configuration)
* 1 - MD5 $1$ * 1 - MD5 $1$
@@ -219,10 +218,10 @@ class Crypt
* 4 - SHA-512 $6$ * 4 - SHA-512 $6$
* *
*/ */
public static function makeCryptPassword($password, $htpasswd = false) public static function makeCryptPassword($password, $htpasswd = false, $openssl = false)
{ {
if ($htpasswd) { if ($htpasswd || $openssl) {
return '{SHA}' . base64_encode(sha1($password, true)); return '{SHA' . ($openssl ? '1' : '') . '}' . base64_encode(sha1($password, true));
} }
$algo = Settings::Get('system.passwordcryptfunc') !== null ? Settings::Get('system.passwordcryptfunc') : PASSWORD_DEFAULT; $algo = Settings::Get('system.passwordcryptfunc') !== null ? Settings::Get('system.passwordcryptfunc') : PASSWORD_DEFAULT;
return password_hash($password, $algo); return password_hash($password, $algo);

2
lib/configfiles/bionic.xml
View File

@@ -4261,7 +4261,7 @@ SQLEngine on
SQLAuthenticate on SQLAuthenticate on
# #
# Use both an encrypted or plaintext password # Use both an encrypted or plaintext password
SQLAuthTypes Crypt SQLAuthTypes Crypt OpenSSL
SQLAuthenticate users* groups* SQLAuthenticate users* groups*

2
lib/configfiles/bookworm.xml
View File

@@ -2900,7 +2900,7 @@ SQLEngine on
SQLAuthenticate on SQLAuthenticate on
# #
# Use both an encrypted or plaintext password # Use both an encrypted or plaintext password
SQLAuthTypes Crypt SQLAuthTypes Crypt OpenSSL
SQLAuthenticate users* groups* SQLAuthenticate users* groups*

2
lib/configfiles/bullseye.xml
View File

@@ -4472,7 +4472,7 @@ SQLEngine on
SQLAuthenticate on SQLAuthenticate on
# #
# Use both an encrypted or plaintext password # Use both an encrypted or plaintext password
SQLAuthTypes Crypt SQLAuthTypes Crypt OpenSSL
SQLAuthenticate users* groups* SQLAuthenticate users* groups*

2
lib/configfiles/buster.xml
View File

@@ -4463,7 +4463,7 @@ SQLEngine on
SQLAuthenticate on SQLAuthenticate on
# #
# Use both an encrypted or plaintext password # Use both an encrypted or plaintext password
SQLAuthTypes Crypt SQLAuthTypes Crypt OpenSSL
SQLAuthenticate users* groups* SQLAuthenticate users* groups*

2
lib/configfiles/focal.xml
View File

@@ -3678,7 +3678,7 @@ SQLEngine on
SQLAuthenticate on SQLAuthenticate on
# #
# Use both an encrypted or plaintext password # Use both an encrypted or plaintext password
SQLAuthTypes Crypt SQLAuthTypes Crypt OpenSSL
SQLAuthenticate users* groups* SQLAuthenticate users* groups*

2
lib/configfiles/gentoo.xml
View File

@@ -3453,7 +3453,7 @@ AllowOverwrite on
</Directory> </Directory>
# SQL settings # SQL settings
SQLAuthTypes Crypt SQLAuthTypes Crypt OpenSSL
SQLAuthenticate users* groups* SQLAuthenticate users* groups*
SQLConnectInfo <SQL_DB>@<SQL_HOST> <SQL_UNPRIVILEGED_USER> <SQL_UNPRIVILEGED_PASSWORD> SQLConnectInfo <SQL_DB>@<SQL_HOST> <SQL_UNPRIVILEGED_USER> <SQL_UNPRIVILEGED_PASSWORD>
SQLUserInfo ftp_users username password uid gid homedir shell SQLUserInfo ftp_users username password uid gid homedir shell

2
lib/configfiles/jammy.xml
View File

@@ -3678,7 +3678,7 @@ SQLEngine on
SQLAuthenticate on SQLAuthenticate on
# #
# Use both an encrypted or plaintext password # Use both an encrypted or plaintext password
SQLAuthTypes Crypt SQLAuthTypes Crypt OpenSSL
SQLAuthenticate users* groups* SQLAuthenticate users* groups*