Clean up

Author: MarcialRosales

deps/rabbitmq_management/include/rabbit_mgmt.hrl

@@ -14,7 +14,7 @@
 
 -define(MANAGEMENT_DEFAULT_HTTP_MAX_BODY_SIZE, 20000000).
 
--define(OAUTH2_ACCESS_TOKEN, <<"access_token">>).
--define(OAUTH2_BOOTSTRAP_PATH, <<"js/oidc-oauth/bootstrap.js">>).
--define(MANAGEMENT_LOGIN_STRICT_AUTH_MECHANISM, <<"strict_auth_mechanism">>).
--define(MANAGEMENT_LOGIN_PREFERRED_AUTH_MECHANISM, <<"preferred_auth_mechanism">>).
+-define(OAUTH2_ACCESS_TOKEN,                        <<"access_token">>).
+-define(OAUTH2_BOOTSTRAP_PATH,                      <<"js/oidc-oauth/bootstrap.js">>).
+-define(MANAGEMENT_LOGIN_STRICT_AUTH_MECHANISM,     <<"strict_auth_mechanism">>).
+-define(MANAGEMENT_LOGIN_PREFERRED_AUTH_MECHANISM,  <<"preferred_auth_mechanism">>).

deps/rabbitmq_management/priv/www/js/oidc-oauth/helper.js

@@ -193,24 +193,6 @@ function oauth_initialize_user_manager(resource_server) {
     });
 
 }
-function parseAuthMechanism(oauth, name, auth_mechanism) {
-    if (!auth_mechanism) {
-        return oauth;
-    }
-    
-    if (auth_mechanism.includes(':')) {
-        // OAuth2 case: "oauth2:prod"
-        const [authMethod, resourceId] = auth_mechanism.split(':');        
-        if (authMethod === 'oauth2' && resourceId) {
-            if (oauth.resource_servers.some(resource => resource.id === resourceId)) {
-              oauth[name] = {type: "oauth2", resource_id: resourceId};            
-            }            
-        }
-    } else if (auth_mechanism === 'basic' && oauth.oauth_disable_basic_auth === false) {
-       oauth[name] = {type: "basic"};
-    }
-    return oauth;
-}
 
 export function oauth_initialize(authSettings) {
     authSettings = auth_settings_apply_defaults(authSettings);

deps/rabbitmq_management/src/rabbit_mgmt_login.erl

@@ -73,9 +73,7 @@ login(<<"GET">>, Req, State) ->
             redirect_to_home_with_cookie(?OAUTH2_BOOTSTRAP_PATH, Type, Value, Req, State)
     end;
 
-login(M, Req0, State) ->
-    %% Method not allowed.
-    ?LOG_ERROR("Method ~p not allowed", [M]),
+login(_, Req0, State) ->
     {ok, cowboy_req:reply(405, Req0), State}.
 
 handleStrictOrPreferredAuthMechanism(Req, Body, State) ->

deps/rabbitmq_management/src/rabbit_mgmt_oauth_bootstrap.erl

@@ -37,8 +37,7 @@ init(Req0, State) ->
         rabbit_mgmt_headers:set_common_permission_headers(Req0, ?MODULE), ?MODULE), State).
 
 bootstrap_oauth(Req0, State) ->
-    AuthSettings0 = rabbit_mgmt_wm_auth:authSettings(),
-    {Req1, AuthSettings} = enrich_oauth_settings(Req0, AuthSettings0),
+    {Req1, AuthSettings} = enrich_oauth_settings(Req0, rabbit_mgmt_wm_auth:authSettings()),
     Dependencies = oauth_dependencies(),
     {Req2, SetTokenAuth} = set_token_auth(AuthSettings, Req1),
     JSContent = import_dependencies(Dependencies) ++
@@ -56,7 +55,7 @@ enrich_oauth_settings(Req0, AuthSettings) ->
         {preferred_auth_mechanism, Args} -> {Req1, [{preferred_auth_mechanism, Args} | AuthSettings]};
         {strict_auth_mechanism, Args} -> {Req1, [{strict_auth_mechanism, Args} | AuthSettings]};
         {error, Reason} -> ?LOG_DEBUG("~p", [Reason]),
-                           {Req1, AuthSettings}        
+                           {Req1, AuthSettings}
     end.
 get_auth_mechanism(Req) ->
     case get_auth_mechanism_from_cookies(Req) of 
@@ -115,7 +114,7 @@ set_token_auth(AuthSettings, Req0) ->
                     };
                 _ -> 
                     Cookies = cowboy_req:parse_cookies(Req0),
-                    case lists:keyfind(?OAUTH2_ACCESS_TOKEN, 1, Cookies) of 
+                    case proplists:get_value(?OAUTH2_ACCESS_TOKEN, Cookies) of 
                         {_, Token} -> 
                             {
                                 cowboy_req:set_resp_cookie(
@@ -127,7 +126,7 @@ set_token_auth(AuthSettings, Req0) ->
                                     }), 
                                 ["set_token_auth('", Token, "');"]
                             };
-                        false -> {
+                        undefined -> {
                                 Req0, 
                                 []
                             }

deps/rabbitmq_management/src/rabbit_mgmt_schema.erl

@@ -29,7 +29,7 @@ translate_oauth_resource_servers(Conf) ->
         extract_resource_server_properties(Settings),
         extract_resource_server_endpoint_params(oauth_authorization_endpoint_params, Settings),
         extract_resource_server_endpoint_params(oauth_token_endpoint_params, Settings)
-    ]),    
+    ]),
     Map0 = maps:map(fun(K,V) ->
         case proplists:get_value(id, V) of
             undefined -> V ++ [{id, K}];

deps/rabbitmq_management/src/rabbit_mgmt_wm_auth.erl

@@ -120,7 +120,6 @@ buildRootResourceServerIfAny(Id, Props) ->
 
 authSettings() ->
     ManagementProps = application:get_all_env(rabbitmq_management),
-    ?LOG_DEBUG("ManagementProps: ~p", [ManagementProps]),
     OAuth2BackendProps = application:get_all_env(rabbitmq_auth_backend_oauth2),
     EnableOAUTH = proplists:get_value(oauth_enabled, ManagementProps, false),
     case EnableOAUTH of