Content differences:
--- /etc/confd/templates/_etc_haproxy_conf.d_tls.cfg.tmpl.orig
+++ /etc/confd/templates/_etc_haproxy_conf.d_tls.cfg.tmpl
@@ -123,6 +123,9 @@
# Copy X-Analytics hdr into var to safely log it after deletion
http-response set-var(txn.x_analytics,ifnotempty) res.fhdr(X-Analytics)
+ # Capture upstream response headers for inclusion in x_analytics
+ http-response set-var(txn.x_trusted_request) res.fhdr(X-Trusted-Request)
+ http-response set-var(txn.x_wmf_ratelimit_class) res.fhdr(X-Wmf-Ratelimit-Class)
http-response del-header X-Analytics if missing_xwd
http-response del-header Backend-Timing if missing_xwd
@@ -231,6 +234,9 @@
# add ja4h to x-analytics variable
http-after-response set-var(txn.x_analytics,ifset) var(txn.x_analytics),add_item(';ja4h=',txn.fingerprint_ja4h) unless { var(txn.x_analytics) -m sub ;ja4h= }
http-after-response set-var(txn.x_analytics,ifset) var(txn.x_analytics),add_item(';res_',txn.res_proxy) if { var(txn.res_proxy) -m found } !{ var(txn.x_analytics) -m sub ;res_ }
+ # add x_trusted_request and x_wmf_ratelimit_class to x_analytics from upstream response headers
+ http-after-response set-var(txn.x_analytics,ifset) var(txn.x_analytics),add_item(';x_trusted_request=',txn.x_trusted_request) if { var(txn.x_trusted_request) -m found } !{ var(txn.x_analytics) -m sub ;x_trusted_request= }
+ http-after-response set-var(txn.x_analytics,ifset) var(txn.x_analytics),add_item(';x_wmf_ratelimit_class=',txn.x_wmf_ratelimit_class) if { var(txn.x_wmf_ratelimit_class) -m found } !{ var(txn.x_analytics) -m sub ;x_wmf_ratelimit_class= }
{{- $path := "/request-haproxy-dsl/cache-upload/moat-drmrs" -}}
{{- if not (exists $path) }}