jenkins-bot has submitted this change and it was merged. Change subject: Add emailauth role ......................................................................
Add emailauth role Change-Id: Ibf475d791fbefc0feafc5a445aa60648b624ca44 Depends-On: Ia6ed8f1952fd727af352646433b5f90f7083a8c2 Depends-On: Ie15c45c9b29de0a0f926c2467808ca144f05e866 --- A puppet/modules/role/manifests/emailauth.pp A puppet/modules/role/templates/emailauth/VagrantRoleEmailAuth.wiki A puppet/modules/role/templates/emailauth/conf.php.erb 3 files changed, 35 insertions(+), 0 deletions(-) Approvals: Gergő Tisza: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/role/manifests/emailauth.pp b/puppet/modules/role/manifests/emailauth.pp new file mode 100644 index 0000000..a0105a3 --- /dev/null +++ b/puppet/modules/role/manifests/emailauth.pp @@ -0,0 +1,16 @@ +# == Class: role::emailauth +# Provisions the EmailAuth[1] extension, which allows +# account verification via email. +# +# [1] https://www.mediawiki.org/wiki/Extension:EmailAuth +# +class role::emailauth { + mediawiki::extension { 'EmailAuth': + settings => template('role/emailauth/conf.php.erb'), + } + + mediawiki::import::text { 'VagrantRoleEmailAuth': + content => template('role/emailauth/VagrantRoleEmailAuth.wiki'), + } +} + diff --git a/puppet/modules/role/templates/emailauth/VagrantRoleEmailAuth.wiki b/puppet/modules/role/templates/emailauth/VagrantRoleEmailAuth.wiki new file mode 100644 index 0000000..6c22b52 --- /dev/null +++ b/puppet/modules/role/templates/emailauth/VagrantRoleEmailAuth.wiki @@ -0,0 +1,4 @@ +[https://www.mediawiki.org/wiki/Extension:EmailAuth EmailAuth] can request email-based verification on login. +It can be activated with the [https://www.mediawiki.org/wiki/Extension:EmailAuth/EmailAuthRequireToken EmailAuthRequireToken] hook. +The vagrant role enables it for admins who do not have OATH authentication enabled. + diff --git a/puppet/modules/role/templates/emailauth/conf.php.erb b/puppet/modules/role/templates/emailauth/conf.php.erb new file mode 100644 index 0000000..6697f2d --- /dev/null +++ b/puppet/modules/role/templates/emailauth/conf.php.erb @@ -0,0 +1,15 @@ +$wgHooks['EmailAuthRequireToken'][] = function ( + $user, &$verificationRequired, &$formMessage, &$subjectMessage, &$bodyMessage +) { + if ( + class_exists( OATHAuthUtils::class ) && + OATHAuthUtils::isEnabledFor( $user ) + ) { + return; + } + + if ( $user->isAllowed( 'delete' ) ) { + $verificationRequired = true; + return false; + } +}; -- To view, visit https://gerrit.wikimedia.org/r/321705 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibf475d791fbefc0feafc5a445aa60648b624ca44 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org> Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org> Gerrit-Reviewer: Gergő Tisza <gti...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
