App public_key and crypto as extra apps

So that dialyzer can find the missing functions

Author: MarcialRosales

deps/rabbitmq_auth_backend_http/BUILD.bazel

@@ -57,7 +57,12 @@ rabbitmq_app(
     app_module = APP_MODULE,
     app_name = APP_NAME,
     beam_files = [":beam_files"],
-    extra_apps = ["inets"],
+    extra_apps = [
+        "crypto",
+        "inets",
+        "ssl",
+        "public_key",
+    ],
     license_files = [":license_files"],
     priv = [":priv"],
     deps = [

deps/rabbitmq_auth_backend_http/test/auth_SUITE.erl

@@ -16,18 +16,18 @@
 -define(USER_PATH, "/auth/user").
 -define(ALLOWED_USER, #{username => <<"Ala1">>,
                         password => <<"Kocur">>,
-												expected_credentials => [username, password],
+                        expected_credentials => [username, password],
                         tags => [policymaker, monitoring]}).
 -define(ALLOWED_USER_WITH_EXTRA_CREDENTIALS, #{username => <<"Ala2">>,
-                        password => <<"Kocur">>,
-												client_id => <<"some_id">>,
-												expected_credentials => [username, password, client_id],
-                        tags => [policymaker, monitoring]}).
+                                               password => <<"Kocur">>,
+                                               client_id => <<"some_id">>,
+                                               expected_credentials => [username, password, client_id],
+                                               tags => [policymaker, monitoring]}).
 -define(DENIED_USER, #{username => <<"Alice">>,
-											 password => <<"Cat">>
-											 }).
+                       password => <<"Cat">>
+                      }).
 
-all() ->  
+all() ->
     [
         {group, over_https},
         {group, over_http}
@@ -49,31 +49,30 @@ shared() ->
         grants_access_to_user_with_credentials_in_rabbit_auth_backend_cache
     ].
 
-init_per_suite(Config) ->    
-    rabbit_ct_helpers:run_setup_steps(Config) ++ 
+init_per_suite(Config) ->
+    rabbit_ct_helpers:run_setup_steps(Config) ++
         [{allowed_user, ?ALLOWED_USER},
         {allowed_user_with_extra_credentials, ?ALLOWED_USER_WITH_EXTRA_CREDENTIALS},
         {denied_user, ?DENIED_USER}].
 
 init_per_group(over_http, Config) ->
     configure_http_auth_backend("http", Config),
     {User1, Tuple1} = extractUserTuple(?ALLOWED_USER),
