extern/KasmVNC
1
0
Fork 0
mirror of https://github.com/kasmtech/KasmVNC.git synced 2024-11-21 23:53:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/KASM-2287_remove_user_transaction' into 'master'

Browse Source 
Bulk update_user and remove_user should check for all users' existence

Closes KASM-2287

See merge request kasm-technologies/internal/KasmVNC!25
This commit is contained in:
Matthew McClaskey 2022-01-31 14:53:29 +00:00
commit 974a06bb8c
1 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
common/network/websocket.c
View File

@ -902,6 +902,40 @@ nope:
ws_send(ws_ctx, buf, strlen(buf));
}
static uint8_t allUsersPresent(const struct kasmpasswd_t * const inset) {
struct kasmpasswd_t *fullset = readkasmpasswd(settings.passwdfile);
if (!fullset->num) {
free(fullset);
return 0;
}
unsigned f, i;
for (i = 0; i < inset->num; i++) {
uint8_t found = 0;
for (f = 0; f < fullset->num; f++) {
if (!strcmp(inset->entries[i].user, fullset->entries[f].user)) {
found = 1;
break;
}
}
if (!found)
goto notfound;
}
free(fullset->entries);
free(fullset);
return 1;
notfound:
free(fullset->entries);
free(fullset);
return 0;
}
static uint8_t ownerapi_post(ws_ctx_t *ws_ctx, const char *in) {
char buf[4096], path[4096];
uint8_t ret = 0; // 0 = continue checking
@ -983,6 +1017,11 @@ static uint8_t ownerapi_post(ws_ctx_t *ws_ctx, const char *in) {
goto nope;
}
if (!allUsersPresent(set)) {
wserr("One or more users didn't exist\n");
goto nope;
}
for (s = 0; s < set->num; s++) {
if (!set->entries[s].user[0]) {
wserr("Username missing\n");
@ -1015,6 +1054,11 @@ static uint8_t ownerapi_post(ws_ctx_t *ws_ctx, const char *in) {
goto nope;
}
if (!allUsersPresent(set)) {
wserr("One or more users didn't exist\n");
goto nope;
}
for (s = 0; s < set->num; s++) {
if (!set->entries[s].user[0]) {
wserr("Username missing\n");