Skip to content

Revert "cuttlefish tls schema for amqp_client" #11531

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

Merged
merged 1 commit into from
Jun 22, 2024
Merged

Revert "cuttlefish tls schema for amqp_client" #11531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
212 changes: 0 additions & 212 deletions deps/rabbit/priv/schema/rabbit.schema
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2661,218 +2661,6 @@ fun(Conf) ->
list_to_binary(cuttlefish:conf_get("amqp1_0.default_vhost", Conf))
end}.

%% ----------------------------------------------------------------------------
%% AMQP client 1.0 TLS options
%% ----------------------------------------------------------------------------

{mapping, "amqp10_client.ssl_options", "amqp10_client.ssl_options", [
{datatype, {enum, [none]}}
]}.

{translation, "amqp10_client.ssl_options",
fun(Conf) ->
case cuttlefish:conf_get("amqp10_client.ssl_options", Conf, undefined) of
none -> [];
_ -> cuttlefish:invalid("Invalid amqp10_client.ssl_options")
end
end}.

{mapping, "amqp10_client.ssl_options.verify", "amqp10_client.ssl_options.verify", [
{datatype, {enum, [verify_peer, verify_none]}}]}.

{mapping, "amqp10_client.ssl_options.cacertfile", "amqp10_client.ssl_options.cacertfile",
[{datatype, string}, {validators, ["file_accessible"]}]}.

{mapping, "amqp10_client.ssl_options.certfile", "amqp10_client.ssl_options.certfile",
[{datatype, string}, {validators, ["file_accessible"]}]}.

{mapping, "amqp10_client.ssl_options.cacerts.$name", "amqp10_client.ssl_options.cacerts",
[{datatype, string}]}.

{translation, "amqp10_client.ssl_options.cacerts",
fun(Conf) ->
Settings = cuttlefish_variable:filter_by_prefix("amqp10_client.ssl_options.cacerts", Conf),
[ list_to_binary(V) || {_, V} <- Settings ]
end}.

{mapping, "amqp10_client.ssl_options.cert", "amqp10_client.ssl_options.cert",
[{datatype, string}]}.

{translation, "amqp10_client.ssl_options.cert",
fun(Conf) ->
list_to_binary(cuttlefish:conf_get("amqp10_client.ssl_options.cert", Conf))
end}.

{mapping, "amqp10_client.ssl_options.crl_check", "amqp10_client.ssl_options.crl_check",
[{datatype, [{enum, [true, false, peer, best_effort]}]}]}.

{mapping, "amqp10_client.ssl_options.depth", "amqp10_client.ssl_options.depth",
[{datatype, integer}, {validators, ["byte"]}]}.

{mapping, "amqp10_client.ssl_options.key.RSAPrivateKey", "amqp10_client.ssl_options.key",
[{datatype, string}]}.

{mapping, "amqp10_client.ssl_options.key.DSAPrivateKey", "amqp10_client.ssl_options.key",
[{datatype, string}]}.

{mapping, "amqp10_client.ssl_options.key.PrivateKeyInfo", "amqp10_client.ssl_options.key",
[{datatype, string}]}.

{translation, "amqp10_client.ssl_options.key",
fun(Conf) ->
case cuttlefish_variable:filter_by_prefix("amqp10_client.ssl_options.key", Conf) of
[{[_,_,Key], Val}|_] -> {list_to_atom(Key), list_to_binary(Val)};
_ -> undefined
end
end}.

{mapping, "amqp10_client.ssl_options.keyfile", "amqp10_client.ssl_options.keyfile",
[{datatype, string}, {validators, ["file_accessible"]}]}.

{mapping, "amqp10_client.ssl_options.log_alert", "amqp10_client.ssl_options.log_alert",
[{datatype, {enum, [true, false]}}]}.

{mapping, "amqp10_client.ssl_options.password", "amqp10_client.ssl_options.password",
[{datatype, string}]}.

{mapping, "amqp10_client.ssl_options.psk_identity", "amqp10_client.ssl_options.psk_identity",
[{datatype, string}]}.

{mapping, "amqp10_client.ssl_options.reuse_sessions", "amqp10_client.ssl_options.reuse_sessions",
[{datatype, {enum, [true, false]}}]}.

{mapping, "amqp10_client.ssl_options.secure_renegotiate", "amqp10_client.ssl_options.secure_renegotiate",
[{datatype, {enum, [true, false]}}]}.

{mapping, "amqp10_client.ssl_options.versions.$version", "amqp10_client.ssl_options.versions",
[{datatype, atom}]}.

{translation, "amqp10_client.ssl_options.versions",
fun(Conf) ->
Settings = cuttlefish_variable:filter_by_prefix("amqp10_client.ssl_options.versions", Conf),
[ V || {_, V} <- Settings ]
end}.

{mapping, "amqp10_client.ssl_options.sni", "amqp10_client.ssl_options.server_name_indication",
[{datatype, [{enum, [none]}, string]}]}.

