Skip to content

feat: add block reason for http_request_deny_conditions #796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
b1tamara merged 1 commit into from
May 13, 2025
Merged

feat: add block reason for http_request_deny_conditions #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions jobs/haproxy/templates/haproxy.config.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,7 @@ frontend http-in
<%- acl_names=acl_names+acl["acl_name"]+" " -%>
<%- end -%>
<%- end -%>
http-request set-var-fmt(txn.block_reason) "blocked by custom acl(s) <%= acl_names %>" if <%= acl_names %>
http-request deny if <%= acl_names %>
<%- end -%>
<%- end -%>
Expand Down Expand Up @@ -653,6 +654,7 @@ frontend https-in
<%- acl_names=acl_names+acl["acl_name"]+" " -%>
<%- end -%>
<%- end -%>
http-request set-var-fmt(txn.block_reason) "blocked by custom acl(s) <%= acl_names %>" if <%= acl_names %>
http-request deny if <%= acl_names %>
<%- end -%>
<%- end -%>
Expand Down Expand Up @@ -833,6 +835,7 @@ frontend wss-in
<%- acl_names=acl_names+acl["acl_name"]+" " -%>
<%- end -%>
<%- end -%>
http-request set-var-fmt(txn.block_reason) "blocked by custom acl(s) <%= acl_names %>" if <%= acl_names %>
http-request deny if <%= acl_names %>
<%- end -%>
<%- end -%>
Expand Down
2 changes: 1 addition & 1 deletion spec/haproxy/templates/haproxy_config/frontend_http_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
it 'adds the correct acls and http-request deny rules' do
expect(frontend_http).to include('acl block_host hdr_beg(host) -i login')
expect(frontend_http).to include('acl whitelist_ips src 5.22.5.11 5.22.5.12')

expect(frontend_http).to include('http-request set-var-fmt(txn.block_reason) "blocked by custom acl(s) block_host !whitelist_ips " if block_host !whitelist_ips')
expect(frontend_http).to include('http-request deny if block_host !whitelist_ips')
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/haproxy/templates/haproxy_config/frontend_https_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@
it 'adds the correct acls and http-request deny rules' do
expect(frontend_https).to include('acl block_host hdr_beg(host) -i login')
expect(frontend_https).to include('acl whitelist_ips src 5.22.5.11 5.22.5.12')

expect(frontend_https).to include('http-request set-var-fmt(txn.block_reason) "blocked by custom acl(s) block_host !whitelist_ips " if block_host !whitelist_ips')
expect(frontend_https).to include('http-request deny if block_host !whitelist_ips')
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/haproxy/templates/haproxy_config/frontend_wss_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@
it 'adds the correct acls and http-request deny rules' do
expect(frontend_wss).to include('acl block_host hdr_beg(host) -i login')
expect(frontend_wss).to include('acl whitelist_ips src 5.22.5.11 5.22.5.12')

expect(frontend_wss).to include('http-request set-var-fmt(txn.block_reason) "blocked by custom acl(s) block_host !whitelist_ips " if block_host !whitelist_ips')
expect(frontend_wss).to include('http-request deny if block_host !whitelist_ips')
end
end
Expand Down