Websocket upgrade directive implementation

Contributes to tempesta-tech#755

Signed-off-by: Aleksey Mikhaylov <[email protected]>

Author: ttaym

fw/http.c

@@ -5540,6 +5540,13 @@ tfw_http_req_process(TfwConn *conn, TfwStream *stream, struct sk_buff *skb)
 				   "request dropped: cannot find appropriate "
 				   "virtual host");
 		TFW_INC_STAT_BH(clnt.msgs_otherr);
+	}
+	/* Process websocket upgrade case */
+	else if (unlikely(
+		 test_bit(TFW_HTTP_B_CONN_EXTRA, req->flags)
+	))
+	{
+
 	}
 	/*
 	 * Look up a cache entry for this request. If there's one, a response

fw/http.h

@@ -170,11 +170,11 @@ typedef struct {
  * Http headers table.
  *
  * Singular headers (in terms of RFC 7230 3.2.2) go first to protect header
- * repetition attacks. See __hdr_is_singular() and don't forget to
- * update the static headers array when add a new singular header here.
- * If the new header is hop-by-hop (must not be forwarded and cached by Tempesta)
- * it must be listed in tfw_http_init_parser_req()/tfw_http_init_parser_resp()
- * for unconditionally hop-by-hop header or in __parse_connection() otherwize.
+ * repetition attacks. See __hdr_is_singular() and don't forget to update the
+ * static headers array when add a new singular header here. If the new header
+ * is hop-by-hop (must not be forwarded and cached by Tempesta) it must be
+ * listed in tfw_http_init_parser_req()/tfw_http_init_parser_resp()
+ * for unconditionally hop-by-hop header or in __parse_connection() otherwise.
  * If the header is end-to-end it must be listed in __hbh_parser_add_data().
  *
  * Note: don't forget to update __http_msg_hdr_val() and
@@ -212,6 +212,7 @@ typedef enum {
 	TFW_HTTP_HDR_X_FORWARDED_FOR,
 	TFW_HTTP_HDR_KEEP_ALIVE,
 	TFW_HTTP_HDR_TRANSFER_ENCODING,
+	TFW_HTTP_HDR_UPGRADE,
 
 	/* Start of list of generic (raw) headers. */
 	TFW_HTTP_HDR_RAW,
@@ -240,6 +241,8 @@ enum {
 	TFW_HTTP_B_CONN_CLOSE	= TFW_HTTP_FLAGS_COMMON,
 	TFW_HTTP_B_CONN_KA,
 	TFW_HTTP_B_CONN_EXTRA,
+	/* Request is a websocket upgrade request */
+	TFW_HTTP_B_UPGRADE_WEBSOCKET,
 	/* Chunked is last transfer encoding. */
 	TFW_HTTP_B_CHUNKED,
 	/* Chunked in the middle of applied transfer encodings. */

fw/http_msg.c

@@ -155,6 +155,7 @@ tfw_http_msg_resp_spec_hid(const TfwStr *hdr)
 		TfwStrDefV("transfer-encoding:",TFW_HTTP_HDR_TRANSFER_ENCODING),
 		TfwStrDefV("x-forwarded-for:",	TFW_HTTP_HDR_X_FORWARDED_FOR),
 		TfwStrDefV("x-tempesta-cache:",	TFW_HTTP_HDR_X_TEMPESTA_CACHE),
+		TfwStrDefV("upgrade:",		TFW_HTTP_HDR_UPGRADE),
 	};
 
 	BUILD_BUG_ON(ARRAY_SIZE(resp_hdrs) !=
@@ -182,6 +183,7 @@ tfw_http_msg_req_spec_hid(const TfwStr *hdr)
 		TfwStrDefV("user-agent:",	TFW_HTTP_HDR_USER_AGENT),
 		TfwStrDefV("x-forwarded-for:",	TFW_HTTP_HDR_X_FORWARDED_FOR),
 		TfwStrDefV("x-tempesta-cache:",	TFW_HTTP_HDR_X_TEMPESTA_CACHE),
+		TfwStrDefV("upgrade:",		TFW_HTTP_HDR_UPGRADE),
 	};
 
 	BUILD_BUG_ON(ARRAY_SIZE(req_hdrs) !=
@@ -215,6 +217,7 @@ __http_msg_hdr_val(TfwStr *hdr, unsigned id, TfwStr *val, bool client)
 			[TFW_HTTP_HDR_SET_COOKIE]	= SLEN("Set-Cookie:"),
 			[TFW_HTTP_HDR_ETAG]		= SLEN("ETag:"),
 			[TFW_HTTP_HDR_REFERER]		= SLEN("Referer:"),
+			[TFW_HTTP_HDR_UPGRADE]		= SLEN("Upgrade:"),
 		},
 		(unsigned char []) {
 			[TFW_HTTP_HDR_HOST]		= SLEN("Host:"),
@@ -229,6 +232,7 @@ __http_msg_hdr_val(TfwStr *hdr, unsigned id, TfwStr *val, bool client)
 			[TFW_HTTP_HDR_COOKIE]		= SLEN("Cookie:"),
 			[TFW_HTTP_HDR_IF_NONE_MATCH]	= SLEN("If-None-Match:"),
 			[TFW_HTTP_HDR_REFERER]		= SLEN("Referer:"),
+			[TFW_HTTP_HDR_UPGRADE]		= SLEN("Upgrade:"),
 		},
 	};
 	TfwStr *c, *end;