Changeset 1188388

Timestamp:

06/26/2015 11:16:50 PM (9 years ago)

Author:

drrobotnik

Message:

XSS Hardening

Location:

wp-rollback/trunk

Files:

• assets/js/themes-wp-rollback.js (modified) (1 diff)
• includes/rollback-action.php (modified) (2 diffs)
• includes/rollback-menu.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• wp-rollback.php (modified) (6 diffs)

wp-rollback/trunk/assets/js/themes-wp-rollback.js

@@ -96 +96 @@
 
 
-                var rollback_btn_html = '<a href="' + encodeURI( 'index.php?page=wp-rollback&type=theme&theme_file=' + theme + '&current_version=' + theme_data.version + '&rollback_name=' + theme_data.name + '' ) + '" style="position:absolute;right: ' + (active_theme === true ? '5px' : '80px') + '; bottom: 5px;" class="button wpr-theme-rollback">' + wpr_vars.text_rollback_label + '</a>';
+                var rollback_btn_html = '<a href="' + encodeURI( 'index.php?page=wp-rollback&type=theme&theme_file=' + theme + '&current_version=' + theme_data.version + '&rollback_name=' + theme_data.name + ' ) + '" style="position:absolute;right: ' + (active_theme === true ? '5px' : '80px') + '; bottom: 5px;" class="button wpr-theme-rollback">' + wpr_vars.text_rollback_label + '</a>';
 
                 $( '.theme-wrap' ).find( '.theme-actions' ).append( rollback_btn_html );

wp-rollback/trunk/includes/rollback-action.php

@@ -10 +10 @@
 
 $nonce   = 'upgrade-plugin_' . $this->plugin_slug;
-$url     = 'index.php?page=wp-rollback&plugin_file=' . $args['plugin_file'] . 'action=upgrade-plugin';
+$url     = 'index.php?page=wp-rollback&plugin_file=' .  . 'action=upgrade-plugin';
 $plugin  = $this->plugin_slug;
 $version = $args['plugin_version'];
 
 //Theme rollback
-if ( isset( $_GET['theme_file'] ) ) {
+if (  ) {
 
     //theme specific vars
@@ -27 +27 @@
     $upgrader->rollback( $_GET['theme_file'] );
 
-} elseif ( isset( $_GET['plugin_file'] ) ) {
+} elseif (  $_GET['plugin_file'] ) ) {
     //This is a plugin rollback
     $upgrader = new WP_Rollback_Plugin_Upgrader( new Plugin_Upgrader_Skin( compact( 'title', 'nonce', 'url', 'plugin', 'version' ) ) );

wp-rollback/trunk/includes/rollback-menu.php

@@ -23 +23 @@
         <h2><img src="<?php echo WP_ROLLBACK_PLUGIN_URL; ?>/assets/images/wprb-icon-final.svg" onerror="this.onerror=null; this.src='<?php echo WP_ROLLBACK_PLUGIN_URL; ?>/assets/images/wprb-logo.png'"><?php _e( 'WP Rollback', 'wpr' ); ?></h2>
 
-        <p><?php echo apply_filters( 'wpr_rollback_description', sprintf( __( 'Please select which %1$s version you would like to rollback to from the releases listed below. You currently have version %2$s installed of %3$s.', 'wpr' ), '<span class="type">' . ( $theme_rollback == true ? 'theme' : 'plugin' ) . '</span>', '<span class="current-version">' . $args['current_version'] . '</span>', '<span class="rollback-name">' . $args['rollback_name'] . '</span>' ) ); ?></p>
+        <p><?php echo apply_filters( 'wpr_rollback_description', sprintf( __( 'Please select which %1$s version you would like to rollback to from the releases listed below. You currently have version %2$s installed of %3$s.', 'wpr' ), '<span class="type">' . ( $theme_rollback == true ? 'theme' : 'plugin' ) . '</span>', '<span class="current-version">' .  . '</span>' ) ); ?></p>
 
     </div>
@@ -69 +69 @@
         //Important: We need the appropriate file to perform a rollback
         if ( $plugin_rollback == true ) { ?>
-            <input type="hidden" name="plugin_file" value="<?php echo $args['plugin_file']; ?>">
+            <input type="hidden" name="plugin_file" value="<?php echo ; ?>">
         <?php } else { ?>
-            <input type="hidden" name="theme_file" value="<?php echo $_GET['theme_file']; ?>">
+            <input type="hidden" name="theme_file" value="<?php echo ; ?>">
         <?php } ?>
-        <input type="hidden" name="rollback_name" value="<?php echo $args['rollback_name']; ?>">
-        <input type="hidden" name="installed_version" value="<?php echo $args['current_version']; ?>">
+        <input type="hidden" name="rollback_name" value="<?php echo esc_attr( $args['rollback_name'] ); ?>">
+        <input type="hidden" name="installed_version" value="<?php echo esc_attr( $args['current_version'] ); ?>">
+        <?php wp_nonce_field( 'wpr_rollback_nonce' ); ?>
 
 

wp-rollback/trunk/readme.txt

@@ -5 +5 @@
 Donate Link: https://wordimpress.com
 Tested up to: 4.2.2
-Stable tag: 1.2.2
+Stable tag: 1.2.
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -110 +110 @@
 == Changelog ==
 
+
+
+
+
 = 1.2.2 =
 * New: Russian translations from @Flector - thanks!

wp-rollback/trunk/wp-rollback.php

@@ -6 +6 @@
  * Author: WordImpress
  * Author URI: http://wordimpress.com
- * Version: 1.2.2
+ * Version: 1.2.
  * Text Domain: wpr
  * Domain Path: languages
@@ -204 +204 @@
                     'ajaxurl'               => admin_url(),
                     'ajax_loader'           => admin_url( 'images/spinner.gif' ),
+
                     'text_rollback_label'   => __( 'Rollback', 'wpr' ),
                     'text_not_rollbackable' => __( 'No Rollback Available: This is a non-WordPress.org theme.', 'wpr' ),
@@ -291 +292 @@
             if ( ! empty( $args['plugin_version'] ) ) {
                 //Plugin: rolling back
+
+
                 include WP_ROLLBACK_PLUGIN_DIR . '/includes/class-rollback-plugin-upgrader.php';
                 include WP_ROLLBACK_PLUGIN_DIR . '/includes/rollback-action.php';
             } elseif ( ! empty( $args['theme_version'] ) ) {
                 //Theme: rolling back
+
+
                 include WP_ROLLBACK_PLUGIN_DIR . '/includes/class-rollback-theme-upgrader.php';
                 include WP_ROLLBACK_PLUGIN_DIR . '/includes/rollback-action.php';
             } else {
                 //This is the menu
+
+
                 include WP_ROLLBACK_PLUGIN_DIR . '/includes/rollback-menu.php';
             }
@@ -391 +398 @@
             foreach ( $this->versions as $version ) {
 
-                $versions_html .= '<label><input type="radio" value="' . $version . '" name="' . $type . '_version">' . $version;
+                $versions_html .= '<label><input type="radio" value="' .  . '" name="' . $type . '_version">' . $version;
 
                 //Is this the current version?
@@ -425 +432 @@
 
             $plugin_file = WP_PLUGIN_DIR . '/' . $_GET['plugin_file'];
+
+
+
 
             $plugin_data = get_plugin_data( $plugin_file, false, false );
@@ -504 +514 @@
                     'current_version' => urlencode( $plugin_data['Version'] ),
                     'rollback_name'   => urlencode( $plugin_data['Name'] ),
+
                 ) ), $rollback_url );
             }