Changeset 3107397
- Timestamp:
- 06/25/2024 10:51:06 AM (21 months ago)
- Location:
- spam-master
- Files:
-
- 99 added
- 7 deleted
- 13 edited
-
tags/7.4.3 (added)
-
tags/7.4.3/class-spammaster.php (added)
-
tags/7.4.3/css (added)
-
tags/7.4.3/css/index.php (added)
-
tags/7.4.3/css/spam-master-firewall.css (added)
-
tags/7.4.3/css/spam-master.css (added)
-
tags/7.4.3/images (added)
-
tags/7.4.3/images/index.php (added)
-
tags/7.4.3/images/spam-master-logs-detailed.png (added)
-
tags/7.4.3/images/spam-master-logs.png (added)
-
tags/7.4.3/images/spam-master-stars.png (added)
-
tags/7.4.3/images/spammaster-wp-plugin-internal-banner.jpg (added)
-
tags/7.4.3/images/spammaster.svg (added)
-
tags/7.4.3/includes (added)
-
tags/7.4.3/includes/admin (added)
-
tags/7.4.3/includes/admin/index.php (added)
-
tags/7.4.3/includes/admin/spam-master-admin-connection-sender.php (added)
-
tags/7.4.3/includes/admin/spam-master-admin-footer.php (added)
-
tags/7.4.3/includes/admin/spam-master-admin-integrations-table.php (added)
-
tags/7.4.3/includes/admin/spam-master-admin-key-sender.php (added)
-
tags/7.4.3/includes/admin/spam-master-admin-offer-table.php (added)
-
tags/7.4.3/includes/admin/spam-master-admin-online-table.php (added)
-
tags/7.4.3/includes/admin/spam-master-admin-status-table.php (added)
-
tags/7.4.3/includes/admin/spam-master-admin-test-table.php (added)
-
tags/7.4.3/includes/admin/spam-master-admin-tools-table.php (added)
-
tags/7.4.3/includes/admin/spam-master-admin.php (added)
-
tags/7.4.3/includes/admin/spam-master-tasks.php (added)
-
tags/7.4.3/includes/admin/upgrade (added)
-
tags/7.4.3/includes/admin/upgrade/index.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-6-6-0.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-6-6-1.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-6-6-19.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-6-6-2.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-6-6-3.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-6-6-5.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-6-6-6.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-6-7-0.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-6-7-2.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-6-7-6.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-6-8-5.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-6-8-6.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-6-8-7.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-6-9-8.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-6.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-7-1-1.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-7-1-2.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-7-2-7.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-7-2-8.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-7-2-9.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-7-3-1.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-7-3-2.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-7-3-6.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-7-3-7.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-7-4-0.php (added)
-
tags/7.4.3/includes/admin/upgrade/spam-master-admin-upgrade-to-7-4-1.php (added)
-
tags/7.4.3/includes/controllers (added)
-
tags/7.4.3/includes/controllers/class-spammasteractioncontroller.php (added)
-
tags/7.4.3/includes/controllers/class-spammasteradminmenutablecontroller.php (added)
-
tags/7.4.3/includes/controllers/class-spammasteradmintablebuffercontroller.php (added)
-
tags/7.4.3/includes/controllers/class-spammasteradmintableinactivecontroller.php (added)
-
tags/7.4.3/includes/controllers/class-spammasteradmintablelogscontroller.php (added)
-
tags/7.4.3/includes/controllers/class-spammasteradmintablewhitecontroller.php (added)
-
tags/7.4.3/includes/controllers/class-spammasterbuffercontroller.php (added)
-
tags/7.4.3/includes/controllers/class-spammastercollectcontroller.php (added)
-
tags/7.4.3/includes/controllers/class-spammasterelusivecontroller.php (added)
-
tags/7.4.3/includes/controllers/class-spammasteremailcontroller.php (added)
-
tags/7.4.3/includes/controllers/class-spammasterfloodcontroller.php (added)
-
tags/7.4.3/includes/controllers/class-spammasterhafcontroller.php (added)
-
tags/7.4.3/includes/controllers/class-spammasterhoneycontroller.php (added)
-
tags/7.4.3/includes/controllers/class-spammasterinvitationcontroller.php (added)
-
tags/7.4.3/includes/controllers/class-spammasterkeycontroller.php (added)
-
tags/7.4.3/includes/controllers/class-spammasterlogcontroller.php (added)
-
tags/7.4.3/includes/controllers/class-spammasterusercontroller.php (added)
-
tags/7.4.3/includes/controllers/class-spammasterwhitecontroller.php (added)
-
tags/7.4.3/includes/controllers/index.php (added)
-
tags/7.4.3/includes/controllers/spam-master-classes.php (added)
-
tags/7.4.3/includes/index.php (added)
-
tags/7.4.3/includes/protection (added)
-
tags/7.4.3/includes/protection/index.php (added)
-
tags/7.4.3/includes/protection/spam-master-action.php (added)
-
tags/7.4.3/includes/protection/spam-master-admin-other-protection-frontend-firewall.html (added)
-
tags/7.4.3/includes/protection/spam-master-amp-fun.php (added)
-
tags/7.4.3/includes/protection/spam-master-auto-update.php (added)
-
tags/7.4.3/includes/protection/spam-master-buddypress-honey.php (added)
-
tags/7.4.3/includes/protection/spam-master-buddypress-sig.php (added)
-
tags/7.4.3/includes/protection/spam-master-contact-form-7-honey.php (added)
-
tags/7.4.3/includes/protection/spam-master-contact-form-7-sig.php (added)
-
tags/7.4.3/includes/protection/spam-master-firewall.php (added)
-
tags/7.4.3/includes/protection/spam-master-honeypot.php (added)
-
tags/7.4.3/includes/protection/spam-master-shortcodes.php (added)
-
tags/7.4.3/includes/protection/spam-master-signatures.php (added)
-
tags/7.4.3/includes/protection/spam-master-widget-top-menu-firewall.php (added)
-
tags/7.4.3/includes/protection/spam-master-woocommerce-honey.php (added)
-
tags/7.4.3/includes/protection/spam-master-woocommerce-sig.php (added)
-
tags/7.4.3/includes/protection/spam-master-wpforms-honey.php (added)
-
tags/7.4.3/includes/protection/spam-master-wpforms-sig.php (added)
-
tags/7.4.3/index.php (added)
-
tags/7.4.3/readme.txt (added)
-
tags/7.4.3/uninstall.php (added)
-
trunk/class-spammaster.php (modified) (5 diffs)
-
trunk/includes/admin/spam-master-admin-connection-sender.php (modified) (2 diffs)
-
trunk/includes/admin/spam-master-admin-key-sender.php (modified) (2 diffs)
-
trunk/includes/admin/spam-master-admin-status-table.php (modified) (2 diffs)
-
trunk/includes/controllers/class-spammastercomconcontroller.php (deleted)
-
trunk/includes/controllers/class-spammasterhoneycontroller.php (modified) (4 diffs)
-
trunk/includes/controllers/class-spammasterkeycontroller.php (modified) (2 diffs)
-
trunk/includes/controllers/class-spammasterregistrationcontroller.php (deleted)
-
trunk/includes/controllers/class-spammasterusercontroller.php (modified) (3 diffs)
-
trunk/includes/controllers/spam-master-classes.php (modified) (2 diffs)
-
trunk/includes/protection/spam-master-buddypress-honey.php (modified) (2 diffs)
-
trunk/includes/protection/spam-master-comment.php (deleted)
-
trunk/includes/protection/spam-master-contact-form-7-honey.php (modified) (2 diffs)
-
trunk/includes/protection/spam-master-contact-form-7.php (deleted)
-
trunk/includes/protection/spam-master-honeypot.php (modified) (8 diffs)
-
trunk/includes/protection/spam-master-registration.php (deleted)
-
trunk/includes/protection/spam-master-woocommerce-honey.php (modified) (8 diffs)
-
trunk/includes/protection/spam-master-woocommerce-reg.php (deleted)
-
trunk/includes/protection/spam-master-woocommerce.php (deleted)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
spam-master/trunk/class-spammaster.php
r3098658 r3107397 3 3 * Plugin Name: Spam Master 4 4 * Plugin URI: https://www.spammaster.org 5 * Version: 7.4. 25 * Version: 7.4.3 6 6 * Author: TechGasp 7 7 * Author URI: https://www.techgasp.com … … 34 34 if ( ! class_exists( 'SpamMaster' ) ) : 35 35 36 define( 'SPAM_MASTER_VERSION', '7.4. 2' );36 define( 'SPAM_MASTER_VERSION', '7.4.3' ); 37 37 define( 'SPAM_MASTER_NAME', 'Spam Master' ); 38 38 define( 'SPAM_MASTER_DOMAIN', 'SpamMaster.org' ); … … 858 858 require_once WP_PLUGIN_DIR . '/spam-master/includes/protection/spam-master-honeypot.php'; 859 859 } 860 if ( '1' === $spam_master_firewall_rules || '2' === $spam_master_firewall_rules ) {861 // Hook learning reg.862 require_once WP_PLUGIN_DIR . '/spam-master/includes/protection/spam-master-registration.php';863 // Hook learning com.864 require_once WP_PLUGIN_DIR . '/spam-master/includes/protection/spam-master-comment.php';865 }866 860 // Hook learning action. 867 861 require_once WP_PLUGIN_DIR . '/spam-master/includes/protection/spam-master-action.php'; … … 889 883 if ( class_exists( 'WPCF7' ) ) { 890 884 if ( 'true' === $spam_master_integrations_contact_form_7 ) { 891 if ( '1' === $spam_master_firewall_rules || '2' === $spam_master_firewall_rules ) {892 require_once WP_PLUGIN_DIR . '/spam-master/includes/protection/spam-master-contact-form-7.php';893 }894 885 require_once WP_PLUGIN_DIR . '/spam-master/includes/protection/spam-master-contact-form-7-honey.php'; 895 886 } … … 959 950 ); 960 951 if ( 'true' === $spam_master_integrations_woocommerce ) { 961 if ( '1' === $spam_master_firewall_rules || '2' === $spam_master_firewall_rules ) {962 require_once WP_PLUGIN_DIR . '/spam-master/includes/protection/spam-master-woocommerce.php';963 }964 952 require_once WP_PLUGIN_DIR . '/spam-master/includes/protection/spam-master-woocommerce-honey.php'; 965 953 } -
spam-master/trunk/includes/admin/spam-master-admin-connection-sender.php
r3045786 r3107397 27 27 // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.InterpolatedNotPrepared 28 28 $spam_master_db_protection_hash = substr( $wpdb->get_var( "SELECT spamvalue FROM {$spam_master_keys} WHERE spamkey = 'Option' AND spamtype = 'spam_master_db_protection_hash'" ), 0, 64 ); 29 // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.InterpolatedNotPrepared 30 $spam_master_firewall_rules = $wpdb->get_var( "SELECT spamvalue FROM {$spam_master_keys} WHERE spamkey = 'Option' AND spamtype = 'spam_master_firewall_rules'" ); 29 31 30 32 if ( empty( $spam_master_connection ) && empty( $spam_license_key ) && 'INACTIVE' === $spam_master_status && 'EMPTY' === $spam_master_type ) { … … 182 184 } 183 185 $spam_count_pre_ar = array( 184 'buffer' => $spam_master_buffer_count, 185 'white' => $spam_master_white_count, 186 'logs' => $spam_master_logs_count, 187 'exempt' => $spam_master_exempt_count, 186 'buf' => $spam_master_buffer_count, 187 'whi' => $spam_master_white_count, 188 'log' => $spam_master_logs_count, 189 'exe' => $spam_master_exempt_count, 190 'fir' => $spam_master_firewall_rules, 188 191 ); 189 192 $spam_count_ar = wp_json_encode( $spam_count_pre_ar ); -
spam-master/trunk/includes/admin/spam-master-admin-key-sender.php
r3030882 r3107397 99 99 // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.InterpolatedNotPrepared 100 100 $spam_master_db_protection_hash = substr( $wpdb->get_var( "SELECT spamvalue FROM {$spam_master_keys} WHERE spamkey = 'Option' AND spamtype = 'spam_master_db_protection_hash'" ), 0, 64 ); 101 // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.InterpolatedNotPrepared 102 $spam_master_firewall_rules = $wpdb->get_var( "SELECT spamvalue FROM {$spam_master_keys} WHERE spamkey = 'Option' AND spamtype = 'spam_master_firewall_rules'" ); 101 103 // Get Counts. 102 104 // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.InterpolatedNotPrepared … … 121 123 } 122 124 $spam_count_pre_ar = array( 123 'buffer' => $spam_master_buffer_count, 124 'white' => $spam_master_white_count, 125 'logs' => $spam_master_logs_count, 126 'exempt' => $spam_master_exempt_count, 125 'buf' => $spam_master_buffer_count, 126 'whi' => $spam_master_white_count, 127 'log' => $spam_master_logs_count, 128 'exe' => $spam_master_exempt_count, 129 'fir' => $spam_master_firewall_rules, 127 130 ); 128 131 $spam_count_ar = wp_json_encode( $spam_count_pre_ar ); -
spam-master/trunk/includes/admin/spam-master-admin-status-table.php
r3045786 r3107397 109 109 // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.InterpolatedNotPrepared 110 110 $spam_master_db_protection_hash = substr( $wpdb->get_var( "SELECT spamvalue FROM {$spam_master_keys} WHERE spamkey = 'Option' AND spamtype = 'spam_master_db_protection_hash'" ), 0, 64 ); 111 // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.InterpolatedNotPrepared 112 $spam_master_firewall_rules = $wpdb->get_var( "SELECT spamvalue FROM {$spam_master_keys} WHERE spamkey = 'Option' AND spamtype = 'spam_master_firewall_rules'" ); 111 113 112 114 // Get Counts. … … 132 134 } 133 135 $spam_count_pre_ar = array( 134 'buffer' => $spam_master_buffer_count, 135 'white' => $spam_master_white_count, 136 'logs' => $spam_master_logs_count, 137 'exempt' => $spam_master_exempt_count, 136 'buf' => $spam_master_buffer_count, 137 'whi' => $spam_master_white_count, 138 'log' => $spam_master_logs_count, 139 'exe' => $spam_master_exempt_count, 140 'fir' => $spam_master_firewall_rules, 138 141 ); 139 142 $spam_count_ar = wp_json_encode( $spam_count_pre_ar ); -
spam-master/trunk/includes/controllers/class-spammasterhoneycontroller.php
r3059027 r3107397 84 84 85 85 /** 86 * Variable spam_master_content. 87 * 88 * @var spam_master_content $spam_master_content 89 **/ 90 protected $spam_master_content; 91 92 /** 86 93 * Spam master honey. 87 94 * … … 95 102 * @param spammaster_extra_field_2 $spammaster_extra_field_2 for scan. 96 103 * @param spam_master_page $spam_master_page for scan. 104 * @param spam_master_content $spam_master_content for scan. 97 105 * 98 106 * @return void 99 107 */ 100 public function spammasterhoney( $remote_ip, $blog_threat_email, $remote_referer, $dest_url, $remote_agent, $spamuser_a, $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page ) {108 public function spammasterhoney( $remote_ip, $blog_threat_email, $remote_referer, $dest_url, $remote_agent, $spamuser_a, $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page, $spam_master_content ) { 101 109 global $wpdb, $blog_id; 102 110 … … 116 124 $spam_master_ip = substr( $wpdb->get_var( "SELECT spamvalue FROM {$spam_master_keys} WHERE spamkey = 'Option' AND spamtype = 'spam_master_ip'" ), 0, 48 ); 117 125 126 $result_post_content_trim = substr( wp_unslash( $spam_master_content ), 0, 963 ); 127 $result_post_content_clean = wp_strip_all_tags( stripslashes_deep( $result_post_content_trim ), true ); 128 118 129 if ( 'VALID' === $spam_master_status || 'MALFUNCTION_1' === $spam_master_status || 'MALFUNCTION_2' === $spam_master_status ) { 119 130 … … 125 136 'blog_threat_type' => 'honeypot', 126 137 'blog_threat_email' => $blog_threat_email, 127 'blog_threat_content' => substr( 'Honeypot ' . $spam_master_page . ' Field 1: ' . $spammaster_extra_field_1 . ', Field 2: ' . $spammaster_extra_field_2 , 0, 963 ),138 'blog_threat_content' => substr( 'Honeypot ' . $spam_master_page . ' Field 1: ' . $spammaster_extra_field_1 . ', Field 2: ' . $spammaster_extra_field_2 . ', MSG: ' . $result_post_content_clean, 0, 963 ), 128 139 'blog_threat_agent' => $remote_agent, 129 140 'blog_threat_refe' => $remote_referer, -
spam-master/trunk/includes/controllers/class-spammasterkeycontroller.php
r3059027 r3107397 174 174 // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.InterpolatedNotPrepared 175 175 $spam_master_db_protection_hash = substr( $wpdb->get_var( "SELECT spamvalue FROM {$spam_master_keys} WHERE spamkey = 'Option' AND spamtype = 'spam_master_db_protection_hash'" ), 0, 64 ); 176 // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.InterpolatedNotPrepared 177 $spam_master_firewall_rules = $wpdb->get_var( "SELECT spamvalue FROM {$spam_master_keys} WHERE spamkey = 'Option' AND spamtype = 'spam_master_firewall_rules'" ); 176 178 // Get Counts. 177 179 // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.InterpolatedNotPrepared … … 196 198 } 197 199 $spam_count_pre_ar = array( 198 'buffer' => $spam_master_buffer_count, 199 'white' => $spam_master_white_count, 200 'logs' => $spam_master_logs_count, 201 'exempt' => $spam_master_exempt_count, 200 'buf' => $spam_master_buffer_count, 201 'whi' => $spam_master_white_count, 202 'log' => $spam_master_logs_count, 203 'exe' => $spam_master_exempt_count, 204 'fir' => $spam_master_firewall_rules, 202 205 ); 203 206 $spam_count_ar = wp_json_encode( $spam_count_pre_ar ); -
spam-master/trunk/includes/controllers/class-spammasterusercontroller.php
r2771127 r3107397 42 42 include ABSPATH . 'wp-includes/pluggable.php'; 43 43 } 44 45 // phpcs:ignore WordPress.Security.NonceVerification.Missing 46 $spampost = $_POST; 47 // Start scan of post. 48 if ( ! empty( $spampost ) && is_array( $spampost ) ) { 49 $spampoststr = str_replace( '=', ' ', urldecode( http_build_query( $spampost, '', ' ' ) ) ); 50 } else { 51 $spampoststr = 'contentless'; 52 } 53 44 54 // Current User. 45 55 $current_user_id = get_current_user_id(); … … 69 79 ); 70 80 } else { 71 // Prepare Email. 72 if ( ! empty( $spampreemail ) ) { 73 if ( filter_var( $spampreemail, FILTER_VALIDATE_EMAIL ) ) { 74 $blog_threat_email = wp_strip_all_tags( substr( $spampreemail, 0, 256 ) ); 75 } else { 76 $blog_threat_email = $spaminitial . '@' . wp_rand( 10000000, 99999999 ) . '.wp'; 81 $blog_threat_email = $spaminitial . '@' . wp_rand( 10000000, 99999999 ) . '.wp'; 82 // Collect email to scan. 83 preg_match( '/[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})/i', $spampoststr, $matches ); 84 if ( $matches ) { 85 foreach ( $matches as $key => $val ) { 86 if ( filter_var( $val, FILTER_VALIDATE_EMAIL ) ) { 87 $blog_threat_email = wp_strip_all_tags( substr( $val, 0, 256 ) ); 88 } 77 89 } 78 90 } else { … … 81 93 $spamuser = array( 'ID' => 'none' ); 82 94 } 83 $spamuser_a = wp_json_encode( $spamuser );84 95 96 $spamuser_a = wp_json_encode( $spamuser ); 97 $spampoststr_a = wp_json_encode( $spampost ); 85 98 return array( 86 'spamuserA' => $spamuser_a, 87 'blog_threat_email' => $blog_threat_email, 99 'spamuserA' => $spamuser_a, 100 'blog_threat_email' => $blog_threat_email, 101 'blog_threat_content' => $spampoststr_a, 88 102 ); 89 103 } -
spam-master/trunk/includes/controllers/spam-master-classes.php
r3098658 r3107397 11 11 if ( ! class_exists( 'SpamMasterBufferController' ) ) { 12 12 require_once WP_PLUGIN_DIR . '/spam-master/includes/controllers/class-spammasterbuffercontroller.php'; 13 }14 if ( ! class_exists( 'SpamMasterComConController' ) ) {15 require_once WP_PLUGIN_DIR . '/spam-master/includes/controllers/class-spammastercomconcontroller.php';16 13 } 17 14 if ( ! class_exists( 'SpamMasterElusiveController' ) ) { … … 32 29 if ( ! class_exists( 'SpamMasterLogController' ) ) { 33 30 require_once WP_PLUGIN_DIR . '/spam-master/includes/controllers/class-spammasterlogcontroller.php'; 34 }35 if ( ! class_exists( 'SpamMasterRegistrationController' ) ) {36 require_once WP_PLUGIN_DIR . '/spam-master/includes/controllers/class-spammasterregistrationcontroller.php';37 31 } 38 32 if ( ! class_exists( 'SpamMasterWhiteController' ) ) { -
spam-master/trunk/includes/protection/spam-master-buddypress-honey.php
r3059027 r3107397 87 87 88 88 // Spam User Controller. 89 //90 89 $spam_master_user_controller = new SpamMasterUserController(); 91 90 $spaminitial = 'honey_bot'; 92 // phpcs:ignore WordPress.Security.NonceVerification.Missing 93 if ( ! empty( $_POST['signup_email'] ) ) { 94 // phpcs:ignore WordPress.Security.NonceVerification.Missing, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized 95 if ( filter_var( wp_unslash( $_POST['signup_email'] ), FILTER_VALIDATE_EMAIL ) ) { 96 // phpcs:ignore WordPress.Security.NonceVerification.Missing, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized 97 $spampreemail = wp_strip_all_tags( substr( wp_unslash( $_POST['signup_email'] ), 0, 256 ) ); 98 } else { 99 $spampreemail = false; 100 } 101 } else { 102 $spampreemail = false; 103 } 104 $is_user = $spam_master_user_controller->spammastergetuser( $spaminitial, $spampreemail ); 91 $spampreemail = false; 92 $is_user = $spam_master_user_controller->spammastergetuser( $spaminitial, $spampreemail ); 105 93 106 94 // Spam Buffer Controller. … … 130 118 // Spam Honey Controller. 131 119 $spam_master_honey_controller = new SpamMasterHoneyController(); 132 $is_honey = $spam_master_honey_controller->spammasterhoney( $is_collected['remote_ip'], $is_user['blog_threat_email'], $is_collected['remote_referer'], $is_collected['dest_url'], $is_collected['remote_agent'], $is_user['spamuserA'], $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page );120 $is_honey = $spam_master_honey_controller->spammasterhoney( $is_collected['remote_ip'], $is_user['blog_threat_email'], $is_collected['remote_referer'], $is_collected['dest_url'], $is_collected['remote_agent'], $is_user['spamuserA'], $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page, $is_user['blog_threat_content'] ); 133 121 if ( $is_honey ) { 134 122 $bp->signup->errors['signup_email'] = __( 'SPAM MASTER', 'spam-master' ) . $spam_master_message; -
spam-master/trunk/includes/protection/spam-master-contact-form-7-honey.php
r3068881 r3107397 91 91 $spam_master_user_controller = new SpamMasterUserController(); 92 92 $spaminitial = 'honey_bot'; 93 94 // phpcs:ignore WordPress.Security.NonceVerification.Missing 95 if ( isset( $_POST['your-email'] ) ) { 96 // phpcs:ignore WordPress.Security.NonceVerification.Missing 97 if ( filter_var( wp_unslash( $_POST['your-email'] ), FILTER_VALIDATE_EMAIL ) ) { 98 // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing 99 $spampreemail = wp_strip_all_tags( substr( wp_unslash( $_POST['your-email'] ), 0, 256 ) ); 100 } else { 101 $spampreemail = false; 102 } 103 } elseif ( isset( $_POST['email'] ) ) {// phpcs:ignore WordPress.Security.NonceVerification.Missing 104 // phpcs:ignore WordPress.Security.NonceVerification.Missing 105 if ( filter_var( wp_unslash( $_POST['email'] ), FILTER_VALIDATE_EMAIL ) ) { 106 // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing 107 $spampreemail = wp_strip_all_tags( substr( wp_unslash( $_POST['email'] ), 0, 256 ) ); 108 } else { 109 $spampreemail = false; 110 } 111 } elseif ( isset( $_POST['mail'] ) ) {// phpcs:ignore WordPress.Security.NonceVerification.Missing 112 // phpcs:ignore WordPress.Security.NonceVerification.Missing 113 if ( filter_var( wp_unslash( $_POST['mail'] ), FILTER_VALIDATE_EMAIL ) ) { 114 // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing 115 $spampreemail = wp_strip_all_tags( substr( wp_unslash( $_POST['mail'] ), 0, 256 ) ); 116 } else { 117 $spampreemail = false; 118 } 119 } elseif ( isset( $_POST['input_email'] ) ) {// phpcs:ignore WordPress.Security.NonceVerification.Missing 120 // phpcs:ignore WordPress.Security.NonceVerification.Missing 121 if ( filter_var( wp_unslash( $_POST['input_email'] ), FILTER_VALIDATE_EMAIL ) ) { 122 // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing 123 $spampreemail = wp_strip_all_tags( substr( wp_unslash( $_POST['input_email'] ), 0, 256 ) ); 124 } else { 125 $spampreemail = false; 126 } 127 } elseif ( isset( $_POST['contact_email'] ) ) {// phpcs:ignore WordPress.Security.NonceVerification.Missing 128 // phpcs:ignore WordPress.Security.NonceVerification.Missing 129 if ( filter_var( wp_unslash( $_POST['contact_email'] ), FILTER_VALIDATE_EMAIL ) ) { 130 // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing 131 $spampreemail = wp_strip_all_tags( substr( wp_unslash( $_POST['contact_email'] ), 0, 256 ) ); 132 } else { 133 $spampreemail = false; 134 } 135 } elseif ( isset( $_POST['contact-email'] ) ) {// phpcs:ignore WordPress.Security.NonceVerification.Missing 136 // phpcs:ignore WordPress.Security.NonceVerification.Missing 137 if ( filter_var( wp_unslash( $_POST['contact-email'] ), FILTER_VALIDATE_EMAIL ) ) { 138 // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing 139 $spampreemail = wp_strip_all_tags( substr( wp_unslash( $_POST['contact-email'] ), 0, 256 ) ); 140 } else { 141 $spampreemail = false; 142 } 143 } elseif ( isset( $_POST['email-395'] ) ) {// phpcs:ignore WordPress.Security.NonceVerification.Missing 144 // phpcs:ignore WordPress.Security.NonceVerification.Missing 145 if ( filter_var( wp_unslash( $_POST['email-395'] ), FILTER_VALIDATE_EMAIL ) ) { 146 // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing, WordPress.Security.ValidatedSanitizedInput.InputNotValidated 147 $spampreemail = wp_strip_all_tags( substr( wp_unslash( $_POST['email-395'] ), 0, 256 ) ); 148 } else { 149 $spampreemail = false; 150 } 151 } elseif ( isset( $_POST['email-469'] ) ) {// phpcs:ignore WordPress.Security.NonceVerification.Missing 152 // phpcs:ignore WordPress.Security.NonceVerification.Missing 153 if ( filter_var( wp_unslash( $_POST['email-469'] ), FILTER_VALIDATE_EMAIL ) ) { 154 // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing, WordPress.Security.ValidatedSanitizedInput.InputNotValidated 155 $spampreemail = wp_strip_all_tags( substr( wp_unslash( $_POST['email-469'] ), 0, 256 ) ); 156 } else { 157 $spampreemail = false; 158 } 159 } elseif ( isset( $_POST['email-address'] ) ) {// phpcs:ignore WordPress.Security.NonceVerification.Missing 160 // phpcs:ignore WordPress.Security.NonceVerification.Missing 161 if ( filter_var( wp_unslash( $_POST['email-address'] ), FILTER_VALIDATE_EMAIL ) ) { 162 // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing, WordPress.Security.ValidatedSanitizedInput.InputNotValidated 163 $spampreemail = wp_strip_all_tags( substr( wp_unslash( $_POST['email-address'] ), 0, 256 ) ); 164 } else { 165 $spampreemail = false; 166 } 167 } else { 168 $spampreemail = false; 169 } 170 $is_user = $spam_master_user_controller->spammastergetuser( $spaminitial, $spampreemail ); 171 if ( isset( $_POST['your-message'] ) ) {// phpcs:ignore WordPress.Security.NonceVerification.Missing 172 // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing 173 $result_comment_content_trim = substr( wp_unslash( $_POST['your-message'] ), 0, 963 ); 174 $result_comment_content_clean = wp_strip_all_tags( stripslashes_deep( $result_comment_content_trim ), true ); 175 } elseif ( isset( $_POST['message'] ) ) {// phpcs:ignore WordPress.Security.NonceVerification.Missing 176 // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing 177 $result_comment_content_trim = substr( wp_unslash( $_POST['message'] ), 0, 963 ); 178 $result_comment_content_clean = wp_strip_all_tags( stripslashes_deep( $result_comment_content_trim ), true ); 179 } elseif ( isset( $_POST['notes'] ) ) {// phpcs:ignore WordPress.Security.NonceVerification.Missing 180 // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing 181 $result_comment_content_trim = substr( wp_unslash( $_POST['notes'] ), 0, 963 ); 182 $result_comment_content_clean = wp_strip_all_tags( stripslashes_deep( $result_comment_content_trim ), true ); 183 } elseif ( isset( $_POST['mensaje'] ) ) {// phpcs:ignore WordPress.Security.NonceVerification.Missing 184 // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing 185 $result_comment_content_trim = substr( wp_unslash( $_POST['mensaje'] ), 0, 963 ); 186 $result_comment_content_clean = wp_strip_all_tags( stripslashes_deep( $result_comment_content_trim ), true ); 187 } elseif ( isset( $_POST['textarea-387'] ) ) {// phpcs:ignore WordPress.Security.NonceVerification.Missing 188 // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing 189 $result_comment_content_trim = substr( wp_unslash( $_POST['textarea-387'] ), 0, 963 ); 190 $result_comment_content_clean = wp_strip_all_tags( stripslashes_deep( $result_comment_content_trim ), true ); 191 } elseif ( isset( $_POST['overview'] ) ) {// phpcs:ignore WordPress.Security.NonceVerification.Missing 192 // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing 193 $result_comment_content_trim = substr( wp_unslash( $_POST['overview'] ), 0, 963 ); 194 $result_comment_content_clean = wp_strip_all_tags( stripslashes_deep( $result_comment_content_trim ), true ); 195 } elseif ( isset( $_POST['contact-message'] ) ) {// phpcs:ignore WordPress.Security.NonceVerification.Missing 196 // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing 197 $result_comment_content_trim = substr( wp_unslash( $_POST['contact-message'] ), 0, 963 ); 198 $result_comment_content_clean = wp_strip_all_tags( stripslashes_deep( $result_comment_content_trim ), true ); 199 } elseif ( isset( $_POST['Comment-Message'] ) ) {// phpcs:ignore WordPress.Security.NonceVerification.Missing 200 // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing 201 $result_comment_content_trim = substr( wp_unslash( $_POST['Comment-Message'] ), 0, 963 ); 202 $result_comment_content_clean = wp_strip_all_tags( stripslashes_deep( $result_comment_content_trim ), true ); 203 } else { 204 // phpcs:ignore WordPress.Security.NonceVerification.Missing 205 $result_comment_content_json = wp_json_encode( $_POST ); 206 $result_comment_content_trim = substr( wp_unslash( $result_comment_content_json ), 0, 963 ); 207 $result_comment_content_clean = wp_strip_all_tags( stripslashes_deep( $result_comment_content_trim ), true ); 208 } 93 $spampreemail = false; 94 $is_user = $spam_master_user_controller->spammastergetuser( $spaminitial, $spampreemail ); 209 95 210 96 // Spam Buffer Controller. … … 235 121 // Spam Honey Controller. 236 122 $spam_master_honey_controller = new SpamMasterHoneyController(); 237 $is_honey = $spam_master_honey_controller->spammasterhoney( $is_collected['remote_ip'], $is_user['blog_threat_email'], $is_collected['remote_referer'], $is_collected['dest_url'], $is_collected['remote_agent'], $is_user['spamuserA'], $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page );123 $is_honey = $spam_master_honey_controller->spammasterhoney( $is_collected['remote_ip'], $is_user['blog_threat_email'], $is_collected['remote_referer'], $is_collected['dest_url'], $is_collected['remote_agent'], $is_user['spamuserA'], $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page, $is_user['blog_threat_content'] ); 238 124 if ( $is_honey ) { 239 125 // phpcs:ignore Squiz.PHP.DisallowMultipleAssignments.Found -
spam-master/trunk/includes/protection/spam-master-honeypot.php
r3059638 r3107397 102 102 $spam_master_user_controller = new SpamMasterUserController(); 103 103 $spaminitial = 'honey_bot'; 104 if ( ! empty( $result['user_email'] ) && ! is_array( $result['user_email'] ) ) { 105 if ( filter_var( $result['user_email'], FILTER_VALIDATE_EMAIL ) ) { 106 $spampreemail = wp_strip_all_tags( substr( $result['user_email'], 0, 256 ) ); 107 } else { 108 $spampreemail = false; 109 } 110 } else { 111 $spampreemail = false; 112 } 113 $is_user = $spam_master_user_controller->spammastergetuser( $spaminitial, $spampreemail ); 104 $spampreemail = false; 105 $is_user = $spam_master_user_controller->spammastergetuser( $spaminitial, $spampreemail ); 114 106 115 107 // Spam Buffer Controller. … … 141 133 // Spam Honey Controller. 142 134 $spam_master_honey_controller = new SpamMasterHoneyController(); 143 $is_honey = $spam_master_honey_controller->spammasterhoney( $is_collected['remote_ip'], $is_user['blog_threat_email'], $is_collected['remote_referer'], $is_collected['dest_url'], $is_collected['remote_agent'], $is_user['spamuserA'], $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page );135 $is_honey = $spam_master_honey_controller->spammasterhoney( $is_collected['remote_ip'], $is_user['blog_threat_email'], $is_collected['remote_referer'], $is_collected['dest_url'], $is_collected['remote_agent'], $is_user['spamuserA'], $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page, $is_user['blog_threat_content'] ); 144 136 if ( $is_honey ) { 145 137 // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped … … 190 182 $spam_master_user_controller = new SpamMasterUserController(); 191 183 $spaminitial = 'honey_bot'; 192 if ( ! empty( $user_email ) ) { 193 if ( filter_var( $user_email, FILTER_VALIDATE_EMAIL ) ) { 194 $spampreemail = wp_strip_all_tags( substr( $user_email, 0, 256 ) ); 195 } else { 196 $spampreemail = false; 197 } 198 } else { 199 $spampreemail = false; 200 } 201 $is_user = $spam_master_user_controller->spammastergetuser( $spaminitial, $spampreemail ); 184 $spampreemail = false; 185 $is_user = $spam_master_user_controller->spammastergetuser( $spaminitial, $spampreemail ); 202 186 203 187 // Spam Buffer Controller. … … 228 212 // Spam Honey Controller. 229 213 $spam_master_honey_controller = new SpamMasterHoneyController(); 230 $is_honey = $spam_master_honey_controller->spammasterhoney( $is_collected['remote_ip'], $is_user['blog_threat_email'], $is_collected['remote_referer'], $is_collected['dest_url'], $is_collected['remote_agent'], $is_user['spamuserA'], $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page );214 $is_honey = $spam_master_honey_controller->spammasterhoney( $is_collected['remote_ip'], $is_user['blog_threat_email'], $is_collected['remote_referer'], $is_collected['dest_url'], $is_collected['remote_agent'], $is_user['spamuserA'], $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page, $is_user['blog_threat_content'] ); 231 215 if ( $is_honey ) { 232 216 $errors->add( 'invalid_email', esc_attr( __( 'SPAM MASTER: ', 'spam_master' ) . $spam_master_message ) ); … … 275 259 $spam_master_user_controller = new SpamMasterUserController(); 276 260 $spaminitial = 'honey_bot'; 277 if ( ! empty( $user_email ) ) { 278 if ( filter_var( $user_email, FILTER_VALIDATE_EMAIL ) ) { 279 $spampreemail = wp_strip_all_tags( substr( $user_email, 0, 256 ) ); 280 } else { 281 $spampreemail = false; 282 } 283 } else { 284 // phpcs:ignore WordPress.Security.NonceVerification.Recommended 285 if ( ! empty( $_REQUEST['log'] ) ) { 286 // phpcs:ignore WordPress.Security.NonceVerification.Recommended, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized 287 if ( filter_var( wp_unslash( $_REQUEST['log'] ), FILTER_VALIDATE_EMAIL ) ) { 288 // phpcs:ignore WordPress.Security.NonceVerification.Recommended, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized 289 $spampreemail = wp_strip_all_tags( substr( wp_unslash( $_REQUEST['log'] ), 0, 256 ) ); 290 } else { 291 $spampreemail = false; 292 } 293 } else { 294 $spampreemail = false; 295 } 296 } 297 $is_user = $spam_master_user_controller->spammastergetuser( $spaminitial, $spampreemail ); 261 $spampreemail = false; 262 $is_user = $spam_master_user_controller->spammastergetuser( $spaminitial, $spampreemail ); 298 263 299 264 // Spam Buffer Controller. … … 323 288 // Spam Honey Controller. 324 289 $spam_master_honey_controller = new SpamMasterHoneyController(); 325 $is_honey = $spam_master_honey_controller->spammasterhoney( $is_collected['remote_ip'], $is_user['blog_threat_email'], $is_collected['remote_referer'], $is_collected['dest_url'], $is_collected['remote_agent'], $is_user['spamuserA'], $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page );290 $is_honey = $spam_master_honey_controller->spammasterhoney( $is_collected['remote_ip'], $is_user['blog_threat_email'], $is_collected['remote_referer'], $is_collected['dest_url'], $is_collected['remote_agent'], $is_user['spamuserA'], $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page, $is_user['blog_threat_content'] ); 326 291 if ( $is_honey ) { 327 292 $error = '<strong>SPAM MASTER</strong>: ' . $spam_master_message; … … 366 331 $spam_master_user_controller = new SpamMasterUserController(); 367 332 $spaminitial = 'honey_bot'; 368 if ( ! empty( $commentdata['comment_author_email'] ) ) { 369 if ( filter_var( $commentdata['comment_author_email'], FILTER_VALIDATE_EMAIL ) ) { 370 $spampreemail = wp_strip_all_tags( substr( $commentdata['comment_author_email'], 0, 256 ) ); 371 } else { 372 $spampreemail = false; 373 } 374 } else { 375 $spampreemail = false; 376 } 377 $is_user = $spam_master_user_controller->spammastergetuser( $spaminitial, $spampreemail ); 333 $spampreemail = false; 334 $is_user = $spam_master_user_controller->spammastergetuser( $spaminitial, $spampreemail ); 378 335 379 336 // Prepare Comment. … … 411 368 // Spam Honey Controller. 412 369 $spam_master_honey_controller = new SpamMasterHoneyController(); 413 $is_honey = $spam_master_honey_controller->spammasterhoney( $is_collected['remote_ip'], $is_user['blog_threat_email'], $is_collected['remote_referer'], $is_collected['dest_url'], $is_collected['remote_agent'], $is_user['spamuserA'], $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page );370 $is_honey = $spam_master_honey_controller->spammasterhoney( $is_collected['remote_ip'], $is_user['blog_threat_email'], $is_collected['remote_referer'], $is_collected['dest_url'], $is_collected['remote_agent'], $is_user['spamuserA'], $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page, $is_user['blog_threat_content'] ); 414 371 if ( $is_honey ) { 415 372 return wp_die( esc_attr( __( 'SPAM MASTER: ', 'spam_master' ) . $spam_master_message ) ); -
spam-master/trunk/includes/protection/spam-master-woocommerce-honey.php
r3059638 r3107397 104 104 $spam_master_user_controller = new SpamMasterUserController(); 105 105 $spaminitial = 'honey_bot'; 106 if ( ! empty( $creds_user_login ) ) { 107 if ( filter_var( $creds_user_login, FILTER_VALIDATE_EMAIL ) ) { 108 $spampreemail = wp_strip_all_tags( substr( $creds_user_login, 0, 256 ) ); 109 } else { 110 $spampreemail = false; 111 } 112 } else { 113 $spampreemail = false; 114 } 115 $is_user = $spam_master_user_controller->spammastergetuser( $spaminitial, $spampreemail ); 106 $spampreemail = false; 107 $is_user = $spam_master_user_controller->spammastergetuser( $spaminitial, $spampreemail ); 116 108 117 109 // Spam Buffer Controller. … … 142 134 // Spam Honey Controller. 143 135 $spam_master_honey_controller = new SpamMasterHoneyController(); 144 $is_honey = $spam_master_honey_controller->spammasterhoney( $is_collected['remote_ip'], $is_user['blog_threat_email'], $is_collected['remote_referer'], $is_collected['dest_url'], $is_collected['remote_agent'], $is_user['spamuserA'], $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page );136 $is_honey = $spam_master_honey_controller->spammasterhoney( $is_collected['remote_ip'], $is_user['blog_threat_email'], $is_collected['remote_referer'], $is_collected['dest_url'], $is_collected['remote_agent'], $is_user['spamuserA'], $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page, $is_user['blog_threat_content'] ); 145 137 if ( $is_honey ) { 146 138 $validation_error->add( 'invalid_email', esc_attr( __( 'SPAM MASTER: ', 'spam_master' ) . $spam_master_message ) ); … … 189 181 $spam_master_user_controller = new SpamMasterUserController(); 190 182 $spaminitial = 'honey_bot'; 191 if ( ! empty( $email ) ) { 192 if ( filter_var( $email, FILTER_VALIDATE_EMAIL ) ) { 193 $spampreemail = wp_strip_all_tags( substr( $email, 0, 256 ) ); 194 } else { 195 $spampreemail = false; 196 } 197 } else { 198 $spampreemail = false; 199 } 200 $is_user = $spam_master_user_controller->spammastergetuser( $spaminitial, $spampreemail ); 183 $spampreemail = false; 184 $is_user = $spam_master_user_controller->spammastergetuser( $spaminitial, $spampreemail ); 201 185 202 186 // Spam Buffer Controller. … … 227 211 // Spam Honey Controller. 228 212 $spam_master_honey_controller = new SpamMasterHoneyController(); 229 $is_honey = $spam_master_honey_controller->spammasterhoney( $is_collected['remote_ip'], $is_user['blog_threat_email'], $is_collected['remote_referer'], $is_collected['dest_url'], $is_collected['remote_agent'], $is_user['spamuserA'], $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page );213 $is_honey = $spam_master_honey_controller->spammasterhoney( $is_collected['remote_ip'], $is_user['blog_threat_email'], $is_collected['remote_referer'], $is_collected['dest_url'], $is_collected['remote_agent'], $is_user['spamuserA'], $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page, $is_user['blog_threat_content'] ); 230 214 if ( $is_honey ) { 231 215 $validation_errors->add( 'invalid_email', esc_attr( __( 'SPAM MASTER: ', 'spam_master' ) . $spam_master_message ) ); … … 268 252 $spam_master_user_controller = new SpamMasterUserController(); 269 253 $spaminitial = 'honey_bot'; 270 // phpcs:ignore WordPress.Security.NonceVerification.Missing, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized 271 if ( ! empty( $_POST['billing_email'] ) ) { 272 // phpcs:ignore WordPress.Security.NonceVerification 273 if ( filter_var( wp_unslash( $_POST['billing_email'] ), FILTER_VALIDATE_EMAIL ) ) { 274 // phpcs:ignore WordPress.Security.NonceVerification.Missing, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized 275 $spampreemail = wp_strip_all_tags( substr( wp_unslash( $_POST['billing_email'] ), 0, 256 ) ); 276 } else { 277 $spampreemail = false; 278 } 279 } else { 280 $spampreemail = false; 281 } 282 $is_user = $spam_master_user_controller->spammastergetuser( $spaminitial, $spampreemail ); 254 $spampreemail = false; 255 $is_user = $spam_master_user_controller->spammastergetuser( $spaminitial, $spampreemail ); 283 256 284 257 // Spam Buffer Controller. … … 308 281 // Spam Honey Controller. 309 282 $spam_master_honey_controller = new SpamMasterHoneyController(); 310 $is_honey = $spam_master_honey_controller->spammasterhoney( $is_collected['remote_ip'], $is_user['blog_threat_email'], $is_collected['remote_referer'], $is_collected['dest_url'], $is_collected['remote_agent'], $is_user['spamuserA'], $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page );283 $is_honey = $spam_master_honey_controller->spammasterhoney( $is_collected['remote_ip'], $is_user['blog_threat_email'], $is_collected['remote_referer'], $is_collected['dest_url'], $is_collected['remote_agent'], $is_user['spamuserA'], $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page, $is_user['blog_threat_content'] ); 311 284 if ( $is_honey ) { 312 285 wc_add_notice( esc_attr( __( 'SPAM MASTER: ', 'spam_master' ) . $spam_master_message ) ); … … 350 323 $spam_master_user_controller = new SpamMasterUserController(); 351 324 $spaminitial = 'honey_bot'; 352 // phpcs:ignore WordPress.Security.NonceVerification.Missing 353 if ( ! empty( $_POST['user_login'] ) ) { 354 // phpcs:ignore WordPress.Security.NonceVerification.Missing 355 if ( filter_var( wp_unslash( $_POST['user_login'] ), FILTER_VALIDATE_EMAIL ) ) { 356 // phpcs:ignore WordPress.Security.NonceVerification.Missing, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized 357 $spampreemail = wp_strip_all_tags( substr( wp_unslash( $_POST['user_login'] ), 0, 256 ) ); 358 } else { 359 $spampreemail = false; 360 } 361 } else { 362 $spampreemail = false; 363 } 364 $is_user = $spam_master_user_controller->spammastergetuser( $spaminitial, $spampreemail ); 325 $spampreemail = false; 326 $is_user = $spam_master_user_controller->spammastergetuser( $spaminitial, $spampreemail ); 365 327 366 328 // Spam Buffer Controller. … … 390 352 // Spam Honey Controller. 391 353 $spam_master_honey_controller = new SpamMasterHoneyController(); 392 $is_honey = $spam_master_honey_controller->spammasterhoney( $is_collected['remote_ip'], $is_user['blog_threat_email'], $is_collected['remote_referer'], $is_collected['dest_url'], $is_collected['remote_agent'], $is_user['spamuserA'], $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page );354 $is_honey = $spam_master_honey_controller->spammasterhoney( $is_collected['remote_ip'], $is_user['blog_threat_email'], $is_collected['remote_referer'], $is_collected['dest_url'], $is_collected['remote_agent'], $is_user['spamuserA'], $spammaster_extra_field_1, $spammaster_extra_field_2, $spam_master_page, $is_user['blog_threat_content'] ); 393 355 if ( $is_honey ) { 394 356 $errors->add( esc_attr( __( 'SPAM MASTER: ', 'spam_master' ) . $spam_master_message ) ); -
spam-master/trunk/readme.txt
r3098658 r3107397 3 3 Tags: firewall, spam, antispam, antibot, protection 4 4 Requires at least: 5.0 5 Tested up to: 6.5. 46 Stable tag: 7.4. 25 Tested up to: 6.5.5 6 Stable tag: 7.4.3 7 7 License: GPLv2 or later 8 8 … … 217 217 218 218 == Changelog == 219 220 = 7.4.3 = 221 * Action service should take in account firewall rule set 222 * Further speed improvements and log reduction 223 * Load reduction by removing duplicate checks in forms via HAF check 224 * Honeypot and antibot single check trigger 225 * Cleaning and removing legacy data collection in honeypot and HAF 219 226 220 227 = 7.4.2 =
Note: See TracChangeset
for help on using the changeset viewer.