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

allow 60sec discrepancy for email based 2fa; fix dbms version compare issue when removing user; adjust pure-ftpd mysql.conf file permissions

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2024-08-12 18:37:38 +02:00
parent 869b01204a
commit 5d2ce4ecfb
7 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
index.php
View File

@@ -84,7 +84,8 @@ if ($action == '2fa_entercode') {
// verify code set to user's data_2fa field // verify code set to user's data_2fa field
$sel_stmt = Database::prepare("SELECT `data_2fa` FROM " . $table . " WHERE `" . $field . "` = :uid"); $sel_stmt = Database::prepare("SELECT `data_2fa` FROM " . $table . " WHERE `" . $field . "` = :uid");
$userinfo_code = Database::pexecute_first($sel_stmt, ['uid' => $uid]); $userinfo_code = Database::pexecute_first($sel_stmt, ['uid' => $uid]);
$result = $tfa->verifyCode($userinfo_code['data_2fa'], $code); // 60sec discrepancy (possible slow email delivery)
$result = $tfa->verifyCode($userinfo_code['data_2fa'], $code, 60);
} else { } else {
$result = $tfa->verifyCode($_SESSION['secret_2fa'], $code, 3); $result = $tfa->verifyCode($_SESSION['secret_2fa'], $code, 3);
} }

2
lib/Froxlor/Database/Manager/DbManagerMySQL.php
View File

@@ -187,7 +187,7 @@ class DbManagerMySQL
*/ */
public function deleteUser(string $username, string $host) public function deleteUser(string $username, string $host)
{ {
if (Database::getAttribute(PDO::ATTR_SERVER_VERSION) < '5.0.2') { if (version_compare(Database::getAttribute(PDO::ATTR_SERVER_VERSION), '5.0.2', '<')) {
// Revoke privileges (only required for MySQL 4.1.2 - 5.0.1) // Revoke privileges (only required for MySQL 4.1.2 - 5.0.1)
$stmt = Database::prepare("REVOKE ALL PRIVILEGES ON * . * FROM `" . $username . "`@`" . $host . "`"); $stmt = Database::prepare("REVOKE ALL PRIVILEGES ON * . * FROM `" . $username . "`@`" . $host . "`");
Database::pexecute($stmt); Database::pexecute($stmt);

2
lib/configfiles/bookworm.xml
View File

@@ -3174,7 +3174,7 @@ no
</content> </content>
</file> </file>
<file name="/etc/pure-ftpd/db/mysql.conf" chown="root:0" <file name="/etc/pure-ftpd/db/mysql.conf" chown="root:0"
chmod="0644" backup="true"> chmod="0640" backup="true">
<content><![CDATA[ <content><![CDATA[
############################################## ##############################################
# # # #

2
lib/configfiles/bullseye.xml
View File

@@ -4742,7 +4742,7 @@ no
</content> </content>
</file> </file>
<file name="/etc/pure-ftpd/db/mysql.conf" chown="root:0" <file name="/etc/pure-ftpd/db/mysql.conf" chown="root:0"
chmod="0644" backup="true"> chmod="0640" backup="true">
<content><![CDATA[ <content><![CDATA[
############################################## ##############################################
# # # #

2
lib/configfiles/focal.xml
View File

@@ -3961,7 +3961,7 @@ no
</content> </content>
</file> </file>
<file name="/etc/pure-ftpd/db/mysql.conf" chown="root:0" <file name="/etc/pure-ftpd/db/mysql.conf" chown="root:0"
chmod="0644" backup="true"> chmod="0640" backup="true">
<content><![CDATA[ <content><![CDATA[
############################################## ##############################################
# # # #

2
lib/configfiles/jammy.xml
View File

@@ -3953,7 +3953,7 @@ no
</content> </content>
</file> </file>
<file name="/etc/pure-ftpd/db/mysql.conf" chown="root:0" <file name="/etc/pure-ftpd/db/mysql.conf" chown="root:0"
chmod="0644" backup="true"> chmod="0640" backup="true">
<content><![CDATA[ <content><![CDATA[
############################################## ##############################################
# # # #

2
lib/configfiles/noble.xml
View File

@@ -2628,7 +2628,7 @@ no
</content> </content>
</file> </file>
<file name="/etc/pure-ftpd/db/mysql.conf" chown="root:0" <file name="/etc/pure-ftpd/db/mysql.conf" chown="root:0"
chmod="0644" backup="true"> chmod="0640" backup="true">
<content><![CDATA[ <content><![CDATA[
############################################## ##############################################
# # # #