sheppy/athq-vm-management
1
0
Fork 0
mirror of https://github.com/FAUSheppy/athq-vm-management synced 2025-12-06 05:41:35 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: support for non-optional cert (generic only)

Browse Source
This commit is contained in:
Johnathen Sheppard
2024-01-21 19:04:40 +00:00
parent c136721137
commit de148b1686
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/nginx_server_block.conf.j2
View File

@@ -17,7 +17,11 @@ server{
{% if cert_optional %} {% if cert_optional %}
ssl_client_certificate ca_cert.pem; ssl_client_certificate ca_cert.pem;
{% if cert_non_optional %}
ssl_verify_client on;
{% else %}
ssl_verify_client optional; ssl_verify_client optional;
{% endif %}
ssl_verify_depth 1; ssl_verify_depth 1;
{% endif %} {% endif %}

3
vm.py
View File

@@ -144,12 +144,15 @@ class VM:
header_line = "proxy_set_header X-Nginx-Cert-Auth false;" header_line = "proxy_set_header X-Nginx-Cert-Auth false;"
cert_optional = False cert_optional = False
cert_non_optional = subdomain.get("cert-non-optional") or False
component = template.render(targetip=self.ip, targetport=targetport, component = template.render(targetip=self.ip, targetport=targetport,
servernames=[subdomain["name"]], comment=compositeName, servernames=[subdomain["name"]], comment=compositeName,
proxy_pass_blob=self.proxy_pass_blob, acme=not self.noTerminateACME, proxy_pass_blob=self.proxy_pass_blob, acme=not self.noTerminateACME,
basicauth=subdomain.get("basicauth"), basicauth=subdomain.get("basicauth"),
extra_location=subdomain.get("extra-location"), extra_location=subdomain.get("extra-location"),
cert_optional=cert_optional, cert_optional=cert_optional,
cert_non_optional=cert_non_optional,
cert_header_line=header_line) cert_header_line=header_line)
components.append(component) components.append(component)