Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add client_renegotiation ssl option, use more ssl options in management plugin #1024

Merged
merged 2 commits into from
Nov 16, 2024
Merged

Add client_renegotiation ssl option, use more ssl options in management plugin #1024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a940564
Add ssl options for client renegotiation to rabbitmq-server
kperronne-godaddy Apr 5, 2022
af88d1f
Update to EPP templates and other minor fixes after resolving conflicts
wyardley Nov 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions REFERENCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ The following parameters are available in the `rabbitmq` class:
* [`ssl_cacert`](#-rabbitmq--ssl_cacert)
* [`ssl_cert`](#-rabbitmq--ssl_cert)
* [`ssl_cert_password`](#-rabbitmq--ssl_cert_password)
* [`ssl_client_renegotiation`](#-rabbitmq--ssl_client_renegotiation)
* [`ssl_depth`](#-rabbitmq--ssl_depth)
* [`ssl_dhfile`](#-rabbitmq--ssl_dhfile)
* [`ssl_erl_dist`](#-rabbitmq--ssl_erl_dist)
Expand Down Expand Up @@ -882,6 +883,14 @@ Password used when generating CSR.

Default value: `undef`

##### <a name="-rabbitmq--ssl_client_renegotiation"></a>`ssl_client_renegotiation`

Data type: `Optional[Boolean]`

Allow ssl client renegotiation

Default value: `undef`

##### <a name="-rabbitmq--ssl_depth"></a>`ssl_depth`

Data type: `Optional[Integer]`
Expand Down
1 change: 1 addition & 0 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
$ssl_stomp_port = $rabbitmq::ssl_stomp_port
$ssl_verify = $rabbitmq::ssl_verify
$ssl_fail_if_no_peer_cert = $rabbitmq::ssl_fail_if_no_peer_cert
$ssl_client_renegotiation = $rabbitmq::ssl_client_renegotiation
$ssl_secure_renegotiate = $rabbitmq::ssl_secure_renegotiate
$ssl_reuse_sessions = $rabbitmq::ssl_reuse_sessions
$ssl_honor_cipher_order = $rabbitmq::ssl_honor_cipher_order
Expand Down
5 changes: 4 additions & 1 deletion manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,8 @@
# Cert to use for SSL.
# @param ssl_cert_password
# Password used when generating CSR.
# @param ssl_client_renegotiation
# Allow ssl client renegotiation
# @param ssl_depth
# SSL verification depth.
# @param ssl_dhfile
Expand Down Expand Up @@ -419,13 +421,14 @@
Enum['verify_none','verify_peer'] $ssl_management_verify = 'verify_none',
Boolean $ssl_management_fail_if_no_peer_cert = false,
Optional[Array] $ssl_versions = undef,
Optional[Boolean] $ssl_client_renegotiation = undef,
Boolean $ssl_secure_renegotiate = true,
Boolean $ssl_reuse_sessions = true,
Boolean $ssl_honor_cipher_order = true,
Optional[Stdlib::Absolutepath] $ssl_dhfile = undef,
Array $ssl_ciphers = [],
Enum['true','false','peer','best_effort'] $ssl_crl_check = 'false',
Optional[Stdlib::Absolutepath] $ssl_crl_cache_hash_dir = undef,
Optional[Stdlib::Absolutepath] $ssl_crl_cache_hash_dir = undef,
Optional[Integer] $ssl_crl_cache_http_timeout = undef,
Boolean $stomp_ensure = false,
Boolean $ldap_auth = false,
Expand Down
38 changes: 38 additions & 0 deletions spec/classes/rabbitmq_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,6 +1194,34 @@
end
end

# tlsv1.3 not supported on older RMQ/Erlang with this distro
describe 'ssl options with ssl version tlsv1.3' do
let(:params) do
{ ssl: true,
ssl_port: 3141,
ssl_cacert: '/path/to/cacert',
ssl_cert: '/path/to/cert',
ssl_key: '/path/to/key',
ssl_versions: ['tlsv1.3'] }
end

it 'sets ssl options to specified values' do
is_expected.to contain_file('rabbitmq.config').with_content(%r{ssl_listeners, \[3141\]})
is_expected.to contain_file('rabbitmq.config').with_content(%r{ssl_options, \[})
is_expected.to contain_file('rabbitmq.config').with_content(%r{cacertfile,"/path/to/cacert"})
is_expected.to contain_file('rabbitmq.config').with_content(%r{certfile,"/path/to/cert"})
is_expected.to contain_file('rabbitmq.config').with_content(%r{keyfile,"/path/to/key})
is_expected.to contain_file('rabbitmq.config').with_content(%r{ssl, \[\{versions, \['tlsv1.3'\]\}\]})
is_expected.to contain_file('rabbitmq.config').with_content(%r{versions, \['tlsv1.3'\]})
end

it 'does not set ssl negotiation options with tlsv1.3' do
is_expected.to contain_file('rabbitmq.config'). \
without_content(%r{client_renegotiation}). \
without_content(%r{secure_renegotiate})
end
end

describe 'ssl options with ssl_versions and not ssl' do
let(:params) do
{ ssl: false,
Expand Down Expand Up @@ -1379,6 +1407,16 @@
it { is_expected.to contain_file('rabbitmq.config').without_content(%r{dhfile,}) }
end

describe 'ssl with ssl_client_renegotiation false' do
let(:params) do
{ ssl: true,
ssl_interface: '0.0.0.0',
ssl_client_renegotiation: false }
end

it { is_expected.to contain_file('rabbitmq.config').with_content(%r{client_renegotiation,false}) }
end

describe 'ssl with ssl_secure_renegotiate false' do
let(:params) do
{ ssl: true,
Expand Down
13 changes: 13 additions & 0 deletions templates/rabbitmq.config.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,12 @@
<%- if $rabbitmq::config::ssl_dhfile {-%>
{dhfile, "<%= $rabbitmq::config::ssl_dhfile %>"},
<%- } -%>
<%- if !$rabbitmq::config::ssl_versions or !('tlsv1.3' in $rabbitmq::config::ssl_versions) {-%>
<%- if $rabbitmq::config::ssl_client_renegotiation != undef {-%>
{client_renegotiation,<%= $rabbitmq::config::ssl_client_renegotiation %>},
<%- } -%>
{secure_renegotiate,<%= $rabbitmq::config::ssl_secure_renegotiate %>},
<%- } -%>
{reuse_sessions,<%= $rabbitmq::config::ssl_reuse_sessions %>},
{honor_cipher_order,<%= $rabbitmq::config::ssl_honor_cipher_order %>},
{verify,<%= $rabbitmq::config::ssl_verify %>},
Expand Down Expand Up @@ -150,6 +155,14 @@
<%- } -%>
{certfile, "<%= $rabbitmq::config::ssl_management_cert %>"},
{keyfile, "<%= $rabbitmq::config::ssl_management_key %>"},
<%- if !$rabbitmq::config::ssl_versions or !('tlsv1.3' in $rabbitmq::config::ssl_versions) {-%>
<%- if $rabbitmq::config::ssl_client_renegotiation != undef {-%>
{client_renegotiation,<%= $rabbitmq::config::ssl_client_renegotiation %>},
<%- } -%>
{secure_renegotiate,<%= $rabbitmq::config::ssl_secure_renegotiate %>},
<%- } -%>
{reuse_sessions,<%= $rabbitmq::config::ssl_reuse_sessions %>},
{honor_cipher_order,<%= $rabbitmq::config::ssl_honor_cipher_order %>},
{verify,<%= $rabbitmq::config::ssl_management_verify %>},
{fail_if_no_peer_cert,<%= $rabbitmq::config::ssl_management_fail_if_no_peer_cert %>}
<%- if $rabbitmq::config::ssl_versions {-%>
Expand Down
Loading