krd/angie-conv-image
1
0
Fork 0
Code Activity

conf: add some missing escapes

Browse Source
This commit is contained in:
Konstantin Demin
2025-06-06 11:39:23 +03:00
parent 50d0bbeedf
commit db627f7255
17 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
angie/conf/brotli/types.conf.j2
View File

@@ -3,7 +3,7 @@
{%- if mime_types -%} {%- if mime_types -%}
brotli_types brotli_types
{%- for t in mime_types %} {%- for t in mime_types %}
{{ t }} {{ t | ngx_esc }}
{%- endfor %} {%- endfor %}
; ;
{%- endif -%} {%- endif -%}

2
angie/conf/gzip/types.conf.j2
View File

@@ -3,7 +3,7 @@
{%- if mime_types -%} {%- if mime_types -%}
gzip_types gzip_types
{%- for t in mime_types %} {%- for t in mime_types %}
{{ t }} {{ t | ngx_esc }}
{%- endfor %} {%- endfor %}
; ;
{%- endif -%} {%- endif -%}

2
angie/conf/http-ssl.conf.j2
View File

@@ -4,7 +4,7 @@ include conf/ssl/*.conf;
ssl_buffer_size 4k; ssl_buffer_size 4k;
{%- if env.NGX_HTTP_SSL_PROFILE %} {%- if env.NGX_HTTP_SSL_PROFILE %}
include snip/ssl-{{ env.NGX_HTTP_SSL_PROFILE }}; include {{ "snip/ssl-{}".format(env.NGX_HTTP_SSL_PROFILE) | ngx_esc }};
{%- endif %} {%- endif %}
{%- if j2cfg.tls.stapling.enable %} {%- if j2cfg.tls.stapling.enable %}

2
angie/conf/mail-ssl.conf.j2
View File

@@ -1,5 +1,5 @@
include conf/ssl/*.conf; include conf/ssl/*.conf;
{%- if env.NGX_MAIL_SSL_PROFILE %} {%- if env.NGX_MAIL_SSL_PROFILE %}
include snip/ssl-{{ env.NGX_MAIL_SSL_PROFILE }}; include {{ "snip/ssl-{}".format(env.NGX_MAIL_SSL_PROFILE) | ngx_esc }};
{%- endif %} {%- endif %}

2
angie/conf/stream-ssl.conf.j2
View File

@@ -1,5 +1,5 @@
include conf/ssl/*.conf; include conf/ssl/*.conf;
{%- if env.NGX_STREAM_SSL_PROFILE %} {%- if env.NGX_STREAM_SSL_PROFILE %}
include snip/ssl-{{ env.NGX_STREAM_SSL_PROFILE }}; include {{ "snip/ssl-{}".format(env.NGX_STREAM_SSL_PROFILE) | ngx_esc }};
{%- endif %} {%- endif %}

2
angie/conf/zstd/types.conf.j2
View File

@@ -3,7 +3,7 @@
{%- if mime_types -%} {%- if mime_types -%}
zstd_types zstd_types
{%- for t in mime_types %} {%- for t in mime_types %}
{{ t }} {{ t | ngx_esc }}
{%- endfor %} {%- endfor %}
; ;
{%- endif -%} {%- endif -%}

2
angie/snip/fastcgi-response-headers.j2
View File

@@ -3,5 +3,5 @@
{%- set resp_hdr_dict = j2cfg.response_headers or {} -%} {%- set resp_hdr_dict = j2cfg.response_headers or {} -%}
{%- set resp_hdr_list = resp_hdr_dict | dict_keys -%} {%- set resp_hdr_list = resp_hdr_dict | dict_keys -%}
{%- for h in resp_hdr_list %} {%- for h in resp_hdr_list %}
fastcgi_hide_header {{ h }}; fastcgi_hide_header {{ h | ngx_esc }};
{%- endfor %} {%- endfor %}

2
angie/snip/grpc-request-headers.j2
View File

@@ -2,5 +2,5 @@
## set/remove request headers ## set/remove request headers
{%- set req_hdr_dict = j2cfg.request_headers or {} -%} {%- set req_hdr_dict = j2cfg.request_headers or {} -%}
{%- for h, v in req_hdr_dict|dictsort %} {%- for h, v in req_hdr_dict|dictsort %}
grpc_set_header {{ h }} {{ v | ngx_esc }}; grpc_set_header {{ h | ngx_esc }} {{ v | ngx_esc }};
{%- endfor %} {%- endfor %}

2
angie/snip/grpc-response-headers.j2
View File

@@ -3,5 +3,5 @@
{%- set resp_hdr_dict = j2cfg.response_headers or {} -%} {%- set resp_hdr_dict = j2cfg.response_headers or {} -%}
{%- set resp_hdr_list = resp_hdr_dict | dict_keys -%} {%- set resp_hdr_list = resp_hdr_dict | dict_keys -%}
{%- for h in resp_hdr_list %} {%- for h in resp_hdr_list %}
grpc_hide_header {{ h }}; grpc_hide_header {{ h | ngx_esc }};
{%- endfor %} {%- endfor %}

2
angie/snip/http-response-headers.j2
View File

@@ -2,5 +2,5 @@
## add response headers ## add response headers
{%- set resp_hdr_dict = j2cfg.response_headers or {} -%} {%- set resp_hdr_dict = j2cfg.response_headers or {} -%}
{%- for h, v in resp_hdr_dict|dictsort %} {%- for h, v in resp_hdr_dict|dictsort %}
add_header {{ h }} {{ v | ngx_esc }}; add_header {{ h | ngx_esc }} {{ v | ngx_esc }};
{%- endfor %} {%- endfor %}

2
angie/snip/proxy-request-headers.j2
View File

@@ -2,5 +2,5 @@
## set/remove request headers ## set/remove request headers
{%- set req_hdr_dict = j2cfg.request_headers or {} -%} {%- set req_hdr_dict = j2cfg.request_headers or {} -%}
{%- for h, v in req_hdr_dict|dictsort %} {%- for h, v in req_hdr_dict|dictsort %}
proxy_set_header {{ h }} {{ v | ngx_esc }}; proxy_set_header {{ h | ngx_esc }} {{ v | ngx_esc }};
{%- endfor %} {%- endfor %}

2
angie/snip/proxy-response-headers.j2
View File

@@ -3,5 +3,5 @@
{%- set resp_hdr_dict = j2cfg.response_headers or {} -%} {%- set resp_hdr_dict = j2cfg.response_headers or {} -%}
{%- set resp_hdr_list = resp_hdr_dict | dict_keys -%} {%- set resp_hdr_list = resp_hdr_dict | dict_keys -%}
{%- for h in resp_hdr_list %} {%- for h in resp_hdr_list %}
proxy_hide_header {{ h }}; proxy_hide_header {{ h | ngx_esc }};
{%- endfor %} {%- endfor %}

2
angie/snip/scgi-response-headers.j2
View File

@@ -3,5 +3,5 @@
{%- set resp_hdr_dict = j2cfg.response_headers or {} -%} {%- set resp_hdr_dict = j2cfg.response_headers or {} -%}
{%- set resp_hdr_list = resp_hdr_dict | dict_keys -%} {%- set resp_hdr_list = resp_hdr_dict | dict_keys -%}
{%- for h in resp_hdr_list %} {%- for h in resp_hdr_list %}
scgi_hide_header {{ h }}; scgi_hide_header {{ h | ngx_esc }};
{%- endfor %} {%- endfor %}

18
angie/snip/ssl-profile.j2inc
View File

@@ -1,28 +1,28 @@
{%- if ssl_profile.protocols %} {%- if ssl_profile.protocols %}
ssl_protocols {{ ssl_profile.protocols }}; ssl_protocols {{ ssl_profile.protocols | ngx_esc }};
{%- endif %} {%- endif %}
{%- if ssl_profile.prefer_server_ciphers %} {%- if ssl_profile.prefer_server_ciphers %}
ssl_prefer_server_ciphers {{ ssl_profile.prefer_server_ciphers }}; ssl_prefer_server_ciphers {{ ssl_profile.prefer_server_ciphers | ngx_esc }};
{%- endif %} {%- endif %}
{%- if ssl_profile.ciphers %} {%- if ssl_profile.ciphers %}
ssl_ciphers {{ ssl_profile.ciphers }}; ssl_ciphers {{ ssl_profile.ciphers | ngx_esc }};
{%- endif %} {%- endif %}
{%- if ssl_profile.dhparam %} {%- if ssl_profile.dhparam %}
ssl_dhparam {{ ssl_profile.dhparam }}; ssl_dhparam {{ ssl_profile.dhparam | ngx_esc }};
{%- endif %} {%- endif %}
{%- if ssl_profile.ecdh_curve %} {%- if ssl_profile.ecdh_curve %}
ssl_ecdh_curve {{ ssl_profile.ecdh_curve }}; ssl_ecdh_curve {{ ssl_profile.ecdh_curve | ngx_esc }};
{%- endif %} {%- endif %}
{%- if ssl_profile.session_cache %} {%- if ssl_profile.session_cache %}
ssl_session_cache {{ ssl_profile.session_cache }}; ssl_session_cache {{ ssl_profile.session_cache | ngx_esc }};
{%- endif %} {%- endif %}
{%- if ssl_profile.session_timeout %} {%- if ssl_profile.session_timeout %}
ssl_session_timeout {{ ssl_profile.session_timeout }}; ssl_session_timeout {{ ssl_profile.session_timeout | ngx_esc }};
{%- endif %} {%- endif %}
{%- if ssl_profile.session_tickets %} {%- if ssl_profile.session_tickets %}
ssl_session_tickets {{ ssl_profile.session_tickets }}; ssl_session_tickets {{ ssl_profile.session_tickets | ngx_esc }};
{%- endif %} {%- endif %}
{%- if ssl_profile.session_ticket_key %} {%- if ssl_profile.session_ticket_key %}
ssl_session_ticket_key {{ ssl_profile.session_ticket_key }}; ssl_session_ticket_key {{ ssl_profile.session_ticket_key | ngx_esc }};
{%- endif %} {%- endif %}

2
angie/snip/uwsgi-response-headers.j2
View File

@@ -3,5 +3,5 @@
{%- set resp_hdr_dict = j2cfg.response_headers or {} -%} {%- set resp_hdr_dict = j2cfg.response_headers or {} -%}
{%- set resp_hdr_list = resp_hdr_dict | dict_keys -%} {%- set resp_hdr_list = resp_hdr_dict | dict_keys -%}
{%- for h in resp_hdr_list %} {%- for h in resp_hdr_list %}
uwsgi_hide_header {{ h }}; uwsgi_hide_header {{ h | ngx_esc }};
{%- endfor %} {%- endfor %}

4
doc/examples/config-template/README.md
View File

@@ -3,12 +3,12 @@
configuration: configuration:
```nginx ```nginx
{%- import 'snip/cache.j2mod' as ngx_cache -%} {%- import 'snip/cache.j2mod' as _cache -%}
{%- set my_caches = (j2cfg.my_caches or []) -%} {%- set my_caches = (j2cfg.my_caches or []) -%}
{%- for h in my_caches %} {%- for h in my_caches %}
{{ ngx_cache.proxy_cache_path(h.name, size='10m', levels='1:2', inactive=h.max_time) }} {{ _cache.proxy_cache_path(h.name, size='10m', levels='1:2', inactive=h.max_time) }}
{%- endfor %} {%- endfor %}
server { server {

4
doc/examples/config-template/conf/site/http-my-cache.conf.j2
View File

@@ -1,4 +1,4 @@
{%- import 'snip/cache.j2mod' as ngx_cache -%} {%- import 'snip/cache.j2mod' as _cache -%}
{%- set my_caches = (j2cfg.my_caches or []) -%} {%- set my_caches = (j2cfg.my_caches or []) -%}
map $uri map $uri
@@ -34,7 +34,7 @@ proxy_cache_use_stale error timeout invalid_header updating http_429 ht
proxy_cache_revalidate on; proxy_cache_revalidate on;
{%- for h in my_caches %} {%- for h in my_caches %}
{{ ngx_cache.proxy_cache_path(h.name, size='10m', levels='1:2', inactive=h.max_time) }} {{ _cache.proxy_cache_path(h.name, size='10m', levels='1:2', inactive=h.max_time) }}
{%- endfor %} {%- endfor %}
server { server {