Bugzilla – Attachment 31907 Details for
Bug 8446
Shibboleth authentication
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
BUG8446, QA Followup: Use DBIx::Class
BUG8446-QA-Followup-Use-DBIxClass.patch (text/plain), 1.61 KB, created by
Martin Renvoize (ashimema)
on 2014-09-29 08:02:30 UTC
(
hide
)
Description:
BUG8446, QA Followup: Use DBIx::Class
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2014-09-29 08:02:30 UTC
Size:
1.61 KB
patch
obsolete
>From dc957af3ea95ffa4b16fe21c87ae0b12bc2ae67f Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Mon, 29 Sep 2014 07:51:42 +0000 >Subject: [PATCH] BUG8446, QA Followup: Use DBIx::Class > >- Convert Auth_with_shibboleth to use dbic stanzas. >--- > C4/Auth_with_shibboleth.pm | 17 +++++++---------- > 1 file changed, 7 insertions(+), 10 deletions(-) > >diff --git a/C4/Auth_with_shibboleth.pm b/C4/Auth_with_shibboleth.pm >index d2a4cdf..6d2c08d 100644 >--- a/C4/Auth_with_shibboleth.pm >+++ b/C4/Auth_with_shibboleth.pm >@@ -21,6 +21,7 @@ use Modern::Perl; > > use C4::Debug; > use C4::Context; >+use Koha::Database; > use Carp; > use CGI; > >@@ -94,16 +95,12 @@ sub checkpw_shib { > my $config = _get_shib_config(); > $debug and warn "User Shibboleth-authenticated as: $match"; > >- # Does the given shibboleth attribute value ($match) match a valid koha user ? >- my $sth = $dbh->prepare( >- "select cardnumber, userid from borrowers where $config->{matchpoint}=?" >- ); >- $sth->execute($match); >- if ( $sth->rows ) { >- my @retvals = $sth->fetchrow; >- $retnumber = $retvals[0]; >- $userid = $retvals[1]; >- return ( 1, $retnumber, $userid ); >+ # Does the given shibboleth attribute value ($match) match a valid koha user ? >+ my $borrower = >+ Koha::Database->new()->schema()->resultset('Borrower') >+ ->find( { $config->{matchpoint} => $match } ); >+ if ( defined($borrower) ) { >+ return ( 1, $borrower->get_column('cardnumber'), $borrower->get_column('userid') ); > } > > # If we reach this point, the user is not a valid koha user >-- >1.7.10.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 8446
:
10841
|
22098
|
22107
|
22860
|
23224
|
23225
|
23226
|
25765
|
25766
|
26176
|
26177
|
26178
|
26187
|
26749
|
26750
|
26751
|
26752
|
26760
|
26761
|
26762
|
28892
|
28893
|
28894
|
28895
|
28896
|
28897
|
28898
|
28899
|
28900
|
28901
|
28902
|
28903
|
30017
|
30018
|
30019
|
30020
|
30021
|
30022
|
30023
|
30030
|
30031
|
30033
|
30283
|
30284
|
30285
|
30286
|
30335
|
30353
|
30354
|
30355
|
30356
|
30384
|
30594
|
30604
|
30605
|
30616
|
30617
|
30618
|
30619
|
30620
|
30621
|
30684
|
31407
|
31408
|
31836
|
31905
|
31906
|
31907
|
32125
|
32158
|
32162
|
32163
|
32164
|
32165
|
32166
|
32167
|
32168
|
32169
|
32170
|
32365
|
32366
|
32367
|
32368
|
32369
|
32370
|
32371
|
32372
|
32373
|
32374
|
32426
|
32427