From 152c80c2cf385c072ab5a9e6e02189e3475f5952 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Thu, 17 Feb 2022 23:35:18 -0800 Subject: [PATCH] Send log entries to CheckUser Because our log is restricted, we don't publish it to RecentChanges, so it never ends up in CU. Let's be consistent and log these to CheckUser as well. Bug: T301992 Change-Id: I37dac4ecdcf70368f416fc2983afbb4238c19bb2 --- .phan/config.php | 2 ++ src/Special/DisableOATHForUser.php | 6 ++++++ src/Special/VerifyOATHForUser.php | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/.phan/config.php b/.phan/config.php index 294f13da..0de52aad 100644 --- a/.phan/config.php +++ b/.phan/config.php @@ -4,12 +4,14 @@ $cfg = require __DIR__ . '/../vendor/mediawiki/mediawiki-phan-config/src/config. $cfg['directory_list'] = array_merge( $cfg['directory_list'], [ + '../../extensions/CheckUser', '../../extensions/Echo', ] ); $cfg['exclude_analysis_directory_list'] = array_merge( $cfg['exclude_analysis_directory_list'], [ + '../../extensions/CheckUser', '../../extensions/Echo', ] ); diff --git a/src/Special/DisableOATHForUser.php b/src/Special/DisableOATHForUser.php index 2ff7270d..f2edbc00 100644 --- a/src/Special/DisableOATHForUser.php +++ b/src/Special/DisableOATHForUser.php @@ -2,7 +2,9 @@ namespace MediaWiki\Extension\OATHAuth\Special; +use ExtensionRegistry; use ManualLogEntry; +use MediaWiki\CheckUser\Hooks as CheckUserHooks; use MediaWiki\Config\ConfigException; use MediaWiki\Extension\OATHAuth\OATHUserRepository; use MediaWiki\HTMLForm\HTMLForm; @@ -151,6 +153,10 @@ class DisableOATHForUser extends FormSpecialPage { $logEntry->setComment( $formData['reason'] ); $logEntry->insert(); + if ( ExtensionRegistry::getInstance()->isLoaded( 'CheckUser' ) ) { + CheckUserHooks::updateCheckUserData( $logEntry->getRecentChange() ); + } + LoggerFactory::getInstance( 'authentication' )->info( 'OATHAuth disabled for {usertarget} by {user} from {clientip}', [ 'user' => $this->getUser()->getName(), diff --git a/src/Special/VerifyOATHForUser.php b/src/Special/VerifyOATHForUser.php index 0d95caf1..83b56335 100644 --- a/src/Special/VerifyOATHForUser.php +++ b/src/Special/VerifyOATHForUser.php @@ -2,7 +2,9 @@ namespace MediaWiki\Extension\OATHAuth\Special; +use ExtensionRegistry; use ManualLogEntry; +use MediaWiki\CheckUser\Hooks as CheckUserHooks; use MediaWiki\Config\ConfigException; use MediaWiki\Extension\OATHAuth\OATHUserRepository; use MediaWiki\HTMLForm\HTMLForm; @@ -131,6 +133,10 @@ class VerifyOATHForUser extends FormSpecialPage { $logEntry->setComment( $formData['reason'] ); $logEntry->insert(); + if ( ExtensionRegistry::getInstance()->isLoaded( 'CheckUser' ) ) { + CheckUserHooks::updateCheckUserData( $logEntry->getRecentChange() ); + } + LoggerFactory::getInstance( 'authentication' )->info( 'OATHAuth status checked for {usertarget} by {user} from {clientip}', [ 'user' => $this->getUser()->getName(),