Attachment 129661 Details for Bug 28786 – Bug 28786: (QA follow-up) Do not call generate_secret32

[patch] Bug 28786: (QA follow-up) Do not call generate_secret32

Bug-28786-QA-follow-up-Do-not-call-generatesecret3.patch (text/plain), 1.89 KB, created by Jonathan Druart on 2022-01-20 14:11:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2022-01-20 14:11:14 UTC

Size: 1.89 KB

patch

obsolete

>From 879ad5c7b39f29cc8cc66817c7472eb9bf8d7fc1 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Mon, 17 Jan 2022 12:53:46 +0000
>Subject: [PATCH] Bug 28786: (QA follow-up) Do not call generate_secret32
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> Koha/Auth/TwoFactorAuth.pm | 6 ++----
> members/two_factor_auth.pl | 5 ++---
> 2 files changed, 4 insertions(+), 7 deletions(-)
>
>diff --git a/Koha/Auth/TwoFactorAuth.pm b/Koha/Auth/TwoFactorAuth.pm
>index 89320067638..81ddf06a3d4 100644
>--- a/Koha/Auth/TwoFactorAuth.pm
>+++ b/Koha/Auth/TwoFactorAuth.pm
>@@ -29,10 +29,8 @@ Koha::Auth::TwoFactorAuth- Koha class deal with Two factor authentication
> use Koha::Auth::TwoFactorAuth;
> 
> my $secret = Koha::AuthUtils::generate_salt( 'weak', 16 );
>-my $auth = Koha::Auth::TwoFactorAuth->new(
>-    { patron => $patron, secret => $secret } );
>-my $secret32 = $auth->generate_secret32;
>-my $ok = $auth->verify($pin_code, 1, $secret32);
>+my $auth = Koha::Auth::TwoFactorAuth->new({ patron => $patron, secret => $secret });
>+my $ok = $auth->verify( $pin_code, 1 );
> 
> It's based on Auth::GoogleAuth
> 
>diff --git a/members/two_factor_auth.pl b/members/two_factor_auth.pl
>index 2a5a996c566..3d763d23f3c 100755
>--- a/members/two_factor_auth.pl
>+++ b/members/two_factor_auth.pl
>@@ -78,14 +78,13 @@ if ( $op eq 'enable-2FA' ) {
>     my $auth = Koha::Auth::TwoFactorAuth->new(
>         { patron => $logged_in_user, secret => $secret } );
> 
>-    my $secret32 = $auth->generate_secret32;
>     my $qr_code_url =
>-      $auth->qr_code( $secret32, $auth->key_id, $auth->issuer, );
>+      $auth->qr_code( undef, $auth->key_id, $auth->issuer ); # no need to pass secret32
> 
>     $template->param(
>         issuer      => $auth->issuer,
>         key_id      => $auth->key_id,
>-        secret32    => $secret32,
>+        secret32    => $auth->secret32,
>         qr_code_url => $qr_code_url,
>     );
>     $auth->clear;
>-- 
>2.25.1

Actions: View | Diff | Splinter Review

Attachments on bug 28786: 123375 | 123376 | 123377 | 123378 | 123379 | 123380 | 123381 | 123397 | 123398 | 123399 | 123400 | 123401 | 123402 | 123403 | 124569 | 124770 | 124771 | 124844 | 124845 | 124846 | 124847 | 128841 | 128842 | 129383 | 129384 | 129474 | 129521 | 129557 | 129558 | 129559 | 129560 | 129561 | 129562 | 129563 | 129564 | 129565 | 129566 | 129567 | 129568 | 129569 | 129654 | 129655 | 129656 | 129657 | 129658 | 129659 | 129660 | 129661 | 129662 | 129665 | 131940 | 131941 | 131942 | 131943 | 131944 | 131945 | 131946 | 131947 | 131948 | 131949 | 131950 | 131951 | 131952 | 131953 | 131954 | 131955 | 131956 | 131957 | 131958 | 132142 | 132143 | 132144 | 132145 | 132146 | 132147 | 132148 | 132149 | 132150 | 132153 | 132154 | 132155 | 132156 | 132157 | 133222 | 133516 | 133522 | 133531 | 133533 | 133541 | 133548 | 133643 | 133686