Merge pull request #6298 from tigercl/feat/cluster-authn

feat(authn): support sync configuration in the cluster
2021-12-06 10:04:48 +08:00 · 2021-12-06 10:04:48 +08:00 · 9e8b4ab237
parent 1070948a70 1dfc37cd18
commit 9e8b4ab237
10 changed files with 27 additions and 8 deletions
--- a/apps/emqx_authn/src/emqx_authn_api.erl
+++ b/apps/emqx_authn/src/emqx_authn_api.erl
@ -793,9 +793,10 @@ add_user(ChainName,
         AuthenticatorID,
         #{<<"user_id">> := UserID, <<"password">> := Password} = UserInfo) ->
    IsSuperuser = maps:get(<<"is_superuser">>, UserInfo, false),
-    case emqx_authentication:add_user(ChainName, AuthenticatorID, #{ user_id => UserID
-                                                      , password => Password
-                                                      , is_superuser => IsSuperuser}) of
+    case emqx_authentication:add_user(ChainName, AuthenticatorID,
+                                      #{ user_id => UserID
+                                       , password => Password
+                                       , is_superuser => IsSuperuser}) of
        {ok, User} ->
            {201, User};
        {error, Reason} ->
@ -845,7 +846,8 @@ list_users(ChainName, AuthenticatorID, PageParams) ->
    end.

 update_config(Path, ConfigRequest) ->
-    emqx:update_config(Path, ConfigRequest, #{rawconf_with_defaults => true}).
+    emqx_conf:update(Path, ConfigRequest, #{rawconf_with_defaults => true,
+                                            override_to => cluster}).

 get_raw_config_with_defaults(ConfKeyPath) ->
    NConfKeyPath = [atom_to_binary(Key, utf8) || Key <- ConfKeyPath],
--- a/apps/emqx_authn/test/emqx_authn_api_SUITE.erl
+++ b/apps/emqx_authn/test/emqx_authn_api_SUITE.erl
@ -43,6 +43,7 @@ groups() ->
    [].

 init_per_testcase(_, Config) ->
+    {ok, _} = emqx_cluster_rpc:start_link(node(), emqx_cluster_rpc, 1000),
    emqx_authn_test_lib:delete_authenticators(
      [authentication],
      ?GLOBAL),
@ -55,6 +56,7 @@ init_per_testcase(_, Config) ->
    Config.

 init_per_suite(Config) ->
+    _ = application:load(emqx_conf),
    ok = emqx_common_test_helpers:start_apps(
           [emqx_authn, emqx_dashboard],
           fun set_special_configs/1),
--- a/apps/emqx_authn/test/emqx_authn_http_SUITE.erl
+++ b/apps/emqx_authn/test/emqx_authn_http_SUITE.erl
@ -39,6 +39,7 @@ all() ->
    emqx_common_test_helpers:all(?MODULE).

 init_per_suite(Config) ->
+    _ = application:load(emqx_conf),
    emqx_common_test_helpers:start_apps([emqx_authn]),
    application:ensure_all_started(cowboy),
    Config.
@ -52,6 +53,7 @@ end_per_suite(_) ->
    ok.

 init_per_testcase(_Case, Config) ->
+    {ok, _} = emqx_cluster_rpc:start_link(node(), emqx_cluster_rpc, 1000),
    emqx_authn_test_lib:delete_authenticators(
      [authentication],
      ?GLOBAL),
--- a/apps/emqx_authn/test/emqx_authn_jwt_SUITE.erl
+++ b/apps/emqx_authn/test/emqx_authn_jwt_SUITE.erl
@ -34,7 +34,12 @@
 all() ->
    emqx_common_test_helpers:all(?MODULE).

+init_per_testcase(_, Config) ->
+    {ok, _} = emqx_cluster_rpc:start_link(node(), emqx_cluster_rpc, 1000),
+    Config.
+
 init_per_suite(Config) ->
+    _ = application:load(emqx_conf),
    emqx_common_test_helpers:start_apps([emqx_authn]),
    Config.

--- a/apps/emqx_authn/test/emqx_authn_mnesia_SUITE.erl
+++ b/apps/emqx_authn/test/emqx_authn_mnesia_SUITE.erl
@ -29,6 +29,7 @@ all() ->
    emqx_common_test_helpers:all(?MODULE).

 init_per_suite(Config) ->
+    _ = application:load(emqx_conf),
    emqx_common_test_helpers:start_apps([emqx_authn]),
    Config.

@ -37,6 +38,7 @@ end_per_suite(_) ->
    ok.

 init_per_testcase(_Case, Config) ->
+    {ok, _} = emqx_cluster_rpc:start_link(node(), emqx_cluster_rpc, 1000),
    mria:clear_table(emqx_authn_mnesia),
    Config.

--- a/apps/emqx_authn/test/emqx_authn_mongo_SUITE.erl
+++ b/apps/emqx_authn/test/emqx_authn_mongo_SUITE.erl
@ -33,8 +33,8 @@
 all() ->
    emqx_common_test_helpers:all(?MODULE).

