Skip to content

Fix comparison of IPv6 addresses in session_get_bydata() #1187

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

Open
s-k2 wants to merge 4 commits into
base: devel
Choose a base branch
from
Open

Fix comparison of IPv6 addresses in session_get_bydata() #1187

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
09d16b3
Fix comparison of IPv6 addresses in session_get_bydata()
s-k2 Aug 5, 2018
238953b
Fix: Used strncmp() instead of g_strncmp()
s-k2 Aug 5, 2018
5aca723
Moved last_index_of() to os_calls.c and renamed it to g_last_ch_pos()
Aug 10, 2018
fe3371f
Make limit parameter n const and add some brackets
Aug 11, 2018
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: 32 additions & 1 deletion sesman/session.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,37 @@ dumpItemsToString(struct list *self, char *outstr, int len)
return outstr ;
}

/* find the last occurrence of ch in str limited by n */
static int
last_index_of(const char *str, char ch, int n)
Copy link
Member

@metalefty metalefty Aug 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function should be placed common/ because it has nothing sesman-specific.
It looks general helper function handling string.

{
int last_colon = -1;
int i;

for (i = 0; i < n && str[i] != 0; i++)
{
if (str[i] == ch)
last_colon = i;
}

return last_colon;
}

/* compare two strings containing ip-addresses and ports but ignore the latter */
static int
is_equal_ip_ignoring_port(const char *ip1, const char *ip2, size_t n)
Copy link
Member

@speidy speidy Aug 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

const size_t n ?

Copy link
Author

@s-k2 s-k2 Aug 11, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ouch, I accidentally used size_t as I always do. But in xrdp's codebase it is hardly used. Should I change it to an signed const int here, too?

{
int last_colon_ip1 = last_index_of(ip1, ':', n);
int last_colon_ip2 = last_index_of(ip2, ':', n);

if (last_colon_ip1 != last_colon_ip2)
Copy link
Member

@speidy speidy Aug 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please always use brackets.

return 0;

if (last_colon_ip1 == -1)
Copy link
Member

@speidy speidy Aug 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

last_colon_ip1 = n;

return g_strncmp(ip1, ip2, last_colon_ip1) == 0;
}

/******************************************************************************/
struct session_item *
Expand Down Expand Up @@ -141,7 +172,7 @@ session_get_bydata(const char *name, int width, int height, int bpp, int type,
(!(policy & SESMAN_CFG_SESS_POLICY_D) ||
(tmp->item->width == width && tmp->item->height == height)) &&
(!(policy & SESMAN_CFG_SESS_POLICY_I) ||
(g_strncmp_d(client_ip, tmp->item->client_ip, ':', 255) == 0)) &&
is_equal_ip_ignoring_port(client_ip, tmp->item->client_ip, 255)) &&
(!(policy & SESMAN_CFG_SESS_POLICY_C) ||
(g_strncmp(client_ip, tmp->item->client_ip, 255) == 0)) &&
tmp->item->bpp == bpp &&
Expand Down