Skip to content

Commit dfdcdf3

Browse files
ltningEirik Øverby
andauthored
Fix ssl verify client compat (#1647)
* 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. * Make `ssl_verify_client` optinal, retain old behaviour when `ssl_client_certificate` is defined. --------- Co-authored-by: Eirik Øverby <ltning@anduin.net>
1 parent 286b28d commit dfdcdf3

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

REFERENCE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3747,11 +3747,11 @@ Default value: `undef`
37473747

37483748
##### <a name="-nginx--resource--server--ssl_verify_client"></a>`ssl_verify_client`
37493749

3750-
Data type: `String`
3750+
Data type: `Optional[String]`
37513751

37523752
Enables verification of client certificates.
37533753

3754-
Default value: `'on'`
3754+
Default value: `undef`
37553755

37563756
##### <a name="-nginx--resource--server--ssl_crl"></a>`ssl_crl`
37573757

manifests/resource/server.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@
305305
Boolean $ssl_listen_option = true,
306306
Optional[Variant[String, Boolean, Array[String]]] $ssl_cert = undef,
307307
Optional[String] $ssl_client_cert = undef,
308-
String $ssl_verify_client = 'on',
308+
Optional[String] $ssl_verify_client = undef,
309309
Optional[String] $ssl_dhparam = undef,
310310
Optional[String] $ssl_ecdh_curve = undef,
311311
Boolean $ssl_redirect = false,

templates/server/server_ssl_settings.erb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
<% end -%>
2121
<% if ( defined? @ssl_verify_client ) && ( @ssl_client_cert.is_a?(String) || @ssl_trusted_cert.is_a?(String) ) -%>
2222
ssl_verify_client <%= @ssl_verify_client %>;
23+
<% elsif ( not defined? @ssl_verify_client ) && ( @ssl_client_cert.is_a?(String) ) -%>
24+
ssl_verify_client on;
2325
<% end -%>
2426
<% else -%>
2527
<% if defined? @ssl_client_cert -%>

0 commit comments

Comments
 (0)