From 69755ad3fb2d2d52359e3a01ff6792652dd77779 Mon Sep 17 00:00:00 2001
From: zhouzb <zhouzb@emqx.io>
Date: Thu, 16 Sep 2021 16:45:56 +0800
Subject: [PATCH] fix(authn): fix bug in authn

---
 apps/emqx/src/emqx_authentication.erl                | 5 +----
 apps/emqx_authn/src/simple_authn/emqx_authn_http.erl | 4 ++--
 apps/emqx_authn/src/simple_authn/emqx_authn_jwt.erl  | 8 ++------
 apps/emqx_connector/src/emqx_connector_http.erl      | 6 +++---
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/apps/emqx/src/emqx_authentication.erl b/apps/emqx/src/emqx_authentication.erl
index ecef32475..8c682d1fc 100644
--- a/apps/emqx/src/emqx_authentication.erl
+++ b/apps/emqx/src/emqx_authentication.erl
@@ -272,10 +272,7 @@ do_post_config_update({delete_authenticator, ChainName, AuthenticatorID}, _NewCo
             {error, Reason}
     end;
 
-do_post_config_update({update_authenticator, ChainName, AuthenticatorID, _Config}, NewConfig, _OldConfig, _AppEnvs) ->
-    [Config] = lists:filter(fun(NewConfig0) ->
-                                AuthenticatorID =:= generate_id(NewConfig0)
-                            end, NewConfig),
+do_post_config_update({update_authenticator, ChainName, AuthenticatorID, Config}, _NewConfig, _OldConfig, _AppEnvs) ->
     NConfig = check_config(Config),
     update_authenticator(ChainName, AuthenticatorID, NConfig);
 
diff --git a/apps/emqx_authn/src/simple_authn/emqx_authn_http.erl b/apps/emqx_authn/src/simple_authn/emqx_authn_http.erl
index daa7f8073..9814d3e58 100644
--- a/apps/emqx_authn/src/simple_authn/emqx_authn_http.erl
+++ b/apps/emqx_authn/src/simple_authn/emqx_authn_http.erl
@@ -78,7 +78,7 @@ validations() ->
 
 url(type) -> binary();
 url(nullable) -> false;
-url(validate) -> [fun check_url/1];
+url(validator) -> [fun check_url/1];
 url(_) -> undefined.
 
 headers(type) -> map();
@@ -99,7 +99,7 @@ headers_no_content_type(_) -> undefined.
 
 body(type) -> map();
 body(nullable) -> false;
-body(validate) -> [fun check_body/1];
+body(validator) -> [fun check_body/1];
 body(_) -> undefined.
 
 request_timeout(type) -> non_neg_integer();
diff --git a/apps/emqx_authn/src/simple_authn/emqx_authn_jwt.erl b/apps/emqx_authn/src/simple_authn/emqx_authn_jwt.erl
index 774d75157..327e356f2 100644
--- a/apps/emqx_authn/src/simple_authn/emqx_authn_jwt.erl
+++ b/apps/emqx_authn/src/simple_authn/emqx_authn_jwt.erl
@@ -123,7 +123,7 @@ server_name_indication(_) -> undefined.
 
 verify_claims(type) -> list();
 verify_claims(default) -> #{};
-verify_claims(validate) -> [fun check_verify_claims/1];
+verify_claims(validator) -> [fun do_check_verify_claims/1];
 verify_claims(converter) ->
     fun(VerifyClaims) ->
         maps:to_list(VerifyClaims)
@@ -298,12 +298,8 @@ do_verify_claims(Claims, [{Name, Value} | More]) ->
             {error, {claims, {Name, Value0}}}
     end.
 
-check_verify_claims(Conf) ->
-    Claims = hocon_schema:get_value("verify_claims", Conf),
-    do_check_verify_claims(Claims).
-
 do_check_verify_claims([]) ->
-    false;
+    true;
 do_check_verify_claims([{Name, Expected} | More]) ->
     check_claim_name(Name) andalso
     check_claim_expected(Expected) andalso
diff --git a/apps/emqx_connector/src/emqx_connector_http.erl b/apps/emqx_connector/src/emqx_connector_http.erl
index 73412f388..0f8c23986 100644
--- a/apps/emqx_connector/src/emqx_connector_http.erl
+++ b/apps/emqx_connector/src/emqx_connector_http.erl
@@ -65,10 +65,10 @@ validations() ->
 
 base_url(type) -> url();
 base_url(nullable) -> false;
-base_url(validate) -> fun (#{query := _Query}) ->
-                              {error, "There must be no query in the base_url"};
+base_url(validator) -> fun(#{query := _Query}) ->
+                           {error, "There must be no query in the base_url"};
                           (_) -> ok
-                      end;
+                       end;
 base_url(_) -> undefined.
 
 connect_timeout(type) -> connect_timeout();