Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 37816: (QA follow-up) Avoid repetition, typo and pipe test

Browse source 
Combining three regexes into one. Typo replcing.
Adding a test with pipe in pwd.

Test plan:
Run t/SIP/Sip.t

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Marcel de Rooy 2025-01-17 10:51:42 +00:00 committed by Katrin Fischer
parent cb9c2146db
commit abb2fc36d3
Signed by: kfischer
GPG key ID: 0EF6E2C03357A834
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
C4/SIP/Sip.pm
View file

@ -258,7 +258,7 @@ We do this by looking for:
delimiter + AC/AD/CO + something + delimiter
and replcing it with:
and replacing it with:
delimiter + field name + asterisks + delimiter
@ -284,10 +284,10 @@ Messages and fields that can contain passwords:
sub remove_password_from_message {
my ($message) = @_;
$message =~ s/\Q${field_delimiter}\EAC.*?\Q${field_delimiter}\E/${field_delimiter}AC***${field_delimiter}/g;
$message =~ s/\Q${field_delimiter}\EAD.*?\Q${field_delimiter}\E/${field_delimiter}AD***${field_delimiter}/g;
$message =~ s/\Q${field_delimiter}\ECO.*?\Q${field_delimiter}\E/${field_delimiter}CO***${field_delimiter}/g;
# regex does not work with (AC|AD|CO), probably due to .*? and the g modifier
# NOTE: Does not work correctly if the password contains a field delimiter, but you cannot login either.
$message =~ s/\Q${field_delimiter}\E$_.*?\Q${field_delimiter}\E/${field_delimiter}$_***${field_delimiter}/g
for ( 'AC', 'AD', 'CO' );
return $message;
}

9
t/SIP/Sip.t
View file

@ -56,7 +56,7 @@ warning_is { $invalidTest = C4::SIP::Sip::Checksum::verify_cksum("1234567") }
is( $invalidTest, 0, "Checksum: 1234567 is invalid as expected" );
subtest 'remove_password_from_message' => sub {
plan tests => 8;
plan tests => 9;
is(
C4::SIP::Sip::remove_password_from_message("INPUT MSG: '9300CNterm1|COterm1|CPCPL|'"),
@ -85,6 +85,13 @@ subtest 'remove_password_from_message' => sub {
"11 Checkout"
);
is(
C4::SIP::Sip::remove_password_from_message(
"11YN20240903 134450 AOCPL|AA23529000035676|AB39999000003697|AC12|34|AD1234|BON"),
'11YN20240903 134450 AOCPL|AA23529000035676|AB39999000003697|AC***|34|AD***|BON',
"11 Checkout with pipe in password"
);
is(
C4::SIP::Sip::remove_password_from_message(
"11YN20240903 134450 AOCPL|AA23529000035676|AB39999000003697|AC|AD1234|BON"),