Attachment 123399 Details for Bug 28786 – Bug 28786: Add new DB column borrowers.auth_method

[patch] Bug 28786: Add new DB column borrowers.auth_method

Bug-28786-Add-new-DB-column-borrowersauthmethod.patch (text/plain), 3.46 KB, created by David Nind on 2021-08-02 19:53:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2021-08-02 19:53:14 UTC

Size: 3.46 KB

patch

obsolete

>From 1e333a34d4f27d97f5f6219241e483d1517fedcf Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 29 Jul 2021 15:40:07 +0200
>Subject: [PATCH] Bug 28786: Add new DB column borrowers.auth_method
>
>Sponsored-by: Orex Digital
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> installer/data/mysql/atomicupdate/two-fa.perl | 12 ++++++++++++
> installer/data/mysql/kohastructure.sql        |  2 ++
> 2 files changed, 14 insertions(+)
>
>diff --git a/installer/data/mysql/atomicupdate/two-fa.perl b/installer/data/mysql/atomicupdate/two-fa.perl
>index 5d62189b1c..f11c0d0684 100644
>--- a/installer/data/mysql/atomicupdate/two-fa.perl
>+++ b/installer/data/mysql/atomicupdate/two-fa.perl
>@@ -15,6 +15,18 @@ if( CheckVersion( $DBversion ) ) {
>     if( !column_exists( 'deletedborrowers', 'secret' ) ) {
>       $dbh->do(q{
>           ALTER TABLE deletedborrowers ADD COLUMN `secret` MEDIUMTEXT COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Secret for 2FA' AFTER `password`
>+        });
>+    }
>+
>+    if( !column_exists( 'borrowers', 'auth_method' ) ) {
>+      $dbh->do(q{
>+          ALTER TABLE borrowers ADD COLUMN `auth_method` ENUM('password', 'two-factor') NOT NULL DEFAULT 'password' COMMENT 'Authentication method' AFTER `secret`
>+      });
>+    }
>+
>+    if( !column_exists( 'deletedborrowers', 'auth_method' ) ) {
>+      $dbh->do(q{
>+          ALTER TABLE deletedborrowers ADD COLUMN `auth_method` ENUM('password', 'two-factor') NOT NULL DEFAULT 'password' COMMENT 'Authentication method' AFTER `secret`
>       });
>     }
> 
>diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>index afb4e9c138..9d4b641f16 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -1407,6 +1407,7 @@ CREATE TABLE `borrowers` (
>   `sex` varchar(1) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s gender',
>   `password` varchar(60) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s Bcrypt encrypted password',
>   `secret` MEDIUMTEXT COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Secret for 2FA',
>+  `auth_method` ENUM('password', 'two-factor') NOT NULL DEFAULT 'password' COMMENT 'Authentication method',
>   `flags` int(11) DEFAULT NULL COMMENT 'will include a number associated with the staff member''s permissions',
>   `userid` varchar(75) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s opac and/or staff interface log in',
>   `opacnote` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'a note on the patron/borrower''s account that is visible in the OPAC and staff interface',
>@@ -2415,6 +2416,7 @@ CREATE TABLE `deletedborrowers` (
>   `sex` varchar(1) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s gender',
>   `password` varchar(60) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s encrypted password',
>   `secret` MEDIUMTEXT COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'Secret for 2FA',
>+  `auth_method` ENUM('password', 'two-factor') NOT NULL DEFAULT 'password' COMMENT 'Authentication method',
>   `flags` int(11) DEFAULT NULL COMMENT 'will include a number associated with the staff member''s permissions',
>   `userid` varchar(75) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'patron/borrower''s opac and/or staff interface log in',
>   `opacnote` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'a note on the patron/borrower''s account that is visible in the OPAC and staff interface',
>-- 
>2.20.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