add unit test for X-Forwarded-For field in request

Author: avbelov23

tempesta_db/core/main.c

@@ -267,7 +267,7 @@ tdb_rec_get_alloc(TDB *db, unsigned long key, size_t *len,
 
 	*is_new = true;
 	r = tdb_entry_alloc(db, key, len);
-	init(iter.rec, cb, data);
+	init(r, cb, data);
 
 	spin_unlock(&get_alloc_lock);
 

tempesta_fw/client.c

@@ -40,7 +40,7 @@ static struct {
 
 typedef struct {
 	TfwClient	cli;
-	spinlock_t	*hb_lock;
+	spinlock_t	hb_lock;
 	time_t		expires;
 } TfwClientEntry;
 
@@ -63,17 +63,17 @@ tfw_client_put(TfwClient *cli)
 		return;
 
 	ent = (TfwClientEntry *)cli;
-	spin_lock(ent->hb_lock);
+	spin_lock(&ent->hb_lock);
 
 	if (atomic_read(&cli->conn_users)) {
-		spin_unlock(ent->hb_lock);
+		spin_unlock(&ent->hb_lock);
 		return;
 	}
 	BUG_ON(!list_empty(&cli->conn_list));
 
 	ent->expires = tfw_current_timestamp() + client_cfg.lifetime;
 
-	spin_unlock(ent->hb_lock);
+	spin_unlock(&ent->hb_lock);
 
 	TFW_DBG("put client: cli=%p\n", cli);
 	TFW_DEC_STAT_BH(clnt.online);
@@ -90,7 +90,7 @@ tfw_client_addr_eq(TdbRec *rec, void (*init)(void *), void *data)
 
 	if (!memcmp_fast(&cli->addr.sin6_addr, &addr->sin6_addr,
 			 sizeof(cli->addr.sin6_addr))) {
-		spin_lock(ent->hb_lock);
+		spin_lock(&ent->hb_lock);
 
 		if (curr_time > ent->expires) {
 			bzero_fast(&cli->class_prvt, sizeof(cli->class_prvt));
@@ -104,7 +104,7 @@ tfw_client_addr_eq(TdbRec *rec, void (*init)(void *), void *data)
 		if (conn_users == 1)
 			TFW_INC_STAT_BH(clnt.online);
 
-		spin_unlock(ent->hb_lock);
+		spin_unlock(&ent->hb_lock);
 
 		TFW_DBG("client was found in tdb\n");
 		TFW_DBG2("client %p, conn_users=%d\n", cli, conn_users);
@@ -122,7 +122,7 @@ tfw_client_ent_init(TdbRec *rec, void (*init)(void *), void *data)
 	TfwClient *cli = &ent->cli;
 	TfwAddr *addr = (TfwAddr *)data;
 
-	spin_lock_init(ent->hb_lock);
+	spin_lock_init(&ent->hb_lock);
 
 	ent->expires = LONG_MAX;
 	if (init)

tempesta_fw/t/unit/test_http_parser.c

@@ -2421,6 +2421,48 @@ TEST(http_parser, content_type_line_parser)
 #undef TAIL
 }
 
+static
+TfwStr get_next_str_val(TfwStr *str)
+{
+	TfwStr v, *c, *end;
+	unsigned int nchunks = 0;
+
+	v = *str = tfw_str_next_str_val(str);
+	TFW_STR_FOR_EACH_CHUNK(c, &v, end) {
+		if (!(c->flags & TFW_STR_VALUE))
+			break;
+		nchunks++;
+	}
+	v.nchunks = nchunks;
+
+	return v;
+}
+
+TEST(http_parser, xff)
+{
+	TfwStr xff, v;
+
+	const char *s_client = "203.0.113.195";
+	const char *s_proxy1 = "70.41.3.18";
+	const char *s_proxy2 = "150.172.238.178";
+
+	FOR_REQ("GET /foo HTTP/1.1\r\n"
+		"X-Forwarded-For: 203.0.113.195,70.41.3.18,150.172.238.178\r\n"
+		"\r\n");
+	{
+		xff = req->h_tbl->tbl[TFW_HTTP_HDR_X_FORWARDED_FOR];
+
+		v = get_next_str_val(&xff);
+		EXPECT_TRUE(tfw_str_eq_cstr(&v, s_client, strlen(s_client), 0));
+
+		v = get_next_str_val(&xff);
+		EXPECT_TRUE(tfw_str_eq_cstr(&v, s_proxy1, strlen(s_proxy1), 0));
+
+		v = get_next_str_val(&xff);
+		EXPECT_TRUE(tfw_str_eq_cstr(&v, s_proxy2, strlen(s_proxy2), 0));
+	}
+}
+
 TEST_SUITE(http_parser)
 {
 	int r;
@@ -2458,6 +2500,7 @@ TEST_SUITE(http_parser)
 	TEST_RUN(http_parser, resp_hop_by_hop);
 	TEST_RUN(http_parser, fuzzer);
 	TEST_RUN(http_parser, content_type_line_parser);
+	TEST_RUN(http_parser, xff);
 
 	/*
 	 * Testing for correctness of redirection mark parsing (in