{translation, "amqp10_client.ssl_options.server_name_indication",
fun(Conf) ->
case cuttlefish:conf_get("amqp10_client.ssl_options.sni", Conf, undefined) of
undefined -> cuttlefish:unset();
none -> cuttlefish:unset();
Hostname -> Hostname
end
end}.


% ===============================
% AMQP 0.9.1
% ===============================

%% ----------------------------------------------------------------------------
%% AMQP client 0.9.1 TLS options
%% ----------------------------------------------------------------------------

{mapping, "amqp_client.ssl_options", "amqp_client.ssl_options", [
{datatype, {enum, [none]}}
]}.

{translation, "amqp_client.ssl_options",
fun(Conf) ->
case cuttlefish:conf_get("amqp_client.ssl_options", Conf, undefined) of
none -> [];
_ -> cuttlefish:invalid("Invalid amqp_client.ssl_options")
end
end}.

{mapping, "amqp_client.ssl_options.verify", "amqp_client.ssl_options.verify", [
{datatype, {enum, [verify_peer, verify_none]}}]}.

{mapping, "amqp_client.ssl_options.cacertfile", "amqp_client.ssl_options.cacertfile",
[{datatype, string}, {validators, ["file_accessible"]}]}.

{mapping, "amqp_client.ssl_options.certfile", "amqp_client.ssl_options.certfile",
[{datatype, string}, {validators, ["file_accessible"]}]}.

{mapping, "amqp_client.ssl_options.cacerts.$name", "amqp_client.ssl_options.cacerts",
[{datatype, string}]}.

{translation, "amqp_client.ssl_options.cacerts",
fun(Conf) ->
Settings = cuttlefish_variable:filter_by_prefix("amqp_client.ssl_options.cacerts", Conf),
[ list_to_binary(V) || {_, V} <- Settings ]
end}.

{mapping, "amqp_client.ssl_options.cert", "amqp_client.ssl_options.cert",
[{datatype, string}]}.

{translation, "amqp_client.ssl_options.cert",
fun(Conf) ->
list_to_binary(cuttlefish:conf_get("amqp_client.ssl_options.cert", Conf))
end}.

{mapping, "amqp_client.ssl_options.crl_check", "amqp_client.ssl_options.crl_check",
[{datatype, [{enum, [true, false, peer, best_effort]}]}]}.

{mapping, "amqp_client.ssl_options.depth", "amqp_client.ssl_options.depth",
[{datatype, integer}, {validators, ["byte"]}]}.

{mapping, "amqp_client.ssl_options.key.RSAPrivateKey", "amqp_client.ssl_options.key",
[{datatype, string}]}.

{mapping, "amqp_client.ssl_options.key.DSAPrivateKey", "amqp_client.ssl_options.key",
[{datatype, string}]}.

{mapping, "amqp_client.ssl_options.key.PrivateKeyInfo", "amqp_client.ssl_options.key",
[{datatype, string}]}.

{translation, "amqp_client.ssl_options.key",
fun(Conf) ->
case cuttlefish_variable:filter_by_prefix("amqp_client.ssl_options.key", Conf) of
[{[_,_,Key], Val}|_] -> {list_to_atom(Key), list_to_binary(Val)};
_ -> undefined
end
end}.

{mapping, "amqp_client.ssl_options.keyfile", "amqp_client.ssl_options.keyfile",
[{datatype, string}, {validators, ["file_accessible"]}]}.

{mapping, "amqp_client.ssl_options.log_alert", "amqp_client.ssl_options.log_alert",
[{datatype, {enum, [true, false]}}]}.

{mapping, "amqp_client.ssl_options.password", "amqp_client.ssl_options.password",
[{datatype, string}]}.

{mapping, "amqp_client.ssl_options.psk_identity", "amqp_client.ssl_options.psk_identity",
[{datatype, string}]}.

{mapping, "amqp_client.ssl_options.reuse_sessions", "amqp_client.ssl_options.reuse_sessions",
[{datatype, {enum, [true, false]}}]}.

{mapping, "amqp_client.ssl_options.secure_renegotiate", "amqp_client.ssl_options.secure_renegotiate",
[{datatype, {enum, [true, false]}}]}.

{mapping, "amqp_client.ssl_options.versions.$version", "amqp_client.ssl_options.versions",
[{datatype, atom}]}.

{translation, "amqp_client.ssl_options.versions",
fun(Conf) ->
Settings = cuttlefish_variable:filter_by_prefix("amqp_client.ssl_options.versions", Conf),
[ V || {_, V} <- Settings ]
end}.

{mapping, "amqp_client.ssl_options.sni", "amqp_client.ssl_options.server_name_indication",
[{datatype, [{enum, [none]}, string]}]}.

{translation, "amqp_client.ssl_options.server_name_indication",
fun(Conf) ->
case cuttlefish:conf_get("amqp_client.ssl_options.sni", Conf, undefined) of
undefined -> cuttlefish:unset();
none -> cuttlefish:unset();
Hostname -> Hostname
end
end}.

% ===============================
% Validators
Expand Down
Loading