-
 init_per_testcase(_TestCase, Config) ->
+    {ok, _} = emqx_cluster_rpc:start_link(node(), emqx_cluster_rpc, 1000),
    emqx_authentication:initialize_authentication(?GLOBAL, []),
    emqx_authn_test_lib:delete_authenticators(
      [authentication],
@ -45,8 +45,8 @@ init_per_testcase(_TestCase, Config) ->
 end_per_testcase(_TestCase, _Config) ->
    ok = mc_worker_api:disconnect(?MONGO_CLIENT).

-
 init_per_suite(Config) ->
+    _ = application:load(emqx_conf),
    case emqx_authn_test_lib:is_tcp_server_available(?MONGO_HOST, ?MONGO_PORT) of
        true ->
            ok = emqx_common_test_helpers:start_apps([emqx_authn]),
--- a/apps/emqx_authn/test/emqx_authn_mysql_SUITE.erl
+++ b/apps/emqx_authn/test/emqx_authn_mysql_SUITE.erl
@ -38,6 +38,7 @@ groups() ->
    [{require_seeds, [], [t_authenticate, t_update, t_destroy]}].

 init_per_testcase(_, Config) ->
+    {ok, _} = emqx_cluster_rpc:start_link(node(), emqx_cluster_rpc, 1000),
    emqx_authentication:initialize_authentication(?GLOBAL, []),
    emqx_authn_test_lib:delete_authenticators(
      [authentication],
@ -53,6 +54,7 @@ end_per_group(require_seeds, Config) ->
    Config.

 init_per_suite(Config) ->
+    _ = application:load(emqx_conf),
    case emqx_authn_test_lib:is_tcp_server_available(?MYSQL_HOST, ?MYSQL_PORT) of
        true ->
            ok = emqx_common_test_helpers:start_apps([emqx_authn]),
--- a/apps/emqx_authn/test/emqx_authn_pgsql_SUITE.erl
+++ b/apps/emqx_authn/test/emqx_authn_pgsql_SUITE.erl
@ -38,6 +38,7 @@ groups() ->
    [{require_seeds, [], [t_authenticate, t_update, t_destroy, t_is_superuser]}].

 init_per_testcase(_, Config) ->
+    {ok, _} = emqx_cluster_rpc:start_link(node(), emqx_cluster_rpc, 1000),
    emqx_authentication:initialize_authentication(?GLOBAL, []),
    emqx_authn_test_lib:delete_authenticators(
      [authentication],
@ -53,6 +54,7 @@ end_per_group(require_seeds, Config) ->
    Config.

 init_per_suite(Config) ->
+    _ = application:load(emqx_conf),
    case emqx_authn_test_lib:is_tcp_server_available(?PGSQL_HOST, ?PGSQL_PORT) of
        true ->
            ok = emqx_common_test_helpers:start_apps([emqx_authn]),
--- a/apps/emqx_authn/test/emqx_authn_redis_SUITE.erl
+++ b/apps/emqx_authn/test/emqx_authn_redis_SUITE.erl
@ -23,12 +23,10 @@
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("common_test/include/ct.hrl").

-
 -define(REDIS_HOST, "redis").
 -define(REDIS_PORT, 6379).
 -define(REDIS_RESOURCE, <<"emqx_authn_redis_SUITE">>).

-
 -define(PATH, [authentication]).

 all() ->
@ -38,6 +36,7 @@ groups() ->
    [{require_seeds, [], [t_authenticate, t_update, t_destroy]}].

 init_per_testcase(_, Config) ->
+    {ok, _} = emqx_cluster_rpc:start_link(node(), emqx_cluster_rpc, 1000),
    emqx_authentication:initialize_authentication(?GLOBAL, []),
    emqx_authn_test_lib:delete_authenticators(
      [authentication],
@ -53,6 +52,7 @@ end_per_group(require_seeds, Config) ->
    Config.

 init_per_suite(Config) ->
+   _ = application:load(emqx_conf),
    case emqx_authn_test_lib:is_tcp_server_available(?REDIS_HOST, ?REDIS_PORT) of
        true ->
            ok = emqx_common_test_helpers:start_apps([emqx_authn]),
--- a/apps/emqx_authn/test/emqx_enhanced_authn_scram_mnesia_SUITE.erl
+++ b/apps/emqx_authn/test/emqx_enhanced_authn_scram_mnesia_SUITE.erl
@ -33,6 +33,7 @@ all() ->
    emqx_common_test_helpers:all(?MODULE).

 init_per_suite(Config) ->
+     _ = application:load(emqx_conf),
    ok = emqx_common_test_helpers:start_apps([emqx_authn]),
    Config.

@ -40,6 +41,7 @@ end_per_suite(_Config) ->
    ok = emqx_common_test_helpers:stop_apps([emqx_authn]).

 init_per_testcase(_Case, Config) ->
+    {ok, _} = emqx_cluster_rpc:start_link(node(), emqx_cluster_rpc, 1000),
    mria:clear_table(emqx_enhanced_authn_scram_mnesia),
    emqx_authn_test_lib:delete_authenticators(
      [authentication],