LogFormatter::formatParameterValue: handle bad user names

This makes LogFormatter more robust against bad user names coming from
broken log records.

Bug: T224368
Change-Id: Ifce9e86bddba274182253cd25338766e8093d6ad

diff --git a/includes/logging/LogFormatter.php b/includes/logging/LogFormatter.php
index 3e942ae..e8dd898 100644 (file)
--- a/includes/logging/LogFormatter.php
+++ b/includes/logging/LogFormatter.php
@@ -613,9 +613,13 @@ class LogFormatter {
                                $this->setShowUserToolLinks( false );
 
                                $user = User::newFromName( $value );
-                               $value = Message::rawParam( $this->makeUserLink( $user ) );
 
-                               $this->setShowUserToolLinks( $saveLinkFlood );
+                               if ( !$user ) {
+                                       $value = $this->msg( 'empty-username' )->text();
+                               } else {
+                                       $value = Message::rawParam( $this->makeUserLink( $user ) );
+                                       $this->setShowUserToolLinks( $saveLinkFlood );
+                               }
                                break;
                        case 'title':
                                $title = Title::newFromText( $value );

diff --git a/tests/phpunit/includes/logging/LogFormatterTest.php b/tests/phpunit/includes/logging/LogFormatterTest.php
index f444d40..4bb9d5a 100644 (file)
--- a/tests/phpunit/includes/logging/LogFormatterTest.php
+++ b/tests/phpunit/includes/logging/LogFormatterTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\User\UserIdentityValue;
+
 /**
  * @group Database
  */
@@ -214,6 +216,23 @@ class LogFormatterTest extends MediaWikiLangTestCase {
                $this->assertEquals( $expected, $logParam );
        }
 
+       /**
+        * @covers LogFormatter::newFromEntry
+        * @covers LogFormatter::getActionText
+        */
+       public function testLogParamsTypeUserLink_empty() {
+               $params = [ '4:user-link:userLink' => ':' ];
+
+               $entry = $this->newLogEntry( 'param', $params );
+               $formatter = LogFormatter::newFromEntry( $entry );
+
+               $this->context->setLanguage( Language::factory( 'qqx' ) );
+               $formatter->setContext( $this->context );
+
+               $logParam = $formatter->getActionText();
+               $this->assertContains( '(empty-username)', $logParam );
+       }
+
        /**
         * @covers LogFormatter::newFromEntry
         * @covers LogFormatter::getActionText
@@ -248,6 +267,20 @@ class LogFormatterTest extends MediaWikiLangTestCase {
                $this->assertEquals( $expected, $logParam );
        }
 
+       /**
+        * @covers LogFormatter::getPerformerElement
+        */
+       public function testGetPerformerElement() {
+               $entry = $this->newLogEntry( 'param', [] );
+               $entry->setPerformer( new UserIdentityValue( 1328435, 'Test', 0 ) );
+
+               $formatter = LogFormatter::newFromEntry( $entry );
+               $formatter->setContext( $this->context );
+
+               $element = $formatter->getPerformerElement();
+               $this->assertContains( 'User:Test', $element );
+       }
+
        /**
         * @covers LogFormatter::newFromEntry
         * @covers LogFormatter::getComment