diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 5880cc4..239f4df 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -19,6 +19,8 @@ http { send_timeout 15s; reset_timedout_connection on; server_tokens off; + underscores_in_headers off; + ignore_invalid_headers on; client_max_body_size 10m; client_body_buffer_size 128k; client_header_buffer_size 1k; diff --git a/nginx/snippets/proxy.conf b/nginx/snippets/proxy.conf index cc3afc9..1261e0d 100644 --- a/nginx/snippets/proxy.conf +++ b/nginx/snippets/proxy.conf @@ -4,12 +4,16 @@ proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; +proxy_set_header X-Forwarded-Host $host; +proxy_set_header X-Forwarded-Port $server_port; proxy_set_header X-Request-ID $request_id; proxy_connect_timeout 3s; proxy_send_timeout 30s; proxy_read_timeout 30s; proxy_set_header Connection ""; proxy_hide_header X-Powered-By; +proxy_hide_header Server; +proxy_intercept_errors on; proxy_next_upstream error timeout http_502 http_503 http_504; proxy_next_upstream_tries 2; proxy_next_upstream_timeout 10s; diff --git a/tests/test_project.py b/tests/test_project.py index 4000be9..7a28725 100644 --- a/tests/test_project.py +++ b/tests/test_project.py @@ -152,5 +152,17 @@ def test_slowloris_timeouts_and_socket_resets(self): proxy = load('nginx/snippets/proxy.conf') self.assertIn('proxy_ssl_server_name on;', proxy) + def test_header_sanitization_and_smuggling_defense(self): + cfg = load('nginx/nginx.conf') + self.assertIn('underscores_in_headers off;', cfg) + self.assertIn('ignore_invalid_headers on;', cfg) + + proxy = load('nginx/snippets/proxy.conf') + self.assertIn('proxy_hide_header Server;', proxy) + self.assertIn('proxy_hide_header X-Powered-By;', proxy) + self.assertIn('proxy_set_header X-Forwarded-Host $host;', proxy) + self.assertIn('proxy_set_header X-Forwarded-Port $server_port;', proxy) + self.assertIn('proxy_intercept_errors on;', proxy) + if __name__ == '__main__': unittest.main()