Jonathan Druart
d7288411f0
If encryption_key is not set in $KOHA_CONF we are raising an exception. This key was only needed for a couple of feature, but now we are using Koha::Encryption from the update DB process, and so the upgrade fails with no more info than 'No encryption_key in koha-conf.xml'. We need to provide more detail in this error. Additionally we reject "__ENCRYPTION_KEY__", in case people will simple copy/paste that Test plan: Apply the patch Edit $KOHA_CONf, remove the encryption_key entry (or blank) restart_all Go to the about page and enable 2FA => warning on the about page, and 500 server-side are displaying more info about how to generate the missing entry Edit $KOHA_CONF and set the value to __ENCRYPTION_KEY__ restart_all => Same messages Edit $KOHA_CONF and set a correct value restart_all => No error, everything is working correctly Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
69 lines
1.8 KiB
Perl
69 lines
1.8 KiB
Perl
package Koha::Encryption;
|
|
|
|
# Copyright 2022 Koha Development Team
|
|
#
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
|
|
use base qw( Crypt::CBC );
|
|
|
|
use C4::Context;
|
|
use Koha::Exceptions;
|
|
|
|
=head1 NAME
|
|
|
|
Koha::Encryption - Koha class to encrypt or decrypt strings
|
|
|
|
=head1 SYNOPSIS
|
|
|
|
use Koha::Encryption;
|
|
my $secret = Koha::AuthUtils::generate_salt( 'weak', 16 );
|
|
my $crypt = Koha::Encryption->new;
|
|
my $encrypted = $crypt->encrypt_hex($secret);
|
|
my $decrypted = $crypt->decrypt_hex($encrypted);
|
|
|
|
return 1 if $decrypted eq $secret;
|
|
|
|
It's based on Crypt::CBC
|
|
|
|
=cut
|
|
|
|
=head2 METHODS
|
|
|
|
=head3 new
|
|
|
|
my $cipher = Koha::Encryption->new;
|
|
|
|
Constructor. Uses encryption_key from koha-conf.xml.
|
|
|
|
=cut
|
|
|
|
sub new {
|
|
my ( $class ) = @_;
|
|
my $encryption_key = C4::Context->config('encryption_key');
|
|
if ( !$encryption_key || $encryption_key eq '__ENCRYPTION_KEY__') {
|
|
Koha::Exceptions::MissingParameter->throw(
|
|
q{No encryption_key in koha-conf.xml. Please generate a key. We recommend one of at least 32 bytes. (You might use 'pwgen 32' to do so.)}
|
|
);
|
|
}
|
|
return $class->SUPER::new(
|
|
-key => $encryption_key,
|
|
-cipher => 'Cipher::AES'
|
|
);
|
|
}
|
|
|
|
1;
|