[MediaWiki-commits] [Gerrit] mediawiki...OATHAuth[master]: Declare issuer name in QR code when setting up 2FA

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Declare issuer name in QR code when setting up 2FA
..


Declare issuer name in QR code when setting up 2FA

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
---
M OATHUser.php
M special/SpecialOATHEnable.php
2 files changed, 15 insertions(+), 6 deletions(-)

Approvals:
  Parent5446: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/OATHUser.php b/OATHUser.php
index e5822c0..10a6312 100644
--- a/OATHUser.php
+++ b/OATHUser.php
@@ -31,13 +31,19 @@
/**
 * @return String
 */
-   public function getAccount() {
+   public function getIssuer() {
global $wgSitename, $wgOATHAuthAccountPrefix;
-
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();
}
 
/**
diff --git a/special/SpecialOATHEnable.php b/special/SpecialOATHEnable.php
index ecc26a1..7607b67 100644
--- a/special/SpecialOATHEnable.php
+++ b/special/SpecialOATHEnable.php
@@ -80,10 +80,13 @@
}
 
$secret = $key->getSecret();
+   $label = 
"{$this->OATHUser->getIssuer()}:{$this->OATHUser->getAccount()}";
$qrcodeUrl = "otpauth://totp/"
-   . rawurlencode( $this->OATHUser->getAccount() )
+   . rawurlencode( $label )
. "?secret="
-   . rawurlencode( $secret );
+   . rawurlencode( $secret )
+   . "="
+   . rawurlencode( $this->OATHUser->getIssuer() );
 
$qrcodeElement = Html::element( 'div', [
'data-mw-qrcode-url' => $qrcodeUrl,

-- 
To view, visit https://gerrit.wikimedia.org/r/321168
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I741dd671e79e0326dfe97bdaaf63b3997960d115
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/OATHAuth
Gerrit-Branch: master
Gerrit-Owner: Hydriz 
Gerrit-Reviewer: Hydriz 
Gerrit-Reviewer: Parent5446 
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...OATHAuth[master]: Declare issuer name in QR code when setting up 2FA

[Hydriz (Code Review)]

Hydriz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/321168

Change subject: Declare issuer name in QR code when setting up 2FA
..

Declare issuer name in QR code when setting up 2FA

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
---
M OATHUser.php
M special/SpecialOATHEnable.php
2 files changed, 13 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OATHAuth 
refs/changes/68/321168/1

diff --git a/OATHUser.php b/OATHUser.php
index e5822c0..10a6312 100644
--- a/OATHUser.php
+++ b/OATHUser.php
@@ -31,13 +31,19 @@
/**
 * @return String
 */
-   public function getAccount() {
+   public function getIssuer() {
global $wgSitename, $wgOATHAuthAccountPrefix;
-
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();
}
 
/**
diff --git a/special/SpecialOATHEnable.php b/special/SpecialOATHEnable.php
index ecc26a1..86f5aee 100644
--- a/special/SpecialOATHEnable.php
+++ b/special/SpecialOATHEnable.php
@@ -83,7 +83,9 @@
$qrcodeUrl = "otpauth://totp/"
. rawurlencode( $this->OATHUser->getAccount() )
. "?secret="
-   . rawurlencode( $secret );
+   . rawurlencode( $secret )
+   . "="
+   . rawurlencode( $this->OATHUser->getIssuer() );
 
$qrcodeElement = Html::element( 'div', [
'data-mw-qrcode-url' => $qrcodeUrl,

-- 
To view, visit https://gerrit.wikimedia.org/r/321168
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I741dd671e79e0326dfe97bdaaf63b3997960d115
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OATHAuth
Gerrit-Branch: master
Gerrit-Owner: Hydriz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits