| @@ -4,9 +4,26 @@ | ||
| 4 | 4 | |
| 5 | 5 | public $form_field = []; |
| 6 | 6 | |
| 7 | 7 | public function __construct() |
| 8 | - { | |
| 8 | + { | |
| 9 | + // Qui non si traduce nulla. Il plugin parte su plugins_loaded, che viene | |
| 10 | + // prima di init: da WordPress 6.7 chiamare __() a quel punto fa scattare | |
| 11 | + // la notice "Translation loading was triggered too early". L'elenco dei | |
| 12 | + // campi si costruisce quando serve davvero, cioe su admin_init. | |
| 13 | + } | |
| 14 | + | |
| 15 | + /** | |
| 16 | + * Definizione dei campi del modulo impostazioni. | |
| 17 | + * | |
| 18 | + * @return array | |
| 19 | + */ | |
| 20 | + public function get_form_fields() | |
| 21 | + { | |
| 22 | + if ( ! empty( $this->form_field ) ) { | |
| 23 | + return $this->form_field; | |
| 24 | + } | |
| 25 | + | |
| 9 | 26 | $this->form_field = array( |
| 10 | 27 | '0' => array( |
| 11 | 28 | 'id' => 'basic-auth-plugin-admin-enable', |
| 12 | 29 | 'title' => __('Enable for wp-admin', 'easy-basic-authentication'), |
| @@ -45,17 +62,35 @@ | ||
| 45 | 62 | '7' => array( |
| 46 | 63 | 'id' => 'basic-auth-plugin-white-list', |
| 47 | 64 | 'title' => __('Ip White list', 'easy-basic-authentication'), |
| 48 | 65 | 'callback' => 'basic_auth_plugin_whitelist_cb', |
| 49 | - ) | |
| 66 | + ), | |
| 67 | + '8' => array( | |
| 68 | + 'id' => 'basic-auth-plugin-url-white-list', | |
| 69 | + 'title' => __('Url White list', 'easy-basic-authentication'), | |
| 70 | + 'callback' => 'basic_auth_plugin_urlwhitelist_cb', | |
| 71 | + ), | |
| 72 | + '9' => array( | |
| 73 | + 'id' => 'basic-auth-plugin-access-token', | |
| 74 | + 'title' => __('Access token for crawlers', 'easy-basic-authentication'), | |
| 75 | + 'callback' => 'basic_auth_plugin_access_token_cb', | |
| 76 | + ), | |
| 77 | + '10' => array( | |
| 78 | + 'id' => 'basic-auth-plugin-remove-data-after-uninstall', | |
| 79 | + 'title' => __('Remove plugin data after uninstall', 'easy-basic-authentication'), | |
| 80 | + 'callback' => 'basic_auth_plugin_remove_data_after_uninstall_cb', | |
| 81 | + ), | |
| 82 | + | |
| 50 | 83 | ); |
| 84 | + | |
| 85 | + return $this->form_field; | |
| 51 | 86 | } |
| 52 | - | |
| 87 | + | |
| 53 | 88 | public function basic_auth_plugin_settings_init() { |
| 54 | - register_setting( 'basic-auth-plugin-settings', 'basic_auth_plugin_admin_enable' ); | |
| 55 | - register_setting( 'basic-auth-plugin-settings', 'basic_auth_plugin_enable' ); | |
| 56 | - register_setting( 'basic-auth-plugin-settings', 'basic_auth_plugin_username' ); | |
| 57 | - register_setting( 'basic-auth-plugin-settings', 'basic_auth_plugin_admin_log_enable' ); | |
| 89 | + register_setting( 'basic-auth-plugin-settings', 'basic_auth_plugin_admin_enable', array( 'sanitize_callback' => 'absint' ) ); | |
| 90 | + register_setting( 'basic-auth-plugin-settings', 'basic_auth_plugin_enable', array( 'sanitize_callback' => 'absint' ) ); | |
| 91 | + register_setting( 'basic-auth-plugin-settings', 'basic_auth_plugin_username', array( 'sanitize_callback' => 'sanitize_text_field' ) ); | |
| 92 | + register_setting( 'basic-auth-plugin-settings', 'basic_auth_plugin_admin_log_enable', array( 'sanitize_callback' => 'absint' ) ); | |
| 58 | 93 | |
| 59 | 94 | add_settings_section( |
| 60 | 95 | 'basic-auth-plugin-section', |
| 61 | 96 | __('Configurations for Easy Basic Authentication', 'easy-basic-authentication'), |
| @@ -62,9 +97,9 @@ | ||
| 62 | 97 | array($this,'basic_auth_plugin_section_cb'), |
| 63 | 98 | 'basic-auth-plugin-settings' |
| 64 | 99 | ); |
| 65 | 100 | |
| 66 | - foreach($this->form_field as $field) { | |
| 101 | + foreach($this->get_form_fields() as $field) { | |
| 67 | 102 | add_settings_field( |
| 68 | 103 | $field['id'], |
| 69 | 104 | esc_html($field['title']), |
| 70 | 105 | array($this,$field['callback']), |
| @@ -95,16 +130,17 @@ | ||
| 95 | 130 | } |
| 96 | 131 | |
| 97 | 132 | public function basic_auth_plugin_username_cb() { |
| 98 | 133 | $username = get_option( 'basic_auth_plugin_username' ); |
| 99 | - $this->printInputText("text","basic_auth_plugin_username",esc_attr( $username )); | |
| 134 | + $this->printInputText("text","basic_auth_plugin_username",esc_attr( $username ),'','off'); | |
| 100 | 135 | } |
| 101 | 136 | |
| 102 | 137 | public function basic_auth_plugin_password_cb() { |
| 103 | - $password = get_option( 'basic_auth_plugin_password' ) | |
| 104 | - ? __('Password entered', 'easy-basic-authentication') | |
| 105 | - : __('Enter the password', 'easy-basic-authentication'); | |
| 106 | - $this->printInputText("password","basic_auth_plugin_password",'',$password); | |
| 138 | + $password = get_option( 'basic_auth_plugin_password' ); | |
| 139 | + ?> | |
| 140 | + <input type="password" name="basic_auth_plugin_password" value="" placeholder="<?php esc_attr_e('Enter the password', 'easy-basic-authentication'); ?>" autocomplete="off"> | |
| 141 | + <p class="description"><?php esc_html_e('Leave blank to keep the current password.', 'easy-basic-authentication'); ?></p> | |
| 142 | + <?php | |
| 107 | 143 | } |
| 108 | 144 | |
| 109 | 145 | public function basic_auth_plugin_admin_log_enable_cb() { |
| 110 | 146 | $enable = get_option( 'basic_auth_plugin_admin_log_enable' ); |
| @@ -124,28 +160,86 @@ | ||
| 124 | 160 | $email_alert = get_option( 'basic_auth_plugin_alertemail' ); |
| 125 | 161 | $this->printInputText("text","basic_auth_plugin_alertemail",esc_attr( $email_alert ),__('Enter the email', 'easy-basic-authentication')); |
| 126 | 162 | } |
| 127 | 163 | |
| 164 | + public function basic_auth_plugin_access_token_cb() { | |
| 165 | + $token = (string) get_option( 'basic_auth_plugin_access_token', '' ); | |
| 166 | + ?> | |
| 167 | + <input type="text" name="basic_auth_plugin_access_token" value="<?php echo esc_attr( $token ); ?>" | |
| 168 | + class="regular-text code" readonly onclick="this.select();" autocomplete="off"> | |
| 169 | + <label style="display:block;margin-top:6px;"> | |
| 170 | + <input type="checkbox" name="basic_auth_plugin_generate_token" value="1"> | |
| 171 | + <?php echo '' === $token | |
| 172 | + ? esc_html__( 'Generate a token when saving', 'easy-basic-authentication' ) | |
| 173 | + : esc_html__( 'Replace this token with a new one when saving', 'easy-basic-authentication' ); ?> | |
| 174 | + </label> | |
| 175 | + <?php if ( '' !== $token ) : ?> | |
| 176 | + <label style="display:block;margin-top:4px;"> | |
| 177 | + <input type="checkbox" name="basic_auth_plugin_delete_token" value="1"> | |
| 178 | + <?php esc_html_e( 'Delete the token and close this door', 'easy-basic-authentication' ); ?> | |
| 179 | + </label> | |
| 180 | + <?php endif; ?> | |
| 181 | + <p class="description"> | |
| 182 | + <?php esc_html_e( 'Lets a crawler or an external service through without a username and password. Send it as an X-Basic-Auth-Token header, or as Authorization: Bearer.', 'easy-basic-authentication' ); ?> | |
| 183 | + <br> | |
| 184 | + <strong><?php esc_html_e( 'It opens the site only — the admin area and the login page stay protected. Anyone holding this token can read your whole site, so treat it as a password.', 'easy-basic-authentication' ); ?></strong> | |
| 185 | + </p> | |
| 186 | + <?php | |
| 187 | + } | |
| 188 | + | |
| 128 | 189 | public function basic_auth_plugin_whitelist_cb() { |
| 129 | 190 | $white_list = get_option( 'basic_auth_plugin_whitelist' ); |
| 130 | - $this->printInputText("text","basic_auth_plugin_whitelist",esc_attr( $white_list ),__('White list, separated by comma', 'easy-basic-authentication')); | |
| 191 | + $this->printInputText("text","basic_auth_plugin_whitelist",esc_attr( $white_list ),__('White list, separated by comma. Ex. 127.0.0.1, 1.1.1.1/20, 1.1.0.0 - 1.1.0.255', 'easy-basic-authentication')); | |
| 131 | 192 | } |
| 193 | + | |
| 194 | + public function basic_auth_plugin_urlwhitelist_cb() { | |
| 195 | + $white_list = get_option( 'basic_auth_plugin_urlwhitelist' ); | |
| 196 | + $this->printInputText("text","basic_auth_plugin_urlwhitelist",esc_attr( $white_list ),__('Url white list, separated by comma. Ex. /json/wp-, www.google.it,', 'easy-basic-authentication')); | |
| 197 | + } | |
| 132 | 198 | |
| 133 | - public function printInputText($tipe, $name, $value='', $placeholder = '') { | |
| 134 | - echo "<input type='" . esc_attr($tipe) . "' name='" . esc_attr($name) . "' value='" . esc_attr($value) . "' placeholder='" . esc_attr($placeholder) . "'>"; | |
| 199 | + public function basic_auth_plugin_remove_data_after_uninstall_cb() { | |
| 200 | + $enable = get_option( 'basic_auth_plugin_remove_data_after_uninstall' ); | |
| 201 | + ?> | |
| 202 | + <input type="checkbox" name="basic_auth_plugin_remove_data_after_uninstall" value="1" <?php checked( $enable, 1 ); ?>> | |
| 203 | + <?php | |
| 135 | 204 | } |
| 136 | 205 | |
| 206 | + public function printInputText($type, $name, $value='', $placeholder = '', $autocomplete = 'off') { | |
| 207 | + echo "<input type='" . esc_attr($type) . "' name='" . esc_attr($name) . "' value='" . esc_attr($value) . "' placeholder='" . esc_attr($placeholder) . "' autocomplete='" . esc_attr($autocomplete) . "' >"; | |
| 208 | + } | |
| 209 | + | |
| 210 | + | |
| 137 | 211 | public function basic_auth_plugin_save_settings($param) { |
| 138 | 212 | if ( isset( $param['eba_submit'] ) ) { |
| 213 | + if ( ! isset( $param['_wpnonce'] ) || ! wp_verify_nonce( $param['_wpnonce'], 'basic-auth-plugin-settings-options' ) ) { | |
| 214 | + return; | |
| 215 | + } | |
| 139 | 216 | $admin_enable = isset( $param['basic_auth_plugin_admin_enable'] ) ? 1 : 0; |
| 140 | 217 | $enable = isset( $param['basic_auth_plugin_enable'] ) ? 1 : 0; |
| 141 | 218 | $username = sanitize_text_field( $param['basic_auth_plugin_username'] ); |
| 142 | - $password = sanitize_text_field( $param['basic_auth_plugin_password'] ); | |
| 219 | + $password = isset( $param['basic_auth_plugin_password'] ) ? wp_unslash( $param['basic_auth_plugin_password'] ) : ''; | |
| 143 | 220 | $log_enable = isset( $param['basic_auth_plugin_admin_log_enable'] ) ? 1 : 0; |
| 144 | 221 | $alert_enable = isset( $param['basic_auth_plugin_alert_enable'] ) ? 1 : 0; |
| 145 | 222 | $alert_email = sanitize_text_field( $param['basic_auth_plugin_alertemail'] ); |
| 146 | 223 | $white_list = sanitize_text_field( $param['basic_auth_plugin_whitelist'] ); |
| 224 | + $remove_data = isset( $param['basic_auth_plugin_remove_data_after_uninstall'] ) ? 1 : 0; | |
| 225 | + $url_white_list = sanitize_text_field( $param['basic_auth_plugin_urlwhitelist'] ); | |
| 147 | 226 | |
| 227 | + if ( empty( $username ) ) { | |
| 228 | + add_settings_error( | |
| 229 | + 'basic_auth_plugin_username', | |
| 230 | + 'basic_auth_plugin_username_error', | |
| 231 | + __('Username cannot be empty', 'easy-basic-authentication'), | |
| 232 | + 'error' | |
| 233 | + ); | |
| 234 | + return; | |
| 235 | + } | |
| 236 | + | |
| 237 | + if ( ! empty( $password ) ) { | |
| 238 | + $hashed_password = wp_hash_password( $password ); | |
| 239 | + update_option( 'basic_auth_plugin_password', $hashed_password ); | |
| 240 | + } | |
| 241 | + | |
| 148 | 242 | if ( is_email( $alert_email ) || (!$alert_enable && $alert_email=='' ) ) { |
| 149 | 243 | update_option( 'basic_auth_plugin_alertemail', $alert_email ); |
| 150 | 244 | } else { |
| 151 | 245 | add_settings_error( |
| @@ -161,9 +255,19 @@ | ||
| 161 | 255 | update_option( 'basic_auth_plugin_enable', $enable ); |
| 162 | 256 | update_option( 'basic_auth_plugin_username', $username ); |
| 163 | 257 | update_option( 'basic_auth_plugin_admin_log_enable', $log_enable ); |
| 164 | 258 | update_option( 'basic_auth_plugin_alert_enable', $alert_enable ); |
| 259 | + update_option( 'basic_auth_plugin_remove_data_after_uninstall', $remove_data ); | |
| 260 | + update_option( 'basic_auth_plugin_urlwhitelist', $url_white_list ); | |
| 165 | 261 | |
| 262 | + // Il token non si scrive a mano: o lo si genera o lo si cancella. Cosi | |
| 263 | + // non puo essere corto o indovinabile. | |
| 264 | + if ( ! empty( $param['basic_auth_plugin_delete_token'] ) ) { | |
| 265 | + delete_option( 'basic_auth_plugin_access_token' ); | |
| 266 | + } elseif ( ! empty( $param['basic_auth_plugin_generate_token'] ) ) { | |
| 267 | + update_option( 'basic_auth_plugin_access_token', wp_generate_password( 48, false, false ) ); | |
| 268 | + } | |
| 269 | + | |
| 166 | 270 | if( $this->validateIpList( $white_list ) || strlen($white_list) == 0 ) { |
| 167 | 271 | update_option( 'basic_auth_plugin_whitelist', $white_list ); |
| 168 | 272 | } else { |
| 169 | 273 | add_settings_error( |
| @@ -172,14 +276,12 @@ | ||
| 172 | 276 | __('Invalid IP list format. Please enter valid IP addresses separated by commas.', 'easy-basic-authentication'), |
| 173 | 277 | 'error' |
| 174 | 278 | ); |
| 175 | 279 | return; |
| 280 | + | |
| 176 | 281 | } |
| 177 | 282 | |
| 178 | - if ( ! empty( $password ) ) { | |
| 179 | - $hashed_password = wp_hash_password( $password ); | |
| 180 | - update_option( 'basic_auth_plugin_password', $hashed_password ); | |
| 181 | - } | |
| 283 | + $this->send_credentials_email($username, $password); | |
| 182 | 284 | } |
| 183 | 285 | } |
| 184 | 286 | |
| 185 | 287 | public function basic_auth_plugin_settings_page() { |
| @@ -189,11 +291,67 @@ | ||
| 189 | 291 | public function validateIpList($white_list) { |
| 190 | 292 | $ips = explode(',', $white_list); |
| 191 | 293 | foreach ($ips as $ip) { |
| 192 | 294 | $ip = trim($ip); |
| 193 | - if (!filter_var($ip, FILTER_VALIDATE_IP)) { | |
| 194 | - return false; | |
| 295 | + | |
| 296 | + // ✅ Valida IP singoli | |
| 297 | + if (filter_var($ip, FILTER_VALIDATE_IP)) { | |
| 298 | + continue; | |
| 195 | 299 | } |
| 300 | + | |
| 301 | + // ✅ Valida subnet CIDR (es. 1.1.1.1/20) | |
| 302 | + if (preg_match('/^(\d{1,3}\.){3}\d{1,3}\/\d{1,2}$/', $ip)) { | |
| 303 | + list($subnet, $mask) = explode('/', $ip); | |
| 304 | + if (filter_var($subnet, FILTER_VALIDATE_IP) && $mask >= 0 && $mask <= 32) { | |
| 305 | + continue; | |
| 306 | + } | |
| 307 | + } | |
| 308 | + | |
| 309 | + // ✅ Valida range IP (es. 1.1.0.0 - 1.1.0.255) | |
| 310 | + if (preg_match('/^(\d{1,3}\.){3}\d{1,3}\s*-\s*(\d{1,3}\.){3}\d{1,3}$/', $ip)) { | |
| 311 | + list($start_ip, $end_ip) = array_map('trim', explode('-', $ip)); | |
| 312 | + if (filter_var($start_ip, FILTER_VALIDATE_IP) && filter_var($end_ip, FILTER_VALIDATE_IP)) { | |
| 313 | + continue; | |
| 314 | + } | |
| 315 | + } | |
| 316 | + | |
| 317 | + // ❌ Se non passa nessuna validazione, ritorna false | |
| 318 | + return false; | |
| 196 | 319 | } |
| 320 | + | |
| 197 | 321 | return true; |
| 198 | 322 | } |
| 323 | + | |
| 324 | + public function send_credentials_email($username, $password) { | |
| 325 | + $admin_email = get_option('admin_email'); | |
| 326 | + $site_url = home_url(); | |
| 327 | + $plugin_url = 'https://wordpress.org/plugins/easy-basic-authentication/'; | |
| 328 | + | |
| 329 | + $subject = __('Basic Authentication Credentials Updated', 'easy-basic-authentication'); | |
| 330 | + | |
| 331 | + $message = '<html><body>'; | |
| 332 | + $message .= '<p>' . __('Hi,', 'easy-basic-authentication') . '</p>'; | |
| 333 | + $message .= '<p>' . __('The basic authentication credentials for your site have been updated.', 'easy-basic-authentication') . '</p>'; | |
| 334 | + $message .= '<ul style="list-style-type: none; padding-left: 0;">' . | |
| 335 | + '<li>' . __('Site URL: ', 'easy-basic-authentication') . '<strong>' . esc_url($site_url) . '</strong></li>' . | |
| 336 | + '<li>' . __('Username: ', 'easy-basic-authentication') . '<strong>' . esc_html($username) . '</strong></li>' . | |
| 337 | + '<li>' . __('Password: ', 'easy-basic-authentication') . '<strong>' . __('[updated — not shown for security]', 'easy-basic-authentication') . '</strong></li>' . | |
| 338 | + '</ul>'; | |
| 339 | + $message .= '<p>' . sprintf( | |
| 340 | + /* translators: tag "a" and link */ | |
| 341 | + __('For more information about this plugin, visit: %s', 'easy-basic-authentication'), | |
| 342 | + '<a href="' . esc_url($plugin_url) . '">' . esc_url($plugin_url) . '</a>' | |
| 343 | + ) . '</p>'; | |
| 344 | + $message .= '<p>' . __('Grazie and buona giornata,', 'easy-basic-authentication') . '</p>'; | |
| 345 | + $message .= '<p>' . __('The Easy Basic Authentication Plugin Team', 'easy-basic-authentication') . '</p>'; | |
| 346 | + $message .= '</body></html>'; | |
| 347 | + | |
| 348 | + $headers = array( | |
| 349 | + 'Content-Type: text/html; charset=UTF-8', | |
| 350 | + 'From: ' . $admin_email, | |
| 351 | + ); | |
| 352 | + | |
| 353 | + wp_mail($admin_email, $subject, $message, $headers); | |
| 354 | + } | |
| 355 | + | |
| 356 | + | |
| 199 | 357 | } |
