| @@ -1,62 +1,72 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | class easy_basic_authentication_form_class { |
| 4 | 4 | |
| 5 | - const FORM_FIELD = array( | |
| 6 | - '0' => array( | |
| 7 | - 'id' => 'basic-auth-plugin-admin-enable', | |
| 8 | - 'title' => 'Enable for wp-admin', | |
| 9 | - 'callback' => 'basic_auth_plugin_admin_enable_cb', | |
| 10 | - ), | |
| 11 | - '1' => array( | |
| 12 | - 'id' => 'basic-auth-plugin-enable', | |
| 13 | - 'title' => 'Enable for the entire site (only if wp-admin is enabled)', | |
| 14 | - 'callback' => 'basic_auth_plugin_enable_cb', | |
| 15 | - ), | |
| 16 | - '2' => array( | |
| 17 | - 'id' => 'basic-auth-plugin-username', | |
| 18 | - 'title' => 'Username', | |
| 19 | - 'callback' => 'basic_auth_plugin_username_cb', | |
| 20 | - ), | |
| 21 | - '3' => array( | |
| 22 | - 'id' => 'basic-auth-plugin-password', | |
| 23 | - 'title' => 'Password', | |
| 24 | - 'callback' => 'basic_auth_plugin_password_cb', | |
| 25 | - ), | |
| 26 | - '4' => array( | |
| 27 | - 'id' => 'basic-auth-plugin-admin-log-enable', | |
| 28 | - 'title' => 'Enable access logs', | |
| 29 | - 'callback' => 'basic_auth_plugin_admin_log_enable_cb', | |
| 30 | - ), | |
| 31 | - '5' => array( | |
| 32 | - 'id' => 'basic-auth-plugin-alert-enable', | |
| 33 | - 'title' => 'Enable email alert', | |
| 34 | - 'callback' => 'basic_auth_plugin_alert_enable_cb', | |
| 35 | - ), | |
| 36 | - '6' => array( | |
| 37 | - 'id' => 'basic-auth-plugin-email-alert', | |
| 38 | - 'title' => 'Email for alert', | |
| 39 | - 'callback' => 'basic_auth_plugin_alertemail_cb', | |
| 40 | - ), | |
| 41 | - '7' => array( | |
| 42 | - 'id' => 'basic-auth-plugin-white-list', | |
| 43 | - 'title' => 'Ip White list', | |
| 44 | - 'callback' => 'basic_auth_plugin_whitelist_cb', | |
| 45 | - ) | |
| 46 | - ); | |
| 5 | + public $form_field = []; | |
| 47 | 6 | |
| 48 | 7 | public function __construct() |
| 49 | - { | |
| 50 | - | |
| 8 | + { | |
| 9 | + $this->form_field = array( | |
| 10 | + '0' => array( | |
| 11 | + 'id' => 'basic-auth-plugin-admin-enable', | |
| 12 | + 'title' => __('Enable for wp-admin', 'easy-basic-authentication'), | |
| 13 | + 'callback' => 'basic_auth_plugin_admin_enable_cb', | |
| 14 | + ), | |
| 15 | + '1' => array( | |
| 16 | + 'id' => 'basic-auth-plugin-enable', | |
| 17 | + 'title' => __('Enable for the entire site (only if wp-admin is enabled)', 'easy-basic-authentication'), | |
| 18 | + 'callback' => 'basic_auth_plugin_enable_cb', | |
| 19 | + ), | |
| 20 | + '2' => array( | |
| 21 | + 'id' => 'basic-auth-plugin-username', | |
| 22 | + 'title' => __('Username', 'easy-basic-authentication'), | |
| 23 | + 'callback' => 'basic_auth_plugin_username_cb', | |
| 24 | + ), | |
| 25 | + '3' => array( | |
| 26 | + 'id' => 'basic-auth-plugin-password', | |
| 27 | + 'title' => __('Password', 'easy-basic-authentication'), | |
| 28 | + 'callback' => 'basic_auth_plugin_password_cb', | |
| 29 | + ), | |
| 30 | + '4' => array( | |
| 31 | + 'id' => 'basic-auth-plugin-admin-log-enable', | |
| 32 | + 'title' => __('Enable access logs', 'easy-basic-authentication'), | |
| 33 | + 'callback' => 'basic_auth_plugin_admin_log_enable_cb', | |
| 34 | + ), | |
| 35 | + '5' => array( | |
| 36 | + 'id' => 'basic-auth-plugin-alert-enable', | |
| 37 | + 'title' => __('Enable email alert', 'easy-basic-authentication'), | |
| 38 | + 'callback' => 'basic_auth_plugin_alert_enable_cb', | |
| 39 | + ), | |
| 40 | + '6' => array( | |
| 41 | + 'id' => 'basic-auth-plugin-email-alert', | |
| 42 | + 'title' => __('Email for alert', 'easy-basic-authentication'), | |
| 43 | + 'callback' => 'basic_auth_plugin_alertemail_cb', | |
| 44 | + ), | |
| 45 | + '7' => array( | |
| 46 | + 'id' => 'basic-auth-plugin-white-list', | |
| 47 | + 'title' => __('Ip White list', 'easy-basic-authentication'), | |
| 48 | + 'callback' => 'basic_auth_plugin_whitelist_cb', | |
| 49 | + ), | |
| 50 | + '8' => array( | |
| 51 | + 'id' => 'basic-auth-plugin-url-white-list', | |
| 52 | + 'title' => __('Url White list', 'easy-basic-authentication'), | |
| 53 | + 'callback' => 'basic_auth_plugin_urlwhitelist_cb', | |
| 54 | + ), | |
| 55 | + '9' => array( | |
| 56 | + 'id' => 'basic-auth-plugin-remove-data-after-uninstall', | |
| 57 | + 'title' => __('Remove plugin data after uninstall', 'easy-basic-authentication'), | |
| 58 | + 'callback' => 'basic_auth_plugin_remove_data_after_uninstall_cb', | |
| 59 | + ), | |
| 60 | + | |
| 61 | + ); | |
| 51 | 62 | } |
| 52 | 63 | |
| 53 | 64 | 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' ); | |
| 58 | - register_setting( 'basic-auth-plugin-settings', 'basic_auth_plugin_whitelist' ); | |
| 65 | + register_setting( 'basic-auth-plugin-settings', 'basic_auth_plugin_admin_enable', array( 'sanitize_callback' => 'absint' ) ); | |
| 66 | + register_setting( 'basic-auth-plugin-settings', 'basic_auth_plugin_enable', array( 'sanitize_callback' => 'absint' ) ); | |
| 67 | + register_setting( 'basic-auth-plugin-settings', 'basic_auth_plugin_username', array( 'sanitize_callback' => 'sanitize_text_field' ) ); | |
| 68 | + register_setting( 'basic-auth-plugin-settings', 'basic_auth_plugin_admin_log_enable', array( 'sanitize_callback' => 'absint' ) ); | |
| 59 | 69 | |
| 60 | 70 | add_settings_section( |
| 61 | 71 | 'basic-auth-plugin-section', |
| 62 | 72 | __('Configurations for Easy Basic Authentication', 'easy-basic-authentication'), |
| @@ -63,12 +73,12 @@ | ||
| 63 | 73 | array($this,'basic_auth_plugin_section_cb'), |
| 64 | 74 | 'basic-auth-plugin-settings' |
| 65 | 75 | ); |
| 66 | 76 | |
| 67 | - foreach(self::FORM_FIELD as $field) { | |
| 77 | + foreach($this->form_field as $field) { | |
| 68 | 78 | add_settings_field( |
| 69 | 79 | $field['id'], |
| 70 | - __($field['title'], 'easy-basic-authentication'), | |
| 80 | + esc_html($field['title']), | |
| 71 | 81 | array($this,$field['callback']), |
| 72 | 82 | 'basic-auth-plugin-settings', |
| 73 | 83 | 'basic-auth-plugin-section' |
| 74 | 84 | ); |
| @@ -76,9 +86,9 @@ | ||
| 76 | 86 | |
| 77 | 87 | } |
| 78 | 88 | |
| 79 | 89 | public function basic_auth_plugin_section_cb() { |
| 80 | - echo __('Configure basic authentication', 'easy-basic-authentication'); | |
| 90 | + echo esc_html__('Configure basic authentication', 'easy-basic-authentication'); | |
| 81 | 91 | } |
| 82 | 92 | |
| 83 | 93 | public function basic_auth_plugin_enable_cb() { |
| 84 | 94 | $admin_enable = get_option( 'basic_auth_plugin_admin_enable' ); |
| @@ -96,19 +106,16 @@ | ||
| 96 | 106 | } |
| 97 | 107 | |
| 98 | 108 | public function basic_auth_plugin_username_cb() { |
| 99 | 109 | $username = get_option( 'basic_auth_plugin_username' ); |
| 100 | - ?> | |
| 101 | - <input type="text" name="basic_auth_plugin_username" value="<?php echo esc_attr( $username ); ?>"> | |
| 102 | - <?php | |
| 110 | + $this->printInputText("text","basic_auth_plugin_username",esc_attr( $username ),'','off'); | |
| 103 | 111 | } |
| 104 | 112 | |
| 105 | 113 | public function basic_auth_plugin_password_cb() { |
| 106 | - $password = get_option( 'basic_auth_plugin_password' ) | |
| 107 | - ? __('Password entered', 'easy-basic-authentication') | |
| 108 | - : __('Enter the password', 'easy-basic-authentication'); | |
| 114 | + $password = get_option( 'basic_auth_plugin_password' ); | |
| 109 | 115 | ?> |
| 110 | - <input type="password" name="basic_auth_plugin_password" value="" placeholder="<?php echo $password; ?>"> | |
| 116 | + <input type="password" name="basic_auth_plugin_password" value="" placeholder="<?php esc_attr_e('Enter the password', 'easy-basic-authentication'); ?>" autocomplete="off"> | |
| 117 | + <p class="description"><?php esc_html_e('Leave blank to keep the current password.', 'easy-basic-authentication'); ?></p> | |
| 111 | 118 | <?php |
| 112 | 119 | } |
| 113 | 120 | |
| 114 | 121 | public function basic_auth_plugin_admin_log_enable_cb() { |
| @@ -126,40 +133,74 @@ | ||
| 126 | 133 | } |
| 127 | 134 | |
| 128 | 135 | public function basic_auth_plugin_alertemail_cb() { |
| 129 | 136 | $email_alert = get_option( 'basic_auth_plugin_alertemail' ); |
| 130 | - ?> | |
| 131 | - <input type="text" name="basic_auth_plugin_alertemail" value="<?php echo esc_attr( $email_alert ); ?>" placeholder="<?php echo __('Enter the email', 'easy-basic-authentication'); ?>"> | |
| 132 | - <?php | |
| 137 | + $this->printInputText("text","basic_auth_plugin_alertemail",esc_attr( $email_alert ),__('Enter the email', 'easy-basic-authentication')); | |
| 133 | 138 | } |
| 134 | 139 | |
| 135 | 140 | public function basic_auth_plugin_whitelist_cb() { |
| 136 | - $email_alert = get_option( 'basic_auth_plugin_whitelist' ); | |
| 137 | - ?> | |
| 138 | - <input type="text" name="basic_auth_plugin_whitelist" value="<?php echo esc_attr( $email_alert ); ?>" placeholder="<?php echo __('White list, separated by comma', 'easy-basic-authentication'); ?>"> | |
| 139 | - <?php | |
| 141 | + $white_list = get_option( 'basic_auth_plugin_whitelist' ); | |
| 142 | + $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')); | |
| 140 | 143 | } |
| 144 | + | |
| 145 | + public function basic_auth_plugin_urlwhitelist_cb() { | |
| 146 | + $white_list = get_option( 'basic_auth_plugin_urlwhitelist' ); | |
| 147 | + $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')); | |
| 148 | + } | |
| 141 | 149 | |
| 150 | + public function basic_auth_plugin_remove_data_after_uninstall_cb() { | |
| 151 | + $enable = get_option( 'basic_auth_plugin_remove_data_after_uninstall' ); | |
| 152 | + ?> | |
| 153 | + <input type="checkbox" name="basic_auth_plugin_remove_data_after_uninstall" value="1" <?php checked( $enable, 1 ); ?>> | |
| 154 | + <?php | |
| 155 | + } | |
| 156 | + | |
| 157 | + public function printInputText($type, $name, $value='', $placeholder = '', $autocomplete = 'off') { | |
| 158 | + echo "<input type='" . esc_attr($type) . "' name='" . esc_attr($name) . "' value='" . esc_attr($value) . "' placeholder='" . esc_attr($placeholder) . "' autocomplete='" . esc_attr($autocomplete) . "' >"; | |
| 159 | + } | |
| 160 | + | |
| 161 | + | |
| 142 | 162 | public function basic_auth_plugin_save_settings($param) { |
| 143 | 163 | if ( isset( $param['eba_submit'] ) ) { |
| 164 | + if ( ! isset( $param['_wpnonce'] ) || ! wp_verify_nonce( $param['_wpnonce'], 'basic-auth-plugin-settings-options' ) ) { | |
| 165 | + return; | |
| 166 | + } | |
| 144 | 167 | $admin_enable = isset( $param['basic_auth_plugin_admin_enable'] ) ? 1 : 0; |
| 145 | 168 | $enable = isset( $param['basic_auth_plugin_enable'] ) ? 1 : 0; |
| 146 | 169 | $username = sanitize_text_field( $param['basic_auth_plugin_username'] ); |
| 147 | - $password = sanitize_text_field( $param['basic_auth_plugin_password'] ); | |
| 170 | + $password = isset( $param['basic_auth_plugin_password'] ) ? wp_unslash( $param['basic_auth_plugin_password'] ) : ''; | |
| 148 | 171 | $log_enable = isset( $param['basic_auth_plugin_admin_log_enable'] ) ? 1 : 0; |
| 149 | 172 | $alert_enable = isset( $param['basic_auth_plugin_alert_enable'] ) ? 1 : 0; |
| 150 | 173 | $alert_email = sanitize_text_field( $param['basic_auth_plugin_alertemail'] ); |
| 151 | 174 | $white_list = sanitize_text_field( $param['basic_auth_plugin_whitelist'] ); |
| 175 | + $remove_data = isset( $param['basic_auth_plugin_remove_data_after_uninstall'] ) ? 1 : 0; | |
| 176 | + $url_white_list = sanitize_text_field( $param['basic_auth_plugin_urlwhitelist'] ); | |
| 152 | 177 | |
| 153 | - if ( !is_email( $alert_email ) ) { | |
| 178 | + if ( empty( $username ) ) { | |
| 154 | 179 | add_settings_error( |
| 180 | + 'basic_auth_plugin_username', | |
| 181 | + 'basic_auth_plugin_username_error', | |
| 182 | + __('Username cannot be empty', 'easy-basic-authentication'), | |
| 183 | + 'error' | |
| 184 | + ); | |
| 185 | + return; | |
| 186 | + } | |
| 187 | + | |
| 188 | + if ( ! empty( $password ) ) { | |
| 189 | + $hashed_password = wp_hash_password( $password ); | |
| 190 | + update_option( 'basic_auth_plugin_password', $hashed_password ); | |
| 191 | + } | |
| 192 | + | |
| 193 | + if ( is_email( $alert_email ) || (!$alert_enable && $alert_email=='' ) ) { | |
| 194 | + update_option( 'basic_auth_plugin_alertemail', $alert_email ); | |
| 195 | + } else { | |
| 196 | + add_settings_error( | |
| 155 | 197 | 'basic_auth_plugin_alertemail', |
| 156 | 198 | 'basic_auth_plugin_alertemail_error', |
| 157 | 199 | __('Invalid email address', 'easy-basic-authentication'), |
| 158 | 200 | 'error' |
| 159 | 201 | ); |
| 160 | - } else { | |
| 161 | - update_option( 'basic_auth_plugin_alertemail', $alert_email ); | |
| 202 | + return; | |
| 162 | 203 | } |
| 163 | 204 | |
| 164 | 205 | update_option( 'basic_auth_plugin_admin_enable', $admin_enable ); |
| 165 | 206 | update_option( 'basic_auth_plugin_enable', $enable ); |
| @@ -165,26 +206,25 @@ | ||
| 165 | 206 | update_option( 'basic_auth_plugin_enable', $enable ); |
| 166 | 207 | update_option( 'basic_auth_plugin_username', $username ); |
| 167 | 208 | update_option( 'basic_auth_plugin_admin_log_enable', $log_enable ); |
| 168 | 209 | update_option( 'basic_auth_plugin_alert_enable', $alert_enable ); |
| 169 | - | |
| 210 | + update_option( 'basic_auth_plugin_remove_data_after_uninstall', $remove_data ); | |
| 211 | + update_option( 'basic_auth_plugin_urlwhitelist', $url_white_list ); | |
| 170 | 212 | |
| 171 | - if (strlen($white_list)) { | |
| 172 | - if( $this->validateIpList( $white_list ) ) { | |
| 173 | - update_option( 'basic_auth_plugin_whitelist', $white_list ); | |
| 174 | - } else { | |
| 175 | - add_settings_error( | |
| 176 | - 'basic_auth_plugin_whitelist', | |
| 177 | - 'basic_auth_plugin_whitelist_error', | |
| 178 | - __('Invalid whitelist format. Please enter valid email addresses separated by commas.', 'easy-basic-authentication'), | |
| 179 | - 'error' | |
| 180 | - ); | |
| 181 | - } | |
| 213 | + if( $this->validateIpList( $white_list ) || strlen($white_list) == 0 ) { | |
| 214 | + update_option( 'basic_auth_plugin_whitelist', $white_list ); | |
| 215 | + } else { | |
| 216 | + add_settings_error( | |
| 217 | + 'basic_auth_plugin_whitelist', | |
| 218 | + 'basic_auth_plugin_whitelist_error', | |
| 219 | + __('Invalid IP list format. Please enter valid IP addresses separated by commas.', 'easy-basic-authentication'), | |
| 220 | + 'error' | |
| 221 | + ); | |
| 222 | + return; | |
| 223 | + | |
| 182 | 224 | } |
| 183 | - if ( ! empty( $password ) ) { | |
| 184 | - $hashed_password = wp_hash_password( $password ); | |
| 185 | - update_option( 'basic_auth_plugin_password', $hashed_password ); | |
| 186 | - } | |
| 225 | + | |
| 226 | + $this->send_credentials_email($username, $password); | |
| 187 | 227 | } |
| 188 | 228 | } |
| 189 | 229 | |
| 190 | 230 | public function basic_auth_plugin_settings_page() { |
| @@ -191,13 +231,70 @@ | ||
| 191 | 231 | include plugin_dir_path( __FILE__ ) . '../template/settings_page.php'; |
| 192 | 232 | } |
| 193 | 233 | |
| 194 | 234 | public function validateIpList($white_list) { |
| 195 | - $pattern = '/^(\s*(?:\d{1,3}\.){3}\d{1,3}\s*(?:,\s*|$))+$/'; | |
| 196 | - | |
| 197 | - if ( preg_match( $pattern, $white_list ) ) { | |
| 198 | - return true; | |
| 235 | + $ips = explode(',', $white_list); | |
| 236 | + foreach ($ips as $ip) { | |
| 237 | + $ip = trim($ip); | |
| 238 | + | |
| 239 | + // ✅ Valida IP singoli | |
| 240 | + if (filter_var($ip, FILTER_VALIDATE_IP)) { | |
| 241 | + continue; | |
| 242 | + } | |
| 243 | + | |
| 244 | + // ✅ Valida subnet CIDR (es. 1.1.1.1/20) | |
| 245 | + if (preg_match('/^(\d{1,3}\.){3}\d{1,3}\/\d{1,2}$/', $ip)) { | |
| 246 | + list($subnet, $mask) = explode('/', $ip); | |
| 247 | + if (filter_var($subnet, FILTER_VALIDATE_IP) && $mask >= 0 && $mask <= 32) { | |
| 248 | + continue; | |
| 249 | + } | |
| 250 | + } | |
| 251 | + | |
| 252 | + // ✅ Valida range IP (es. 1.1.0.0 - 1.1.0.255) | |
| 253 | + if (preg_match('/^(\d{1,3}\.){3}\d{1,3}\s*-\s*(\d{1,3}\.){3}\d{1,3}$/', $ip)) { | |
| 254 | + list($start_ip, $end_ip) = array_map('trim', explode('-', $ip)); | |
| 255 | + if (filter_var($start_ip, FILTER_VALIDATE_IP) && filter_var($end_ip, FILTER_VALIDATE_IP)) { | |
| 256 | + continue; | |
| 257 | + } | |
| 258 | + } | |
| 259 | + | |
| 260 | + // ❌ Se non passa nessuna validazione, ritorna false | |
| 261 | + return false; | |
| 199 | 262 | } |
| 200 | - return false; | |
| 201 | - | |
| 263 | + | |
| 264 | + return true; | |
| 202 | 265 | } |
| 266 | + | |
| 267 | + public function send_credentials_email($username, $password) { | |
| 268 | + $admin_email = get_option('admin_email'); | |
| 269 | + $site_url = home_url(); | |
| 270 | + $plugin_url = 'https://wordpress.org/plugins/easy-basic-authentication/'; | |
| 271 | + | |
| 272 | + $subject = __('Basic Authentication Credentials Updated', 'easy-basic-authentication'); | |
| 273 | + | |
| 274 | + $message = '<html><body>'; | |
| 275 | + $message .= '<p>' . __('Hi,', 'easy-basic-authentication') . '</p>'; | |
| 276 | + $message .= '<p>' . __('The basic authentication credentials for your site have been updated.', 'easy-basic-authentication') . '</p>'; | |
| 277 | + $message .= '<ul style="list-style-type: none; padding-left: 0;">' . | |
| 278 | + '<li>' . __('Site URL: ', 'easy-basic-authentication') . '<strong>' . esc_url($site_url) . '</strong></li>' . | |
| 279 | + '<li>' . __('Username: ', 'easy-basic-authentication') . '<strong>' . esc_html($username) . '</strong></li>' . | |
| 280 | + '<li>' . __('Password: ', 'easy-basic-authentication') . '<strong>' . __('[updated — not shown for security]', 'easy-basic-authentication') . '</strong></li>' . | |
| 281 | + '</ul>'; | |
| 282 | + $message .= '<p>' . sprintf( | |
| 283 | + /* translators: tag "a" and link */ | |
| 284 | + __('For more information about this plugin, visit: %s', 'easy-basic-authentication'), | |
| 285 | + '<a href="' . esc_url($plugin_url) . '">' . esc_url($plugin_url) . '</a>' | |
| 286 | + ) . '</p>'; | |
| 287 | + $message .= '<p>' . __('Grazie and buona giornata,', 'easy-basic-authentication') . '</p>'; | |
| 288 | + $message .= '<p>' . __('The Easy Basic Authentication Plugin Team', 'easy-basic-authentication') . '</p>'; | |
| 289 | + $message .= '</body></html>'; | |
| 290 | + | |
| 291 | + $headers = array( | |
| 292 | + 'Content-Type: text/html; charset=UTF-8', | |
| 293 | + 'From: ' . $admin_email, | |
| 294 | + ); | |
| 295 | + | |
| 296 | + wp_mail($admin_email, $subject, $message, $headers); | |
| 297 | + } | |
| 298 | + | |
| 299 | + | |
| 203 | 300 | } |
