use user-agent for searching a client

Author: avbelov23

tempesta_fw/client.c

@@ -78,17 +78,17 @@ addr_eq(TdbRec *rec, void *data)
 }
 
 /**
- * Find a client corresponding to @addr.
- * More advanced identification is possible based on User-Agent,
- * Cookie and other HTTP headers.
+ * Find a client corresponding to @addr and @user_agent.
+ * More advanced identification is possible based on Cookie and
+ * other HTTP headers.
  * TODO (#488,#598,#1054?) actually clients can be relatively reliably
  * identified with TLS sessions (#1054) or HTTP sticky cookies.
  *
  * The returned TfwClient reference must be released via tfw_client_put()
  * when the @sk is closed.
  */
 TfwClient *
-tfw_client_obtain(TfwAddr addr, void (*init)(TfwClient *))
+tfw_client_obtain(TfwAddr addr, TfwStr *user_agent, void (*init)(TfwClient *))
 {
 	TfwClientEntry *ent;
 	TfwClient *cli;
@@ -102,6 +102,10 @@ tfw_client_obtain(TfwAddr addr, void (*init)(TfwClient *))
 	key = hash_calc((const char *)&addr.sin6_addr,
 			sizeof(addr.sin6_addr));
 
+	if (user_agent)
+		key += hash_calc((const char *)user_agent->data,
+                                 min(user_agent->len, 256UL));
+
 	len = sizeof(*cli);
 	rec = tdb_rec_get_alloc(client_db, key, &len, &addr_eq, &is_new, &addr);
 	if (!rec)

tempesta_fw/client.h

@@ -40,7 +40,8 @@ typedef struct {
 	TfwClassifierPrvt	class_prvt;
 } TfwClient;
 
-TfwClient *tfw_client_obtain(TfwAddr addr, void (*init)(TfwClient *));
+TfwClient *tfw_client_obtain(TfwAddr addr, TfwStr *user_agent,
+                             void (*init)(TfwClient *));
 void tfw_client_put(TfwClient *cli);
 int tfw_client_for_each(int (*fn)(void *));
 void tfw_cli_conn_release(TfwCliConn *cli_conn);

tempesta_fw/http.c

@@ -2829,7 +2829,7 @@ tfw_http_req_process(TfwConn *conn, const TfwFsmData *data)
 	TfwHttpParser *parser;
 	TfwFsmData data_up;
 	TfwAddr addr;
-	TfwStr s_xff, s_ip, *c, *end;
+	TfwStr s_xff, s_ip, s_user_agent, *c, *end;
 	unsigned int nchunks;
 
 	BUG_ON(!conn->msg);
@@ -2948,8 +2948,15 @@ tfw_http_req_process(TfwConn *conn, const TfwFsmData *data)
 	}
 	s_ip.nchunks = nchunks;
 
-	if (!TFW_STR_EMPTY(&s_ip) && tfw_addr_pton(&s_ip, &addr) == 0) {
-		TfwClient *cli = tfw_client_obtain(addr, NULL);
+	if (TFW_STR_EMPTY(&s_ip) || tfw_addr_pton(&s_ip, &addr) != 0) {
+		ss_getpeername(conn->sk, &addr);
+	}
+
+	tfw_http_msg_clnthdr_val(&req->h_tbl->tbl[TFW_HTTP_HDR_USER_AGENT],
+				 TFW_HTTP_HDR_USER_AGENT, &s_user_agent);
+
+	if (!TFW_STR_EMPTY(&s_ip) || !TFW_STR_EMPTY(&s_user_agent)) {
+		TfwClient *cli = tfw_client_obtain(addr, &s_user_agent, NULL);
 		TfwClient *conn_cli = (TfwClient *)conn->peer;
 		if (cli && conn_cli != cli) {
 			tfw_connection_unlink_from_peer(conn);

tempesta_fw/http_limits.c

@@ -338,7 +338,7 @@ frang_conn_new(struct sock *sk)
 	TfwAddr addr;
 
 	ss_getpeername(sk, &addr);
-	cli = tfw_client_obtain(addr, __frang_init_acc);
+	cli = tfw_client_obtain(addr, NULL, __frang_init_acc);
 	if (unlikely(!cli)) {
 		TFW_ERR("can't obtain a client for frang accounting\n");
 		return TFW_BLOCK;

tempesta_fw/sock_clnt.c

@@ -160,7 +160,7 @@ tfw_sock_clnt_new(struct sock *sk)
 	tfw_connection_unlink_from_sk(sk);
 
 	ss_getpeername(sk, &addr);
-	cli = tfw_client_obtain(addr, NULL);
+	cli = tfw_client_obtain(addr, NULL, NULL);
 	if (!cli) {
 		TFW_ERR("can't obtain a client for the new socket\n");
 		return -ENOENT;