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

(-)a/C4/SIP/Sip.pm (-5 / +5 lines)
Lines 249-255 We do this by looking for: Link Here
249
249
250
  delimiter + AC/AD/CO + something + delimiter
250
  delimiter + AC/AD/CO + something + delimiter
251
251
252
and replcing it with:
252
and replacing it with:
253
253
254
  delimiter + field name + asterisks + delimiter
254
  delimiter + field name + asterisks + delimiter
255
255
Lines 275-284 Messages and fields that can contain passwords: Link Here
275
sub remove_password_from_message {
275
sub remove_password_from_message {
276
    my ($message) = @_;
276
    my ($message) = @_;
277
277
278
    $message =~ s/\Q${field_delimiter}\EAC.*?\Q${field_delimiter}\E/${field_delimiter}AC***${field_delimiter}/g;
278
    # regex does not work with (AC|AD|CO), probably due to .*? and the g modifier
279
    $message =~ s/\Q${field_delimiter}\EAD.*?\Q${field_delimiter}\E/${field_delimiter}AD***${field_delimiter}/g;
279
    # NOTE: Does not work correctly if the password contains a field delimiter, but you cannot login either.
280
    $message =~ s/\Q${field_delimiter}\ECO.*?\Q${field_delimiter}\E/${field_delimiter}CO***${field_delimiter}/g;
280
    $message =~ s/\Q${field_delimiter}\E$_.*?\Q${field_delimiter}\E/${field_delimiter}$_***${field_delimiter}/g
281
281
        for ( 'AC', 'AD', 'CO' );
282
    return $message;
282
    return $message;
283
}
283
}
284
284
(-)a/t/SIP/Sip.t (-2 / +8 lines)
Lines 56-62 warning_is { $invalidTest = C4::SIP::Sip::Checksum::verify_cksum("1234567") } Link Here
56
is($invalidTest, 0, "Checksum: 1234567 is invalid as expected");
56
is($invalidTest, 0, "Checksum: 1234567 is invalid as expected");
57
57
58
subtest 'remove_password_from_message' => sub {
58
subtest 'remove_password_from_message' => sub {
59
    plan tests => 8;
59
    plan tests => 9;
60
60
61
    is(
61
    is(
62
        C4::SIP::Sip::remove_password_from_message("INPUT MSG: '9300CNterm1|COterm1|CPCPL|'"),
62
        C4::SIP::Sip::remove_password_from_message("INPUT MSG: '9300CNterm1|COterm1|CPCPL|'"),
Lines 85-90 subtest 'remove_password_from_message' => sub { Link Here
85
        "11 Checkout"
85
        "11 Checkout"
86
    );
86
    );
87
87
88
    is(
89
        C4::SIP::Sip::remove_password_from_message(
90
            "11YN20240903    134450                  AOCPL|AA23529000035676|AB39999000003697|AC12|34|AD1234|BON"),
91
        '11YN20240903    134450                  AOCPL|AA23529000035676|AB39999000003697|AC***|34|AD***|BON',
92
        "11 Checkout with pipe in password"
93
    );
94
88
    is(
95
    is(
89
        C4::SIP::Sip::remove_password_from_message(
96
        C4::SIP::Sip::remove_password_from_message(
90
            "11YN20240903    134450                  AOCPL|AA23529000035676|AB39999000003697|AC|AD1234|BON"),
97
            "11YN20240903    134450                  AOCPL|AA23529000035676|AB39999000003697|AC|AD1234|BON"),
91
- 

Return to bug 37816