snapshot of https://github.com/zulip/zulip.git @ 48c69911c7dd4e03b20552eb3bd77ad8151c1357 (2026-09-15)
Some checks failed
Code scanning / CodeQL (push) Failing after 15s
Zulip production suite / Ubuntu 22.04 production build (push) Failing after 26s
Zulip production suite / Debian 12 production install with custom db name and user (push) Has been skipped
Zulip production suite / Ubuntu 22.04 production install and PostgreSQL upgrade with pgroonga (push) Has been skipped
Zulip production suite / Ubuntu 24.04 production install (push) Has been skipped
Zulip production suite / Ubuntu 26.04 production install (push) Has been skipped
Zulip production suite / Debian 13 production install (push) Has been skipped
Zulip production suite / 7.0 Version Upgrade (push) Has been skipped
Zulip production suite / 8.0 Version Upgrade (push) Has been skipped
Zulip production suite / 6.0 Version Upgrade (push) Has been skipped
Zulip production suite / 10.0 Version Upgrade (push) Has been skipped
Zulip production suite / 9.0 Version Upgrade (push) Has been skipped
Zulip production suite / 12.0 Version Upgrade (push) Has been skipped
Zulip production suite / 11.0 Version Upgrade (push) Has been skipped
GitHub Actions Security Analysis with zizmor / zizmor (push) Failing after 3s
Zulip CI / Debian 12 (Python 3.11, backend + documentation) (push) Failing after 26s
Zulip CI / Ubuntu 22.04 (Python 3.10, backend + frontend) (push) Failing after 3s
Zulip CI / Ubuntu 24.04 (Python 3.12, backend) (push) Failing after 25s
Zulip CI / Ubuntu 26.04 (Python 3.14, backend) (push) Failing after 25s
Zulip CI / Debian 13 (Python 3.13, backend) (push) Failing after 28s
Zulip production suite / Required jobs (push) Has been cancelled
Zulip CI / Required jobs (push) Has been cancelled
API Documentation Update Check / check-feature-level-updated (push) Has been cancelled
API Documentation Update Check / notify-if-api-docs-changed (push) Has been cancelled
Some checks failed
Code scanning / CodeQL (push) Failing after 15s
Zulip production suite / Ubuntu 22.04 production build (push) Failing after 26s
Zulip production suite / Debian 12 production install with custom db name and user (push) Has been skipped
Zulip production suite / Ubuntu 22.04 production install and PostgreSQL upgrade with pgroonga (push) Has been skipped
Zulip production suite / Ubuntu 24.04 production install (push) Has been skipped
Zulip production suite / Ubuntu 26.04 production install (push) Has been skipped
Zulip production suite / Debian 13 production install (push) Has been skipped
Zulip production suite / 7.0 Version Upgrade (push) Has been skipped
Zulip production suite / 8.0 Version Upgrade (push) Has been skipped
Zulip production suite / 6.0 Version Upgrade (push) Has been skipped
Zulip production suite / 10.0 Version Upgrade (push) Has been skipped
Zulip production suite / 9.0 Version Upgrade (push) Has been skipped
Zulip production suite / 12.0 Version Upgrade (push) Has been skipped
Zulip production suite / 11.0 Version Upgrade (push) Has been skipped
GitHub Actions Security Analysis with zizmor / zizmor (push) Failing after 3s
Zulip CI / Debian 12 (Python 3.11, backend + documentation) (push) Failing after 26s
Zulip CI / Ubuntu 22.04 (Python 3.10, backend + frontend) (push) Failing after 3s
Zulip CI / Ubuntu 24.04 (Python 3.12, backend) (push) Failing after 25s
Zulip CI / Ubuntu 26.04 (Python 3.14, backend) (push) Failing after 25s
Zulip CI / Debian 13 (Python 3.13, backend) (push) Failing after 28s
Zulip production suite / Required jobs (push) Has been cancelled
Zulip CI / Required jobs (push) Has been cancelled
API Documentation Update Check / check-feature-level-updated (push) Has been cancelled
API Documentation Update Check / notify-if-api-docs-changed (push) Has been cancelled
This commit is contained in:
54
puppet/zulip/templates/nginx/trusted-ip.template.erb
Normal file
54
puppet/zulip/templates/nginx/trusted-ip.template.erb
Normal file
@@ -0,0 +1,54 @@
|
||||
<% if @loadbalancers.any? %>
|
||||
# Configuration for making Zulip app frontends accept the
|
||||
# X-Forwarded-For header used by proxies. The trusted IP addresses
|
||||
# here are set by `loadbalancer.ips` in /etc/zulip/zulip.conf.
|
||||
#
|
||||
# This causes us to update $remote_addr, which we use in logging, and
|
||||
# also pass down to Zulip as X-Real-Ip.
|
||||
real_ip_header X-Forwarded-For;
|
||||
real_ip_recursive on;
|
||||
<% @loadbalancers.each do |host| -%>
|
||||
set_real_ip_from <%= host %>;
|
||||
<% end -%>
|
||||
|
||||
<% if @true_client_header == '' %>
|
||||
# real_ip has done the work of updating $remote_addr based
|
||||
# on the trusted @loadbalancers
|
||||
map $remote_addr $trusted_remote_addr {
|
||||
default $remote_addr;
|
||||
}
|
||||
<% else %>
|
||||
<% if @true_client_header_from.any? %>
|
||||
# We have a separate set of post-X-Forwarded-For IPs we
|
||||
# trust with $http_<%= @true_client_header %>
|
||||
geo $remote_addr $do_trust_<%= @true_client_header %> {
|
||||
default 0;
|
||||
<% @true_client_header_from.each do |host| %>
|
||||
<%= host %> 1;
|
||||
<%- end %>
|
||||
}
|
||||
<% else %>
|
||||
# If our most recent hop came from a trusted source, we
|
||||
# trust $http_<%= @true_client_header %>
|
||||
geo $realip_remote_addr $do_trust_<%= @true_client_header %> {
|
||||
default 0;
|
||||
<% @loadbalancers.each do |host| %>
|
||||
<%= host %> 1;
|
||||
<%- end %>
|
||||
}
|
||||
<% end %>
|
||||
|
||||
# This is done in two steps because geo handles CIDRs,
|
||||
# and map handles interpolation.
|
||||
map "$do_trust_<%= @true_client_header %>:$http_<%= @true_client_header %>" $trusted_remote_addr {
|
||||
"~^0:" $remote_addr;
|
||||
"~^1:$" $remote_addr;
|
||||
"~^1:" $http_<%= @true_client_header %>;
|
||||
}
|
||||
<% end %>
|
||||
<% else %>
|
||||
# No remote proxies -- the remote_addr is what it is
|
||||
map $remote_addr $trusted_remote_addr {
|
||||
default $remote_addr;
|
||||
}
|
||||
<% end %>
|
||||
Reference in New Issue
Block a user