yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: delete needless auth plugins

This commit is contained in:
zhanghongtong 2021-06-25 10:01:51 +08:00 committed by Shawn
parent c24f3688c4
commit 09e995a1b2
9 changed files with 36 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README-CN.md
View File

@ -101,7 +101,7 @@ make dialyzer
##### 要分析特定的应用程序，（用逗号分隔的应用程序列表） ##### 要分析特定的应用程序，（用逗号分隔的应用程序列表）
``` ```
DIALYZER_ANALYSE_APP=emqx_lwm2m,emqx_auth_jwt,emqx_auth_ldap make dialyzer DIALYZER_ANALYSE_APP=emqx_lwm2m,emqx_authz make dialyzer
``` ```
## 社区 ## 社区

2
README-JP.md
View File

@ -95,7 +95,7 @@ make dialyzer
##### 特定のアプリケーションのみ解析する（アプリケーション名をコンマ区切りで入力） ##### 特定のアプリケーションのみ解析する（アプリケーション名をコンマ区切りで入力）
``` ```
DIALYZER_ANALYSE_APP=emqx_lwm2m,emqx_auth_jwt,emqx_auth_ldap make dialyzer DIALYZER_ANALYSE_APP=emqx_lwm2m,emqx_authz make dialyzer
``` ```
## コミュニティ ## コミュニティ

2
README-RU.md
View File

@ -104,7 +104,7 @@ make dialyzer
##### Статический анализ части приложений (список через запятую) ##### Статический анализ части приложений (список через запятую)
``` ```
DIALYZER_ANALYSE_APP=emqx_lwm2m,emqx_auth_jwt,emqx_auth_ldap make dialyzer DIALYZER_ANALYSE_APP=emqx_lwm2m,emqx_authz make dialyzer
``` ```
## Сообщество ## Сообщество

2
README.md
View File

@ -103,7 +103,7 @@ make dialyzer
##### To Analyse specific apps, (list of comma separated apps) ##### To Analyse specific apps, (list of comma separated apps)
``` ```
DIALYZER_ANALYSE_APP=emqx_lwm2m,emqx_auth_jwt,emqx_auth_ldap make dialyzer DIALYZER_ANALYSE_APP=emqx_lwm2m,emqx_authz make dialyzer
``` ```
## Community ## Community

5
apps/emqx_authentication/rebar.config
View File

