[MediaWiki-commits] [Gerrit] mediawiki...ConfirmEdit[master]: Use TitleReadWhitelist for automatic whitelist
jenkins-bot has submitted this change and it was merged.
Change subject: Use TitleReadWhitelist for automatic whitelist
..
Use TitleReadWhitelist for automatic whitelist
Instead of abusing the extension.json callback.
Bug: T142259
Change-Id: I12501ebfa61a4b2f72cec1f94b86a54e56c28719
---
M extension.json
M includes/ConfirmEditHooks.php
2 files changed, 19 insertions(+), 10 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 380545c..26f6830 100644
--- a/extension.json
+++ b/extension.json
@@ -82,6 +82,9 @@
],
"APIGetParamDescription": [
"ConfirmEditHooks::APIGetParamDescription"
+ ],
+ "TitleReadWhitelist": [
+ "ConfirmEditHooks::onTitleReadWhitelist"
]
},
"config": {
diff --git a/includes/ConfirmEditHooks.php b/includes/ConfirmEditHooks.php
index e0bf824..ebff507 100644
--- a/includes/ConfirmEditHooks.php
+++ b/includes/ConfirmEditHooks.php
@@ -142,25 +142,31 @@
* Set up $wgWhitelistRead
*/
public static function confirmEditSetup() {
- global $wgGroupPermissions, $wgCaptchaTriggers,
$wgWikimediaJenkinsCI;
+ global $wgCaptchaTriggers, $wgWikimediaJenkinsCI;
// There is no need to run (core) tests with enabled
ConfirmEdit - bug T44145
if ( isset( $wgWikimediaJenkinsCI ) && $wgWikimediaJenkinsCI
=== true ) {
$wgCaptchaTriggers = array_fill_keys( array_keys(
$wgCaptchaTriggers ), false );
}
+ }
- if ( !$wgGroupPermissions['*']['read'] &&
$wgCaptchaTriggers['badlogin'] ) {
- // We need to ensure that the captcha interface is
accessible
- // so that unauthenticated users can actually get in
after a
- // mistaken password typing.
- global $wgWhitelistRead;
- $image = SpecialPage::getTitleFor( 'Captcha', 'image' );
- $help = SpecialPage::getTitleFor( 'Captcha', 'help' );
- $wgWhitelistRead[] = $image->getPrefixedText();
- $wgWhitelistRead[] = $help->getPrefixedText();
+ /**
+* TitleReadWhitelist hook handler.
+*
+* @param Title $title
+* @param User $user
+* @param $whitelisted
+*/
+ public static function onTitleReadWhitelist( Title $title, User $user,
&$whitelisted ) {
+ $image = SpecialPage::getTitleFor( 'Captcha', 'image' );
+ $help = SpecialPage::getTitleFor( 'Captcha', 'help' );
+ if ( $title->equals( $image ) || $title->equals( $help ) ) {
+ $whitelisted = true;
}
}
+
/**
+*
* Callback for extension.json of FancyCaptcha to set a default captcha
directory,
* which depends on wgUploadDirectory
*/
--
To view, visit https://gerrit.wikimedia.org/r/305550
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I12501ebfa61a4b2f72cec1f94b86a54e56c28719
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ConfirmEdit[master]: Use TitleReadWhitelist for automatic whitelist
Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/305550
Change subject: Use TitleReadWhitelist for automatic whitelist
..
Use TitleReadWhitelist for automatic whitelist
Instead of abusing the extension.json callback.
Bug: T142259
Change-Id: I12501ebfa61a4b2f72cec1f94b86a54e56c28719
---
M extension.json
M includes/ConfirmEditHooks.php
2 files changed, 19 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit
refs/changes/50/305550/1
diff --git a/extension.json b/extension.json
index 380545c..26f6830 100644
--- a/extension.json
+++ b/extension.json
@@ -82,6 +82,9 @@
],
"APIGetParamDescription": [
"ConfirmEditHooks::APIGetParamDescription"
+ ],
+ "TitleReadWhitelist": [
+ "ConfirmEditHooks::onTitleReadWhitelist"
]
},
"config": {
diff --git a/includes/ConfirmEditHooks.php b/includes/ConfirmEditHooks.php
index e0bf824..ebff507 100644
--- a/includes/ConfirmEditHooks.php
+++ b/includes/ConfirmEditHooks.php
@@ -142,25 +142,31 @@
* Set up $wgWhitelistRead
*/
public static function confirmEditSetup() {
- global $wgGroupPermissions, $wgCaptchaTriggers,
$wgWikimediaJenkinsCI;
+ global $wgCaptchaTriggers, $wgWikimediaJenkinsCI;
// There is no need to run (core) tests with enabled
ConfirmEdit - bug T44145
if ( isset( $wgWikimediaJenkinsCI ) && $wgWikimediaJenkinsCI
=== true ) {
$wgCaptchaTriggers = array_fill_keys( array_keys(
$wgCaptchaTriggers ), false );
}
+ }
- if ( !$wgGroupPermissions['*']['read'] &&
$wgCaptchaTriggers['badlogin'] ) {
- // We need to ensure that the captcha interface is
accessible
- // so that unauthenticated users can actually get in
after a
- // mistaken password typing.
- global $wgWhitelistRead;
- $image = SpecialPage::getTitleFor( 'Captcha', 'image' );
- $help = SpecialPage::getTitleFor( 'Captcha', 'help' );
- $wgWhitelistRead[] = $image->getPrefixedText();
- $wgWhitelistRead[] = $help->getPrefixedText();
+ /**
+* TitleReadWhitelist hook handler.
+*
+* @param Title $title
+* @param User $user
+* @param $whitelisted
+*/
+ public static function onTitleReadWhitelist( Title $title, User $user,
&$whitelisted ) {
+ $image = SpecialPage::getTitleFor( 'Captcha', 'image' );
+ $help = SpecialPage::getTitleFor( 'Captcha', 'help' );
+ if ( $title->equals( $image ) || $title->equals( $help ) ) {
+ $whitelisted = true;
}
}
+
/**
+*
* Callback for extension.json of FancyCaptcha to set a default captcha
directory,
* which depends on wgUploadDirectory
*/
--
To view, visit https://gerrit.wikimedia.org/r/305550
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12501ebfa61a4b2f72cec1f94b86a54e56c28719
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
