[open-ils-commits] [GIT] Evergreen ILS branch master updated. 0af1850ad882e25c88fd0f5e9e8dd24f05721e92

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  0af1850ad882e25c88fd0f5e9e8dd24f05721e92 (commit)
       via  c9404f643c5ad18440f8a5cd0ef117592ea398ce (commit)
       via  a8f6ccf9f62ebb516efdddab908a7422d5458f4d (commit)
      from  3f4a956c91e8a3d244dd7f63b463e4db960b7750 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0af1850ad882e25c88fd0f5e9e8dd24f05721e92
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Mon Sep 9 15:27:19 2019 -0400

    LP#1817645: adjust live_t remoteauth checks
    
    Version 6.07 or higher of LWP::Protocol::https is required to
    avoid an issue where an SSL certificate check of localhost
    cannot be bypassed. We could instead have chosen to install
    that Perl module from CPAN rather than packages, but since there's
    presently no non-test code that requires that bugfix, I've elected
    not to bother installing that module from CPAN for now.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/perlmods/live_t/29-lp1817645-remoteauth-patron-api.t b/Open-ILS/src/perlmods/live_t/29-lp1817645-remoteauth-patron-api.t
index e2c7bb28b7..6963feb9eb 100644
--- a/Open-ILS/src/perlmods/live_t/29-lp1817645-remoteauth-patron-api.t
+++ b/Open-ILS/src/perlmods/live_t/29-lp1817645-remoteauth-patron-api.t
@@ -1,6 +1,16 @@
 #!perl
 
-use Test::More tests => 10; # XXX
+use Test::More;
+
+# need at least 6.07 of LWP::Protocol::https to avoid
+# an issue where it cannot successfully bypass a
+# certificate check of localhost
+eval 'use LWP::Protocol::https 6.07';
+if ($@) {
+    plan skip_all => 'LWP::Protocol::https 6.0.7 or later required for live tests of remoteauth' if $@;
+} else {
+    plan tests => 10;
+}
 
 diag("Tests RemoteAuth patron auth/retrieval");
 

commit c9404f643c5ad18440f8a5cd0ef117592ea398ce
Author: Ben Shum <ben at evergreener.net>
Date:   Sun Sep 8 17:21:18 2019 -0400

    LP#1817645: fix live perl test for basic auth API
    
    The live perl test is failing because we are not passing all
    the right parameters for ignoring the SSL certificate verification
    checks. Pass another variable to see if this helps.
    
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/perlmods/live_t/29-lp1817645-remoteauth-patron-api.t b/Open-ILS/src/perlmods/live_t/29-lp1817645-remoteauth-patron-api.t
index 6732d6c15b..e2c7bb28b7 100644
--- a/Open-ILS/src/perlmods/live_t/29-lp1817645-remoteauth-patron-api.t
+++ b/Open-ILS/src/perlmods/live_t/29-lp1817645-remoteauth-patron-api.t
@@ -40,7 +40,10 @@ my $e = new_editor( authtoken => $staff_login->{payload}->{authtoken} );
 $e->init;
 
 my $client = LWP::UserAgent->new;
-$client->ssl_opts( verify_hostname => 0 );
+$client->ssl_opts(
+    SSL_verify_mode => 0,
+    verify_hostname => 0
+);
 
 # my $res = $client->request( $method, $uri, $headers, $content, $request_timeout );
 

commit a8f6ccf9f62ebb516efdddab908a7422d5458f4d
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Mon Sep 9 14:28:18 2019 -0400

    LP#1817645: (follow-up) avoid hardcoding user ID in a live_t test
    
    This patch is an alternative implementation of an idea from
    Ben Shum to avoid assuming that a given username in Concerto
    will always be associated with the same patron ID.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/sql/Pg/live_t/lp1468422_passwd_storage.pg b/Open-ILS/src/sql/Pg/live_t/lp1468422_passwd_storage.pg
index 18b7cdd805..bef44d945d 100644
--- a/Open-ILS/src/sql/Pg/live_t/lp1468422_passwd_storage.pg
+++ b/Open-ILS/src/sql/Pg/live_t/lp1468422_passwd_storage.pg
@@ -19,30 +19,30 @@ SELECT plan(6);
 
 SELECT ok(
     (SELECT TRUE AS verify_old_pw FROM actor.usr 
-        WHERE id = 189 AND passwd = MD5('montyc1234')),
+        WHERE id = (SELECT id FROM actor.usr WHERE usrname = 'br1mclark') AND passwd = MD5('montyc1234')),
     'Legacy password should match'
 );
 
 SELECT isnt_empty(
-    'SELECT actor.get_salt(189, ''main'')',
+    'SELECT actor.get_salt((SELECT id FROM actor.usr WHERE usrname = ''br1mclark''), ''main'')',
     'get_salt() returns a new salt'
 );
 
 SELECT isnt_empty(
-    'SELECT * FROM actor.passwd WHERE usr = 189 AND passwd_type = ''main''',
+    'SELECT * FROM actor.passwd WHERE usr = (SELECT id FROM actor.usr WHERE usrname = ''br1mclark'') AND passwd_type = ''main''',
     'get_salt() should migrate the password'
 );
 
 SELECT ok(
-    (SELECT actor.verify_passwd(189, 'main', 
-        MD5(actor.get_salt(189, 'main') || MD5('montyc1234')))),
+    (SELECT actor.verify_passwd((SELECT id FROM actor.usr WHERE usrname = 'br1mclark'), 'main',
+        MD5(actor.get_salt((SELECT id FROM actor.usr WHERE usrname = 'br1mclark'), 'main') || MD5('montyc1234')))),
     'verify_passwd should verify migrated password'
 );
 
 SELECT ok(
     (SELECT NOT (
-        SELECT actor.verify_passwd(189, 'main', 
-            MD5(actor.get_salt(189, 'main') || MD5('BADPASSWORD'))))
+        SELECT actor.verify_passwd((SELECT id FROM actor.usr WHERE usrname = 'br1mclark'), 'main',
+            MD5(actor.get_salt((SELECT id FROM actor.usr WHERE usrname = 'br1mclark'), 'main') || MD5('BADPASSWORD'))))
     ),
     'verify_passwd should fail with wrong password'
 );
@@ -55,12 +55,12 @@ BEGIN
     -- calls will create a new one.
     SELECT INTO new_salt actor.create_salt('main');
     PERFORM actor.set_passwd(
-        189, 'main', MD5(new_salt || MD5('bobblehead')), new_salt);
+        (SELECT id FROM actor.usr WHERE usrname = 'br1mclark'), 'main', MD5(new_salt || MD5('bobblehead')), new_salt);
 END $$;
 
 SELECT ok(
-    (SELECT actor.verify_passwd(189, 'main', 
-        MD5(actor.get_salt(189, 'main') || MD5('bobblehead')))),
+    (SELECT actor.verify_passwd((SELECT id FROM actor.usr WHERE usrname = 'br1mclark'), 'main',
+        MD5(actor.get_salt((SELECT id FROM actor.usr WHERE usrname = 'br1mclark'), 'main') || MD5('bobblehead')))),
     'verify_passwd should verify new password'
 );
 

-----------------------------------------------------------------------

Summary of changes:
 .../live_t/29-lp1817645-remoteauth-patron-api.t      | 17 +++++++++++++++--
 .../src/sql/Pg/live_t/lp1468422_passwd_storage.pg    | 20 ++++++++++----------
 2 files changed, 25 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
Evergreen ILS