Skip to content

in_forward: Fix incorrect user auth sequence #11028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 16, 2025
Merged

in_forward: Fix incorrect user auth sequence #11028

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions plugins/in_forward/fw_prot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,11 +775,10 @@ static int send_pong(struct flb_input_instance *in,
if (bytes == -1) {
flb_plg_error(in, "cannot send PONG");

result = -1;
}
else if (userauth == FLB_FALSE) {
flb_plg_error(in, "cannot send PONG");

/*
* The 'userauth == FLB_FALSE' case is not an error; it's a successful
* transmission of a failure notification. We only fail if the write fails.
*/
result = -1;
}
else {
Expand Down Expand Up @@ -1186,36 +1185,46 @@ int fw_prot_secure_forward_handshake_start(struct flb_input_instance *ins,
int fw_prot_secure_forward_handshake(struct flb_input_instance *ins,
struct fw_conn *conn)
{
int ret;
char *shared_key_salt = NULL;
int userauth = FLB_TRUE;
flb_sds_t reason = NULL;
int ping_ret;
int pong_ret;

reason = flb_sds_create_size(32);
flb_plg_debug(ins, "protocol: checking PING");
ret = check_ping(ins, conn, &shared_key_salt);
if (ret == -1) {
ping_ret = check_ping(ins, conn, &shared_key_salt);
if (ping_ret == -1) {
flb_plg_error(ins, "handshake error checking PING");

goto error;
}
else if (ret == -2) {
else if (ping_ret == -2) {
flb_plg_warn(ins, "user authentication is failed");
userauth = FLB_FALSE;
reason = flb_sds_cat(reason, "username/password mismatch", 26);
}

flb_plg_debug(ins, "protocol: sending PONG");
ret = send_pong(ins, conn, shared_key_salt, userauth, reason);
if (ret == -1) {
flb_plg_error(ins, "handshake error sending PONG");
pong_ret = send_pong(ins, conn, shared_key_salt, userauth, reason);
if (pong_ret == -1) {
flb_plg_error(ins, "handshake error: could not send PONG to client");

goto error;
}

flb_sds_destroy(shared_key_salt);
flb_sds_destroy(reason);

/*
* If the initial authentication check failed (either shared_key or user),
* we have successfully notified the client with a PONG failure message,
* so we must now terminate the handshake by returning an error.
*/
if (ping_ret < 0) {
return -1;
}

return 0;

error:
Expand Down
Loading