Merge pull request #545 from Freemius/feature/2.5.0-rc.2-linear-secur…

…ity-fix Reapply security patches on develop branch for 2.5.0-rc.2 tag
Freemius · Mar 3, 2022 · 60bf619 · 60bf619
2 parents 0592b3b + e4d29e7
commit 60bf619
Show file tree

Hide file tree

Showing 18 changed files with 112 additions and 26 deletions.
diff --git a/includes/class-freemius.php b/includes/class-freemius.php
@@ -3781,6 +3781,8 @@ static function _add_debug_section() {
          * @since  1.1.7.3
          */
         static function _toggle_debug_mode() {
+            check_admin_referer( 'fs_toggle_debug_mode' );
+
             if ( ! is_super_admin() ) {
                 return;
             }
@@ -3802,10 +3804,19 @@ static function _toggle_debug_mode() {
          * @since  1.2.1.6
          */
         static function _get_debug_log() {
+            check_admin_referer( 'fs_get_debug_log' );
+
+            if ( ! is_super_admin() ) {
+                return;
+            }
+
+            $limit  = min( ! empty( $_POST['limit'] ) ? absint( $_POST['limit'] ) : 200, 200 );
+            $offset = min( ! empty( $_POST['offset'] ) ? absint( $_POST['offset'] ) : 200, 200 );
+
             $logs = FS_Logger::load_db_logs(
                 fs_request_get( 'filters', false, 'post' ),
-                ! empty( $_POST['limit'] ) && is_numeric( $_POST['limit'] ) ? intval( $_POST['limit'] ) : 200,
-                ! empty( $_POST['offset'] ) && is_numeric( $_POST['offset'] ) ? intval( $_POST['offset'] ) : 0
+                $limit,
+                $offset
             );
 
             self::shoot_ajax_success( $logs );
@@ -4717,6 +4728,12 @@ function _add_connectivity_issue_message( $api_result, $is_first_failure = true
          * @since  1.0.9
          */
         function _email_about_firewall_issue() {
+            check_admin_referer( 'fs_resolve_firewall_issues' );
+
+            if ( ! current_user_can( is_multisite() ? 'manage_options' : 'activate_plugins' ) ) {
+                return;
+            }
+
             $this->_admin_notices->remove_sticky( 'failed_connect_api' );
 
             $pong = $this->ping();
@@ -4791,6 +4808,12 @@ function _email_about_firewall_issue() {
          * @since  1.1.7.4
          */
         function _retry_connectivity_test() {
+            check_admin_referer( 'fs_retry_connectivity_test' );
+
+            if ( ! current_user_can( is_multisite() ? 'manage_options' : 'activate_plugins' ) ) {
+                return;
+            }
+
             $this->_admin_notices->remove_sticky( 'failed_connect_api_first' );
 
             $pong = $this->ping();

diff --git a/includes/managers/class-fs-admin-notice-manager.php b/includes/managers/class-fs-admin-notice-manager.php
@@ -178,7 +178,12 @@ protected function __construct(
          *
          */
         function dismiss_notice_ajax_callback() {
-            $this->_sticky_storage->remove( $_POST['message_id'] );
+            check_admin_referer( 'fs_dismiss_notice_action' );
+
+            if ( ! is_numeric( $_POST['message_id'] ) ) {
+                $this->_sticky_storage->remove( $_POST['message_id'] );
+            }
+
             wp_die();
         }
 
@@ -518,4 +523,4 @@ private function get_notices_type() {
         }
 
         #endregion
-    }
+    }
diff --git a/includes/sdk/Exceptions/ArgumentNotExistException.php b/includes/sdk/Exceptions/ArgumentNotExistException.php
@@ -1,9 +1,13 @@
 <?php
+    if ( ! defined( 'ABSPATH' ) ) {
+        exit;
+    }
+
 	if ( ! class_exists( 'Freemius_InvalidArgumentException' ) ) {
 		exit;
 	}
 
 	if ( ! class_exists( 'Freemius_ArgumentNotExistException' ) ) {
 		class Freemius_ArgumentNotExistException extends Freemius_InvalidArgumentException {
 		}
-	}
+	}
diff --git a/includes/sdk/Exceptions/EmptyArgumentException.php b/includes/sdk/Exceptions/EmptyArgumentException.php
@@ -1,9 +1,13 @@
 <?php
+    if ( ! defined( 'ABSPATH' ) ) {
+        exit;
+    }
+
 	if ( ! class_exists( 'Freemius_InvalidArgumentException' ) ) {
 		exit;
 	}
 
 	if ( ! class_exists( 'Freemius_EmptyArgumentException' ) ) {
 		class Freemius_EmptyArgumentException extends Freemius_InvalidArgumentException {
 		}
-	}
+	}
diff --git a/includes/sdk/Exceptions/Exception.php b/includes/sdk/Exceptions/Exception.php
@@ -1,4 +1,8 @@
 <?php
+        if ( ! defined( 'ABSPATH' ) ) {
+            exit;
+        }
+
 	if ( ! class_exists( 'Freemius_Exception' ) ) {
 		/**
 		 * Thrown when an API call returns an exception.
@@ -71,4 +75,4 @@ public function __toString() {
 				return $str . $this->getMessage();
 			}
 		}
-	}
+	}
diff --git a/includes/sdk/Exceptions/InvalidArgumentException.php b/includes/sdk/Exceptions/InvalidArgumentException.php
@@ -1,8 +1,12 @@
 <?php
+    if ( ! defined( 'ABSPATH' ) ) {
+        exit;
+    }
+
 	if ( ! class_exists( 'Freemius_Exception' ) ) {
 		exit;
 	}
 
 	if ( ! class_exists( 'Freemius_InvalidArgumentException' ) ) {
 		class Freemius_InvalidArgumentException extends Freemius_Exception { }
-	}
+	}
diff --git a/includes/sdk/Exceptions/OAuthException.php b/includes/sdk/Exceptions/OAuthException.php
@@ -1,4 +1,8 @@
 <?php
+    if ( ! defined( 'ABSPATH' ) ) {
+        exit;
+    }
+
 	if ( ! class_exists( 'Freemius_Exception' ) ) {
 		exit;
 	}
@@ -9,4 +13,4 @@ public function __construct( $pResult ) {
 				parent::__construct( $pResult );
 			}
 		}
-	}
+	}
diff --git a/includes/sdk/FreemiusBase.php b/includes/sdk/FreemiusBase.php
@@ -15,6 +15,10 @@
 	 * under the License.
 	 */
 
+    if ( ! defined( 'ABSPATH' ) ) {
+        exit;
+    }
+
 	if ( ! defined( 'FS_API__VERSION' ) ) {
 		define( 'FS_API__VERSION', '1' );
 	}

diff --git a/includes/sdk/FreemiusWordPress.php b/includes/sdk/FreemiusWordPress.php
@@ -14,6 +14,9 @@
 	 * License for the specific language governing permissions and limitations
 	 * under the License.
 	 */
+    if ( ! defined( 'ABSPATH' ) ) {
+        exit;
+    }
 
 	require_once dirname( __FILE__ ) . '/FreemiusBase.php';
 
@@ -709,4 +712,4 @@ private static function ThrowSquidAclException( $pResult = '' ) {
 		}
 
 		#endregion
-	}
+	}
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "author": "Freemius, Inc.",
   "license": "GPL-3.0",
   "homepage": "https://freemius.com",
-  "version": "2.5.0",
+  "version": "2.5.0.1",
   "main": "gulpfile.js",
   "dependencies": {},
   "scripts": {

diff --git a/require.php b/require.php
@@ -6,6 +6,10 @@
 	 * @since       1.1.9
 	 */
 
+    if ( ! defined( 'ABSPATH' ) ) {
+        exit;
+    }
+
 	// Configuration should be loaded first.
 	require_once dirname( __FILE__ ) . '/config.php';
 	require_once WP_FS__DIR_INCLUDES . '/fs-core-functions.php';
@@ -47,4 +51,4 @@
     require_once WP_FS__DIR_INCLUDES . '/class-fs-admin-notices.php';
 	require_once WP_FS__DIR_INCLUDES . '/class-freemius-abstract.php';
 	require_once WP_FS__DIR_INCLUDES . '/sdk/Exceptions/Exception.php';
-	require_once WP_FS__DIR_INCLUDES . '/class-freemius.php';
+	require_once WP_FS__DIR_INCLUDES . '/class-freemius.php';
diff --git a/start.php b/start.php
@@ -15,7 +15,7 @@
 	 *
 	 * @var string
 	 */
-	$this_sdk_version = '2.5.0';
+	$this_sdk_version = '2.5.0.1';
 
 	#region SDK Selection Logic --------------------------------------------------------------------
 

diff --git a/templates/account/partials/addon.php b/templates/account/partials/addon.php
@@ -1,4 +1,9 @@
 <?php
+
+    if ( ! defined( 'ABSPATH' ) ) {
+        exit;
+    }
+
     /**
      * @var array    $VARS
      * @var Freemius $fs
@@ -443,4 +448,4 @@ class="edit"><?php echo esc_html( $activate_text ) ?></a>
         </td>
         <!--/ Optional Delete Action -->
     <?php endif ?>
-</tr>
+</tr>
diff --git a/templates/ajax-loader.php b/templates/ajax-loader.php
@@ -1 +1,6 @@
-<div class="fs-ajax-loader" style="display: none"><?php for ( $i = 1; $i <= 8; $i ++ ) : ?><div class="fs-ajax-loader-bar fs-ajax-loader-bar-<?php echo $i ?>"></div><?php endfor ?></div>
+<?php
+    if ( ! defined( 'ABSPATH' ) ) {
+        exit;
+    }
+?>
+<div class="fs-ajax-loader" style="display: none"><?php for ( $i = 1; $i <= 8; $i ++ ) : ?><div class="fs-ajax-loader-bar fs-ajax-loader-bar-<?php echo $i ?>"></div><?php endfor ?></div>
diff --git a/templates/debug.php b/templates/debug.php
@@ -37,6 +37,8 @@
 
                     $.post( ajaxurl, {
                         action: 'fs_toggle_debug_mode',
+                        // As such we don't need to use `wp_json_encode` method but using it to follow wp.org guideline.
+                        _wpnonce   : <?php echo wp_json_encode( wp_create_nonce( 'fs_toggle_debug_mode' ) ); ?>,
                         is_on : ($(this).hasClass( 'fs-on' ) ? 1 : 0)
                     }, function ( response ) {
                         if ( 1 == response ) {
@@ -121,7 +123,8 @@
             if (optionName) {
                 $.post(ajaxurl, {
                     action     : 'fs_get_db_option',
-                    _wpnonce   : '<?php echo wp_create_nonce( 'fs_get_db_option' ) ?>',
+                    // As such we don't need to use `wp_json_encode` method but using it to follow wp.org guideline.
+                    _wpnonce   : <?php echo wp_json_encode( wp_create_nonce( 'fs_get_db_option' ) ); ?>,
                     option_name: optionName
                 }, function (response) {
                     if (response.data.value)
@@ -141,7 +144,8 @@
                 if (optionValue) {
                     $.post(ajaxurl, {
                         action      : 'fs_set_db_option',
-                        _wpnonce   : '<?php echo wp_create_nonce( 'fs_set_db_option' ) ?>',
+                        // As such we don't need to use `wp_json_encode` method but using it to follow wp.org guideline.
+                        _wpnonce    : <?php echo wp_json_encode( wp_create_nonce( 'fs_set_db_option' ) ); ?>,
                         option_name : optionName,
                         option_value: optionValue
                     }, function () {
@@ -738,6 +742,8 @@ class="dashicons dashicons-download"></i> <?php fs_esc_html_echo_inline( 'Downlo
 
                 $.post(ajaxurl, {
                     action : 'fs_get_debug_log',
+                    // As such we don't need to use `wp_json_encode` method but using it to follow wp.org guideline.
+                    _wpnonce : <?php echo wp_json_encode( wp_create_nonce( 'fs_get_debug_log' ) ); ?>,
                     filters: filters,
                     offset : offset,
                     limit  : limit

diff --git a/templates/firewall-issues-js.php b/templates/firewall-issues-js.php
@@ -22,10 +22,12 @@
 				notice           = $( this ).parents( '.fs-notice' ),
 				ajaxActionSuffix = notice.attr( 'data-manager-id' ).replace( ':', '-' );
 
-			var data = {
-				action    : 'fs_resolve_firewall_issues_' + ajaxActionSuffix,
-				error_type: error_type
-			};
+            var data = {
+                action   : 'fs_resolve_firewall_issues_' + ajaxActionSuffix,
+                // As such we don't need to use `wp_json_encode` method but using it to follow wp.org guideline.
+                _wpnonce : <?php echo wp_json_encode( wp_create_nonce( 'fs_resolve_firewall_issues' ) ); ?>,
+                error_type: error_type
+            };
 
 			if ( 'squid' === error_type ) {
 				data.hosting_company = prompt( 'What is the name or URL of your hosting company?' );
@@ -39,7 +41,9 @@
 			}
 
 			if ( 'retry_ping' === error_type ) {
-				data.action = 'fs_retry_connectivity_test_' + ajaxActionSuffix;
+                data.action   = 'fs_retry_connectivity_test_' + ajaxActionSuffix;
+                // As such we don't need to use `wp_json_encode` method but using it to follow wp.org guideline.
+                data._wpnonce = <?php echo wp_json_encode( wp_create_nonce( 'fs_retry_connectivity_test' ) ); ?>;
 			}
 
 			$( this ).css({'cursor': 'wait'});
@@ -56,4 +60,4 @@
 			});
 		});
 	});
-</script>
+</script>
diff --git a/templates/partials/network-activation.php b/templates/partials/network-activation.php
@@ -1,4 +1,9 @@
 <?php
+
+    if ( ! defined( 'ABSPATH' ) ) {
+        exit;
+    }
+
     /**
      * @var array $VARS
      * @var Freemius $fs
@@ -86,4 +91,4 @@
             </tbody>
         </table>
     </div>
-</div>
+</div>
diff --git a/templates/sticky-admin-notice-js.php b/templates/sticky-admin-notice-js.php
@@ -23,7 +23,9 @@
 
 			notice.fadeOut( 'fast', function() {
 				var data = {
-					action    : 'fs_dismiss_notice_action_' + ajaxActionSuffix,
+					action   : 'fs_dismiss_notice_action_' + ajaxActionSuffix,
+                    // As such we don't need to use `wp_json_encode` method but using it to follow wp.org guideline.
+                    _wpnonce : <?php echo wp_json_encode( wp_create_nonce( 'fs_dismiss_notice_action' ) ); ?>,
 					message_id: id
 				};
 
@@ -36,4 +38,4 @@
 			});
 		});
 	});
-</script>
+</script>