<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[18356] branches/3.1: Hardening.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/18356">18356</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-06-27 21:36:48 +0000 (Mon, 27 Jun 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Hardening. Santizers for WPLANG and new_admin_email. Prevent stomping ID and filter. Validate locale filename. Props westi. For 3.1.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches31wpadmincustomheaderphp">branches/3.1/wp-admin/custom-header.php</a></li>
<li><a href="#branches31wpadminincludesmediaphp">branches/3.1/wp-admin/includes/media.php</a></li>
<li><a href="#branches31wpadminincludespostphp">branches/3.1/wp-admin/includes/post.php</a></li>
<li><a href="#branches31wpadminoptionsgeneralphp">branches/3.1/wp-admin/options-general.php</a></li>
<li><a href="#branches31wpincludesformattingphp">branches/3.1/wp-includes/formatting.php</a></li>
<li><a href="#branches31wpsettingsphp">branches/3.1/wp-settings.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches31">branches/3.1/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches31"></a>
<div class="propset"><h4>Property changes: branches/3.1</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk:17689,17990-17999,18324,18344-18346
</span><a id="branches31wpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-admin/custom-header.php (18355 => 18356)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-admin/custom-header.php 2011-06-27 21:35:59 UTC (rev 18355)
+++ branches/3.1/wp-admin/custom-header.php 2011-06-27 21:36:48 UTC (rev 18356)
</span><span class="lines">@@ -596,7 +596,8 @@
</span><span class="cx"> 'post_content' => $url,
</span><span class="cx"> 'post_mime_type' => $type,
</span><span class="cx"> 'guid' => $url,
</span><del>- 'context' => 'custom-header');
</del><ins>+ 'context' => 'custom-header'
+ );
</ins><span class="cx">
</span><span class="cx"> // Save the data
</span><span class="cx"> $id = wp_insert_attachment($object, $file);
</span></span></pre></div>
<a id="branches31wpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-admin/includes/media.php (18355 => 18356)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-admin/includes/media.php 2011-06-27 21:35:59 UTC (rev 18355)
+++ branches/3.1/wp-admin/includes/media.php 2011-06-27 21:36:48 UTC (rev 18356)
</span><span class="lines">@@ -228,6 +228,10 @@
</span><span class="cx"> 'post_content' => $content,
</span><span class="cx"> ), $post_data );
</span><span class="cx">
</span><ins>+ // This should never be set as it would then overwrite an existing attachment.
+ if ( isset( $attachment['ID'] ) )
+ unset( $attachment['ID'] );
+
</ins><span class="cx"> // Save the data
</span><span class="cx"> $id = wp_insert_attachment($attachment, $file, $post_id);
</span><span class="cx"> if ( !is_wp_error($id) ) {
</span><span class="lines">@@ -281,6 +285,10 @@
</span><span class="cx"> 'post_content' => $content,
</span><span class="cx"> ), $post_data );
</span><span class="cx">
</span><ins>+ // This should never be set as it would then overwrite an existing attachment.
+ if ( isset( $attachment['ID'] ) )
+ unset( $attachment['ID'] );
+
</ins><span class="cx"> // Save the attachment metadata
</span><span class="cx"> $id = wp_insert_attachment($attachment, $file, $post_id);
</span><span class="cx"> if ( !is_wp_error($id) )
</span></span></pre></div>
<a id="branches31wpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-admin/includes/post.php (18355 => 18356)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-admin/includes/post.php 2011-06-27 21:35:59 UTC (rev 18355)
+++ branches/3.1/wp-admin/includes/post.php 2011-06-27 21:36:48 UTC (rev 18356)
</span><span class="lines">@@ -135,6 +135,10 @@
</span><span class="cx"> if ( empty($post_data) )
</span><span class="cx"> $post_data = &$_POST;
</span><span class="cx">
</span><ins>+ // Clear out any data in internal vars.
+ if ( isset( $post_data['filter'] ) )
+ unset( $post_data['filter'] );
+
</ins><span class="cx"> $post_ID = (int) $post_data['post_ID'];
</span><span class="cx"> $post = get_post( $post_ID );
</span><span class="cx"> $post_data['post_type'] = $post->post_type;
</span><span class="lines">@@ -553,6 +557,15 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // 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();
+ }
+
</ins><span class="cx"> $translated = _wp_translate_postdata( false );
</span><span class="cx"> if ( is_wp_error($translated) )
</span><span class="cx"> return $translated;
</span></span></pre></div>
<a id="branches31wpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-admin/options-general.php (18355 => 18356)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-admin/options-general.php 2011-06-27 21:35:59 UTC (rev 18355)
+++ branches/3.1/wp-admin/options-general.php 2011-06-27 21:36:48 UTC (rev 18356)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> $new_admin_email = get_option( 'new_admin_email' );
</span><span class="cx"> if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?>
</span><span class="cx"> <div class="updated inline">
</span><del>-<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>
</del><ins>+<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>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </td>
</span></span></pre></div>
<a id="branches31wpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/formatting.php (18355 => 18356)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/formatting.php 2011-06-27 21:35:59 UTC (rev 18355)
+++ branches/3.1/wp-includes/formatting.php 2011-06-27 21:36:48 UTC (rev 18356)
</span><span class="lines">@@ -2440,7 +2440,14 @@
</span><span class="cx"> add_settings_error('admin_email', 'invalid_admin_email', __('The email address entered did not appear to be a valid email address. Please enter a valid email address.'));
</span><span class="cx"> }
</span><span class="cx"> break;
</span><del>-
</del><ins>+ 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;
</ins><span class="cx"> case 'thumbnail_size_w':
</span><span class="cx"> case 'thumbnail_size_h':
</span><span class="cx"> case 'medium_size_w':
</span><span class="lines">@@ -2534,6 +2541,11 @@
</span><span class="cx"> add_settings_error('home', 'invalid_home', __('The Site address you entered did not appear to be a valid URL. Please enter a valid URL.'));
</span><span class="cx"> }
</span><span class="cx"> break;
</span><ins>+ case 'WPLANG':
+ $allowed = get_available_languages();
+ if ( ! in_array( $value, $allowed ) && ! empty( $value ) )
+ $value = get_option( $option );
+ break;
</ins><span class="cx">
</span><span class="cx"> default :
</span><span class="cx"> $value = apply_filters("sanitize_option_{$option}", $value, $option);
</span></span></pre></div>
<a id="branches31wpsettingsphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-settings.php (18355 => 18356)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-settings.php 2011-06-27 21:35:59 UTC (rev 18355)
+++ branches/3.1/wp-settings.php 2011-06-27 21:36:48 UTC (rev 18356)
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx"> // Find the blog locale.
</span><span class="cx"> $locale = get_locale();
</span><span class="cx"> $locale_file = WP_LANG_DIR . "/$locale.php";
</span><del>-if ( is_readable( $locale_file ) )
</del><ins>+if ( ( 0 === validate_file( $locale ) ) && is_readable( $locale_file ) )
</ins><span class="cx"> require( $locale_file );
</span><span class="cx"> unset($locale_file);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>