From f18eab402a918d1556544bd93267a2b36fe10086 Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Thu, 9 Jun 2022 18:45:31 +0800 Subject: [PATCH] fix(CI): don't use any authz sources when testing --- .ci/docker-compose-file/scripts/run-emqx.sh | 2 ++ .github/workflows/run_fvt_tests.yaml | 2 ++ apps/emqx_authz/src/emqx_authz.erl | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.ci/docker-compose-file/scripts/run-emqx.sh b/.ci/docker-compose-file/scripts/run-emqx.sh index bf99cb61f..e8cdfdf4f 100755 --- a/.ci/docker-compose-file/scripts/run-emqx.sh +++ b/.ci/docker-compose-file/scripts/run-emqx.sh @@ -22,6 +22,8 @@ esac echo "HOCON_ENV_OVERRIDE_PREFIX=EMQX_" echo "EMQX_ZONES__DEFAULT__MQTT__RETRY_INTERVAL=2s" echo "EMQX_ZONES__DEFAULT__MQTT__MAX_TOPIC_ALIAS=10" + echo "EMQX_AUTHORIZATION__SOURCES=[]" + echo "EMQX_AUTHORIZATION__NO_MATCH=allow" } >> .ci/docker-compose-file/conf.cluster.env is_node_up() { diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml index f90f3155a..d5fbc32b6 100644 --- a/.github/workflows/run_fvt_tests.yaml +++ b/.github/workflows/run_fvt_tests.yaml @@ -186,6 +186,8 @@ jobs: --set image.pullPolicy=Never \ --set emqxConfig.EMQX_ZONES__DEFAULT__MQTT__RETRY_INTERVAL=2s \ --set emqxConfig.EMQX_ZONES__DEFAULT__MQTT__MAX_TOPIC_ALIAS=10 \ + --set emqxConfig.EMQX_AUTHORIZATION__SOURCES=[] \ + --set emqxConfig.EMQX_AUTHORIZATION__NO_MATCH=allow \ deploy/charts/emqx \ --debug diff --git a/apps/emqx_authz/src/emqx_authz.erl b/apps/emqx_authz/src/emqx_authz.erl index b4dd180e3..e41ef71ce 100644 --- a/apps/emqx_authz/src/emqx_authz.erl +++ b/apps/emqx_authz/src/emqx_authz.erl @@ -329,7 +329,7 @@ authorize( 'client.check_authz_complete', [Client, PubSub, Topic, deny, AuthzSource] ), - ?SLOG(info, #{ + ?SLOG(warning, #{ msg => "authorization_permission_denied", username => Username, ipaddr => IpAddress,