Merge pull request #1060 from tempesta-tech/ao-1058

Fix #1058: Protocol/port persistence support during redirection.

Author: aleksostapenko

tempesta_fw/connection.h

@@ -106,6 +106,7 @@ typedef struct {
 } TfwConn;
 
 #define TFW_CONN_TYPE(c)	((c)->proto.type)
+#define TFW_CONN_PROTO(c)	TFW_CONN_TYPE2IDX(TFW_CONN_TYPE(c))
 
 /*
  * Queues in client and server connections provide support for correct

tempesta_fw/http.c

@@ -59,6 +59,7 @@ static struct {
 
 #define S_CRLFCRLF		"\r\n\r\n"
 #define S_HTTP			"http://"
+#define S_HTTPS			"https://"
 
 #define S_0			"HTTP/1.1 "
 #define S_200			"HTTP/1.1 200 OK"
@@ -343,6 +344,7 @@ unsigned long tfw_hash_str(const TfwStr *str);
 #define S_REDIR_KEEP	S_CRLF S_F_CONNECTION S_V_CONN_KA S_CRLF
 #define S_REDIR_CLOSE	S_CRLF S_F_CONNECTION S_V_CONN_CLOSE S_CRLF
 #define S_REDIR_C_LEN	S_F_CONTENT_LENGTH "0" S_CRLFCRLF
+
 /**
  * The response redirects the client to the same URI as the original request,
  * but it includes 'Set-Cookie:' header field that sets Tempesta sticky cookie.
@@ -390,6 +392,11 @@ tfw_http_prep_redirect(TfwHttpMsg *resp, unsigned short status, TfwStr *rmark,
 		.ptr = S_REDIR_CLOSE, .len = SLEN(S_REDIR_CLOSE) };
 	static TfwStr c_len_crlf = {
 		.ptr = S_REDIR_C_LEN, .len = SLEN(S_REDIR_C_LEN) };
+	static TfwStr protos[] = {
+		{ .ptr = S_HTTP, .len = SLEN(S_HTTP) },
+		{ .ptr = S_HTTPS, .len = SLEN(S_HTTPS) },
+	};
+	TfwStr *proto = &protos[TFW_CONN_PROTO(req->conn) == TFW_FSM_HTTPS];
 	TfwStr host, *rh, *cookie_crlf = &crlf, *r_end;
 
 	if (status == 302) {
@@ -405,10 +412,11 @@ tfw_http_prep_redirect(TfwHttpMsg *resp, unsigned short status, TfwStr *rmark,
 	else
 		r_end = &c_len_crlf;
 
-	tfw_http_msg_clnthdr_val(&req->h_tbl->tbl[TFW_HTTP_HDR_HOST],
-				 TFW_HTTP_HDR_HOST, &host);
-	if (TFW_STR_EMPTY(&host))
+	if (req->host.len)
 		host = req->host;
+	else
+		tfw_http_msg_clnthdr_val(&req->h_tbl->tbl[TFW_HTTP_HDR_HOST],
+					 TFW_HTTP_HDR_HOST, &host);
 
 	/* Set "Connection:" header field if needed. */
 	if (conn_flag == TFW_HTTP_F_CONN_CLOSE)
