Merge "Allow showing a CAPTCHA in response to AbuseFilter consequence"

extension.json

@@ -94,6 +94,9 @@
 			"services": [
 				"MainWANObjectCache"
 			]
+		},
+		"AbuseFilterHooks": {
+			"class": "MediaWiki\\Extension\\ConfirmEdit\\AbuseFilterHooks"
 		}
 	},
 	"Hooks": {
@@ -107,7 +110,8 @@
 		"EditPage::showEditForm:fields": "ConfirmEditHooks",
 		"EditFilterMergedContent": "ConfirmEditHooks",
 		"APIGetAllowedParams": "ConfirmEditHooks",
-		"AuthChangeFormFields": "ConfirmEditHooks"
+		"AuthChangeFormFields": "ConfirmEditHooks",
+		"AbuseFilterCustomActions": "AbuseFilterHooks"
 	},
 	"AuthManagerAutoConfig": {
 		"preauth": {

i18n/en.json

@@ -31,5 +31,6 @@
 	"confirmedit-preview-validity": "Validity",
 	"confirmedit-preview-valid": "valid",
 	"confirmedit-preview-invalid": "invalid",
-	"confirmedit-preview-description": "The following table shows the list of lines on this page and whether it's a valid IP address or IP address range. If the line is a valid IP address or IP address range, it will be excluded from CAPTCHA checks but invalid lines will be ignored. An example of a valid IP address range would be: 69.208.0.0/16 which goes from 69.208.0.0 to 69.208.255.255. [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Range_blocks#Calculating_the_CIDR_suffix More information] about calculating an IP address range."
+	"confirmedit-preview-description": "The following table shows the list of lines on this page and whether it's a valid IP address or IP address range. If the line is a valid IP address or IP address range, it will be excluded from CAPTCHA checks but invalid lines will be ignored. An example of a valid IP address range would be: 69.208.0.0/16 which goes from 69.208.0.0 to 69.208.255.255. [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Range_blocks#Calculating_the_CIDR_suffix More information] about calculating an IP address range.",
+	"abusefilter-edit-action-showcaptcha": "Require the user to complete a CAPTCHA in order to proceed with the action. Users with permission to skip a CAPTCHA are exempt."
 }

i18n/qqq.json

@@ -47,5 +47,6 @@
 	"confirmedit-preview-validity": "Used as a table heading for the edit preview of [[MediaWiki:Captcha-ip-whitelist]] to indicate the validity of a content of a line (if it's an IP address or not).\n{{Identical|Validity}}",
 	"confirmedit-preview-valid": "Used to indicate a valid IP address in the edit preview of [[MediaWiki:Captcha-ip-whitelist]].\n{{Identical|Valid}}",
 	"confirmedit-preview-invalid": "Used to indicate an invalid IP address in the edit preview of [[MediaWiki:Captcha-ip-whitelist]].\n{{Identical|Invalid}}",
-	"confirmedit-preview-description": "Explains the edit preview of [[MediaWiki:Captcha-ip-whitelist]]."
+	"confirmedit-preview-description": "Explains the edit preview of [[MediaWiki:Captcha-ip-whitelist]].",
+	"abusefilter-edit-action-showcaptcha": "Label shown in [[Special:AbuseFilter]] for the show CAPTCHA consequence."
 }

includes/AbuseFilter/CaptchaConsequence.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace MediaWiki\Extension\ConfirmEdit\AbuseFilter;
+
+use MediaWiki\Context\RequestContext;
+use MediaWiki\Extension\AbuseFilter\Consequences\Consequence\Consequence;
+
+/**
+ * Will inform ConfirmEdit extension to show a CAPTCHA.
+ */
+class CaptchaConsequence extends Consequence {
+
+	public const FLAG = 'wgAbuseFilterCaptchaConsequence';
+
+	public function execute(): bool {
+		// This consequence was triggered, so we need to set a global flag
+		// which Extension:ConfirmEdit will read in order to decide if a
+		// CAPTCHA should be shown to the user in onConfirmEditTriggersCaptcha
+		RequestContext::getMain()->getRequest()->setVal( self::FLAG, true );
+		return true;
+	}
+}

includes/AbuseFilterHooks.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace MediaWiki\Extension\ConfirmEdit;
+
+use MediaWiki\Extension\AbuseFilter\Consequences\Parameters;
+use MediaWiki\Extension\AbuseFilter\Hooks\AbuseFilterCustomActionsHook;
+use MediaWiki\Extension\ConfirmEdit\AbuseFilter\CaptchaConsequence;
+
+class AbuseFilterHooks implements AbuseFilterCustomActionsHook {
+
+	/** @inheritDoc */
+	public function onAbuseFilterCustomActions( array &$actions ): void {
+		$actions['showcaptcha'] = static function ( Parameters $params ): CaptchaConsequence {
+			return new CaptchaConsequence( $params );
+		};
+	}
+
+}

tests/phpunit/integration/AbuseFilter/CaptchaConsequenceTest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace MediaWiki\Extension\ConfirmEdit\Test\Integration\AbuseFilter;
+
+use MediaWiki\Context\RequestContext;
+use MediaWiki\Extension\AbuseFilter\Consequences\Parameters;
+use MediaWiki\Extension\ConfirmEdit\AbuseFilter\CaptchaConsequence;
+use MediaWikiIntegrationTestCase;
+
+/**
+ * @covers \MediaWiki\Extension\ConfirmEdit\AbuseFilter\CaptchaConsequence
+ */
+class CaptchaConsequenceTest extends MediaWikiIntegrationTestCase {
+
+	public function testExecute() {
+		$parameters = $this->createMock( Parameters::class );
+		$parameters->method( 'getAction' )->willReturn( 'edit' );
+		$captchaConsequence = new CaptchaConsequence( $parameters );
+		$request = RequestContext::getMain();
+		$this->assertNull( $request->getRequest()->getVal(
+			CaptchaConsequence::FLAG
+		) );
+		$captchaConsequence->execute();
+		$this->assertTrue(
+			$request->getRequest()->getBool(
+				CaptchaConsequence::FLAG
+			)
+		);
+	}
+
+}

tests/phpunit/unit/AbuseFilterHooksTest.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace MediaWiki\Extension\ConfirmEdit\Test\Unit\AbuseFilter;
+
+use MediaWiki\Extension\ConfirmEdit\AbuseFilterHooks;
+use MediaWikiUnitTestCase;
+
+/**
+ * @covers \MediaWiki\Extension\ConfirmEdit\AbuseFilterHooks
+ */
+class AbuseFilterHooksTest extends MediaWikiUnitTestCase {
+
+	public function testOnAbuseFilterCustomActions() {
+		$abuseFilterHooks = new AbuseFilterHooks();
+		$actions = [];
+		$abuseFilterHooks->onAbuseFilterCustomActions( $actions );
+		$this->assertArrayHasKey( 'showcaptcha', $actions );
+	}
+}