Attachment 124705 Details for Bug 28772 – Bug 28772: (QA follow-up) Apply change to other dbrev too [STABLE]

[patch] Bug 28772: (QA follow-up) Apply change to other dbrev too [STABLE]

Bug-28772-QA-follow-up-Apply-change-to-other-dbrev.patch (text/plain), 1.27 KB, created by Marcel de Rooy on 2021-09-09 12:47:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2021-09-09 12:47:31 UTC

Size: 1.27 KB

patch

obsolete

>From f766d9504c115996c519d849a2576e7baa1148dc Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Thu, 9 Sep 2021 12:42:01 +0000
>Subject: [PATCH] Bug 28772: (QA follow-up) Apply change to other dbrev too
> [STABLE]
>Content-Type: text/plain; charset=utf-8
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> installer/data/mysql/atomicupdate/bug_28772_api_keys.perl | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/installer/data/mysql/atomicupdate/bug_28772_api_keys.perl b/installer/data/mysql/atomicupdate/bug_28772_api_keys.perl
>index cb4529a71a..6265944586 100755
>--- a/installer/data/mysql/atomicupdate/bug_28772_api_keys.perl
>+++ b/installer/data/mysql/atomicupdate/bug_28772_api_keys.perl
>@@ -19,8 +19,10 @@ if( CheckVersion( $DBversion ) ) {
>     });
> 
>     foreach my $api_key (@$results) {
>-        my $digest = Koha::AuthUtils::hash_password( $api_key->{secret} );
>-        $sth->execute( $digest, $api_key->{client_id} );
>+        unless ( $api_key->{secret} =~ m/^\$2a\$08\$/ ) {
>+            my $digest = Koha::AuthUtils::hash_password( $api_key->{secret} );
>+            $sth->execute( $digest, $api_key->{client_id} );
>+        }
>     }
> 
>     NewVersion( $DBversion, 28772, "Store hashed API key secrets" );
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 28772: 124195 | 124247 | 124248 | 124249 | 124250 | 124251 | 124487 | 124488 | 124489 | 124490 | 124491 | 124691 | 124692 | 124693 | 124694 | 124695 | 124696 | 124697 | 124698 | 124699 | 124700 | 124701 | 124702 | 124703 | 124704 | 124705 | 124727 | 125088 | 125112 | 125116 | 125118 | 125128