Skip to content

Commit 286b28d

Browse files
authored
Allow ssl_verify_client when only ssl_trusted_cert is set (#1645)
* Allow ssl_verify_client when only ssl_trusted_cert is set Fixes #1644 * Fix ssl_verify_client, add version check to remain backward compatible Previous version of patch had a logic error; fixed this. Also made sure we're on an nginx version that supports optional ssl_client_certificate.
1 parent a76e29c commit 286b28d

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

templates/server/server_ssl_settings.erb

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,18 @@
1414
ssl_certificate_key <%= key %>;
1515
<% end -%>
1616
<% end -%>
17-
<% if defined? @ssl_client_cert -%>
17+
<% if scope.call_function('versioncmp', [scope['nginx::nginx_version'], '1.27.2']) >= 0 -%>
18+
<% if defined? @ssl_client_cert -%>
1819
ssl_client_certificate <%= @ssl_client_cert %>;
20+
<% end -%>
21+
<% if ( defined? @ssl_verify_client ) && ( @ssl_client_cert.is_a?(String) || @ssl_trusted_cert.is_a?(String) ) -%>
1922
ssl_verify_client <%= @ssl_verify_client %>;
23+
<% end -%>
24+
<% else -%>
25+
<% if defined? @ssl_client_cert -%>
26+
ssl_client_certificate <%= @ssl_client_cert %>;
27+
ssl_verify_client <%= @ssl_verify_client %>;
28+
<% end -%>
2029
<% end -%>
2130
<% if defined? @ssl_dhparam -%>
2231
ssl_dhparam <%= @ssl_dhparam %>;

0 commit comments

Comments
 (0)