Bugzilla – Attachment 27211 Details for
Bug 11944
Cleanup Koha UTF-8
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11944: Authentication
Bug-11944-Authentication.patch (text/plain), 2.01 KB, created by
Jonathan Druart
on 2014-04-16 14:13:56 UTC
(
hide
)
Description:
Bug 11944: Authentication
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2014-04-16 14:13:56 UTC
Size:
2.01 KB
patch
obsolete
>From 47b4728d9167bf41484c7b033eba80f8dd354691 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Mon, 7 Apr 2014 16:45:59 +0200 >Subject: [PATCH] Bug 11944: Authentication >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >The password should be encoded before hashing. > >Test plan: >- Before applying the patch, create a user with a password "μμμμ" >- apply patches >- try to log in >- change the password >- log out >- try to log in >--- > C4/Auth.pm | 4 ++++ > Koha/AuthUtils.pm | 3 +++ > 2 files changed, 7 insertions(+) > >diff --git a/C4/Auth.pm b/C4/Auth.pm >index 6cd72e7..ce75d5e 100644 >--- a/C4/Auth.pm >+++ b/C4/Auth.pm >@@ -32,6 +32,7 @@ use C4::VirtualShelves; > use Koha::AuthUtils qw(hash_password); > use POSIX qw/strftime/; > use List::MoreUtils qw/ any /; >+use Encode qw( encode is_utf8); > > # use utf8; > use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug $ldap $cas $caslogout); >@@ -1542,6 +1543,9 @@ sub checkpw { > sub checkpw_internal { > my ( $dbh, $userid, $password ) = @_; > >+ $password = Encode::encode( 'UTF-8', $password ) >+ if Encode::is_utf8($password); >+ > my $sth = > $dbh->prepare( > "select password,cardnumber,borrowernumber,userid,firstname,surname,branchcode,flags from borrowers where userid=?" >diff --git a/Koha/AuthUtils.pm b/Koha/AuthUtils.pm >index a8024d9..b748c1b 100644 >--- a/Koha/AuthUtils.pm >+++ b/Koha/AuthUtils.pm >@@ -19,6 +19,7 @@ package Koha::AuthUtils; > > use Modern::Perl; > use Crypt::Eksblowfish::Bcrypt qw(bcrypt en_base64); >+use Encode qw( encode is_utf8 ); > use Fcntl qw/O_RDONLY/; # O_RDONLY is used in generate_salt > > use base 'Exporter'; >@@ -51,6 +52,8 @@ user passwords. > # Using Bcrypt method for hashing. This can be changed to something else in future, if needed. > sub hash_password { > my $password = shift; >+ $password = Encode::encode( 'UTF-8', $password ) >+ if Encode::is_utf8($password); > > # Generate a salt if one is not passed > my $settings = shift; >-- >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 11944
:
26364
|
26365
|
26366
|
26367
|
26368
|
26369
|
26370
|
26371
|
26372
|
26407
|
26408
|
26409
|
26737
|
26738
|
26739
|
26740
|
26741
|
26742
|
26743
|
26744
|
26745
|
26746
|
26747
|
26748
|
26794
|
26857
|
26858
|
26859
|
26860
|
26861
|
26862
|
26863
|
26864
|
26865
|
26866
|
26867
|
26868
|
26869
|
26870
|
26871
|
26895
|
26921
|
27021
|
27080
|
27094
|
27158
|
27159
|
27161
|
27193
|
27194
|
27195
|
27196
|
27198
|
27199
|
27200
|
27201
|
27202
|
27203
|
27204
|
27205
|
27206
|
27207
|
27208
|
27209
|
27210
|
27211
|
27212
|
27213
|
27214
|
27215
|
27216
|
27585
|
27586
|
27587
|
27588
|
27589
|
27590
|
27591
|
27592
|
27593
|
27594
|
27595
|
27596
|
27597
|
27598
|
27599
|
27600
|
27601
|
27602
|
27603
|
27880
|
27881
|
27882
|
27883
|
27884
|
27885
|
27886
|
27887
|
27888
|
27889
|
27890
|
27891
|
27892
|
27893
|
27894
|
27895
|
27896
|
27897
|
27898
|
28046
|
28047
|
28048
|
28049
|
28050
|
28051
|
28052
|
28053
|
28054
|
28055
|
28056
|
28057
|
28058
|
28059
|
28060
|
28061
|
28062
|
28063
|
28064
|
28065
|
28066
|
28097
|
28245
|
28246
|
28247
|
28248
|
28249
|
28250
|
28251
|
28252
|
28253
|
28732
|
29981
|
29982
|
29983
|
29984
|
29985
|
29986
|
29987
|
29988
|
29989
|
29990
|
29991
|
29992
|
29993
|
29994
|
29995
|
29996
|
29997
|
29998
|
29999
|
30000
|
30001
|
30002
|
30003
|
30004
|
30005
|
30006
|
30012
|
30016
|
30945
|
31299
|
35223
|
35224
|
35225
|
35226
|
35227
|
35228
|
35229
|
35230
|
35231
|
35232
|
35233
|
35234
|
35235
|
35236
|
35237
|
35238
|
35239
|
35240
|
35241
|
35242
|
35243
|
35244
|
35245
|
35246
|
35247
|
35248
|
35249
|
35250
|
35251
|
35252
|
35253