Migrate to use DatabaseVirtualDomains (#59)

extension.json

@@ -12,7 +12,7 @@
 	"license-name": "GPL-3.0-or-later",
 	"type": "specialpage",
 	"requires": {
-		"MediaWiki": ">= 1.39.0"
+		"MediaWiki": ">= 1.42.0"
 	},
 	"MessagesDirs": {
 		"RequestSSL": [
@@ -79,7 +79,7 @@
 		"RequestSSL": {
 			"class": "Miraheze\\RequestSSL\\Specials\\SpecialRequestSSL",
 			"services": [
-				"DBLoadBalancerFactory",
+				"ConnectionProvider",
 				"MimeAnalyzer",
 				"RemoteWikiFactory",
 				"RepoGroup",
@@ -89,7 +89,7 @@
 		"RequestSSLQueue": {
 			"class": "Miraheze\\RequestSSL\\Specials\\SpecialRequestSSLQueue",
 			"services": [
-				"DBLoadBalancerFactory",
+				"ConnectionProvider",
 				"RequestSSLManager",
 				"PermissionManager",
 				"UserFactory"
@@ -117,21 +117,19 @@
 		"Main": {
 			"class": "Miraheze\\RequestSSL\\Hooks\\Handlers\\Main",
 			"services": [
-				"ConfigFactory"
+				"ConnectionProvider"
 			]
 		}
 	},
 	"ResourceModules": {
 		"ext.requestssl.oouiform": {
-			"targets": [ "desktop", "mobile" ],
 			"scripts": "ext.requestssl.oouiform.ooui.js",
 			"dependencies": [
 				"mediawiki.storage",
 				"oojs-ui-widgets"
 			]
 		},
 		"ext.requestssl.oouiform.styles": {
-			"targets": [ "desktop", "mobile" ],
 			"styles": "ext.requestssl.oouiform.ooui.less"
 		}
 	},
@@ -140,10 +138,6 @@
 		"remoteExtPath": "RequestSSL/modules"
 	},
 	"config": {
-		"RequestSSLCentralWiki": {
-			"value": "",
-			"description": "If set, only allow users to request a SSL certificate on this wiki."
-		},
 		"RequestSSLHelpUrl": {
 			"value": "",
 			"description": "Full URL. If set, adds a help URL to Special:RequestSSL."
@@ -183,5 +177,8 @@
 	"ServiceWiringFiles": [
 		"includes/ServiceWiring.php"
 	],
+	"DatabaseVirtualDomains": [
+		"virtual-requestssl"
+	],
 	"manifest_version": 2
 }

includes/Hooks/Handlers/Installer.php

@@ -14,6 +14,12 @@ public function onLoadExtensionSchemaUpdates( $updater ) {
 		$dbType = $updater->getDB()->getType();
 		$dir = __DIR__ . '/../../../sql';
 
-		$updater->addExtensionTable( 'requestssl_requests', "$dir/$dbType/tables-generated.sql" );
+		$updater->addExtensionUpdateOnVirtualDomain( [
+			'virtual-requestssl',
+			'addTable',
+			'requestssl_requests',
+			"$dir/$dbType/tables-generated.sql",
+			true,
+		] );
 	}
 }

includes/Hooks/Handlers/Main.php

@@ -2,29 +2,28 @@
 
 namespace Miraheze\RequestSSL\Hooks\Handlers;
 
-use Config;
-use ConfigFactory;
 use EchoAttributeManager;
 use MediaWiki\Block\Hook\GetAllBlockActionsHook;
 use MediaWiki\User\Hook\UserGetReservedNamesHook;
 use Miraheze\RequestSSL\Notifications\EchoNewRequestPresentationModel;
 use Miraheze\RequestSSL\Notifications\EchoRequestCommentPresentationModel;
 use Miraheze\RequestSSL\Notifications\EchoRequestStatusUpdatePresentationModel;
 use WikiMap;
+use Wikimedia\Rdbms\IConnectionProvider;
 
 class Main implements
 	GetAllBlockActionsHook,
 	UserGetReservedNamesHook
 {
 
-	/** @var Config */
-	private $config;
+	/** @var IConnectionProvider */
+	private $connectionProvider;
 
 	/**
-	 * @param ConfigFactory $configFactory
+	 * @param IConnectionProvider $connectionProvider
 	 */
-	public function __construct( ConfigFactory $configFactory ) {
-		$this->config = $configFactory->makeConfig( 'RequestSSL' );
+	public function __construct( IConnectionProvider $connectionProvider ) {
+		$this->connectionProvider = $connectionProvider;
 	}
 
 	/**
@@ -39,10 +38,8 @@ public function onUserGetReservedNames( &$reservedUsernames ) {
 	 * @param array &$actions
 	 */
 	public function onGetAllBlockActions( &$actions ) {
-		if (
-			$this->config->get( 'RequestSSLCentralWiki' ) &&
-			!WikiMap::isCurrentWikiId( $this->config->get( 'RequestSSLCentralWiki' ) )
-		) {
+		$dbr = $this->connectionProvider->getReplicaDatabase( 'virtual-requestssl' );
+		if ( !WikiMap::isCurrentWikiDbDomain( $dbr->getDomainID() ) ) {
 			return;
 		}
 
@@ -55,10 +52,8 @@ public function onGetAllBlockActions( &$actions ) {
 	 * @param array &$icons
 	 */
 	public function onBeforeCreateEchoEvent( &$notifications, &$notificationCategories, &$icons ) {
-		if (
-			$this->config->get( 'RequestSSLCentralWiki' ) &&
-			!WikiMap::isCurrentWikiId( $this->config->get( 'RequestSSLCentralWiki' ) )
-		) {
+		$dbr = $this->connectionProvider->getReplicaDatabase( 'virtual-requestssl' );
+		if ( !WikiMap::isCurrentWikiDbDomain( $dbr->getDomainID() ) ) {
 			return;
 		}
 

includes/RequestSSLManager.php

@@ -18,8 +18,8 @@
 use SpecialPage;
 use stdClass;
 use User;
-use Wikimedia\Rdbms\DBConnRef;
-use Wikimedia\Rdbms\ILBFactory;
+use Wikimedia\Rdbms\IConnectionProvider;
+use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\SelectQueryBuilder;
 
 class RequestSSLManager {
@@ -29,14 +29,13 @@ class RequestSSLManager {
 	];
 
 	public const CONSTRUCTOR_OPTIONS = [
-		'RequestSSLCentralWiki',
 		'RequestSSLScriptCommand',
 	];
 
 	/** @var Config */
 	private $config;
 
-	/** @var DBConnRef */
+	/** @var IDatabase */
 	private $dbw;
 
 	/** @var int */
@@ -45,8 +44,8 @@ class RequestSSLManager {
 	/** @var ActorStoreFactory */
 	private $actorStoreFactory;
 
-	/** @var ILBFactory */
-	private $dbLoadBalancerFactory;
+	/** @var IConnectionProvider */
+	private $connectionProvider;
 
 	/** @var MessageLocalizer */
 	private $messageLocalizer;
@@ -75,7 +74,7 @@ class RequestSSLManager {
 	/**
 	 * @param Config $config
 	 * @param ActorStoreFactory $actorStoreFactory
-	 * @param ILBFactory $dbLoadBalancerFactory
+	 * @param IConnectionProvider $connectionProvider
 	 * @param LinkRenderer $linkRenderer
 	 * @param RemoteWikiFactory $remoteWikiFactory
 	 * @param RepoGroup $repoGroup
@@ -87,7 +86,7 @@ class RequestSSLManager {
 	public function __construct(
 		Config $config,
 		ActorStoreFactory $actorStoreFactory,
-		ILBFactory $dbLoadBalancerFactory,
+		IConnectionProvider $connectionProvider,
 		LinkRenderer $linkRenderer,
 		RemoteWikiFactory $remoteWikiFactory,
 		RepoGroup $repoGroup,
@@ -100,7 +99,7 @@ public function __construct(
 
 		$this->config = $config;
 		$this->actorStoreFactory = $actorStoreFactory;
-		$this->dbLoadBalancerFactory = $dbLoadBalancerFactory;
+		$this->connectionProvider = $connectionProvider;
 		$this->linkRenderer = $linkRenderer;
 		$this->messageLocalizer = $messageLocalizer;
 		$this->options = $options;
@@ -114,17 +113,9 @@ public function __construct(
 	 * @param int $requestID
 	 */
 	public function fromID( int $requestID ) {
+		$this->dbw = $this->connectionProvider->getPrimaryDatabase( 'virtual-requestssl' );
 		$this->ID = $requestID;
 
-		$centralWiki = $this->options->get( 'RequestSSLCentralWiki' );
-		if ( $centralWiki ) {
-			$this->dbw = $this->dbLoadBalancerFactory->getMainLB(
-				$centralWiki
-			)->getConnection( DB_PRIMARY, [], $centralWiki );
-		} else {
-			$this->dbw = $this->dbLoadBalancerFactory->getMainLB()->getConnection( DB_PRIMARY );
-		}
-
 		$this->row = $this->dbw->newSelectQueryBuilder()
 			->table( 'requestssl_requests' )
 			->field( '*' )

includes/RequestSSLQueuePager.php

@@ -8,7 +8,7 @@
 use MediaWiki\User\UserFactory;
 use SpecialPage;
 use TablePager;
-use Wikimedia\Rdbms\ILBFactory;
+use Wikimedia\Rdbms\IConnectionProvider;
 
 class RequestSSLQueuePager extends TablePager {
 
@@ -30,7 +30,7 @@ class RequestSSLQueuePager extends TablePager {
 	/**
 	 * @param Config $config
 	 * @param IContextSource $context
-	 * @param ILBFactory $dbLoadBalancerFactory
+	 * @param IConnectionProvider $connectionProvider
 	 * @param LinkRenderer $linkRenderer
 	 * @param UserFactory $userFactory
 	 * @param string $requester
@@ -40,7 +40,7 @@ class RequestSSLQueuePager extends TablePager {
 	public function __construct(
 		Config $config,
 		IContextSource $context,
-		ILBFactory $dbLoadBalancerFactory,
+		IConnectionProvider $connectionProvider,
 		LinkRenderer $linkRenderer,
 		UserFactory $userFactory,
 		string $requester,
@@ -49,14 +49,7 @@ public function __construct(
 	) {
 		parent::__construct( $context, $linkRenderer );
 
-		$centralWiki = $config->get( 'RequestSSLCentralWiki' );
-		if ( $centralWiki ) {
-			$this->mDb = $dbLoadBalancerFactory->getMainLB(
-				$centralWiki
-			)->getConnection( DB_REPLICA, [], $centralWiki );
-		} else {
-			$this->mDb = $dbLoadBalancerFactory->getMainLB()->getConnection( DB_REPLICA );
-		}
+		$this->mDb = $connectionProvider->getReplicaDatabase( 'virtual-requestssl' );
 
 		$this->linkRenderer = $linkRenderer;
 		$this->userFactory = $userFactory;

includes/ServiceWiring.php

@@ -9,7 +9,7 @@
 		return new RequestSSLManager(
 			$services->getConfigFactory()->makeConfig( 'RequestSSL' ),
 			$services->getActorStoreFactory(),
-			$services->getDBLoadBalancerFactory(),
+			$services->getConnectionProvider(),
 			$services->getLinkRenderer(),
 			$services->get( 'RemoteWikiFactory' ),
 			$services->getRepoGroup(),

includes/Specials/SpecialRequestSSL.php

@@ -19,12 +19,12 @@
 use UserBlockedError;
 use UserNotLoggedIn;
 use WikiMap;
-use Wikimedia\Rdbms\ILBFactory;
+use Wikimedia\Rdbms\IConnectionProvider;
 
 class SpecialRequestSSL extends FormSpecialPage {
 
-	/** @var ILBFactory */
-	private $dbLoadBalancerFactory;
+	/** @var IConnectionProvider */
+	private $connectionProvider;
 
 	/** @var MimeAnalyzer */
 	private $mimeAnalyzer;
@@ -39,22 +39,22 @@ class SpecialRequestSSL extends FormSpecialPage {
 	private $userFactory;
 
 	/**
-	 * @param ILBFactory $dbLoadBalancerFactory
+	 * @param IConnectionProvider $connectionProvider
 	 * @param MimeAnalyzer $mimeAnalyzer
 	 * @param RemoteWikiFactory $remoteWikiFactory
 	 * @param RepoGroup $repoGroup
 	 * @param UserFactory $userFactory
 	 */
 	public function __construct(
-		ILBFactory $dbLoadBalancerFactory,
+		IConnectionProvider $connectionProvider,
 		MimeAnalyzer $mimeAnalyzer,
 		RemoteWikiFactory $remoteWikiFactory,
 		RepoGroup $repoGroup,
 		UserFactory $userFactory
 	) {
 		parent::__construct( 'RequestSSL', 'request-ssl' );
 
-		$this->dbLoadBalancerFactory = $dbLoadBalancerFactory;
+		$this->connectionProvider = $connectionProvider;
 		$this->mimeAnalyzer = $mimeAnalyzer;
 		$this->remoteWikiFactory = $remoteWikiFactory;
 		$this->repoGroup = $repoGroup;
@@ -68,10 +68,8 @@ public function execute( $par ) {
 		$this->setParameter( $par );
 		$this->setHeaders();
 
-		if (
-			$this->getConfig()->get( 'RequestSSLCentralWiki' ) &&
-			!WikiMap::isCurrentWikiId( $this->getConfig()->get( 'RequestSSLCentralWiki' ) )
-		) {
+		$dbr = $this->connectionProvider->getReplicaDatabase( 'virtual-requestssl' );
+		if ( !WikiMap::isCurrentWikiDbDomain( $dbr->getDomainID() ) ) {
 			throw new ErrorPageError( 'requestssl-notcentral', 'requestssl-notcentral-text' );
 		}
 
@@ -143,14 +141,7 @@ public function onSubmit( array $data ) {
 			return Status::newFatal( 'sessionfailure' );
 		}
 
-		$centralWiki = $this->getConfig()->get( 'RequestSSLCentralWiki' );
-		if ( $centralWiki ) {
-			$dbw = $this->dbLoadBalancerFactory->getMainLB(
-				$centralWiki
-			)->getConnection( DB_PRIMARY, [], $centralWiki );
-		} else {
-			$dbw = $this->dbLoadBalancerFactory->getMainLB()->getConnection( DB_PRIMARY );
-		}
+		$dbw = $this->connectionProvider->getPrimaryDatabase( 'virtual-requestssl' );
 
 		$duplicate = $dbw->newSelectQueryBuilder()
 			->table( 'requestssl_requests' )
@@ -363,12 +354,6 @@ public function checkPermissions() {
 		) {
 			throw new UserBlockedError( $block );
 		}
-
-		// @phan-suppress-next-line PhanDeprecatedFunction Only for MW 1.39 or lower.
-		$globalBlock = $user->getGlobalBlock();
-		if ( $globalBlock ) {
-			throw new UserBlockedError( $globalBlock );
-		}
 	}
 
 	/**