<!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>[18013] branches/3.1: Send X-Frame-Options: SAMEORIGIN for admin and login pages.</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/18013">18013</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-05-24 15:29:12 +0000 (Tue, 24 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Send X-Frame-Options: SAMEORIGIN for admin and login pages. see <a href="http://trac.wordpress.org/ticket/12293">#12293</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches31wpincludesdefaultfiltersphp">branches/3.1/wp-includes/default-filters.php</a></li>
<li><a href="#branches31wpincludesfunctionsphp">branches/3.1/wp-includes/functions.php</a></li>
<li><a href="#branches31wploginphp">branches/3.1/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches31wpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/default-filters.php (18012 => 18013)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/default-filters.php 2011-05-23 23:43:14 UTC (rev 18012)
+++ branches/3.1/wp-includes/default-filters.php 2011-05-24 15:29:12 UTC (rev 18013)
</span><span class="lines">@@ -218,6 +218,7 @@
</span><span class="cx"> // Login actions
</span><span class="cx"> add_action( 'login_head', 'wp_print_head_scripts', 9 );
</span><span class="cx"> add_action( 'login_footer', 'wp_print_footer_scripts' );
</span><ins>+add_action( 'login_init', 'send_frame_options_header', 10, 0 );
</ins><span class="cx">
</span><span class="cx"> // Feed Generator Tags
</span><span class="cx"> foreach ( array( 'rss2_head', 'commentsrss2_head', 'rss_head', 'rdf_header', 'atom_head', 'comments_atom_head', 'opml_head', 'app_head' ) as $action ) {
</span><span class="lines">@@ -249,6 +250,7 @@
</span><span class="cx"> add_action( 'transition_post_status', '_transition_post_status', 5, 3 );
</span><span class="cx"> add_action( 'comment_form', 'wp_comment_form_unfiltered_html_nonce' );
</span><span class="cx"> add_action( 'wp_scheduled_delete', 'wp_scheduled_delete' );
</span><ins>+add_action( 'admin_init', 'send_frame_options_header', 10, 0 );
</ins><span class="cx">
</span><span class="cx"> // Navigation menu actions
</span><span class="cx"> add_action( 'delete_post', '_wp_delete_post_menu_item' );
</span></span></pre></div>
<a id="branches31wpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/functions.php (18012 => 18013)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/functions.php 2011-05-23 23:43:14 UTC (rev 18012)
+++ branches/3.1/wp-includes/functions.php 2011-05-24 15:29:12 UTC (rev 18013)
</span><span class="lines">@@ -4482,4 +4482,16 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Send a HTTP header to limit rendering of pages to same origin iframes.
+ *
+ * @link https://developer.mozilla.org/en/the_x-frame-options_response_header
+ *
+ * @since 3.2.0
+ * @return none
+ */
+function send_frame_options_header() {
+ @header( 'X-Frame-Options: SAMEORIGIN' );
+}
+
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="branches31wploginphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-login.php (18012 => 18013)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-login.php 2011-05-23 23:43:14 UTC (rev 18012)
+++ branches/3.1/wp-login.php 2011-05-24 15:29:12 UTC (rev 18013)
</span><span class="lines">@@ -368,7 +368,8 @@
</span><span class="cx"> setcookie(TEST_COOKIE, 'WP Cookie check', 0, SITECOOKIEPATH, COOKIE_DOMAIN);
</span><span class="cx">
</span><span class="cx"> // allow plugins to override the default actions, and to add extra actions if they want
</span><del>-do_action('login_form_' . $action);
</del><ins>+do_action( 'login_init' );
+do_action( 'login_form_' . $action );
</ins><span class="cx">
</span><span class="cx"> $http_post = ('POST' == $_SERVER['REQUEST_METHOD']);
</span><span class="cx"> switch ($action) {
</span></span></pre>
</div>
</div>
</body>
</html>