<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[13133] trunk: Fall back to wp_generate_password() in setup-config.
php if HTTPS request for secret keys fails.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13133">13133</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-14 02:47:45 +0000 (Sun, 14 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fall back to wp_generate_password() in setup-config.php if HTTPS request for secret keys fails. Also use pretty link to secret-key API, see <a href="http://trac.wordpress.org/ticket/12159">#12159</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminsetupconfigphp">trunk/wp-admin/setup-config.php</a></li>
<li><a href="#trunkwpconfigsamplephp">trunk/wp-config-sample.php</a></li>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminsetupconfigphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/setup-config.php (13132 => 13133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/setup-config.php 2010-02-14 02:27:19 UTC (rev 13132)
+++ trunk/wp-admin/setup-config.php 2010-02-14 02:47:45 UTC (rev 13133)
</span><span class="lines">@@ -17,6 +17,11 @@
</span><span class="cx"> define('WP_INSTALLING', true);
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * We are blissfully unaware of anything.
+ */
+define('WP_SETUP_CONFIG', true);
+
+/**
</ins><span class="cx"> * Disable error reporting
</span><span class="cx"> *
</span><span class="cx"> * Set this to error_reporting( E_ALL ) or error_reporting( E_ALL | E_STRICT ) for debugging
</span><span class="lines">@@ -179,11 +184,17 @@
</span><span class="cx"> }
</span><span class="cx"> /**#@-*/
</span><span class="cx">
</span><del>- $secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/?salt=1' );
- if ( is_wp_error( $secret_keys ) )
- $secret_keys = false;
- else
</del><ins>+ $secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
+ if ( is_wp_error( $secret_keys ) ) {
+ $secret_keys = array();
+ require_once( ABSPATH . WPINC . '/pluggable.php' );
+ for ( $i = 0; $i < 8; $i++ )
+ $secret_keys[] = wp_generate_password( 64 );
+ } else {
</ins><span class="cx"> $secret_keys = explode( "\n", wp_remote_retrieve_body( $secret_keys ) );
</span><ins>+ foreach ( $secret_keys as $k => $v )
+ $secret_keys[$k] = substr( $v, 28, 64 );
+ }
</ins><span class="cx"> $key = 0;
</span><span class="cx">
</span><span class="cx"> foreach ($configFile as $line_num => $line) {
</span><span class="lines">@@ -211,8 +222,7 @@
</span><span class="cx"> case "define('SECURE_A":
</span><span class="cx"> case "define('LOGGED_I":
</span><span class="cx"> case "define('NONCE_SA":
</span><del>- if ( $secret_keys )
- $configFile[$line_num] = str_replace('put your unique phrase here', substr( $secret_keys[$key++], 28, 64 ), $line );
</del><ins>+ $configFile[$line_num] = str_replace('put your unique phrase here', $secret_keys[$key++], $line );
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpconfigsamplephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-config-sample.php (13132 => 13133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-config-sample.php 2010-02-14 02:27:19 UTC (rev 13132)
+++ trunk/wp-config-sample.php 2010-02-14 02:47:45 UTC (rev 13133)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> * Authentication Unique Keys and Salts.
</span><span class="cx"> *
</span><span class="cx"> * Change these to different unique phrases!
</span><del>- * You can generate these using the {@link https://api.wordpress.org/secret-key/1.1/?salt=1 WordPress.org secret-key service}
</del><ins>+ * You can generate these using the {@link https://api.wordpress.org/secret-key/1.1/salt/ WordPress.org secret-key service}
</ins><span class="cx"> * You can change these at any point in time to invalidate all existing cookies. This will force all users to have to log in again.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.6.0
</span></span></pre></div>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (13132 => 13133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2010-02-14 02:27:19 UTC (rev 13132)
+++ trunk/wp-includes/pluggable.php 2010-02-14 02:47:45 UTC (rev 13133)
</span><span class="lines">@@ -1495,12 +1495,16 @@
</span><span class="cx"> // Reset $rnd_value after 14 uses
</span><span class="cx"> // 32(md5) + 40(sha1) + 40(sha1) / 8 = 14 random numbers from $rnd_value
</span><span class="cx"> if ( strlen($rnd_value) < 8 ) {
</span><del>- $seed = get_transient('random_seed');
</del><ins>+ if ( defined( 'WP_SETUP_CONFIG' ) )
+ static $seed = '';
+ else
+ $seed = get_transient('random_seed');
</ins><span class="cx"> $rnd_value = md5( uniqid(microtime() . mt_rand(), true ) . $seed );
</span><span class="cx"> $rnd_value .= sha1($rnd_value);
</span><span class="cx"> $rnd_value .= sha1($rnd_value . $seed);
</span><span class="cx"> $seed = md5($seed . $rnd_value);
</span><del>- set_transient('random_seed', $seed);
</del><ins>+ if ( ! defined( 'WP_SETUP_CONFIG' ) )
+ set_transient('random_seed', $seed);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Take the first 8 digits for our value
</span></span></pre>
</div>
</div>
</body>
</html>