diff --git a/assets/searchtable.js b/assets/searchtable.js new file mode 100644 index 0000000..89a0c4b --- /dev/null +++ b/assets/searchtable.js @@ -0,0 +1,21 @@ +function searchTable(tableId, searchField) { + var input, filter, table, tr, td, i, j, txtValue; + input = searchField; + filter = input.value.toUpperCase(); + table = document.getElementById(tableId); + tr = table.getElementsByTagName("tr"); + for (i = 0; i < tr.length; i++) { + td = tr[i].getElementsByTagName("td"); + for (j = 0; j < td.length; j++) { + if (td[j]) { + txtValue = td[j].textContent || td[j].innerText; + if (txtValue.toUpperCase().indexOf(filter) > -1) { + tr[i].style.display = ""; + break; + } else { + tr[i].style.display = "none"; + } + } + } + } +} \ No newline at end of file diff --git a/assets/security.css b/assets/security.css index 46884dd..5222bd4 100644 --- a/assets/security.css +++ b/assets/security.css @@ -52,7 +52,7 @@ width: 80%; } -.protect-login-no-blocked-ips +.bdp-kompass-no-blocked-ips { padding: 5px 10px; width: 90%; diff --git a/assets/wordpress-bdp.css b/assets/wordpress-bdp.css index 4951607..ab97f67 100644 --- a/assets/wordpress-bdp.css +++ b/assets/wordpress-bdp.css @@ -8,7 +8,7 @@ body { #adminmenu { margin-top: 12px; background: #f0f0f0; - width: 300px; + width: 300px !important; } #adminmenu { @@ -24,12 +24,10 @@ body { border-color: #f0f0f0; } - #wpbody { background-color: #f0f0f0; position: relative; padding-left: 150px; - padding-top: 25px; } @@ -38,6 +36,18 @@ body { background-color: #f0f0f0; } +.wp-list-table thead { + background-color: rgba(117, 151, 234, 0.6) !important; +} + +.wp-list-table tbody tr:nth-child(odd) { + background-color: rgba(255, 239, 190, 0.45) !important; +} + +.wp-list-table tbody tr:nth-child(even) { + background-color: #ffffff !important; +} + #wpfooter { padding-left: 150px; } @@ -64,7 +74,6 @@ body { #adminmenu li > a.menu-top:focus { color: #1d4899; border-color: #f0f0f0; - font-weight: bold; background: linear-gradient(to right, #efefef, rgba(255, 203, 4, 0.45)); border-radius: 10px; @@ -82,13 +91,20 @@ body { } +.nav-tab { + border-color: rgb(128, 159, 245); + background-color: rgba(185, 203, 255, 0.84); + border-radius: 5px 5px 0 0; +} + /* Active tabs use a bottom border color that matches the page background color. */ .about-wrap .nav-tab-active, .nav-tab-active, .nav-tab-active:hover { border-style: none; - background-color: #fff; + background: linear-gradient(to right, #efefef, rgba(255, 203, 4, 0.45)); border-bottom-color: #fff; + box-shadow: 2px 2px 5px #c0c0c0; } /* Admin Menu: submenu */ @@ -101,6 +117,10 @@ body { width: 300px; } + + + + #adminmenu li.wp-has-submenu.wp-not-current-submenu.opensub:hover:after { display: none; } @@ -350,4 +370,24 @@ ul#adminmenu > li.current > a.current:after { cursor: pointer; width: 10pt; color: #a0a0a0; +} + +@media (max-width: 720px) { + #wpbody { + padding-right: 0px; + padding-left: 0px; + } + + + #adminmenuback, + #adminmenuwrap, + #adminmenu { + margin-top: 12px; + background: #f0f0f0; + width: 400px !important; + } + + #adminmenuback { + box-shadow: 5px 5px 10px #c0c0c0; + } } \ No newline at end of file diff --git a/bdp-kompass.php b/bdp-kompass.php index c8e6daf..c5fb4a3 100644 --- a/bdp-kompass.php +++ b/bdp-kompass.php @@ -2,7 +2,7 @@ /** * Plugin Name: BdP Kompass * Description: Wordpress-Plugin zur Unterstützung von Stämmen im Bund der Pfadfinderinnen und Pfadfinder e.V. zur optimalen Verwaltung eurer Webseite - * Version: 4.2.1 + * Version: 4.3.1 * Tags: bdp, utility, helper * Requires at least: 6.0 * Requires PHP: 8.2 @@ -52,6 +52,7 @@ function register_custom_theme_directory() { } function enqueue_custom_password_js() { + wp_enqueue_script( 'searchable-table', BDP_LV_PLUGIN_URL . '/assets/searchtable.js'); wp_enqueue_script( 'custom-password-js', BDP_LV_PLUGIN_URL . 'assets/password.js'); wp_localize_script( 'custom-password-js', 'php_vars', [ 'allowed_strengths' => kompass_get_minimal_password_strength(), diff --git a/includes/WpConfigEditor.class.php b/includes/WpConfigEditor.class.php index 928d561..02ae8df 100644 --- a/includes/WpConfigEditor.class.php +++ b/includes/WpConfigEditor.class.php @@ -25,7 +25,14 @@ class WpConfigEditor extends \WP_Filesystem_Direct public function writeConfig($value): bool { - $this->put_contents(ABSPATH . self::WP_CONFIG_FILE, $value); + $value = str_replace('', '', $value); + + $value = str_replace(PHP_EOL . PHP_EOL, PHP_EOL, $value); + + $value = 'put_contents(ABSPATH . self::WP_CONFIG_FILE, $value); return true; } @@ -35,7 +42,7 @@ class WpConfigEditor extends \WP_Filesystem_Direct $configContent = $wfs->readConfig(); if (null === self::getConfigValue($key)) { - $configContent .= "define( '$key', $value );"; + $configContent .= "define( '$key', $value );" . PHP_EOL; } preg_match("/define\([ ]?'($key)'\,[ ]?(.*)[ ]?\);/",$configContent, $matches); diff --git a/lang/bdp-kompass_de_DE.po b/lang/bdp-kompass_de_DE.po index 0ad6ab1..3475c67 100644 --- a/lang/bdp-kompass_de_DE.po +++ b/lang/bdp-kompass_de_DE.po @@ -108,4 +108,151 @@ msgid "Change Login URL" msgstr "Login-URL ändern" msgid "Changing the default login URL of WordPress is advisable to enhance the security of your website. By default, WordPress login URLs is /wp-admin or /wp-login.php, which are easily guessed by hackers and facilitate attacks such as brute-force attacks. Changing the login URL to something unique and difficult to guess increases security since potential attackers will struggle to find the correct URL. This can help protect your website from unauthorized access and other malicious activities." -msgstr "Es ist ratsam, die Standard-Login-URL von WordPress zu ändern, um die Sicherheit deiner Website zu erhöhen. Standardmäßig lautet die Login-URL von WordPress /wp-admin oder /wp-login.php, was für Hacker leicht zu erraten ist und Angriffe wie Brute-Force-Attacken erleichtern kann. Durch Ändern der Login-URL auf etwas Einzigartiges und schwer zu erraten, erhöhst du die Sicherheit, da potenzielle Angreifer Schwierigkeiten haben werden, die richtige URL zu finden. Dies kann helfen, deine Website vor unautorisiertem Zugriff und anderen böswilligen Aktivitäten zu schützen." \ No newline at end of file +msgstr "Es ist ratsam, die Standard-Login-URL von WordPress zu ändern, um die Sicherheit deiner Website zu erhöhen. Standardmäßig lautet die Login-URL von WordPress /wp-admin oder /wp-login.php, was für Hacker leicht zu erraten ist und Angriffe wie Brute-Force-Attacken erleichtern kann. Durch Ändern der Login-URL auf etwas Einzigartiges und schwer zu erraten, erhöhst du die Sicherheit, da potenzielle Angreifer Schwierigkeiten haben werden, die richtige URL zu finden. Dies kann helfen, deine Website vor unautorisiertem Zugriff und anderen böswilligen Aktivitäten zu schützen." + +msgid "Login-Protection" +msgstr "Login-Sicherheit" + +msgid "Settings" +msgstr "Einstellungen" + +msgid "There are no ip addresses blocked." +msgstr "Derzeit sind keine Adressen gesperrt." + +msgid "IP address" +msgstr "IP-Adresse" + +msgid "Blocked until" +msgstr "Gesperrt bis" + +msgid "Actions" +msgstr "Aktionen" + +msgid "The settings were saved." +msgstr "Die Einstellungen wurden gespeichert." + +msgid "The ip address was released." +msgstr "Die IP-Adresse wurde freigegeben." + +msgid "The list was saved." +msgstr "Die Liste wurde gespeichert." + +msgid "An error occured." +msgstr "Es ist ein Fehler aufgetreten" + +msgid "Options" +msgstr "Optionen" + +msgid "Blocklist" +msgstr "Blocklist" + +msgid "Allowlist" +msgstr "Allowlist" + +msgid "Blocked IP addresses" +msgstr "Gesperrte IP-Adressen" + +msgid "Too many failed login attempts." +msgstr "Zu vile fehlerhafte Login-Versuche." + +msgid "Please try again later." +msgstr "Bitte versuche es später erneut." + +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d Stunde" +msgstr[1] "%d Stunden" + + +msgid "Please try again in %d hour." +msgid_plural "Please try again in %d hours." +msgstr[0] "Bitte versuche es in %d Stunde noch einmal." +msgstr[1] "Bitte versuche es in %d Stunden noch einmal." + +msgid "Please try again in %d minute." +msgid_plural "Please try again in %d minutes." +msgstr[0] "Bitte versuche es in %d Minute noch einmal." +msgstr[1] "Bitte versuche es in %d Minuten noch einmal." + +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d Minute" +msgstr[1] "%d Minuten" + +msgid "Leave blank for delete" +msgstr "Zum Löschen frei lassen" + +msgid "Add ip address" +msgstr "IP-Adresse hinzufügen" + +msgid "Please use line breaks to enter multiple ip addresses" +msgstr "Bitte Zeilenumbruch verwenden, um mehrere IP-Adressen einzutragen" + +msgid "Maximum reps until lockout" +msgstr "Maximale Wiederholungen bis zur Sperrung" + +msgid "Duration of lockout (in minutes)" +msgstr "Dauer der Sperre (in Minuten)" + +msgid "Maximum number of lockouts" +msgstr "Maximale Anzahl an Sperrungen" + +msgid "Long-term duration (in hours)" +msgstr "Langzeitsperre (in Stunden)" + +msgid "Minimum password strength" +msgstr "Minimale Passwort-Stärke" + +msgid "Page accessible via" +msgstr "Seite erreichbar über" + +msgid "Handle cookies" +msgstr "Cookies verarbeiten" + +msgid "Notify if blocked" +msgstr "Bei Sperrung benachrichtigen" + +msgid "Failed attempts until notification" +msgstr "Fehlversuche bis zur Benachrichtigung" + +msgid "E-Mail to site admin" +msgstr "E-Mail an den Webseiten-Administrator" + +msgid "Direct connection" +msgstr "Direkte Verbindung" + +msgid "Behind a proxy" +msgstr "Hinter einem Proxy" + +msgid "Yes" +msgstr "Ja" + +msgid "No" +msgstr "Nein" + +msgid "Allow all password strengths" +msgstr "Alle Passwort-Stärken erlauben" + +msgid "At least passwords with medium strength" +msgstr "Mindestens Passwortstärke normal" + +msgid "Only allow strong passwords" +msgstr "Nur starke Passwörter erlauben" + +msgid "The password does not correspond to the requirements." +msgstr "Dass Passwort entspricht nicht den Anforderungen." + +msgid "Release ip address" +msgstr "IP-Adresse freigeben" + +msgid "Add ip address to blocklist" +msgstr "IP-Adresse auf Blocklist setzen" + +msgid "Add ip address to allowlist and release" +msgstr "IP-Adresse auf Allowlist setzen und freigeben" + +msgid "Search for ip address" +msgstr "Nach IP-Adresse suchen" + +msgid "Delete" +msgstr "Löschen" \ No newline at end of file diff --git a/modules/LimitLoginAttempts/Controllers/LoginHandler.php b/modules/LimitLoginAttempts/Controllers/LoginHandler.php index 0b92d42..231703a 100644 --- a/modules/LimitLoginAttempts/Controllers/LoginHandler.php +++ b/modules/LimitLoginAttempts/Controllers/LoginHandler.php @@ -5,278 +5,277 @@ namespace Bdp\Modules\LimitLoginAttempts\Controllers; use ProtectLogin\Modules\LimitLoginAttempts\Requests\IpAddress; class LoginHandler { - public const DIRECT_ADDR = 'REMOTE_ADDR'; - public const PROXY_ADDR = 'HTTP_X_FORWARDED_FOR'; + public const DIRECT_ADDR = 'REMOTE_ADDR'; + public const PROXY_ADDR = 'HTTP_X_FORWARDED_FOR'; - public function onSuccessFullLogin($user, $password) { - if (!is_wp_error($user) && $this->isLoginAllowedFromIp() ) { - return $user; - } + public function onSuccessFullLogin($user, $password) { + if (!is_wp_error($user) && $this->isLoginAllowedFromIp() ) { + return $user; + } - global $limit_login_my_error_shown; - $limit_login_my_error_shown = true; + global $limit_login_my_error_shown; + $limit_login_my_error_shown = true; - $error = new \WP_Error(); - // This error should be the same as in "shake it" filter below - $error->add('too_many_retries', $this->composeErrorMessage()); - return $error; - } + $error = new \WP_Error(); + // This error should be the same as in "shake it" filter below + $error->add('too_many_retries', $this->composeErrorMessage()); + return $error; + } - public function onFailedLogin(string $username) { - $ip = $this->getAddress(); + public function onFailedLogin(string $username) { + $ip = $this->getAddress(); - /* if currently locked-out, do not add to retries */ - $lockouts = get_option('protect_login_limit_login_lockouts', []); + /* if currently locked-out, do not add to retries */ + $lockouts = get_option('protect_login_limit_login_lockouts', []); - if(isset($lockouts[$ip]) && time() < $lockouts[$ip]) { - return; - } + if(isset($lockouts[$ip]) && time() < $lockouts[$ip]) { + return; + } - /* Get the arrays with retries and retries-valid information */ - $retries = get_option('kompass_limit_login_retries', []); - $valid = get_option('kompass_limit_login_retries_valid', []); + /* Get the arrays with retries and retries-valid information */ + $retries = get_option('kompass_limit_login_retries', []); + $valid = get_option('kompass_limit_login_retries_valid', []); - /* Check validity and add one to retries */ - if (isset($retries[$ip])) { //} && isset($valid[$ip]) && time() < $valid[$ip]) { - $retries[$ip] ++; - } else { - $retries[$ip] = 1; - } + /* Check validity and add one to retries */ + if (isset($retries[$ip])) { //} && isset($valid[$ip]) && time() < $valid[$ip]) { + $retries[$ip] ++; + } else { + $retries[$ip] = 1; + } - update_option('kompass_limit_login_retries', $retries); + update_option('kompass_limit_login_retries', $retries); - /* lockout? */ - if($retries[$ip] % get_option('kompass_limit_login_allowed_retries', 0) != 0) { - return; - } + /* lockout? */ + if($retries[$ip] % get_option('kompass_limit_login_allowed_retries', 0) != 0) { + return; + } - $retries_long = get_option('kompass_limit_login_allowed_retries', 1) - * get_option('kompass_limit_login_allowed_lockouts', 1); + $retries_long = get_option('kompass_limit_login_allowed_retries', 1) + * get_option('kompass_limit_login_allowed_lockouts', 1); - if ($retries[$ip] >= $retries_long) { - $lockouts[$ip] = time() + get_option('kompass_limit_login_long_duration', 86400); + if ($retries[$ip] >= $retries_long) { + $lockouts[$ip] = time() + get_option('kompass_limit_login_long_duration', 86400); - } else { - $lockouts[$ip] = time() + get_option('kompass_limit_login_lockout_duration', 900); - } + } else { + $lockouts[$ip] = time() + get_option('kompass_limit_login_lockout_duration', 900); + } - update_option('kompass_limit_login_lockouts', $lockouts); + update_option('kompass_limit_login_lockouts', $lockouts); - /* do any notification */ - $this->notify($username); + /* do any notification */ + $this->notify($username); - } + } - private function notifyByEmail($user) - { - $ip = $this->getAddress(); + private function notifyByEmail($user) + { + $ip = $this->getAddress(); - $lockouts = get_option('kompass_limit_login_lockouts', []); - if (!isset($lockouts[$ip])) { - return; - } + $lockouts = get_option('kompass_limit_login_lockouts', []); + if (!isset($lockouts[$ip])) { + return; + } - $blocked_until = $lockouts[$ip]; + $blocked_until = $lockouts[$ip]; - $retries = get_option('kompass_limit_login_retries', []); - $currentRetries = $retries[$ip]; + $retries = get_option('kompass_limit_login_retries', []); + $currentRetries = $retries[$ip]; - $notify_after = get_option('kompass_limit_login_notify_email_after', 1); - if ($currentRetries % $notify_after !== 0) { - return; - } + $notify_after = get_option('kompass_limit_login_notify_email_after', 1); + if ($currentRetries % $notify_after !== 0) { + return; + } - $blogname = get_option('blogname', 'none'); + $blogname = get_option('blogname', 'none'); - $subject = sprintf(__("[%s] Too many failed login attempts" - , 'limit-login-attempts') - , $blogname); + $subject = sprintf(__("[%s] Too many failed login attempts" + , 'limit-login-attempts') + , $blogname); - $message = 'Neue Sperrung auf deiner Webseite: ' . PHP_EOL . - 'IP-Adresse: ' . $ip . PHP_EOL . - 'Gesperrt bis: ' . date('d.m.Y H:i', $blocked_until); + $message = 'Neue Sperrung auf deiner Webseite: ' . PHP_EOL . + 'IP-Adresse: ' . $ip . PHP_EOL . + 'Gesperrt bis: ' . date('d.m.Y H:i', $blocked_until); - $admin_email = get_option('admin_email'); - wp_mail($admin_email, $subject, $message); - } + $admin_email = get_option('admin_email'); + wp_mail($admin_email, $subject, $message); + } - /* Handle notification in event of lockout */ - private function notify($user) { - $args = get_option('kompass_limit_login_lockout_notify', []); + /* Handle notification in event of lockout */ + private function notify($user) { + $args = get_option('kompass_limit_login_lockout_notify', []); if (!is_array($args)) { $args = [$args]; } - foreach ($args as $mode) { - switch (trim($mode)) { - case 'email': - $this->notifyByEmail($user); - break; - } - } - } - + foreach ($args as $mode) { + switch (trim($mode)) { + case 'email': + $this->notifyByEmail($user); + break; + } + } + } private function composeErrorMessage() { $ip = $this->getAddress(); - $lockouts = get_option('kompass_limit_login_lockouts'); + $lockouts = get_option('protect_login_limit_login_lockouts'); - $msg = __('ERROR: Too many failed login attempts.', 'limit-login-attempts') . ' '; + $msg = __('Too many failed login attempts.', BDP_LV_PLUGIN_SLUG) . ' '; if (!is_array($lockouts) || !isset($lockouts[$ip]) || time() >= $lockouts[$ip]) { /* Huh? No timeout active? */ - $msg .= __('Please try again later.', 'limit-login-attempts'); + $msg .= __('Please try again later.', BDP_LV_PLUGIN_SLUG); return $msg; } $when = ceil(($lockouts[$ip] - time()) / 60); if ($when > 60) { $when = ceil($when / 60); - $msg .= sprintf(_n('Please try again in %d hour.', 'Please try again in %d hours.', $when, 'limit-login-attempts'), $when); + $msg .= sprintf(_n('Please try again in %d hour.', 'Please try again in %d hours.', $when, BDP_LV_PLUGIN_SLUG), $when); } else { - $msg .= sprintf(_n('Please try again in %d minute.', 'Please try again in %d minutes.', $when, 'limit-login-attempts'), $when); + $msg .= sprintf(_n('Please try again in %d minute.', 'Please try again in %d minutes.', $when, BDP_LV_PLUGIN_SLUG), $when); } return $msg; } - private static function getAddress($typeName = '') { - global $limitLoginAttemptsSettings; + private static function getAddress($typeName = '') { + global $limitLoginAttemptsSettings; - $typeOriginal = $typeName; - if (empty($typeName)) { - $typeName = get_option('kompass_limit_loginclient_type', self::DIRECT_ADDR); - } + $typeOriginal = $typeName; + if (empty($typeName)) { + $typeName = get_option('kompass_limit_loginclient_type', self::DIRECT_ADDR); + } - if (isset($_SERVER[$typeName]) && filter_var($_SERVER[$typeName], FILTER_VALIDATE_IP)) { - return $_SERVER[$typeName]; - } + if (isset($_SERVER[$typeName]) && filter_var($_SERVER[$typeName], FILTER_VALIDATE_IP)) { + return $_SERVER[$typeName]; + } - /* - * Not found. Did we get proxy type from option? - * If so, try to fall back to direct address. - */ - if ( empty($typeName) && $typeOriginal == self::PROXY_ADDR - && isset($_SERVER[self::DIRECT_ADDR]) - && filter_var($_SERVER[self::DIRECT_ADDR], FILTER_VALIDATE_IP)) { + /* + * Not found. Did we get proxy type from option? + * If so, try to fall back to direct address. + */ + if ( empty($typeName) && $typeOriginal == self::PROXY_ADDR + && isset($_SERVER[self::DIRECT_ADDR]) + && filter_var($_SERVER[self::DIRECT_ADDR], FILTER_VALIDATE_IP)) { - /* - * NOTE: Even though we fall back to direct address -- meaning you - * can get a mostly working plugin when set to PROXY mode while in - * fact directly connected to Internet it is not safe! - * - * Client can itself send HTTP_X_FORWARDED_FOR header fooling us - * regarding which IP should be banned. - */ + /* + * NOTE: Even though we fall back to direct address -- meaning you + * can get a mostly working plugin when set to PROXY mode while in + * fact directly connected to Internet it is not safe! + * + * Client can itself send HTTP_X_FORWARDED_FOR header fooling us + * regarding which IP should be banned. + */ - return $_SERVER[self::DIRECT_ADDR]; - } + return $_SERVER[self::DIRECT_ADDR]; + } - return ''; + return ''; - } + } - public function isLoginAllowedFromIp() { - $ip = $this->getAddress(); + public function isLoginAllowedFromIp() { + $ip = $this->getAddress(); - if (in_array($ip, get_option('kompass_limit_login_blocklist', []))) { - return false; - } + if (in_array($ip, get_option('kompass_limit_login_blocklist', []))) { + return false; + } - if (in_array($ip, get_option('kompass_limit_login_allowlist', []))) { - return true; - } + if (in_array($ip, get_option('kompass_limit_login_allowlist', []))) { + return true; + } - /* lockout active? */ - $lockouts = get_option('kompass_limit_login_lockouts', []); - return (!is_array($lockouts) || !isset($lockouts[$ip]) || time() >= $lockouts[$ip]); - } + /* lockout active? */ + $lockouts = get_option('kompass_limit_login_lockouts', []); + return (!is_array($lockouts) || !isset($lockouts[$ip]) || time() >= $lockouts[$ip]); + } - public function checkFailedCookies($cookie_elements) { - $this->clearAuthCookie(); + public function checkFailedCookies($cookie_elements) { + $this->clearAuthCookie(); - /* - * Invalid username gets counted every time. - */ + /* + * Invalid username gets counted every time. + */ - $this->onFailedLogin($cookie_elements['username']); - } + $this->onFailedLogin($cookie_elements['username']); + } - private function clearAuthCookie() { - wp_clear_auth_cookie(); + private function clearAuthCookie() { + wp_clear_auth_cookie(); - if (!empty($_COOKIE[AUTH_COOKIE])) { - $_COOKIE[AUTH_COOKIE] = ''; - } - if (!empty($_COOKIE[SECURE_AUTH_COOKIE])) { - $_COOKIE[SECURE_AUTH_COOKIE] = ''; - } - if (!empty($_COOKIE[LOGGED_IN_COOKIE])) { - $_COOKIE[LOGGED_IN_COOKIE] = ''; - } - } + if (!empty($_COOKIE[AUTH_COOKIE])) { + $_COOKIE[AUTH_COOKIE] = ''; + } + if (!empty($_COOKIE[SECURE_AUTH_COOKIE])) { + $_COOKIE[SECURE_AUTH_COOKIE] = ''; + } + if (!empty($_COOKIE[LOGGED_IN_COOKIE])) { + $_COOKIE[LOGGED_IN_COOKIE] = ''; + } + } - public function onValidCookie($cookie_elements, $user) { - /* - * As all meta values get cached on user load this should not require - * any extra work for the common case of no stored value. - */ + public function onValidCookie($cookie_elements, $user) { + /* + * As all meta values get cached on user load this should not require + * any extra work for the common case of no stored value. + */ - if (get_user_meta($user->ID, 'kompass_limit_login_previous_cookie')) { - delete_user_meta($user->ID, 'kompass_limit_login_previous_cookie'); - } - } + if (get_user_meta($user->ID, 'kompass_limit_login_previous_cookie')) { + delete_user_meta($user->ID, 'kompass_limit_login_previous_cookie'); + } + } - function clearLoginCookie($cookie_elements) { - $this->clearAuthCookie(); + function clearLoginCookie($cookie_elements) { + $this->clearAuthCookie(); - /* - * Under some conditions an invalid auth cookie will be used multiple - * times, which results in multiple failed attempts from that one - * cookie. - * - * Unfortunately I've not been able to replicate this consistently and - * thus have not been able to make sure what the exact cause is. - * - * Probably it is because a reload of for example the admin dashboard - * might result in multiple requests from the browser before the invalid - * cookie can be cleard. - * - * Handle this by only counting the first attempt when the exact same - * cookie is attempted for a user. - */ + /* + * Under some conditions an invalid auth cookie will be used multiple + * times, which results in multiple failed attempts from that one + * cookie. + * + * Unfortunately I've not been able to replicate this consistently and + * thus have not been able to make sure what the exact cause is. + * + * Probably it is because a reload of for example the admin dashboard + * might result in multiple requests from the browser before the invalid + * cookie can be cleard. + * + * Handle this by only counting the first attempt when the exact same + * cookie is attempted for a user. + */ - extract($cookie_elements, EXTR_OVERWRITE); + extract($cookie_elements, EXTR_OVERWRITE); - // Check if cookie is for a valid user - $user = get_user_by('login', $username); - if (!$user) { - // "shouldn't happen" for this action - $this->onFailedLogin($username); - return; - } + // Check if cookie is for a valid user + $user = get_user_by('login', $username); + if (!$user) { + // "shouldn't happen" for this action + $this->onFailedLogin($username); + return; + } - $previous_cookie = get_user_meta($user->ID, 'kompass_limit_login_previous_cookie', true); - if ($previous_cookie && $previous_cookie == $cookie_elements) { - // Identical cookies, ignore this attempt - return; - } + $previous_cookie = get_user_meta($user->ID, 'kompass_limit_login_previous_cookie', true); + if ($previous_cookie && $previous_cookie == $cookie_elements) { + // Identical cookies, ignore this attempt + return; + } - // Store cookie - if ($previous_cookie) - update_user_meta($user->ID, 'kompass_limit_login_previous_cookie', $cookie_elements); - else - add_user_meta($user->ID, 'kompass_limit_login_previous_cookie', $cookie_elements, true); + // Store cookie + if ($previous_cookie) + update_user_meta($user->ID, 'kompass_limit_login_previous_cookie', $cookie_elements); + else + add_user_meta($user->ID, 'kompass_limit_login_previous_cookie', $cookie_elements, true); - $this->onFailedLogin($username); - } + $this->onFailedLogin($username); + } - public function handleCookies() { - if ($this->isLoginAllowedFromIp()) { - return; - } + public function handleCookies() { + if ($this->isLoginAllowedFromIp()) { + return; + } - $this->clearAuthCookie(); - } + $this->clearAuthCookie(); + } } \ No newline at end of file diff --git a/modules/LimitLoginAttempts/Controllers/OptionsPage.php b/modules/LimitLoginAttempts/Controllers/OptionsPage.php index 8e4f4f3..7b7dc50 100644 --- a/modules/LimitLoginAttempts/Controllers/OptionsPage.php +++ b/modules/LimitLoginAttempts/Controllers/OptionsPage.php @@ -8,7 +8,7 @@ class OptionsPage public function __construct() { add_options_page(BDP_LV_PLUGIN_SLUG . '-limit-login-attempts', - 'Protect Login', + __('Login-Protection', BDP_LV_PLUGIN_SLUG), 'site-health.php', BDP_LV_PLUGIN_SLUG . '-limit-login-attempts', [$this, 'limit_login_option_page'],2048); @@ -21,19 +21,52 @@ class OptionsPage update_option('kompass_limit_login_lockouts', $allIps); } + public static function addToBlocklist(string $ip) + { + $blockedIps = get_option('kompass_limit_login_blocklist', []); + $blockedIps[] = $ip; + update_option('kompass_limit_login_blocklist', $blockedIps); + } + + public static function addToAllowlist(string $ip) + { + $allowedIps = get_option('kompass_limit_login_allowlist', []); + $allowedIps[] = $ip; + update_option('kompass_limit_login_allowlist', $allowedIps); + self::releaseIp($ip); + } + + public function removeFromList(string $listType, string $ip){ + update_option( + 'kompass_limit_login_' . $listType, + array_diff(get_option('kompass_limit_login_' . $listType, []), [$ip]) + ); + } + + public function getBlockedIps() { $ips = ''; foreach (get_option('kompass_limit_login_lockouts', []) as $ip => $blockedUntil) { - $ips .= '' . - '' . $ip . '' . - '' . date('d.m.Y H:i', $blockedUntil) . ' Uhr' . - ' - Freigeben' . - ''; - }; - + $ips .= '' . + '' . $ip . ''; + if (in_array($ip, get_option('protect_login_limit_login_blocklist', []))) { + $ips .= 'Dauerhaft blockiert' . + '' . + 'Keine Aktion möglich' . + ''; + } else { + $ips .= '' . date('d.m.Y', $blockedUntil) . '
' . date('H:i', $blockedUntil) . ' Uhr' . + ' + ' . __('Release ip address', BDP_LV_PLUGIN_SLUG) . '
+ ' . __('Add ip address to blocklist', BDP_LV_PLUGIN_SLUG) . '
+ ' . __('Add ip address to allowlist and release', BDP_LV_PLUGIN_SLUG) . '
' . + ''; + }; + } return $ips; } @@ -44,14 +77,14 @@ class OptionsPage if (isset($_POST['update_options'])) { update_settings($_POST); - $showMessage = 'Die Einstellungen wurden gespeichert'; + $showMessage = __('The settings were saved.', BDP_LV_PLUGIN_SLUG); } if (isset($_GET['action']) && $_GET['action'] == 'release') { - $showMessage = 'Die IP-Adresse wurde freigegeben.'; + $showMessage = __('The ip address was released.', BDP_LV_PLUGIN_SLUG); } if(isset($_POST['save_kompass_balist_list_type'])) { - $showMessage = 'Die Liste wurde gespeichert.'; + $showMessage = __('The list was saved.', BDP_LV_PLUGIN_SLUG); } if (null !== $showMessage && $errors === false) { @@ -62,15 +95,26 @@ class OptionsPage if ($errors) { echo '
'; - echo 'Beim Durchführen der Aktion ist ein Fehler aufgetreten.'; + echo __('An error occured.', BDP_LV_PLUGIN_SLUG); echo '
'; } $tab = isset($_GET['tab']) ? $_GET['tab'] : 'tab1'; + + if (isset($_GET['action']) && $_GET['action'] == 'removeFromList') { + $this->removeFromList($_GET['list'], base64_decode($_GET['ip'])); + if ($_GET['list'] == 'blocklist') { + $tab = 'tab2'; + } else { + $tab = 'tab3'; + } + } + ?>
-

Protect Login - Einstellungen

+

+ -

@@ -101,22 +145,39 @@ class OptionsPage if (isset($_GET['action']) && $_GET['action'] == 'release') { $this->releaseIp(base64_decode($_GET['ip'])); } + + if (isset($_GET['action']) && $_GET['action'] == 'toBlock') { + $this->addToBlocklist(base64_decode($_GET['ip'])); + } + + if (isset($_GET['action']) && $_GET['action'] == 'toAllow') { + $this->addToAllowlist(base64_decode($_GET['ip'])); + } $blockedIps = $this->getBlockedIps(); - ?> -

Gesperrte IPs

- '. __('Blocked IP addresses', BDP_LV_PLUGIN_SLUG) .''; + if (strlen($blockedIps) == 0) { - echo '
'; - echo 'Derzeit sind keine Adressen gesperrt.'; + echo '
'; + echo __('There are no ip addresses blocked.', BDP_LV_PLUGIN_SLUG); echo '
'; } else { ?> - - - - - - - +

+ +

+ +
IPGesperrt bisAktion
+ + + + + + + + + +
[ - 'email' => 'E-Mail an Administrator' + 'email' => __('E-Mail to site admin', BDP_LV_PLUGIN_SLUG) ], ]; @@ -16,7 +15,7 @@ function kompass_print_checkbox($settingName) { $setting = $options[$settingName]; foreach ($setting as $radioOption => $optionText) { - $isChecked = in_array($radioOption, $currentSetting) ? 'checked ' : '' ; + $isChecked = in_array($radioOption, $currentSetting) ? 'checked ' : '' ; echo ' [ - 'REMOTE_ADDR' => 'Direkte Verbrindung', - 'HTTP_X_FORWARDED_FOR' => 'Hinter einem Proxy' + 'REMOTE_ADDR' => __('Direct connection', BDP_LV_PLUGIN_SLUG), + 'HTTP_X_FORWARDED_FOR' => __('Behind a proxy', BDP_LV_PLUGIN_SLUG) ], 'kompass_limit_login_cookies' => [ - true => 'Ja', - false => 'Nein' + true => __('Yes', BDP_LV_PLUGIN_SLUG), + false => __('No', BDP_LV_PLUGIN_SLUG) ], 'kompass_password_minimal_strength' => [ - '1' => 'Alle Passwörter erlauben', - '2' => 'Mittelstarke Passwörter', - '3' => 'Nur Starke Passwörter' + '1' => __('Allow all password strengths', BDP_LV_PLUGIN_SLUG), + '2' => __('At least passwords with medium strength', BDP_LV_PLUGIN_SLUG), + '3' => __('Only allow strong passwords', BDP_LV_PLUGIN_SLUG) ] ]; @@ -30,6 +30,6 @@ function kompass_print_radio($settingName) { name="' . $settingName . '" value="' . $radioOption . '" id="setting_' . $settingName . '_' . $radioOption . '" />' . - '   '; + '
'; } } diff --git a/modules/LimitLoginAttempts/Views/tab-control.php b/modules/LimitLoginAttempts/Views/tab-control.php index c94a830..8a22eea 100644 --- a/modules/LimitLoginAttempts/Views/tab-control.php +++ b/modules/LimitLoginAttempts/Views/tab-control.php @@ -1,18 +1,18 @@ '. - ' - Optionen - '. - ' - Blocklist - '. - ' - Allowlist - '. - ' - Gesperrte IPs - '; + '' . + __('Options', BDP_LV_PLUGIN_SLUG) . + ''. + '' . + __('Blocklist', BDP_LV_PLUGIN_SLUG) . + ''. + '' . + __('Allowlist', BDP_LV_PLUGIN_SLUG) . + ''. + '' . + __('Blocked IP addresses', BDP_LV_PLUGIN_SLUG) . + ''; } \ No newline at end of file diff --git a/modules/LimitLoginAttempts/includes/block-and-allow-list-form.php b/modules/LimitLoginAttempts/includes/block-and-allow-list-form.php index 265584d..87b827d 100644 --- a/modules/LimitLoginAttempts/includes/block-and-allow-list-form.php +++ b/modules/LimitLoginAttempts/includes/block-and-allow-list-form.php @@ -1,47 +1,56 @@ - - -

-
- -

+

+ +

+ + + + + + + + + foreach ($elements as $currentIp) { + echo ''; + echo ''; + echo ''; + echo ''; + } + ?> + +
' . $currentIp .'' + . __('Delete', BDP_LV_PLUGIN_SLUG) . '
+ +

diff --git a/modules/LimitLoginAttempts/includes/gui_elements.php b/modules/LimitLoginAttempts/includes/gui_elements.php index ed7cbbd..24d9a35 100644 --- a/modules/LimitLoginAttempts/includes/gui_elements.php +++ b/modules/LimitLoginAttempts/includes/gui_elements.php @@ -1,14 +1,13 @@ '; } -function _kompass_limit_logins_settings_callback($args) { +function _kompass_limit_logins_settings_callback(array $args) { $setting = get_option($args['setting'], null); if (null === $setting) { - $setting = ''; + return; } $value = esc_attr($setting); @@ -19,22 +18,17 @@ function _kompass_limit_logins_settings_callback($args) { kompass_print_textbox($args['setting'], $value); } -function _kompass_limit_logins_settings_radio_callback($args) +function _kompass_limit_logins_settings_radio_callback(array $args) { kompass_print_radio($args['setting']); } -function _kompass_limit_logins_settings_checkbox_callback($args) { +function _kompass_limit_logins_settings_checkbox_callback(array $args) { kompass_print_checkbox($args['setting']); } - - - - - add_settings_section( 'custom_settings_section', - 'Optionen', + __('Options', BDP_LV_PLUGIN_SLUG), 'custom_settings_section_callback', BDP_LV_PLUGIN_SLUG . '-limit-login-attempts' ); @@ -44,73 +38,73 @@ $settings_page = BDP_LV_PLUGIN_SLUG . '-limit-login-attempts'; add_settings_field( - 'kompass_lla_1', - 'Maximale Wiederholungen', + 'kompass_lla_1', + __('Maximum reps until lockout', BDP_LV_PLUGIN_SLUG), '_kompass_limit_logins_settings_callback', $settings_page, 'custom_settings_section', ['setting' => 'kompass_limit_login_allowed_retries']); add_settings_field( - 'kompass_lla_2', - 'Dauer der Sperre (in Minuten)', + 'kompass_lla_2', + __('Duration of lockout (in minutes)', BDP_LV_PLUGIN_SLUG), '_kompass_limit_logins_settings_callback', $settings_page, 'custom_settings_section', ['setting' => 'kompass_limit_login_lockout_duration', 'unit_division' => 60 ]); add_settings_field( - 'kompass_lla_3', - 'Maximale Anzahl an Sperrungen', + 'kompass_lla_3', + __('Maximum number of lockouts', BDP_LV_PLUGIN_SLUG), '_kompass_limit_logins_settings_callback', $settings_page, 'custom_settings_section', ['setting' => 'kompass_limit_login_allowed_lockouts']); add_settings_field( - 'kompass_lla_4', - 'Langzeitsperre in Stunden', + 'kompass_lla_4', + __('Long-term duration (in hours)', BDP_LV_PLUGIN_SLUG), '_kompass_limit_logins_settings_callback', $settings_page, 'custom_settings_section', ['setting' => 'kompass_limit_login_long_duration', 'unit_division' => 3600]); add_settings_field( - 'kompass_lla_5', - 'Mininmale Passwort-Stärke:', - '_kompass_limit_logins_settings_radio_callback', + 'kompass_lla_5', + __('Minimum password strength', BDP_LV_PLUGIN_SLUG), + '_kompass_limit_logins_settings_radio_callback', $settings_page, 'custom_settings_section', ['setting' => 'kompass_password_minimal_strength']); add_settings_field( - 'kompass_lla_6', - 'Seite erreichbar über:', - '_kompass_limit_logins_settings_radio_callback', + 'kompass_lla_6', + __('Page accessible via', BDP_LV_PLUGIN_SLUG), + '_kompass_limit_logins_settings_radio_callback', $settings_page, 'custom_settings_section', ['setting' => 'kompass_limit_login_client_type']); add_settings_field( - 'kompass_lla_7', - 'Cookies verarbeiten', - '_kompass_limit_logins_settings_radio_callback', + 'kompass_lla_7', + __('Handle cookies', BDP_LV_PLUGIN_SLUG), + '_kompass_limit_logins_settings_radio_callback', $settings_page, 'custom_settings_section', ['setting' => 'kompass_limit_login_cookies']); add_settings_field( - 'kompass_lla_8', - 'Bei Sperrung benachrichtigen', - '_kompass_limit_logins_settings_checkbox_callback', + 'kompass_lla_8', + __('Notify if blocked', BDP_LV_PLUGIN_SLUG), + '_kompass_limit_logins_settings_checkbox_callback', $settings_page, 'custom_settings_section', ['setting' => 'kompass_limit_login_lockout_notify']); add_settings_field( - 'kompass_lla_9', - 'Fehlversuche bis zur Benachrichtigung', - '_kompass_limit_logins_settings_callback', + 'kompass_lla_9', + __('Failed attempts until notification', BDP_LV_PLUGIN_SLUG), + '_kompass_limit_logins_settings_callback', $settings_page, 'custom_settings_section', ['setting' => 'kompass_limit_login_notify_email_after']); diff --git a/modules/LimitLoginAttempts/includes/validators.php b/modules/LimitLoginAttempts/includes/validators.php index e2fb154..5b7d7fe 100644 --- a/modules/LimitLoginAttempts/includes/validators.php +++ b/modules/LimitLoginAttempts/includes/validators.php @@ -1,20 +1,16 @@