Changeset 18356

Timestamp:

06/27/2011 09:36:48 PM (14 years ago)

Author:

ryan

Message:

Hardening. Santizers for WPLANG and new_admin_email. Prevent stomping ID and filter. Validate locale filename. Props westi. For 3.1.

Location:

branches/3.1

Files:

• . (modified) (1 prop)
• wp-admin/custom-header.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (2 diffs)
• wp-admin/includes/post.php (modified) (2 diffs)
• wp-admin/options-general.php (modified) (1 diff)
• wp-includes/formatting.php (modified) (2 diffs)
• wp-settings.php (modified) (1 diff)

branches/3.1/wp-admin/custom-header.php

@@ -597 +597 @@
         'post_mime_type' => $type,
         'guid' => $url,
-        'context' => 'custom-header');
+        'context' => 'custom-header'
+        );
 
         // Save the data

branches/3.1/wp-admin/includes/media.php

@@ -229 +229 @@
     ), $post_data );
 
+    // This should never be set as it would then overwrite an existing attachment.
+    if ( isset( $attachment['ID'] ) )
+        unset( $attachment['ID'] );
+
     // Save the data
     $id = wp_insert_attachment($attachment, $file, $post_id);
@@ -281 +285 @@
         'post_content' => $content,
     ), $post_data );
+
+    // This should never be set as it would then overwrite an existing attachment.
+    if ( isset( $attachment['ID'] ) )
+        unset( $attachment['ID'] );
 
     // Save the attachment metadata

branches/3.1/wp-admin/includes/post.php

@@ -135 +135 @@
     if ( empty($post_data) )
         $post_data = &$_POST;
+
+    // Clear out any data in internal vars.
+    if ( isset( $post_data['filter'] ) )
+        unset( $post_data['filter'] );
 
     $post_ID = (int) $post_data['post_ID'];
@@ -552 +556 @@
             return edit_post();
         }
+    }
+
+    // Edit don't write if we have a post id.
+    if ( isset( $_POST['ID'] ) ) {
+        $_POST['post_ID'] = $_POST['ID'];
+        unset ( $_POST['ID'] );
+    }
+    if ( isset( $_POST['post_ID'] ) ) {
+        return edit_post();
     }
 

branches/3.1/wp-admin/options-general.php

@@ -128 +128 @@
 if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?>
 <div class="updated inline">
-<p><?php printf( __('There is a pending change of the admin e-mail to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), $new_admin_email, esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ) ); ?></p>
+<p><?php printf( __('There is a pending change of the admin e-mail to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), esc_html( $new_admin_email ), esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ) ); ?></p>
 </div>
 <?php endif; ?>

branches/3.1/wp-includes/formatting.php

@@ -2441 +2441 @@
             }
             break;
-
+        case 'new_admin_email':
+            $value = sanitize_email($value);
+            if ( !is_email($value) ) {
+                $value = get_option( $option ); // Resets option to stored value in the case of failed sanitization
+                if ( function_exists('add_settings_error') )
+                    add_settings_error('new_admin_email', 'invalid_admin_email', __('The email address entered did not appear to be a valid email address. Please enter a valid email address.'));
+            }
+            break;
         case 'thumbnail_size_w':
         case 'thumbnail_size_h':
@@ -2535 +2542 @@
             }
             break;
+        case 'WPLANG':
+            $allowed = get_available_languages();
+            if ( ! in_array( $value, $allowed ) && ! empty( $value ) )
+                $value = get_option( $option );
+            break;
 
         default :

branches/3.1/wp-settings.php

@@ -259 +259 @@
 $locale = get_locale();
 $locale_file = WP_LANG_DIR . "/$locale.php";
-if ( is_readable( $locale_file ) )
+if ( ( 0 === validate_file( $locale ) ) && is_readable( $locale_file ) )
     require( $locale_file );
 unset($locale_file);