config/haproxy/cloudflare_ips.lst

@@ -1,15 +0,0 @@
-173.245.48.0/20
-103.21.244.0/22
-103.22.200.0/22
-103.31.4.0/22
-141.101.64.0/18
-108.162.192.0/18
-190.93.240.0/20
-188.114.96.0/20
-197.234.240.0/22
-198.41.128.0/17
-162.158.0.0/15
-104.16.0.0/13
-104.24.0.0/14
-172.64.0.0/13
-131.0.72.0/22

config/haproxy/haproxy.cfg

@@ -47,11 +47,6 @@ frontend web
     http-request set-header X-Url-Scheme https
     http-request set-header Host %[ssl_fc_sni]
 
-    # Set X-Forwarded-For only for requests from Cloudflare
-    acl from_cf    src -f /usr/local/etc/haproxy/cloudflare_ips.lst
-    acl cf_ip_hdr  req.hdr(CF-Connecting-IP) -m found
-    http-request set-header X-Forwarded-For %[req.hdr(CF-Connecting-IP)] if from_cf cf_ip_hdr
-
     # CORS
     http-response set-header Access-Control-Allow-Origin "*"
     http-response set-header Access-Control-Allow-Headers "Origin, X-Requested-With, Content-Type, Accept, Authorization, JSNLog-RequestId, activityId, applicationId, applicationUserId, channelId, senderId, sessionId"
@@ -70,6 +65,7 @@ frontend web
     use_backend backend_restreamer if is_stream
 
 backend backend_api
+    option forwardfor
     balance leastconn
     server api1 api:8080 check inter 5s rise 4 fall 2