@ -1,4 +1,5 @@
{deps, []}. {deps, [{jose, {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.1"}}}
]}.
{edoc_opts, [{preprocess, true}]}. {edoc_opts, [{preprocess, true}]}.
{erl_opts, [warn_unused_vars, {erl_opts, [warn_unused_vars,
@ -15,4 +16,4 @@
{cover_enabled, true}. {cover_enabled, true}.
{cover_opts, [verbose]}. {cover_opts, [verbose]}.
{cover_export_enabled, true}. {cover_export_enabled, true}.

10
apps/emqx_management/test/emqx_mgmt_SUITE.erl
View File

@ -53,7 +53,7 @@ groups() ->
]}]. ]}].
apps() -> apps() ->
[emqx_management, emqx_auth_mnesia, emqx_modules]. [emqx_management, emqx_retainer, emqx_modules].
init_per_suite(Config) -> init_per_suite(Config) ->
application:set_env(ekka, strict_mode, true), application:set_env(ekka, strict_mode, true),
@ -317,12 +317,12 @@ t_plugins_cmd(_) ->
meck:expect(emqx_plugins, reload, fun(_) -> ok end), meck:expect(emqx_plugins, reload, fun(_) -> ok end),
?assertEqual(emqx_mgmt_cli:plugins(["list"]), ok), ?assertEqual(emqx_mgmt_cli:plugins(["list"]), ok),
?assertEqual( ?assertEqual(
emqx_mgmt_cli:plugins(["unload", "emqx_auth_mnesia"]), emqx_mgmt_cli:plugins(["unload", "emqx_retainer"]),
"Plugin emqx_auth_mnesia unloaded successfully.\n" "Plugin emqx_retainer unloaded successfully.\n"
), ),
?assertEqual( ?assertEqual(
emqx_mgmt_cli:plugins(["load", "emqx_auth_mnesia"]), emqx_mgmt_cli:plugins(["load", "emqx_retainer"]),
"Plugin emqx_auth_mnesia loaded successfully.\n" "Plugin emqx_retainer loaded successfully.\n"
), ),
?assertEqual( ?assertEqual(
emqx_mgmt_cli:plugins(["unload", "emqx_management"]), emqx_mgmt_cli:plugins(["unload", "emqx_management"]),

26
apps/emqx_management/test/emqx_mgmt_api_SUITE.erl
View File

@ -285,61 +285,61 @@ t_nodes(_) ->
meck:unload(emqx_mgmt). meck:unload(emqx_mgmt).
t_plugins(_) -> t_plugins(_) ->
application:ensure_all_started(emqx_auth_mnesia), application:ensure_all_started(emqx_retainer),
{ok, Plugins1} = request_api(get, api_path(["plugins"]), auth_header_()), {ok, Plugins1} = request_api(get, api_path(["plugins"]), auth_header_()),
[Plugins11] = filter(get(<<"data">>, Plugins1), <<"node">>, atom_to_binary(node(), utf8)), [Plugins11] = filter(get(<<"data">>, Plugins1), <<"node">>, atom_to_binary(node(), utf8)),
[Plugin1] = filter(maps:get(<<"plugins">>, Plugins11), <<"name">>, <<"emqx_auth_mnesia">>), [Plugin1] = filter(maps:get(<<"plugins">>, Plugins11), <<"name">>, <<"emqx_retainer">>),
?assertEqual(<<"emqx_auth_mnesia">>, maps:get(<<"name">>, Plugin1)), ?assertEqual(<<"emqx_retainer">>, maps:get(<<"name">>, Plugin1)),
?assertEqual(true, maps:get(<<"active">>, Plugin1)), ?assertEqual(true, maps:get(<<"active">>, Plugin1)),
{ok, _} = request_api(put, {ok, _} = request_api(put,
api_path(["plugins", api_path(["plugins",
atom_to_list(emqx_auth_mnesia), atom_to_list(emqx_retainer),
"unload"]), "unload"]),
auth_header_()), auth_header_()),
{ok, Error1} = request_api(put, {ok, Error1} = request_api(put,
api_path(["plugins", api_path(["plugins",
atom_to_list(emqx_auth_mnesia), atom_to_list(emqx_retainer),
"unload"]), "unload"]),
auth_header_()), auth_header_()),
?assertEqual(<<"not_started">>, get(<<"message">>, Error1)), ?assertEqual(<<"not_started">>, get(<<"message">>, Error1)),
{ok, Plugins2} = request_api(get, {ok, Plugins2} = request_api(get,
api_path(["nodes", atom_to_list(node()), "plugins"]), api_path(["nodes", atom_to_list(node()), "plugins"]),
auth_header_()), auth_header_()),
[Plugin2] = filter(get(<<"data">>, Plugins2), <<"name">>, <<"emqx_auth_mnesia">>), [Plugin2] = filter(get(<<"data">>, Plugins2), <<"name">>, <<"emqx_retainer">>),
?assertEqual(<<"emqx_auth_mnesia">>, maps:get(<<"name">>, Plugin2)), ?assertEqual(<<"emqx_retainer">>, maps:get(<<"name">>, Plugin2)),
?assertEqual(false, maps:get(<<"active">>, Plugin2)), ?assertEqual(false, maps:get(<<"active">>, Plugin2)),
{ok, _} = request_api(put, {ok, _} = request_api(put,
api_path(["nodes", api_path(["nodes",
atom_to_list(node()), atom_to_list(node()),
"plugins", "plugins",
atom_to_list(emqx_auth_mnesia), atom_to_list(emqx_retainer),
"load"]), "load"]),
auth_header_()), auth_header_()),
{ok, Plugins3} = request_api(get, {ok, Plugins3} = request_api(get,
api_path(["nodes", atom_to_list(node()), "plugins"]), api_path(["nodes", atom_to_list(node()), "plugins"]),
auth_header_()), auth_header_()),
[Plugin3] = filter(get(<<"data">>, Plugins3), <<"name">>, <<"emqx_auth_mnesia">>), [Plugin3] = filter(get(<<"data">>, Plugins3), <<"name">>, <<"emqx_retainer">>),
?assertEqual(<<"emqx_auth_mnesia">>, maps:get(<<"name">>, Plugin3)), ?assertEqual(<<"emqx_retainer">>, maps:get(<<"name">>, Plugin3)),
?assertEqual(true, maps:get(<<"active">>, Plugin3)), ?assertEqual(true, maps:get(<<"active">>, Plugin3)),
{ok, _} = request_api(put, {ok, _} = request_api(put,
api_path(["nodes", api_path(["nodes",
atom_to_list(node()), atom_to_list(node()),
"plugins", "plugins",
atom_to_list(emqx_auth_mnesia), atom_to_list(emqx_retainer),
"unload"]), "unload"]),
auth_header_()), auth_header_()),
{ok, Error2} = request_api(put, {ok, Error2} = request_api(put,
api_path(["nodes", api_path(["nodes",
atom_to_list(node()), atom_to_list(node()),
"plugins", "plugins",
atom_to_list(emqx_auth_mnesia), atom_to_list(emqx_retainer),
"unload"]), "unload"]),
auth_header_()), auth_header_()),
?assertEqual(<<"not_started">>, get(<<"message">>, Error2)), ?assertEqual(<<"not_started">>, get(<<"message">>, Error2)),
application:stop(emqx_auth_mnesia). application:stop(emqx_retainer).
t_acl_cache(_) -> t_acl_cache(_) ->
ClientId = <<"client1">>, ClientId = <<"client1">>,

23
deploy/docker/README.md
View File

@ -136,16 +136,16 @@ Default environment variable ``EMQX_LOADED_PLUGINS``, including
EMQX_LOADED_PLUGINS="emqx_recon,emqx_retainer,emqx_management,emqx_dashboard" EMQX_LOADED_PLUGINS="emqx_recon,emqx_retainer,emqx_management,emqx_dashboard"
``` ```
For example, set ``EMQX_LOADED_PLUGINS= emqx_auth_redis,emqx_auth_mysql`` to load these two plugins. For example, set ``EMQX_LOADED_PLUGINS= emqx_retainer,emqx_rule_engine`` to load these two plugins.
You can use comma, space or other separator that you want. You can use comma, space or other separator that you want.
All the plugins defined in ``EMQX_LOADED_PLUGINS`` will be loaded. All the plugins defined in ``EMQX_LOADED_PLUGINS`` will be loaded.
```bash ```bash
EMQX_LOADED_PLUGINS="emqx_auth_redis,emqx_auth_mysql" EMQX_LOADED_PLUGINS="emqx_retainer,emqx_rule_engine"
EMQX_LOADED_PLUGINS="emqx_auth_redis emqx_auth_mysql" EMQX_LOADED_PLUGINS="emqx_retainer emqx_rule_engine"
EMQX_LOADED_PLUGINS="emqx_auth_redis | emqx_auth_mysql" EMQX_LOADED_PLUGINS="emqx_retainer | emqx_rule_engine"
``` ```
#### EMQ X Plugins Configuration #### EMQ X Plugins Configuration
@ -155,8 +155,8 @@ The environment variables which with ``EMQX_`` prefix are mapped to all emqx plu
Example: Example:
```bash ```bash
EMQX_AUTH__REDIS__SERVER <--> auth.redis.server EMQX_RETAINER__STORAGE_TYPE <--> retainer.storage_type
EMQX_AUTH__REDIS__PASSWORD <--> auth.redis.password EMQX_RETAINER__MAX_PAYLOAD_SIZE <--> retainer.max_payload_size
``` ```
Don't worry about where to find the configuration file of emqx plugins, this docker image will find and config them automatically using some magic. Don't worry about where to find the configuration file of emqx plugins, this docker image will find and config them automatically using some magic.
@ -166,15 +166,14 @@ All plugin of emqx project could config in this way, following the environment v
Assume you are using redis auth plugin, for example: Assume you are using redis auth plugin, for example:
```bash ```bash
#EMQX_AUTH__REDIS__SERVER="redis.at.yourserver" #EMQX_RETAINER__STORAGE_TYPE = "ram"
#EMQX_AUTH__REDIS__PASSWORD="password_for_redis" #EMQX_RETAINER.MAX_PAYLOAD_SIZE = 1MB
docker run -d --name emqx -p 18083:18083 -p 1883:1883 -p 4369:4369 \ docker run -d --name emqx -p 18083:18083 -p 1883:1883 -p 4369:4369 \
-e EMQX_LISTENER__TCP__EXTERNAL=1883 \ -e EMQX_LISTENER__TCP__EXTERNAL=1883 \
-e EMQX_LOADED_PLUGINS="emqx_auth_redis" \ -e EMQX_LOADED_PLUGINS="emqx_retainer" \
-e EMQX_AUTH__REDIS__SERVER="your.redis.server:6379" \ -e EMQX_RETAINER__STORAGE_TYPE = "ram" \
-e EMQX_AUTH__REDIS__PASSWORD="password_for_redis" \ -e EMQX_RETAINER__MAX_PAYLOAD_SIZE = 1MB \
-e EMQX_AUTH__REDIS__PASSWORD_HASH=plain \
emqx/emqx:latest emqx/emqx:latest
``` ```

8
rebar.config.erl
View File

@ -279,10 +279,6 @@ relx_plugin_apps(ReleaseType) ->
, emqx_coap , emqx_coap
, emqx_stomp , emqx_stomp
, emqx_authentication , emqx_authentication
, emqx_auth_http
, emqx_auth_mysql
, emqx_auth_jwt
, emqx_auth_mnesia
, emqx_web_hook , emqx_web_hook
, emqx_rule_engine , emqx_rule_engine
, emqx_sasl , emqx_sasl
@ -294,10 +290,6 @@ relx_plugin_apps(ReleaseType) ->
relx_plugin_apps_per_rel(cloud) -> relx_plugin_apps_per_rel(cloud) ->
[ emqx_lwm2m [ emqx_lwm2m
, emqx_auth_ldap
, emqx_auth_pgsql
, emqx_auth_redis
, emqx_auth_mongo
, emqx_lua_hook , emqx_lua_hook
, emqx_exhook , emqx_exhook
, emqx_exproto , emqx_exproto