wikimedia/mediawiki-extensions-OATHAuth
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/OATHAuth synced 2024-11-28 02:00:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Declare issuer name in QR code when setting up 2FA

Browse source 
The issuer name is an optional but important feature that allows
the user to differentiate between different accounts used in the
same authenticator app. While we currently use a prefix in the
user account name, declaring an issuer makes it easier for the
user to differentiate.

Bug: T150596
Change-Id: I741dd671e79e0326dfe97bdaaf63b3997960d115
This commit is contained in:
Hydriz 2016-11-13 03:43:55 +00:00
parent e317bf4610
commit 0b460de458
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
OATHUser.php
View file

@ -31,13 +31,19 @@ class OATHUser {
/** /**
* @return String * @return String
*/ */
public function getAccount() { public function getIssuer() {
global $wgSitename, $wgOATHAuthAccountPrefix; global $wgSitename, $wgOATHAuthAccountPrefix;
if ( $wgOATHAuthAccountPrefix !== false ) { if ( $wgOATHAuthAccountPrefix !== false ) {
return "$wgOATHAuthAccountPrefix:{$this->user->getName()}"; return $wgOATHAuthAccountPrefix;
} }
return "$wgSitename:{$this->user->getName()}"; return $wgSitename;
}
/**
* @return String
*/
public function getAccount() {
return $this->user->getName();
} }
/** /**

7
special/SpecialOATHEnable.php
View file

@ -80,10 +80,13 @@ class SpecialOATHEnable extends FormSpecialPage {
} }
$secret = $key->getSecret(); $secret = $key->getSecret();
$label = "{$this->OATHUser->getIssuer()}:{$this->OATHUser->getAccount()}";
$qrcodeUrl = "otpauth://totp/" $qrcodeUrl = "otpauth://totp/"
. rawurlencode( $this->OATHUser->getAccount() ) . rawurlencode( $label )
. "?secret=" . "?secret="
. rawurlencode( $secret ); . rawurlencode( $secret )
. "&issuer="
. rawurlencode( $this->OATHUser->getIssuer() );
$qrcodeElement = Html::element( 'div', [ $qrcodeElement = Html::element( 'div', [
'data-mw-qrcode-url' => $qrcodeUrl, 'data-mw-qrcode-url' => $qrcodeUrl,