@@ -418,7 +426,7 @@ tfw_http_prep_redirect(TfwHttpMsg *resp, unsigned short status, TfwStr *rmark,
 
 	/* Add variable part of data length to get the total */
 	data_len = rh->len + h_common_1.len;
-	data_len += host.len ? host.len + SLEN(S_HTTP) : 0;
+	data_len += host.len ? host.len + proto->len : 0;
 	data_len += rmark->len;
 	data_len += req->uri_path.len + h_common_2.len + cookie->len;
 	data_len += cookie_crlf->len + r_end->len;
@@ -436,8 +444,7 @@ tfw_http_prep_redirect(TfwHttpMsg *resp, unsigned short status, TfwStr *rmark,
 	 * See RFC 1945 9.3 and RFC 7231 7.1.2.
 	 */
 	if (host.len) {
-		static TfwStr proto = { .ptr = S_HTTP, .len = SLEN(S_HTTP) };
-		ret |= tfw_http_msg_write(&it, resp, &proto);
+		ret |= tfw_http_msg_write(&it, resp, proto);
 		ret |= tfw_http_msg_write(&it, resp, &host);
 	}
 
@@ -2766,7 +2773,6 @@ tfw_http_req_process(TfwConn *conn, const TfwFsmData *data)
 		if ((req->vhost = tfw_http_tbl_vhost((TfwMsg *)req, &block)))
 			req->location = tfw_location_match(req->vhost,
 							   &req->uri_path);
-
 		r = tfw_gfsm_move(&conn->state, TFW_HTTP_FSM_REQ_MSG,
 				  &data_up);
 		TFW_DBG3("TFW_HTTP_FSM_REQ_MSG return code %d\n", r);

tempesta_fw/http_parser.c

@@ -3280,6 +3280,8 @@ tfw_http_parse_req(void *req_data, unsigned char *data, size_t len)
 	}
 
 	__FSM_STATE(Req_UriAuthorityEnd) {
+		if (c == ':')
+			__FSM_MOVE_f(Req_UriPort, &req->host);
 		/* Authority End */
 		__msg_field_finish(&req->host, p);
 		TFW_DBG3("Userinfo len = %i, host len = %i\n",
@@ -3290,27 +3292,21 @@ tfw_http_parse_req(void *req_data, unsigned char *data, size_t len)
 		else if (c == ' ') {
 			__FSM_MOVE_nofixup(Req_HttpVer);
 		}
-		else if (c == ':') {
-			__FSM_MOVE_nofixup(Req_UriPort);
-		}
-		else {
-			TFW_PARSER_BLOCK(Req_UriAuthorityEnd);
-		}
+		TFW_PARSER_BLOCK(Req_UriAuthorityEnd);
 	}
 
 	/* Host port in URI */
 	__FSM_STATE(Req_UriPort) {
 		if (likely(isdigit(c)))
-			__FSM_MOVE_nofixup(Req_UriPort);
-		else if (likely(c == '/')) {
+			__FSM_MOVE_f(Req_UriPort, &req->host);
+		__msg_field_finish(&req->host, p);
+		if (likely(c == '/')) {
 			__FSM_JMP(Req_UriMark);
 		}
 		else if (c == ' ') {
 			__FSM_MOVE_nofixup(Req_HttpVer);
 		}
-		else {
-			TFW_PARSER_BLOCK(Req_UriPort);
-		}
+		TFW_PARSER_BLOCK(Req_UriPort);
 	}
 
 	__FSM_STATE(Req_UriMark) {

tempesta_fw/t/unit/test_http_parser.c

@@ -435,9 +435,10 @@ TEST(http_parser, parses_req_uri)
 				 "/a/b/c/dir/?foo=1&bar=2#abcd");
 	}
 
-	/* Absolute URI. */
-	/* NOTE: we don't include port to the req->host */
-
+	/*
+	 * Absolute URI.
+	 * NOTE: we combine host and port URI parts into one field 'req->host'.
+	 */
 	FOR_REQ("GET http://natsys-lab.com/ HTTP/1.1\r\n\r\n") {
 		EXPECT_TFWSTR_EQ(&req->host, "natsys-lab.com");
 		EXPECT_TFWSTR_EQ(&req->uri_path, "/");
@@ -449,12 +450,12 @@ TEST(http_parser, parses_req_uri)
 	}
 
 	FOR_REQ("GET http://natsys-lab.com:8080/ HTTP/1.1\r\n\r\n") {
-		EXPECT_TFWSTR_EQ(&req->host, "natsys-lab.com");
+		EXPECT_TFWSTR_EQ(&req->host, "natsys-lab.com:8080");
 		EXPECT_TFWSTR_EQ(&req->uri_path, "/");
 	}
 
 	FOR_REQ("GET http://natsys-lab.com:8080 HTTP/1.1\r\n\r\n") {
-		EXPECT_TFWSTR_EQ(&req->host, "natsys-lab.com");
+		EXPECT_TFWSTR_EQ(&req->host, "natsys-lab.com:8080");
 		EXPECT_TFWSTR_EQ(&req->uri_path, "");
 	}
 
@@ -466,7 +467,7 @@ TEST(http_parser, parses_req_uri)
 	FOR_REQ("GET http://natsys-lab.com:8080/cgi-bin/show.pl?entry=tempesta"
 		" HTTP/1.1\r\n\r\n")
 	{
-		EXPECT_TFWSTR_EQ(&req->host, "natsys-lab.com");
+		EXPECT_TFWSTR_EQ(&req->host, "natsys-lab.com:8080");
 		EXPECT_TFWSTR_EQ(&req->uri_path,
 				 "/cgi-bin/show.pl?entry=tempesta");
 	}
@@ -511,7 +512,7 @@ TEST(http_parser, parses_enforce_ext_req)
 		"Accept: */*\r\n"
 		"\r\n")
 	{
-		EXPECT_TFWSTR_EQ(&req->host, "natsys-lab.com");
+		EXPECT_TFWSTR_EQ(&req->host, "natsys-lab.com:8080");
 		EXPECT_TFWSTR_EQ(&req->uri_path, "/cgi-bin/show.pl");
 	}
 }
@@ -558,19 +559,19 @@ TEST(http_parser, parses_enforce_ext_req_rmark)
 	}
 
 	FOR_REQ("GET " AUTH RMARK URI_1 " HTTP/1.1\r\n\r\n") {
-		EXPECT_TFWSTR_EQ(&req->host, HOST);
+		EXPECT_TFWSTR_EQ(&req->host, HOST ":" PORT);
 		EXPECT_TFWSTR_EQ(&req->mark, RMARK);
 		EXPECT_TFWSTR_EQ(&req->uri_path, URI_1);
 	}
 
 	FOR_REQ("GET " AUTH RMARK URI_3 " HTTP/1.1\r\n\r\n") {
-		EXPECT_TFWSTR_EQ(&req->host, HOST);
+		EXPECT_TFWSTR_EQ(&req->host, HOST ":" PORT);
 		EXPECT_TFWSTR_EQ(&req->mark, RMARK);
 		EXPECT_TFWSTR_EQ(&req->uri_path, URI_3);
 	}
 
 	FOR_REQ("GET " AUTH RMARK URI_4 " HTTP/1.1\r\n\r\n") {
-		EXPECT_TFWSTR_EQ(&req->host, HOST);
+		EXPECT_TFWSTR_EQ(&req->host, HOST ":" PORT);
 		EXPECT_TFWSTR_EQ(&req->mark, RMARK);
 		EXPECT_TFWSTR_EQ(&req->uri_path, URI_4);
 	}