Add proxy settings to the schema

Author: MarcialRosales

deps/rabbitmq_auth_backend_oauth2/priv/schema/rabbitmq_auth_backend_oauth2.schema

@@ -220,6 +220,21 @@
     rabbit_oauth2_schema:translate_oauth_providers(Conf)
  end}.
 
+{mapping,
+ "auth_oauth2.proxy",
+ "rabbitmq_auth_backend_oauth2.key_config.proxy",
+ [{datatype, string}]}.
+
+{mapping,
+ "auth_oauth2.proxy_username",
+ "rabbitmq_auth_backend_oauth2.key_config.proxy_username",
+ [{datatype, string}]}.
+
+{mapping,
+ "auth_oauth2.proxy_password",
+ "rabbitmq_auth_backend_oauth2.key_config.proxy_password",
+ [{datatype, string}]}.
+
 {mapping,
  "auth_oauth2.https.peer_verification",
  "rabbitmq_auth_backend_oauth2.key_config.peer_verification",
@@ -322,6 +337,21 @@
  "rabbitmq_auth_backend_oauth2.oauth_providers",
  [{datatype, integer}]}.
 
+{mapping,
+ "auth_oauth2.oauth_providers.$name.proxy",
+ "rabbitmq_auth_backend_oauth2.oauth_providers",
+ [{datatype, string}]}.
+
+{mapping,
+ "auth_oauth2.oauth_providers.$name.proxy_username",
+ "rabbitmq_auth_backend_oauth2.oauth_providers",
+ [{datatype, string}]}.
+
+{mapping,
+ "auth_oauth2.oauth_providers.$name.proxy_password",
+ "rabbitmq_auth_backend_oauth2.oauth_providers",
+ [{datatype, string}]}.
+
 {mapping,
  "auth_oauth2.oauth_providers.$name.https.hostname_verification",
  "rabbitmq_auth_backend_oauth2.oauth_providers",

deps/rabbitmq_auth_backend_oauth2/src/rabbit_oauth2_provider.erl

@@ -173,6 +173,38 @@ get_algorithms(OAuthProviderId) ->
         V -> proplists:get_value(algorithms, V, undefined)
     end.
 
+-spec get_proxy(oauth_provider_id()) -> list() | undefined.
+get_proxy(root) ->
+    proplists:get_value(proxy, get_env(key_config, []), undefined);
+get_proxy(OAuthProviderId) ->
+    OAuthProviders = get_env(oauth_providers, #{}),
+    case maps:get(OAuthProviderId, OAuthProviders, undefined) of
+        undefined -> undefined;
+        V -> proplists:get_value(proxy, V, undefined)
+    end.
+
+-spec get_proxy_auth(oauth_provider_id()) -> {list(),list()} | undefined.
+get_proxy_auth(root) ->
+    get_proxy_auth(
+        proplists:get_value(proxy_username, get_env(key_config, []), undefined),
+        proplists:get_value(proxy_password, get_env(key_config, []), undefined)
+    );
+get_proxy_auth(OAuthProviderId) ->
+    OAuthProviders = get_env(oauth_providers, #{}),
+    case maps:get(OAuthProviderId, OAuthProviders, undefined) of
+        undefined -> undefined;
+        V -> get_proxy_auth(
+                proplists:get_value(proxy_username, V, undefined),
+                proplists:get_value(proxy_password, V, undefined)
+            )        
+    end.
+get_proxy_auth(Username, Password) ->
+    case {Username, Password} of 
+        {undefined, _} -> undefined;
+        {_, undefined} -> undefined;
+        {_,_} = Auth -> Auth 
+    end. 
+
 get_env(Par) ->
     application:get_env(rabbitmq_auth_backend_oauth2, Par, undefined).
 get_env(Par, Def) ->

deps/rabbitmq_auth_backend_oauth2/src/rabbit_oauth2_schema.erl

@@ -261,6 +261,9 @@ mapOauthProviderProperty({Key, Value}) ->
             cuttlefish:invalid(io_lib:format(
                 "Invalid attribute (~p) value: should be a map of Key,Value pairs", 
                     [Key]));
+        proxy -> validator_uri(Key, Value);
+        proxy_username -> binary_to_list(Value);
+        proxy_password -> binary_to_list(Value);
         _ -> Value
     end}.
 

deps/rabbitmq_auth_backend_oauth2/test/config_schema_SUITE_data/rabbitmq_auth_backend_oauth2.snippets

@@ -316,5 +316,31 @@
             }            
         ]}
        ], []
+  },
+  {proxy, 
+     "auth_oauth2.proxy = http://localproxy:8080
+      auth_oauth2.proxy_username = proxyuser
+      auth_oauth2.proxy_password = proxypwd
+      auth_oauth2.oauth_providers.keycloak.proxy = http://localproxy2:8080
+      auth_oauth2.oauth_providers.keycloak.proxy_username = proxyuser2
+      auth_oauth2.oauth_providers.keycloak.proxy_password = proxypwd2",
+      [
+      {rabbitmq_auth_backend_oauth2, [
+          {key_config, [
+              {proxy_password, "proxypwd"},
+              {proxy_username, "proxyuser"},
+              {proxy, "http://localproxy:8080"}                            
+          ]},
+          {oauth_providers,
+              #{
+                <<"keycloak">> => [
+                  {proxy_password, "proxypwd2"},
+                  {proxy_username, "proxyuser2"},
+                  {proxy, "http://localproxy2:8080"}
+                ]
+              }
+          }
+      ]}
+      ], []
   }
 ].