ParserAfterTidy to check readOnly mode, refs 2432 (#2434)

SemanticMediaWiki · May 13, 2017 · e09fb92 · e09fb92
1 parent 47cac6b
commit e09fb92
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 0 deletions.
diff --git a/src/MediaWiki/Hooks/HookRegistry.php b/src/MediaWiki/Hooks/HookRegistry.php
@@ -143,6 +143,14 @@ private function addCallbackHandlers( $basePath, $globalVars ) {
 		 */
 		$this->handlers['ParserAfterTidy'] = function ( &$parser, &$text ) {
 
+			// MediaWiki\Services\ServiceDisabledException from line 340 of
+			// ...\ServiceContainer.php: Service disabled: DBLoadBalancer
+			try {
+				$isReadOnly = wfReadOnly();
+			} catch( \MediaWiki\Services\ServiceDisabledException $e ) {
+				$isReadOnly = true;
+			}
+
 			$parserAfterTidy = new ParserAfterTidy(
 				$parser
 			);
@@ -151,6 +159,10 @@ private function addCallbackHandlers( $basePath, $globalVars ) {
 				$GLOBALS['wgCommandLineMode']
 			);
 
+			$parserAfterTidy->isReadOnly(
+				$isReadOnly
+			);
+
 			return $parserAfterTidy->process( $text );
 		};
 

diff --git a/src/MediaWiki/Hooks/ParserAfterTidy.php b/src/MediaWiki/Hooks/ParserAfterTidy.php
@@ -5,6 +5,7 @@
 use Parser;
 use SMW\ApplicationFactory;
 use SMW\SemanticData;
+use SMW\MediaWiki\MediaWiki;
 
 /**
  * Hook: ParserAfterTidy to add some final processing to the
@@ -29,6 +30,11 @@ class ParserAfterTidy extends HookHandler {
 	 */
 	private $isCommandLineMode = false;
 
+	/**
+	 * @var boolean
+	 */
+	private $isReadOnly = false;
+
 	/**
 	 * @since  1.9
 	 *
@@ -49,6 +55,15 @@ public function isCommandLineMode( $isCommandLineMode ) {
 		$this->isCommandLineMode = (bool)$isCommandLineMode;
 	}
 
+	/**
+	 * @since 3.0
+	 *
+	 * @param boolean $isReadOnly
+	 */
+	public function isReadOnly( $isReadOnly ) {
+		$this->isReadOnly = (bool)$isReadOnly;
+	}
+
 	/**
 	 * @since 1.9
 	 *
@@ -67,6 +82,12 @@ public function process( &$text ) {
 
 	private function canPerformUpdate() {
 
+		// #2432 avoid access to the DBLoadBalancer while being in readOnly mode
+		// when for example Title::isProtected is accessed
+		if ( $this->isReadOnly ) {
+			return false;
+		}
+
 		// ParserOptions::getInterfaceMessage is being used to identify whether a
 		// parse was initiated by `Message::parse`
 		if ( $this->parser->getTitle()->isSpecialPage() || $this->parser->getOptions()->getInterfaceMessage() ) {

diff --git a/tests/phpunit/Unit/MediaWiki/Hooks/ParserAfterTidyTest.php b/tests/phpunit/Unit/MediaWiki/Hooks/ParserAfterTidyTest.php
@@ -68,6 +68,22 @@ public function testCanConstruct() {
 		);
 	}
 
+	public function testIsReadOnly() {
+
+		$parser = $this->getMockBuilder( 'Parser' )
+			->disableOriginalConstructor()
+			->getMock();
+
+		$parser->expects( $this->never() )
+			->method( 'getTitle' );
+
+		$instance = new ParserAfterTidy( $parser );
+		$instance->isReadOnly( true );
+
+		$text = '';
+		$instance->process( $text );
+	}
+
 	private function newMockCache( $id, $containsStatus, $fetchStatus ) {
 
 		$key = $this->applicationFactory->newCacheFactory()->getPurgeCacheKey( $id );