-    {User2, Tuple2} = extractUserTuple(?ALLOWED_USER_WITH_EXTRA_CREDENTIALS),    
+    {User2, Tuple2} = extractUserTuple(?ALLOWED_USER_WITH_EXTRA_CREDENTIALS),
     start_http_auth_server(?AUTH_PORT, ?USER_PATH, #{User1 => Tuple1, User2 => Tuple2}),
     Config;
 
 init_per_group(over_https, Config) ->
     configure_http_auth_backend("https", Config),
     {User1, Tuple1} = extractUserTuple(?ALLOWED_USER),
-    {User2, Tuple2} = extractUserTuple(?ALLOWED_USER_WITH_EXTRA_CREDENTIALS),    
+    {User2, Tuple2} = extractUserTuple(?ALLOWED_USER_WITH_EXTRA_CREDENTIALS),
     CertsDir = ?config(rmq_certsdir, Config),
     start_https_auth_server(?AUTH_PORT, CertsDir, ?USER_PATH, #{User1 => Tuple1, User2 => Tuple2}),
     Config.
 
-
 extractUserTuple(User) ->
-	#{username := Username, password := Password, tags := Tags, expected_credentials := ExpectedCredentials} = User,
-	{Username, {Password, Tags, ExpectedCredentials}}.
+    #{username := Username, password := Password, tags := Tags, expected_credentials := ExpectedCredentials} = User,
+    {Username, {Password, Tags, ExpectedCredentials}}.
 
 end_per_suite(Config) ->
     Config.
@@ -87,94 +86,88 @@ end_per_group(over_https, Config) ->
 
 grants_access_to_user(Config) ->
     #{username := U, password := P, tags := T} = ?config(allowed_user, Config),
-		AuthProps = [{password, P}],
+    AuthProps = [{password, P}],
     {ok, User} = rabbit_auth_backend_http:user_login_authentication(U, AuthProps),
-
     ?assertMatch({U, T, AuthProps},
                  {User#auth_user.username, User#auth_user.tags, (User#auth_user.impl)()}).
 
 denies_access_to_user(Config) ->
     #{username := U, password := P} = ?config(denied_user, Config),
     ?assertMatch({refused, "Denied by the backing HTTP service", []},
-                  rabbit_auth_backend_http:user_login_authentication(U, [{password, P}])).
-
+                 rabbit_auth_backend_http:user_login_authentication(U, [{password, P}])).
 
 grants_access_to_user_passing_additional_required_authprops(Config) ->
     #{username := U, password := P, tags := T, client_id := ClientId} = ?config(allowed_user_with_extra_credentials, Config),
-		AuthProps = [{password, P}, {client_id, ClientId}],
+    AuthProps = [{password, P}, {client_id, ClientId}],
     {ok, User} = rabbit_auth_backend_http:user_login_authentication(U, AuthProps),
-		?assertMatch({U, T, AuthProps},
+    ?assertMatch({U, T, AuthProps},
                  {User#auth_user.username, User#auth_user.tags, (User#auth_user.impl)()}).
 
 grants_access_to_user_skipping_internal_authprops(Config) ->
     #{username := U, password := P, tags := T, client_id := ClientId} = ?config(allowed_user_with_extra_credentials, Config),
-		AuthProps = [{password, P}, {client_id, ClientId}, {rabbit_any_internal_property, <<"some value">>}],
+    AuthProps = [{password, P}, {client_id, ClientId}, {rabbit_any_internal_property, <<"some value">>}],
     {ok, User} = rabbit_auth_backend_http:user_login_authentication(U, AuthProps),
-
-		?assertMatch({U, T, AuthProps},
+    ?assertMatch({U, T, AuthProps},
                  {User#auth_user.username, User#auth_user.tags, (User#auth_user.impl)()}).
 
 grants_access_to_user_with_credentials_in_rabbit_auth_backend_http(Config) ->
     #{username := U, password := P, tags := T, client_id := ClientId} = ?config(allowed_user_with_extra_credentials, Config),
-		AuthProps = [{rabbit_auth_backend_http, fun() -> [{password, P}, {client_id, ClientId}] end}],
+    AuthProps = [{rabbit_auth_backend_http, fun() -> [{password, P}, {client_id, ClientId}] end}],
     {ok, User} = rabbit_auth_backend_http:user_login_authentication(U, AuthProps),
-
     ?assertMatch({U, T, AuthProps},
                  {User#auth_user.username, User#auth_user.tags, (User#auth_user.impl)()}).
 
 grants_access_to_user_with_credentials_in_rabbit_auth_backend_cache(Config) ->
     #{username := U, password := P, tags := T, client_id := ClientId} = ?config(allowed_user_with_extra_credentials, Config),
-		AuthProps = [{rabbit_auth_backend_cache, fun() -> [{password, P}, {client_id, ClientId}] end}],
+    AuthProps = [{rabbit_auth_backend_cache, fun() -> [{password, P}, {client_id, ClientId}] end}],
     {ok, User} = rabbit_auth_backend_http:user_login_authentication(U, AuthProps),
-
     ?assertMatch({U, T, AuthProps},
                  {User#auth_user.username, User#auth_user.tags, (User#auth_user.impl)()}).
 
 %%% HELPERS
 
 configure_http_auth_backend(Scheme, Config) ->
     [application:set_env(rabbitmq_auth_backend_http, K, V) || {K, V} <- generate_backend_config(Scheme, Config)].
-undo_configure_http_auth_backend(Scheme, Config) ->    
+undo_configure_http_auth_backend(Scheme, Config) ->
     [application:unset_env(rabbitmq_auth_backend_http, K) || {K, _V} <- generate_backend_config(Scheme, Config)].
 
 start_http_auth_server(Port, Path, Users) ->
     {ok, _} = application:ensure_all_started(inets),
-    application:ensure_all_started(cowboy),
+    {ok, _} = application:ensure_all_started(cowboy),
     Dispatch = cowboy_router:compile([{'_', [{Path, auth_http_mock, Users}]}]),
     {ok, _} = cowboy:start_clear(
-        mock_http_auth_listener, [{port, Port}], #{env => #{dispatch => Dispatch}}).
+                mock_http_auth_listener, [{port, Port}], #{env => #{dispatch => Dispatch}}).
 
 start_https_auth_server(Port, CertsDir, Path, Users) ->
     {ok, _} = application:ensure_all_started(inets),
     {ok, _} = application:ensure_all_started(ssl),
-    {ok, _} = application:ensure_all_started(cowboy),    
-    
+    {ok, _} = application:ensure_all_started(cowboy),
     Dispatch = cowboy_router:compile([{'_', [{Path, auth_http_mock, Users}]}]),
     {ok, _} = cowboy:start_tls(mock_http_auth_listener,
-                      [{port, Port},
-                       {certfile, filename:join([CertsDir, "server", "cert.pem"])},
-                       {keyfile, filename:join([CertsDir, "server", "key.pem"])}],
-                      #{env => #{dispatch => Dispatch}}).
-    
+                               [{port, Port},
+                                {certfile, filename:join([CertsDir, "server", "cert.pem"])},
+                                {keyfile, filename:join([CertsDir, "server", "key.pem"])}],
+                               #{env => #{dispatch => Dispatch}}).
+
 stop_http_auth_server() ->
     cowboy:stop_listener(mock_http_auth_listener).
 
 generate_backend_config(Scheme, Config) ->
     Config0 = [{http_method, get},
-     {user_path, Scheme ++ "://localhost:" ++ integer_to_list(?AUTH_PORT) ++ ?USER_PATH},
-	 {vhost_path, Scheme ++ "://localhost:" ++ integer_to_list(?AUTH_PORT) ++ "/auth/vhost"},
-     {resource_path, Scheme ++ "://localhost:" ++ integer_to_list(?AUTH_PORT) ++ "/auth/resource"},
-	 {topic_path, Scheme ++ "://localhost:" ++ integer_to_list(?AUTH_PORT) ++ "/auth/topic"}],
-    Config1 = case Scheme of 
-        "https" -> 
-            CertsDir = ?config(rmq_certsdir, Config),
-            [{ssl_options, [
-                {cacertfile, filename:join([CertsDir, "testca", "cacert.pem"])},
-                {certfile, filename:join([CertsDir, "server", "cert.pem"])},
-                {keyfile, filename:join([CertsDir, "server", "key.pem"])},
-                {verify, verify_peer},
-                {fail_if_no_peer_cert, false}]
-            }];
-        "http" -> []
-    end,
-    Config0 ++ Config1.
+               {user_path, Scheme ++ "://localhost:" ++ integer_to_list(?AUTH_PORT) ++ ?USER_PATH},
+               {vhost_path, Scheme ++ "://localhost:" ++ integer_to_list(?AUTH_PORT) ++ "/auth/vhost"},
+               {resource_path, Scheme ++ "://localhost:" ++ integer_to_list(?AUTH_PORT) ++ "/auth/resource"},
+               {topic_path, Scheme ++ "://localhost:" ++ integer_to_list(?AUTH_PORT) ++ "/auth/topic"}],
+    Config1 = case Scheme of
+                  "https" ->
+                      CertsDir = ?config(rmq_certsdir, Config),
+                      [{ssl_options, [
+                                      {cacertfile, filename:join([CertsDir, "testca", "cacert.pem"])},
+                                      {certfile, filename:join([CertsDir, "server", "cert.pem"])},
+                                      {keyfile, filename:join([CertsDir, "server", "key.pem"])},
+                                      {verify, verify_peer},
+                                      {fail_if_no_peer_cert, false}]
+                       }];
+                  "http" -> []
+              end,
+    Config0 ++ Config1.