X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/7428c4e07e502019ecaa7830a3659cfba536d6ea..81e41406f4027dfef50dcd5ef33403661bea5995:/wsockd/wsockd.c diff --git a/wsockd/wsockd.c b/wsockd/wsockd.c index 5780ffc7..2f131004 100644 --- a/wsockd/wsockd.c +++ b/wsockd/wsockd.c @@ -95,12 +95,7 @@ typedef struct _conn char client_key[37]; /* maximum 36 bytes + nul */ } conn_t; -#define WEBSOCKET_OPCODE_CONTINUATION_FRAME 0 #define WEBSOCKET_OPCODE_TEXT_FRAME 1 -#define WEBSOCKET_OPCODE_BINARY_FRAME 2 -#define WEBSOCKET_OPCODE_CLOSE_FRAME 8 -#define WEBSOCKET_OPCODE_PING_FRAME 9 -#define WEBSOCKET_OPCODE_PONG_FRAME 10 #define WEBSOCKET_MASK_LENGTH 4 @@ -111,6 +106,8 @@ typedef struct { uint8_t payload_length_mask; // payload_length: 7, mask: 1 } ws_frame_hdr_t; +#define WEBSOCKET_FRAME_HDR_INIT ((ws_frame_hdr_t) { 0, 0 }) + typedef struct { ws_frame_hdr_t header; uint8_t payload_data[WEBSOCKET_MAX_UNEXTENDED_PAYLOAD_DATA_LENGTH]; @@ -125,17 +122,13 @@ typedef struct { uint16_t payload_length_extended; } ws_frame_ext_t; +#define WEBSOCKET_FRAME_EXT_INIT ((ws_frame_ext_t) { WEBSOCKET_FRAME_HDR_INIT, 0 }) + typedef struct { ws_frame_hdr_t header; uint64_t payload_length_extended; } ws_frame_ext2_t; -static inline int -ws_frame_get_opcode(ws_frame_hdr_t *header) -{ - return header->opcode_rsv_fin & 0xF; -} - static inline void ws_frame_set_opcode(ws_frame_hdr_t *header, int opcode) { @@ -143,12 +136,6 @@ ws_frame_set_opcode(ws_frame_hdr_t *header, int opcode) header->opcode_rsv_fin |= opcode & 0xF; } -static inline int -ws_frame_get_fin(ws_frame_hdr_t *header) -{ - return (header->opcode_rsv_fin >> 7) & 0x1; -} - static inline void ws_frame_set_fin(ws_frame_hdr_t *header, int fin) { @@ -156,31 +143,10 @@ ws_frame_set_fin(ws_frame_hdr_t *header, int fin) header->opcode_rsv_fin |= (fin << 7) & (0x1 << 7); } -#ifdef _WIN32 -char * -strcasestr(const char *s, const char *find) -{ - char c, sc; - size_t len; - - if ((c = *find++) != 0) { - c = tolower((unsigned char)c); - len = strlen(find); - do { - do { - if ((sc = *s++) == 0) - return (NULL); - } while ((char)tolower((unsigned char)sc) != c); - } while (strnicmp(s, find, len) != 0); - s--; - } - return ((char *)s); -} -#endif - static void close_conn(conn_t * conn, int wait_plain, const char *fmt, ...); static void conn_mod_read_cb(rb_fde_t *fd, void *data); static void conn_plain_read_cb(rb_fde_t *fd, void *data); +static void conn_plain_process_recvq(conn_t *conn); #define FLAG_CORK 0x01 #define FLAG_DEAD 0x02 @@ -189,7 +155,6 @@ static void conn_plain_read_cb(rb_fde_t *fd, void *data); #define IsCork(x) ((x)->flags & FLAG_CORK) #define IsDead(x) ((x)->flags & FLAG_DEAD) -#define IsWS(x) ((x)->flags & FLAG_WSOCK) #define IsKeyed(x) ((x)->flags & FLAG_KEYED) #define SetCork(x) ((x)->flags |= FLAG_CORK) @@ -198,15 +163,10 @@ static void conn_plain_read_cb(rb_fde_t *fd, void *data); #define SetKeyed(x) ((x)->flags |= FLAG_KEYED) #define ClearCork(x) ((x)->flags &= ~FLAG_CORK) -#define ClearDead(x) ((x)->flags &= ~FLAG_DEAD) -#define ClearWS(x) ((x)->flags &= ~FLAG_WSOCK) -#define ClearKeyed(x) ((x)->flags &= ~FLAG_KEYED) #define NO_WAIT 0x0 #define WAIT_PLAIN 0x1 -#define HASH_WALK_SAFE(i, max, ptr, next, table) for(i = 0; i < max; i++) { RB_DLINK_FOREACH_SAFE(ptr, next, table[i].head) -#define HASH_WALK_END } #define CONN_HASH_SIZE 2000 #define connid_hash(x) (&connid_hash_table[(x % CONN_HASH_SIZE)]) @@ -268,21 +228,6 @@ maxconn(void) return MAXCONNECTIONS; } -static conn_t * -conn_find_by_id(uint32_t id) -{ - rb_dlink_node *ptr; - conn_t *conn; - - RB_DLINK_FOREACH(ptr, (connid_hash(id))->head) - { - conn = ptr->data; - if(conn->id == id && !IsDead(conn)) - return conn; - } - return NULL; -} - static void conn_add_id_hash(conn_t * conn, uint32_t id) { @@ -317,6 +262,30 @@ clean_dead_conns(void *unused) dead_list.tail = dead_list.head = NULL; } +static void +conn_plain_write_sendq(rb_fde_t *fd, void *data) +{ + conn_t *conn = data; + int retlen; + + if(IsDead(conn)) + return; + + while((retlen = rb_linebuf_flush(fd, &conn->plainbuf_out)) > 0) + conn->plain_out += retlen; + + if(retlen == 0 || (retlen < 0 && !rb_ignore_errno(errno))) + { + close_conn(data, NO_WAIT, NULL); + return; + } + + if(rb_linebuf_alloclen(&conn->plainbuf_out) > 0) + rb_setselect(conn->plain_fd, RB_SELECT_WRITE, conn_plain_write_sendq, conn); + else + rb_setselect(conn->plain_fd, RB_SELECT_WRITE, NULL, NULL); +} + static void conn_mod_write_sendq(rb_fde_t *fd, void *data) { @@ -362,9 +331,10 @@ conn_mod_write(conn_t * conn, void *data, size_t len) static void conn_mod_write_short_frame(conn_t * conn, void *data, int len) { - ws_frame_hdr_t hdr; + ws_frame_hdr_t hdr = WEBSOCKET_FRAME_HDR_INIT; - ws_frame_set_opcode(&hdr, WEBSOCKET_OPCODE_BINARY_FRAME); + ws_frame_set_opcode(&hdr, WEBSOCKET_OPCODE_TEXT_FRAME); + ws_frame_set_fin(&hdr, 1); hdr.payload_length_mask = (len + 2) & 0x7f; conn_mod_write(conn, &hdr, sizeof(hdr)); @@ -375,9 +345,10 @@ conn_mod_write_short_frame(conn_t * conn, void *data, int len) static void conn_mod_write_long_frame(conn_t * conn, void *data, int len) { - ws_frame_ext_t hdr; + ws_frame_ext_t hdr = WEBSOCKET_FRAME_EXT_INIT; - ws_frame_set_opcode(&hdr.header, WEBSOCKET_OPCODE_BINARY_FRAME); + ws_frame_set_opcode(&hdr.header, WEBSOCKET_OPCODE_TEXT_FRAME); + ws_frame_set_fin(&hdr.header, 1); hdr.header.payload_length_mask = 126; hdr.payload_length_extended = htons(len + 2); @@ -393,17 +364,12 @@ conn_mod_write_frame(conn_t *conn, void *data, int len) return; if (len < 123) - return conn_mod_write_short_frame(conn, data, len); - - return conn_mod_write_long_frame(conn, data, len); -} - -static void -conn_plain_write(conn_t * conn, void *data, size_t len) -{ - if(IsDead(conn)) /* again no point in queueing to dead men */ + { + conn_mod_write_short_frame(conn, data, len); return; - rb_linebuf_put(&conn->plainbuf_out, data, len); + } + + conn_mod_write_long_frame(conn, data, len); } static void @@ -459,6 +425,9 @@ close_conn(conn_t * conn, int wait_plain, const char *fmt, ...) if(IsDead(conn)) return; + if (IsKeyed(conn)) + conn_plain_process_recvq(conn); + rb_rawbuf_flush(conn->modbuf_out, conn->mod_fd); rb_linebuf_flush(conn->plain_fd, &conn->plainbuf_out); rb_close(conn->mod_fd); @@ -517,6 +486,126 @@ cleanup_bad_message(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb) rb_close(ctlb->F[i]); } +static void +ws_frame_unmask(char *msg, int length, uint8_t maskval[WEBSOCKET_MASK_LENGTH]) +{ + int i; + + for (i = 0; i < length; i++) + msg[i] = msg[i] ^ maskval[i % 4]; +} + +static void +conn_mod_process_frame(conn_t *conn, ws_frame_hdr_t *hdr, int masked) +{ + char msg[WEBSOCKET_MAX_UNEXTENDED_PAYLOAD_DATA_LENGTH]; + uint8_t maskval[WEBSOCKET_MASK_LENGTH]; + int dolen; + + /* if we're masked, we get to collect the masking key for this frame */ + if (masked) + { + dolen = rb_rawbuf_get(conn->modbuf_in, maskval, sizeof(maskval)); + if (!dolen) + { + close_conn(conn, WAIT_PLAIN, "websocket error: fault unpacking unmask key"); + return; + } + } + + dolen = rb_rawbuf_get(conn->modbuf_in, msg, hdr->payload_length_mask); + if (!dolen) + { + close_conn(conn, WAIT_PLAIN, "websocket error: fault unpacking message"); + return; + } + + if (masked) + ws_frame_unmask(msg, dolen, maskval); + + rb_linebuf_parse(&conn->plainbuf_out, msg, dolen, 1); +} + +static void +conn_mod_process_large(conn_t *conn, ws_frame_hdr_t *hdr, int masked) +{ + char msg[READBUF_SIZE]; + uint16_t msglen; + uint8_t maskval[WEBSOCKET_MASK_LENGTH]; + int dolen; + + memset(msg, 0, sizeof msg); + + dolen = rb_rawbuf_get(conn->modbuf_in, &msglen, sizeof(msglen)); + if (!dolen) + { + close_conn(conn, WAIT_PLAIN, "websocket error: fault unpacking message size"); + return; + } + + msglen = ntohs(msglen); + + if (masked) + { + dolen = rb_rawbuf_get(conn->modbuf_in, maskval, sizeof(maskval)); + if (!dolen) + { + close_conn(conn, WAIT_PLAIN, "websocket error: fault unpacking unmask key"); + return; + } + } + + dolen = rb_rawbuf_get(conn->modbuf_in, msg, msglen); + if (!dolen) + { + close_conn(conn, WAIT_PLAIN, "websocket error: fault unpacking message"); + return; + } + + if (masked) + ws_frame_unmask(msg, dolen, maskval); + + rb_linebuf_parse(&conn->plainbuf_out, msg, dolen, 1); +} + +static void +conn_mod_process_huge(conn_t *conn, ws_frame_hdr_t *hdr, int masked) +{ + /* XXX implement me */ +} + +static void +conn_mod_process(conn_t *conn) +{ + ws_frame_hdr_t hdr; + + while (1) + { + int masked; + int dolen = rb_rawbuf_get(conn->modbuf_in, &hdr, sizeof(hdr)); + if (dolen != sizeof(hdr)) + break; + + masked = (hdr.payload_length_mask >> 7) == 1; + + hdr.payload_length_mask &= 0x7f; + switch (hdr.payload_length_mask) + { + case 126: + conn_mod_process_large(conn, &hdr, masked); + break; + case 127: + conn_mod_process_huge(conn, &hdr, masked); + break; + default: + conn_mod_process_frame(conn, &hdr, masked); + break; + } + } + + conn_plain_write_sendq(conn->plain_fd, conn); +} + static void conn_mod_handshake_process(conn_t *conn) { @@ -532,7 +621,7 @@ conn_mod_handshake_process(conn_t *conn) if (!dolen) break; - if ((p = strcasestr(inbuf, "Sec-WebSocket-Key:")) != NULL) + if ((p = rb_strcasestr(inbuf, "Sec-WebSocket-Key:")) != NULL) { char *start, *end; @@ -603,10 +692,13 @@ conn_mod_read_cb(rb_fde_t *fd, void *data) length = rb_read(fd, inbuf, sizeof(inbuf)); - if (length < 0) + if (length < 0) { if (rb_ignore_errno(errno)) + { rb_setselect(fd, RB_SELECT_READ, conn_mod_read_cb, conn); + conn_plain_write_sendq(conn->plain_fd, conn); + } else close_conn(conn, NO_WAIT, "Connection closed"); @@ -621,8 +713,10 @@ conn_mod_read_cb(rb_fde_t *fd, void *data) rb_rawbuf_append(conn->modbuf_in, inbuf, length); if (!IsKeyed(conn)) conn_mod_handshake_process(conn); + else + conn_mod_process(conn); - if (length < sizeof(inbuf)) + if ((size_t) length < sizeof(inbuf)) { rb_setselect(fd, RB_SELECT_READ, conn_mod_read_cb, conn); return; @@ -857,7 +951,7 @@ int main(int argc, char **argv) { const char *s_ctlfd, *s_pipe, *s_pid; - int ctlfd, pipefd, x, maxfd; + int ctlfd, pipefd, maxfd; maxfd = maxconn(); s_ctlfd = getenv("CTL_FD"); @@ -876,8 +970,9 @@ main(int argc, char **argv) ctlfd = atoi(s_ctlfd); pipefd = atoi(s_pipe); ppid = atoi(s_pid); - x = 0; + #ifndef _WIN32 + int x = 0; for(x = 0; x < maxfd; x++) { if(x != ctlfd && x != pipefd && x > 2)