diff --git a/www/admin.php b/www/admin.php
index b4e1141..dec9c34 100644
--- a/www/admin.php
+++ b/www/admin.php
@@ -32,27 +32,34 @@ if ( $_SERVER[ 'REQUEST_METHOD' ] === 'POST' ) {
$_SESSION[ 'csrf_token' ] = sha1( uniqid() );
$msg .= '
'.htmlspecialchars(_('Successfully logged out')).'
';
} elseif ( $_POST[ 'action' ] === 'login' ) {
+ $ok = true;
+ if ( ! check_captcha( $_POST[ 'challenge' ] ?? '', $_POST[ 'captcha' ] ?? '' ) ) {
+ $ok = false;
+ $msg .= ''.htmlspecialchars(_('Invalid captcha')).'
';
+ }
if ( empty( $_POST[ 'user' ] ) ) {
$ok = false;
$msg .= ''.htmlspecialchars(_('Invalid username')).'
';
}
- $stmt = $db->prepare( 'SELECT username, password, password_hash_type, superadmin FROM admin WHERE username = ? AND active = 1;' );
- $stmt->execute( [ $_POST[ 'user' ] ] );
- if ( $tmp = $stmt->fetch( PDO::FETCH_ASSOC ) ) {
- if ( empty( $_POST[ 'pwd' ] ) || ! password_verify( $_POST[ 'pwd' ], $tmp[ 'password' ] ) ) {
- $msg .= ''.htmlspecialchars(_('Incorrect username or password')).'
';
- } else {
- $_SESSION[ 'email_admin_user' ] = $tmp[ 'username' ];
- $_SESSION[ 'email_admin_superadmin' ] = (bool) $tmp[ 'superadmin' ];
- // update password hash if it's using an old hashing algorithm
- if ( $tmp[ 'password_hash_type' ] !== '{ARGON2ID}' ) {
- $hash = password_hash( $_POST[ 'pwd' ], PASSWORD_ARGON2ID );
- $stmt = $db->prepare( 'UPDATE admin SET password_hash_type = "{ARGON2ID}", password = ? WHERE username = ? AND active = 1;' );
- $stmt->execute( [ $hash, $_SESSION[ 'email_admin_user' ] ] );
+ if ( $ok ) {
+ $stmt = $db->prepare( 'SELECT username, password, password_hash_type, superadmin FROM admin WHERE username = ? AND active = 1;' );
+ $stmt->execute( [ $_POST[ 'user' ] ] );
+ if ( $tmp = $stmt->fetch( PDO::FETCH_ASSOC ) ) {
+ if ( empty( $_POST[ 'pwd' ] ) || ! password_verify( $_POST[ 'pwd' ], $tmp[ 'password' ] ) ) {
+ $msg .= ''.htmlspecialchars(_('Incorrect username or password')).'
';
+ } else {
+ $_SESSION[ 'email_admin_user' ] = $tmp[ 'username' ];
+ $_SESSION[ 'email_admin_superadmin' ] = (bool) $tmp[ 'superadmin' ];
+ // update password hash if it's using an old hashing algorithm
+ if ( $tmp[ 'password_hash_type' ] !== '{ARGON2ID}' ) {
+ $hash = password_hash( $_POST[ 'pwd' ], PASSWORD_ARGON2ID );
+ $stmt = $db->prepare( 'UPDATE admin SET password_hash_type = "{ARGON2ID}", password = ? WHERE username = ? AND active = 1;' );
+ $stmt->execute( [ $hash, $_SESSION[ 'email_admin_user' ] ] );
+ }
}
+ } else {
+ $msg .= ''.htmlspecialchars(_('Incorrect username or password')).'
';
}
- } else {
- $msg .= ''.htmlspecialchars(_('Incorrect username or password')).'
';
}
} elseif ( ! empty( $_SESSION[ 'email_admin_user' ] ) ) {
if ( $_POST[ 'action' ] === 'update_alias' ) {
@@ -409,6 +416,7 @@ if ( $_SERVER[ 'REQUEST_METHOD' ] === 'POST' ) {
+