From 5071c6574a6de702d24cdf4be9a30f928caf1a4b Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sun, 21 Oct 2018 00:40:57 -0700
Subject: [PATCH] Use proper cache key construction for throttle, rules, and
 autoblock keys

Change-Id: I72ab39048f955d4262fae81141cf97243e5cd184
---
 includes/AbuseFilter.php | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/includes/AbuseFilter.php b/includes/AbuseFilter.php
index a1902489d..6c6795e16 100644
--- a/includes/AbuseFilter.php
+++ b/includes/AbuseFilter.php
@@ -1900,15 +1900,14 @@ class AbuseFilter {
 
 		global $wgAbuseFilterIsCentral, $wgAbuseFilterCentralDB;
 
+		$cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
 		if ( $global && !$wgAbuseFilterIsCentral ) {
-			list( $globalSite, $globalPrefix ) = wfSplitWikiID( $wgAbuseFilterCentralDB );
-
-			return wfForeignMemcKey(
-				$globalSite, $globalPrefix,
-				'abusefilter', 'throttle', $throttleId, $type, $identifier );
+			return $cache->makeGlobalKey(
+				'abusefilter', 'throttle', $wgAbuseFilterCentralDB, $throttleId, $type, $identifier
+			);
 		}
 
-		return wfMemcKey( 'abusefilter', 'throttle', $throttleId, $type, $identifier );
+		return $cache->makeKey( 'abusefilter', 'throttle', $throttleId, $type, $identifier );
 	}
 
 	/**
@@ -1918,16 +1917,12 @@ class AbuseFilter {
 	public static function getGlobalRulesKey( $group ) {
 		global $wgAbuseFilterIsCentral, $wgAbuseFilterCentralDB;
 
+		$cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
 		if ( !$wgAbuseFilterIsCentral ) {
-			list( $globalSite, $globalPrefix ) = wfSplitWikiID( $wgAbuseFilterCentralDB );
-
-			return wfForeignMemcKey(
-				$globalSite, $globalPrefix,
-				'abusefilter', 'rules', $group
-			);
+			return $cache->makeGlobalKey( 'abusefilter', 'rules', $wgAbuseFilterCentralDB, $group );
 		}
 
-		return wfMemcKey( 'abusefilter', 'rules', $group );
+		return $cache->makeKey( 'abusefilter', 'rules', $group );
 	}
 
 	/**
@@ -1935,7 +1930,9 @@ class AbuseFilter {
 	 * @return string
 	 */
 	public static function autoPromoteBlockKey( $user ) {
-		return wfMemcKey( 'abusefilter', 'block-autopromote', $user->getId() );
+		$cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
+
+		return $cache->makeKey( 'abusefilter', 'block-autopromote', $user->getId() );
 	}
 
 	/**