tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make sure encode_base64 does not break auth strings.

Browse Source 
The way Mail::Sendmail called encode_base64 could break auth strings
into multiple lines, resulting in authentication errors.

Ref pandora_enterprise#7347
This commit is contained in:
Ramon Novoa 2021-04-22 14:51:18 +02:00
parent ce72a5c6ee
commit d423979426
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_server/lib/PandoraFMS/Sendmail.pm
View File

@ -491,11 +491,11 @@ sub sendmail {
|| return fail("send AUTH LOGIN failed (lost connection?)");
socket_read()
|| return fail("AUTH LOGIN failed: $server_reply");
socket_write(encode_base64($auth->{user},$CRLF))
socket_write(encode_base64($auth->{user}, ""), $CRLF)
|| return fail("send LOGIN username failed (lost connection?)");
socket_read()
|| return fail("LOGIN username failed: $server_reply");
socket_write(encode_base64($auth->{password},$CRLF))
socket_write(encode_base64($auth->{password}, ""), $CRLF)
|| return fail("send LOGIN password failed (lost connection?)");
socket_read()
|| return fail("LOGIN password failed: $server_reply");
@ -504,7 +504,7 @@ sub sendmail {
warn "Trying AUTH PLAIN\n" if ($mailcfg{debug} > 9);
socket_write(
"AUTH PLAIN "
. encode_base64(join("\0", $auth->{user}, $auth->{user}, $auth->{password}), $CRLF)
. encode_base64(join("\0", $auth->{user}, $auth->{user}, $auth->{password}), ""), $CRLF
) || return fail("send AUTH PLAIN failed (lost connection?)");
socket_read()
|| return fail("AUTH PLAIN failed: $server_reply");
@ -518,7 +518,7 @@ sub sendmail {
|| return fail("AUTH CRAM-MD5 failed: $server_reply");
$challenge =~ s/^\d+\s+//;
my $response = _hmac_md5($auth->{password}, decode_base64($challenge));
socket_write(encode_base64("$auth->{user} $response", $CRLF))
socket_write(encode_base64("$auth->{user} $response", ""), $CRLF)
|| return fail("AUTH CRAM-MD5 failed: $server_reply");
socket_read()
|| return fail("AUTH CRAM-MD5 failed: $server_reply");