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

Merge branch 'feature/KASM-2619_x_forward_for' into 'master'

Browse Source 
Add support for X-Forwarded-For

Closes KASM-2619

See merge request kasm-technologies/internal/KasmVNC!43
This commit is contained in:
Matthew McClaskey 2022-05-24 11:04:59 +00:00
commit 786670354f
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
common/network/websocket.c
View File

@ -771,6 +771,18 @@ def:
return "application/octet-stream"; return "application/octet-stream";
} }
static uint8_t isValidIp(const char *str, const unsigned len) {
unsigned i;
// Just a quick check for now
for (i = 0; i < len; i++) {
if (!isxdigit(str[i]) && str[i] != '.' && str[i] != ':')
return 0;
}
return 1;
}
static void dirlisting(ws_ctx_t *ws_ctx, const char fullpath[], const char path[]) { static void dirlisting(ws_ctx_t *ws_ctx, const char fullpath[], const char path[]) {
char buf[4096]; char buf[4096];
char enc[PATH_MAX * 3 + 1]; char enc[PATH_MAX * 3 + 1];
@ -1497,7 +1509,7 @@ timeout:
return 1; return 1;
} }
ws_ctx_t *do_handshake(int sock, const char *ip) { ws_ctx_t *do_handshake(int sock, char * const ip) {
char handshake[4096], response[4096], sha1[29], trailer[17]; char handshake[4096], response[4096], sha1[29], trailer[17];
char *scheme, *pre; char *scheme, *pre;
headers_t *headers; headers_t *headers;
@ -1565,6 +1577,25 @@ ws_ctx_t *do_handshake(int sock, const char *ip) {
usleep(10); usleep(10);
} }
// Proxied?
const char *fwd = strcasestr(handshake, "X-Forwarded-For: ");
if (fwd) {
fwd += 17;
const char *end = strchr(fwd, '\r');
const char *comma = memchr(fwd, ',', end - fwd);
if (comma)
end = comma;
// Sanity checks, in case it's malicious input
if (!isValidIp(fwd, end - fwd) || (end - fwd) >= 64) {
wserr("An invalid X-Forwarded-For was passed, maybe an attack\n");
} else {
memcpy(ip, fwd, end - fwd);
ip[end - fwd] = '\0';
handler_msg("X-Forwarded-For ip '%s'\n", ip);
}
}
if (bl_isBlacklisted(ip)) { if (bl_isBlacklisted(ip)) {
wserr("IP %s is blacklisted, dropping\n", ip); wserr("IP %s is blacklisted, dropping\n", ip);
sprintf(response, "HTTP/1.1 401 Forbidden\r\n" sprintf(response, "HTTP/1.1 401 Forbidden\r\n"
@ -1744,7 +1775,7 @@ __thread unsigned wsthread_handler_id;
void *subthread(void *ptr) { void *subthread(void *ptr) {
const struct wspass_t * const pass = ptr; struct wspass_t * const pass = ptr;
const int csock = pass->csock; const int csock = pass->csock;
wsthread_handler_id = pass->id; wsthread_handler_id = pass->id;