View | Details | Raw Unified | Return to bug 11944
Collapse All | Expand All

(-)a/C4/Auth.pm (+4 lines)
Lines 34-39 use C4::VirtualShelves; Link Here
34
use Koha::AuthUtils qw(hash_password);
34
use Koha::AuthUtils qw(hash_password);
35
use POSIX qw/strftime/;
35
use POSIX qw/strftime/;
36
use List::MoreUtils qw/ any /;
36
use List::MoreUtils qw/ any /;
37
use Encode qw( encode is_utf8);
37
38
38
# use utf8;
39
# use utf8;
39
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug $ldap $cas $caslogout $shib $shib_login);
40
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug $ldap $cas $caslogout $shib $shib_login);
Lines 1650-1655 sub checkpw { Link Here
1650
sub checkpw_internal {
1651
sub checkpw_internal {
1651
    my ( $dbh, $userid, $password ) = @_;
1652
    my ( $dbh, $userid, $password ) = @_;
1652
1653
1654
    $password = Encode::encode( 'UTF-8', $password )
1655
      if Encode::is_utf8($password);
1656
1653
    if ( $userid && $userid eq C4::Context->config('user') ) {
1657
    if ( $userid && $userid eq C4::Context->config('user') ) {
1654
        if ( $password && $password eq C4::Context->config('pass') ) {
1658
        if ( $password && $password eq C4::Context->config('pass') ) {
1655
        # Koha superuser account
1659
        # Koha superuser account
(-)a/Koha/AuthUtils.pm (-1 / +3 lines)
Lines 19-24 package Koha::AuthUtils; Link Here
19
19
20
use Modern::Perl;
20
use Modern::Perl;
21
use Crypt::Eksblowfish::Bcrypt qw(bcrypt en_base64);
21
use Crypt::Eksblowfish::Bcrypt qw(bcrypt en_base64);
22
use Encode qw( encode is_utf8 );
22
use Fcntl qw/O_RDONLY/; # O_RDONLY is used in generate_salt
23
use Fcntl qw/O_RDONLY/; # O_RDONLY is used in generate_salt
23
24
24
use base 'Exporter';
25
use base 'Exporter';
Lines 51-56 user passwords. Link Here
51
# Using Bcrypt method for hashing. This can be changed to something else in future, if needed.
52
# Using Bcrypt method for hashing. This can be changed to something else in future, if needed.
52
sub hash_password {
53
sub hash_password {
53
    my $password = shift;
54
    my $password = shift;
55
    $password = Encode::encode( 'UTF-8', $password )
56
      if Encode::is_utf8($password);
54
57
55
    # Generate a salt if one is not passed
58
    # Generate a salt if one is not passed
56
    my $settings = shift;
59
    my $settings = shift;
57
- 

Return to bug 11944