root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Test with a "whitelist" directory under TMPDIR 

This reverts changes made in an earlier commit.
This commit is contained in:
Joseph Yiasemides 2016-02-24 17:05:30 +01:00
parent 973bc4b45a
commit 2c111d2d55
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
deps/rabbitmq_trust_store/test/rabbit_trust_store_test.erl vendored
View File

@ -105,8 +105,7 @@ whitelisted_certificate_accepted_from_AMQP_client_regardless_of_validation_to_ro
{R, _U, _V} = ct_helper:make_certs(),
{_, C, _X} = ct_helper:make_certs(),
ok = file:make_dir(data_directory()),
ok = file:make_dir(friendlies()),
ok = build_directory_tree(friendlies()),
ok = whitelist(friendlies(), "alice", C, _X),
ok = change_configuration(rabbitmq_trust_store, [{directory, friendlies()}]),
@ -125,8 +124,7 @@ whitelisted_certificate_accepted_from_AMQP_client_regardless_of_validation_to_ro
ok = amqp_connection:close(Con),
ok = rabbit_networking:stop_tcp_listener(port()),
ok = file:del_dir(friendlies()),
ok = file:del_dir(data_directory())
force_delete_entire_directory(friendlies())
end
}.
@ -142,8 +140,7 @@ removed_certificate_denied_from_AMQP_client_test_() ->
{R, _U, _V} = ct_helper:make_certs(),
{_, C, _X} = ct_helper:make_certs(),
ok = file:make_dir(data_directory()),
ok = file:make_dir(friendlies()),
ok = build_directory_tree(friendlies()),
ok = whitelist(friendlies(), "bob", C, _X),
ok = change_configuration(rabbitmq_trust_store, [
{directory, friendlies()}, {refresh_interval, {seconds, interval()}}]),
@ -167,8 +164,7 @@ removed_certificate_denied_from_AMQP_client_test_() ->
%% Clean: server TLS/TCP
ok = rabbit_networking:stop_tcp_listener(port()),
ok = file:del_dir(friendlies()),
ok = file:del_dir(data_directory())
force_delete_entire_directory(friendlies())
end
}.
@ -184,8 +180,7 @@ installed_certificate_accepted_from_AMQP_client_test_() ->
{R, _U, _V} = ct_helper:make_certs(),
{_, C, _X} = ct_helper:make_certs(),
ok = file:make_dir(data_directory()),
ok = file:make_dir(friendlies()),
ok = build_directory_tree(friendlies()),
ok = change_configuration(rabbitmq_trust_store, [
{directory, friendlies()}, {refresh_interval, {seconds, interval()}}]),
@ -209,8 +204,8 @@ installed_certificate_accepted_from_AMQP_client_test_() ->
ok = amqp_connection:close(Con),
ok = rabbit_networking:stop_tcp_listener(port()),
ok = file:del_dir(friendlies()),
ok = file:del_dir(data_directory())
force_delete_entire_directory(friendlies())
end
}.
@ -221,8 +216,7 @@ whitelist_directory_DELTA_test_() ->
20,
fun () ->
ok = file:make_dir(data_directory()),
ok = file:make_dir(friendlies()),
ok = build_directory_tree(friendlies()),
%% Given: a certificate `R` which Rabbit can use as a
%% root certificate to validate agianst AND three
@ -265,8 +259,7 @@ whitelist_directory_DELTA_test_() ->
ok = delete("foo.pem"),
ok = delete("baz.pem"),
ok = file:del_dir(friendlies()),
ok = file:del_dir(data_directory()),
force_delete_entire_directory(friendlies()),
ok = amqp_connection:close(I),
ok = amqp_connection:close(J),
@ -281,12 +274,20 @@ whitelist_directory_DELTA_test_() ->
port() -> 4096.
data_directory() ->
{ok, Current} = file:get_cwd(),
filename:join([Current, "data"]).
Path = os:getenv("TMPDIR"),
true = false =/= Path,
Path.
friendlies() ->
filename:join([data_directory(), "friendlies"]).
build_directory_tree(Path) ->
ok = filelib:ensure_dir(Path),
file:make_dir(Path).
force_delete_entire_directory(Path) ->
[] = os:cmd("rm -f -r" ++ " " ++ Path).
interval() ->
1.