Add user-defined headers before forward response to client

etc/tempesta_fw.conf

@@ -488,6 +488,66 @@
 # Default:
 #   None.
 
+# TAG: resp_hdr_add
+#
+# Append a user-defined header to HTTP response message before forwarding
+# it to client.
+#
+# Syntax:
+#   resp_hdr_add <name> <value>;
+#
+# Example:
+#   resp_hdr_add Expires "Thu, 15 Apr 2020 20:00:00 GMT"
+#
+# Default:
+#   None.
+
+# TAG: resp_hdr_set
+#
+# Replace or remove a user-defined header from HTTP response message before
+# forwarding it to client.
+#
+# Syntax:
+#   resp_hdr_set <name> <value>;
+#   resp_hdr_set <name>;
+#
+# Example:
+#   resp_hdr_add Expires "Thu, 15 Apr 2020 20:00:00 GMT"
+#   resp_hdr_add Expires
+#
+# Default:
+#   None.
+
+# TAG: req_hdr_add
+#
+# Append a user-defined header to HTTP request message before forwarding
+# it to backend server.
+#
+# Syntax:
+#   req_hdr_add <name> <value>;
+#
+# Example:
+#   req_hdr_add X-Forwarded-Host "mydomain.com"
+#
+# Default:
+#   None.
+
+# TAG: req_hdr_set
+#
+#  Replace or remove a user-defined header from HTTP request message before
+# forwarding it to backend server.
+#
+# Syntax:
+#   req_hdr_set <name> <value>;
+#   req_hdr_set <name>;
+#
+# Example:
+#   req_hdr_set Host "mydomain.com"
+#   req_hdr_set Cookie
+#
+# Default:
+#   None.
+
 # TAG: location
 #
 # Group of directives applied to specific location defined my a string
@@ -502,7 +562,8 @@
 #
 # <OP> is a match operator, one of "eq", "prefix", "suffix", or "*".
 # <string> is a verbatim string matched against URL in a request.
-# <directive> is one of "cache_bypass", "cache_fulfill", "nonidempotent".
+# <directive> is one of "cache_bypass", "cache_fulfill", "nonidempotent" or
+# "hdr_add".
 #
 # Default:
 #   None.

tempesta_fw/http.c

@@ -1725,6 +1725,29 @@ tfw_http_add_x_forwarded_for(TfwHttpMsg *hm)
 	return r;
 }
 
+static int
+tfw_http_set_loc_hdrs(TfwHttpMsg *hm, TfwHttpReq *req)
+{
+	int r;
+	size_t i;
+	int msg_type = (hm == (TfwHttpMsg *)req) ? TFW_HTTP_MSG_REQ
+						 : TFW_HTTP_MSG_RESP;
+	TfwHdrMods *h_mods = tfw_vhost_get_hdr_mods((TfwMsg *)req, msg_type);
+
+	for (i = 0; i < h_mods->sz; ++i) {
+		TfwHdrModsDesc *d = &h_mods->hdrs[i];
+		r = tfw_http_msg_hdr_xfrm_str(hm, d->hdr, d->hid, d->append);
+		if (r) {
+			TFW_ERR("can't update location-specific header in msg %p\n",
+				hm);
+			return r;
+		}
+		TFW_DBG2("updated location-specific header in msg %p\n", hm);
+	}
+
+	return 0;
+}
+
 /**
  * Adjust the request before proxying it to real server.
  */
@@ -1746,6 +1769,10 @@ tfw_http_adjust_req(TfwHttpReq *req)
 	if (r < 0)
 		return r;
 
+	r = tfw_http_set_loc_hdrs(hm, req);
+	if (r < 0)
+		return r;
+
 	return tfw_http_set_hdr_connection(hm, TFW_HTTP_CONN_KA);
 }
 
@@ -1778,6 +1805,10 @@ tfw_http_adjust_resp(TfwHttpResp *resp, TfwHttpReq *req)
 	if (r < 0)
 		return r;
 
+	r = tfw_http_set_loc_hdrs(hm, req);
+	if (r < 0)
+		return r;
+
 	if (resp->flags & TFW_HTTP_RESP_STALE) {
 #define S_WARN_110 "Warning: 110 - Response is stale"
 		/* TODO: ajust for #215 */
@@ -2030,6 +2061,8 @@ tfw_http_req_mark_nip(TfwHttpReq *req)
 	 * the current vhost. If there are no entries there either, then
 	 * search in the default location of the default vhost - that is,
 	 * in the global policies.
+	 *
+	 * TODO #862: req->location must be the full set of options.
 	 */
 	if (loc && loc->nipdef_sz) {
 		if (tfw_nipdef_match(loc, req->method, &req->uri_path))

tempesta_fw/http.h

@@ -171,7 +171,8 @@ typedef struct {
  * for unconditionally hop-by-hop header or in __parse_connection() otherwize.
  * 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() upon adding a new header.
+ * Note: don't forget to update __http_msg_hdr_val() and
+ * tfw_http_msg_spec_hid() upon adding a new header.
  *
  * Cookie: singular according to RFC 6265 5.4.
  *