external/uhub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixup! Fix bug #171 - Race condition could allow two users with same CID or nick to enter the hub.

Browse Source
This commit is contained in:
Jan Vidar Krey 2011-12-12 12:03:28 +01:00
parent b4779bfb12
commit fc5e09aa9e
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/hub.c
View File

@ -528,7 +528,7 @@ void hub_send_flood_warning(struct hub_info* hub, struct hub_user* u, const char
} }
} }
static enum status_message check_duplicate_logins_ok(struct hub_info* hub, struct hub_user* user) static int check_duplicate_logins_ok(struct hub_info* hub, struct hub_user* user)
{ {
struct hub_user* lookup1; struct hub_user* lookup1;
struct hub_user* lookup2; struct hub_user* lookup2;
@ -541,12 +541,12 @@ static enum status_message check_duplicate_logins_ok(struct hub_info* hub, struc
if (lookup2) if (lookup2)
return status_msg_inf_error_cid_taken; return status_msg_inf_error_cid_taken;
return status_ok; return 0;
} }
static void hub_event_dispatcher(void* callback_data, struct event_data* message) static void hub_event_dispatcher(void* callback_data, struct event_data* message)
{ {
enum status_message status; int status;
struct hub_info* hub = (struct hub_info*) callback_data; struct hub_info* hub = (struct hub_info*) callback_data;
struct hub_user* user = (struct hub_user*) message->ptr; struct hub_user* user = (struct hub_user*) message->ptr;
assert(hub != NULL); assert(hub != NULL);
@ -567,13 +567,13 @@ static void hub_event_dispatcher(void* callback_data, struct event_data* message
/* Race condition, we could have two messages for two logins queued up. /* Race condition, we could have two messages for two logins queued up.
So make sure we don't let the second client in. */ So make sure we don't let the second client in. */
status = check_duplicate_logins_ok(hub, user); status = check_duplicate_logins_ok(hub, user);
if (status == status_ok) if (!status)
{ {
on_login_success(hub, user); on_login_success(hub, user);
} }
else else
{ {
on_login_failure(hub, user, status); on_login_failure(hub, user, (enum status_message) status);
} }
} }
break; break;

1
src/core/hub.h
View File

@ -22,7 +22,6 @@
enum status_message enum status_message
{ {
status_ok = 0,
status_msg_hub_full = -1, /* hub is full */ status_msg_hub_full = -1, /* hub is full */
status_msg_hub_disabled = -2, /* hub is disabled */ status_msg_hub_disabled = -2, /* hub is disabled */
status_msg_hub_registered_users_only = -3, /* hub is for registered users only */ status_msg_hub_registered_users_only = -3, /* hub is for registered users only */