Skip to content

Commit bb1f997

Browse files
Merge pull request #2494 from rabbitmq/rabbitmq-server-2493
Allow 0 value in cuttlefish schema via "byte" validator (cherry picked from commit e22fb10)
1 parent 333a495 commit bb1f997

File tree

2 files changed

+38
-2
lines changed

2 files changed

+38
-2
lines changed

priv/schema/rabbit.schema

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,9 +1754,9 @@ fun(Port) when is_integer(Port) ->
17541754
Port > 0 andalso Port < 65535
17551755
end}.
17561756

1757-
{validator, "byte", "Integer is not 0<i<255",
1757+
{validator, "byte", "Integer must be in the range [0, 255]",
17581758
fun(Int) when is_integer(Int) ->
1759-
Int > 0 andalso Int < 255
1759+
Int >= 0 andalso Int =< 255
17601760
end}.
17611761

17621762
{validator, "dir_writable", "Cannot create file in dir",

test/config_schema_SUITE_data/rabbit.snippets

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,42 @@ tcp_listen_options.exit_on_close = false",
412412
{verify,verify_peer},
413413
{fail_if_no_peer_cert,false}]}]}],
414414
[]},
415+
{ssl_options_depth_0,
416+
"listeners.ssl.1 = 5671
417+
ssl_options.cacertfile = test/config_schema_SUITE_data/certs/cacert.pem
418+
ssl_options.certfile = test/config_schema_SUITE_data/certs/cert.pem
419+
ssl_options.keyfile = test/config_schema_SUITE_data/certs/key.pem
420+
ssl_options.depth = 0
421+
ssl_options.verify = verify_peer
422+
ssl_options.fail_if_no_peer_cert = false",
423+
[{rabbit,
424+
[{ssl_listeners,[5671]},
425+
{ssl_options,
426+
[{cacertfile,"test/config_schema_SUITE_data/certs/cacert.pem"},
427+
{certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
428+
{keyfile,"test/config_schema_SUITE_data/certs/key.pem"},
429+
{depth,0},
430+
{verify,verify_peer},
431+
{fail_if_no_peer_cert,false}]}]}],
432+
[]},
433+
{ssl_options_depth_255,
434+
"listeners.ssl.1 = 5671
435+
ssl_options.cacertfile = test/config_schema_SUITE_data/certs/cacert.pem
436+
ssl_options.certfile = test/config_schema_SUITE_data/certs/cert.pem
437+
ssl_options.keyfile = test/config_schema_SUITE_data/certs/key.pem
438+
ssl_options.depth = 255
439+
ssl_options.verify = verify_peer
440+
ssl_options.fail_if_no_peer_cert = false",
441+
[{rabbit,
442+
[{ssl_listeners,[5671]},
443+
{ssl_options,
444+
[{cacertfile,"test/config_schema_SUITE_data/certs/cacert.pem"},
445+
{certfile,"test/config_schema_SUITE_data/certs/cert.pem"},
446+
{keyfile,"test/config_schema_SUITE_data/certs/key.pem"},
447+
{depth,255},
448+
{verify,verify_peer},
449+
{fail_if_no_peer_cert,false}]}]}],
450+
[]},
415451
{ssl_options_honor_cipher_order,
416452
"listeners.ssl.1 = 5671
417453
ssl_options.cacertfile = test/config_schema_SUITE_data/certs/cacert.pem

0 commit comments

Comments
 (0)