From 9e103d3dc30ae5fa364ff110dcc16b7ce5996932 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Wed, 3 Sep 2008 02:28:41 +0000
Subject: [PATCH] Reverting r40323, as per comments on wikitech-l. Deprecated
 doesn't mean removed. It doesn't even mean it'll be removed in the future. It
 just means you shouldn't use it.

---
 RELEASE-NOTES                        | 3 ---
 config/index.php                     | 2 +-
 includes/DefaultSettings.php         | 2 ++
 includes/ProxyTools.php              | 4 ++--
 includes/Setup.php                   | 4 ----
 includes/User.php                    | 4 +++-
 includes/specials/SpecialBlockme.php | 4 ++--
 7 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bff525111a..6c27e8a8c0 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -46,9 +46,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * $wgAllowExternalImagesFrom may now be an array of multiple strings.
 * Introduced $wgEnableImageWhitelist to toggle the on-wiki external image
   whitelist on or off.
-* $wgProxyKey has been fully deprecated (marked as such since 1.4, never
-  seems to have been completed). $wgSecretKey is the official documented
-  setting now.
   
 === New features in 1.14 ===
 
diff --git a/config/index.php b/config/index.php
index 785ec21a86..a0d7f4fbe4 100644
--- a/config/index.php
+++ b/config/index.php
@@ -1706,7 +1706,7 @@ if ( \$wgCommandLineMode ) {
 
 \$wgLanguageCode = \"{$slconf['LanguageCode']}\";
 
-\$wgSecretKey = \"$secretKey\";
+\$wgProxyKey = \"$secretKey\";
 
 ## Default skin: you can change the default skin. Use the internal symbolic
 ## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook':
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 64a0cab881..ef02aae090 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1357,6 +1357,8 @@ $wgProxyMemcExpiry = 86400;
 $wgSecretKey = false;
 /** big list of banned IP addresses, in the keys not the values */
 $wgProxyList = array();
+/** deprecated */
+$wgProxyKey = false;
 
 /** Number of accounts each IP address may create, 0 to disable.
  * Requires memcached */
diff --git a/includes/ProxyTools.php b/includes/ProxyTools.php
index a89283c3bc..759857d683 100644
--- a/includes/ProxyTools.php
+++ b/includes/ProxyTools.php
@@ -138,7 +138,7 @@ function wfIsTrustedProxy( $ip ) {
 function wfProxyCheck() {
 	global $wgBlockOpenProxies, $wgProxyPorts, $wgProxyScriptPath;
 	global $wgMemc, $wgProxyMemcExpiry;
-	global $wgSecretKey;
+	global $wgProxyKey;
 
 	if ( !$wgBlockOpenProxies ) {
 		return;
@@ -154,7 +154,7 @@ function wfProxyCheck() {
 	# Fork the processes
 	if ( !$skip ) {
 		$title = SpecialPage::getTitleFor( 'Blockme' );
-		$iphash = md5( $ip . $wgSecretKey );
+		$iphash = md5( $ip . $wgProxyKey );
 		$url = $title->getFullURL( 'ip='.$iphash );
 
 		foreach ( $wgProxyPorts as $port ) {
diff --git a/includes/Setup.php b/includes/Setup.php
index 148af48d1c..ecc6deff73 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -150,10 +150,6 @@ require_once( "$IP/includes/StubObject.php" );
 wfProfileOut( $fname.'-includes' );
 wfProfileIn( $fname.'-misc1' );
 
-# Override SecretKey with ProxyKey if a site is using the old setting
-if ( isset( $wgProxyKey ) ) {
-	$wgSecretKey = $wgProxyKey;
-}
 
 $wgIP = false; # Load on demand
 # Can't stub this one, it sets up $_GET and $_REQUEST in its constructor
diff --git a/includes/User.php b/includes/User.php
index 25791e4d5d..5fa2ff5c28 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1650,11 +1650,13 @@ class User {
 	 * @private
 	 */
 	function setToken( $token = false ) {
-		global $wgSecretKey;
+		global $wgSecretKey, $wgProxyKey;
 		$this->load();
 		if ( !$token ) {
 			if ( $wgSecretKey ) {
 				$key = $wgSecretKey;
+			} elseif ( $wgProxyKey ) {
+				$key = $wgProxyKey;
 			} else {
 				$key = microtime();
 			}
diff --git a/includes/specials/SpecialBlockme.php b/includes/specials/SpecialBlockme.php
index 81d368405c..f222e3c63e 100644
--- a/includes/specials/SpecialBlockme.php
+++ b/includes/specials/SpecialBlockme.php
@@ -8,11 +8,11 @@
  *
  */
 function wfSpecialBlockme() {
-	global $wgRequest, $wgBlockOpenProxies, $wgOut, $wgSecretKey;
+	global $wgRequest, $wgBlockOpenProxies, $wgOut, $wgProxyKey;
 
 	$ip = wfGetIP();
 
-	if( !$wgBlockOpenProxies || $wgRequest->getText( 'ip' ) != md5( $ip . $wgSecretKey ) ) {
+	if( !$wgBlockOpenProxies || $wgRequest->getText( 'ip' ) != md5( $ip . $wgProxyKey ) ) {
 		$wgOut->addWikiMsg( 'proxyblocker-disabled' );
 		return;
 	}
-- 
2.20.1