Skip to content

Fix: mdsip no longer accepts connections from unauthorized users #2714

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
mwinkel-dev merged 2 commits into from
Feb 21, 2024
Merged

Fix: mdsip no longer accepts connections from unauthorized users #2714

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0260195
Fix: Now properly handles SsINTERNAL in AcceptConnection()
Dec 19, 2023
ce48f6b
Don't add connection if user is unauthorized
Jan 17, 2024
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
11 changes: 8 additions & 3 deletions mdstcpip/mdsipshr/Connections.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,7 @@ int AcceptConnection(char *protocol, char *info_name, SOCKET readfd, void *info,
*usr = NULL;
Connection *c = newConnection(protocol);
INIT_STATUS_ERROR;
int auth_status = status;
if (c)
{
Message *msg;
Expand All @@ -535,9 +536,9 @@ int AcceptConnection(char *protocol, char *info_name, SOCKET readfd, void *info,
}
c->rm_user = user;
user_p = user ? user : "?";
status = authorize_client(c, user_p);
auth_status = authorize_client(c, user_p);
// SET COMPRESSION //
if (STATUS_OK)
if (IS_OK(auth_status))
{
const int max_version = get_max_version();
c->compression_level = msg->h.status & 0xf;
Expand All @@ -558,7 +559,11 @@ int AcceptConnection(char *protocol, char *info_name, SOCKET readfd, void *info,
// reply to client //
status = SendMdsMsgC(c, msg, 0);
free(msg);
if (STATUS_OK)
// SsINTERNAL has low order bit set so is erroneously treated as OK.
if (status == SsINTERNAL) {
status = MDSplusERROR;
}
if (STATUS_OK && IS_OK(auth_status))
{
if (usr)
*usr = strdup(user_p);
Expand Down