Bugfix to declaration of crawler whitelist map, reduce difficulty for testing

master
Thomas Lynch 11 months ago
parent ab5614e702
commit 1df8277ee2
Signed by: fatchan
GPG Key ID: A7E5E8B7E11EE92D
  1. 2
      docker-compose.yml
  2. 4
      haproxy/haproxy.cfg
  3. 12
      haproxy/map/crawler-whitelist.map
  4. 4
      haproxy/map/ddos_config.map

@ -37,7 +37,7 @@ services:
- CHALLENGE_INCLUDES_IP=true
- ARGON_TIME=2
- ARGON_KB=512
- POW_DIFFICULTY=24
- POW_DIFFICULTY=20
- POW_TYPE=argon2
- TOR_CONTROL_PORT_PASSWORD=changeme

@ -79,8 +79,8 @@ frontend http-in
# acl for lua check whitelisted IPs/subnets and some excluded paths
acl is_excluded src,map_ip(/etc/haproxy/map/whitelist.map) -m found
# acl is_excluded src -m found -f /etc/haproxy/map/crawler-whitelist.map
# acl is_excluded path /favicon.ico /.basedflare/pow-icon #add more
acl is_excluded src -f /etc/haproxy/map/crawler-whitelist.map
acl is_excluded path /favicon.ico /.basedflare/pow-icon #add more
# acl ORs for when ddos_mode_enabled
acl ddos_mode_enabled_override str("true"),map(/etc/haproxy/map/ddos_global.map) -m found

@ -1,10 +1,2 @@
2001:4860:4801:10::/64
2001:4860:4801:11::/64
2001:4860:4801:12::/64
2001:4860:4801:13::/64
2001:4860:4801:14::/64
2001:4860:4801:15::/64
2001:4860:4801:16::/64
2001:4860:4801:17::/64
2001:4860:4801:18::/64
2001:4860:4801:19::/64
#127.0.0.1/24
#10.0.0.0/24

@ -1,2 +1,2 @@
127.0.0.1 {"pd":23,"pt":"argon2","cip":false,"cex":43200}
localhost {"pd":23,"pt":"argon2","cip":false,"cex":43200}
127.0.0.1 {"pd":16,"pt":"sha256","cip":false,"cex":43200}
localhost {"pd":16,"pt":"sha256","cip":false,"cex":43200}

Loading…
Cancel
Save