From 7de768d731f97596daa70a6df1bf46dc9f1ace67 Mon Sep 17 00:00:00 2001 From: Thomas Lynch Date: Thu, 30 Dec 2021 00:13:14 +1100 Subject: [PATCH] /cdn-cgi/trace test --- docker-compose.yml | 3 ++- haproxy/haproxy.cfg | 2 ++ haproxy/trace.html | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 haproxy/trace.html diff --git a/docker-compose.yml b/docker-compose.yml index 67e2a8f..9d8fe18 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,6 +20,7 @@ services: - ./haproxy/backends.map:/etc/haproxy/backends.map - ./haproxy/blocked.map:/etc/haproxy/blocked.map - ./haproxy/dataplaneapi.hcl:/etc/haproxy/dataplaneapi.hcl + - ./haproxy/trace.html:/etc/haproxy/trace.html - ./src/scripts/:/etc/haproxy/scripts/ - ./src/libs/:/etc/haproxy/libs/ - ./haproxy/js/:/var/www/js/ @@ -28,7 +29,7 @@ services: - HCAPTCHA_SITEKEY= - CAPTCHA_COOKIE_SECRET= - POW_COOKIE_SECRET= - - RAY_ID= + - RAY_ID=docker - BUCKET_DURATION=43200 - BACKEND_NAME=servers - SERVER_PREFIX=websrv diff --git a/haproxy/haproxy.cfg b/haproxy/haproxy.cfg index 6e611b9..b741b9c 100644 --- a/haproxy/haproxy.cfg +++ b/haproxy/haproxy.cfg @@ -22,6 +22,8 @@ frontend http-in acl is_existing_vhost hdr(host),lower,map_str(/etc/haproxy/hosts.map) -m found http-request silent-drop unless is_existing_vhost + http-request return status 200 content-type "text/html; charset=utf-8" lf-file /etc/haproxy/trace.html if { path /cdn-cgi/trace } + # acl for blocked IPs/subnets acl blocked_ip_or_subnet src,map_ip(/etc/haproxy/blocked.map) -m found http-request deny deny_status 403 if blocked_ip_or_subnet diff --git a/haproxy/trace.html b/haproxy/trace.html new file mode 100644 index 0000000..c96351f --- /dev/null +++ b/haproxy/trace.html @@ -0,0 +1,21 @@ + + + + +trace + + +
+ts=%Ts
+h=%[hdr(host)]
+ip=%ci
+uag=%[hdr(user-agent)]
+http=%HV
+tls=%[ssl_fc]
+tlsv=%sslv
+sni=%[ssl_fc_sni]
+vey_id=%[env(RAY_ID)]
+bucket=%[env(BUCKET_DURATION)]
+
+ +