Przeglądaj źródła

refactor(authn): use simple sync query for authn

there is no need to route the authn queries through the buffer worker
Zaiming (Stone) Shi 3 lat temu
rodzic
commit
7a471faf67

+ 1 - 1
apps/emqx_authn/src/simple_authn/emqx_authn_http.erl

@@ -192,7 +192,7 @@ authenticate(
     } = State
     } = State
 ) ->
 ) ->
     Request = generate_request(Credential, State),
     Request = generate_request(Credential, State),
-    Response = emqx_resource:query(ResourceId, {Method, Request, RequestTimeout}),
+    Response = emqx_resource:simple_sync_query(ResourceId, {Method, Request, RequestTimeout}),
     ?TRACE_AUTHN_PROVIDER("http_response", #{
     ?TRACE_AUTHN_PROVIDER("http_response", #{
         request => request_for_log(Credential, State),
         request => request_for_log(Credential, State),
         response => response_for_log(Response),
         response => response_for_log(Response),

+ 2 - 2
apps/emqx_authn/src/simple_authn/emqx_authn_jwt.erl

@@ -187,7 +187,7 @@ update(
     #{use_jwks := true} = Config,
     #{use_jwks := true} = Config,
     #{jwk_resource := ResourceId} = State
     #{jwk_resource := ResourceId} = State
 ) ->
 ) ->
-    case emqx_resource:query(ResourceId, {update, connector_opts(Config)}) of
+    case emqx_resource:simple_sync_query(ResourceId, {update, connector_opts(Config)}) of
         ok ->
         ok ->
             case maps:get(verify_claims, Config, undefined) of
             case maps:get(verify_claims, Config, undefined) of
                 undefined ->
                 undefined ->
@@ -229,7 +229,7 @@ authenticate(
         from := From
         from := From
     }
     }
 ) ->
 ) ->
-    case emqx_resource:query(ResourceId, get_jwks) of
+    case emqx_resource:simple_sync_query(ResourceId, get_jwks) of
         {error, Reason} ->
         {error, Reason} ->
             ?TRACE_AUTHN_PROVIDER(error, "get_jwks_failed", #{
             ?TRACE_AUTHN_PROVIDER(error, "get_jwks_failed", #{
                 resource => ResourceId,
                 resource => ResourceId,

+ 1 - 1
apps/emqx_authn/src/simple_authn/emqx_authn_mongodb.erl

@@ -167,7 +167,7 @@ authenticate(
     } = State
     } = State
 ) ->
 ) ->
     Filter = emqx_authn_utils:render_deep(FilterTemplate, Credential),
     Filter = emqx_authn_utils:render_deep(FilterTemplate, Credential),
-    case emqx_resource:query(ResourceId, {find_one, Collection, Filter, #{}}) of
+    case emqx_resource:simple_sync_query(ResourceId, {find_one, Collection, Filter, #{}}) of
         {ok, undefined} ->
         {ok, undefined} ->
             ignore;
             ignore;
         {error, Reason} ->
         {error, Reason} ->

+ 3 - 1
apps/emqx_authn/src/simple_authn/emqx_authn_mysql.erl

@@ -118,7 +118,9 @@ authenticate(
     }
     }
 ) ->
 ) ->
     Params = emqx_authn_utils:render_sql_params(TmplToken, Credential),
     Params = emqx_authn_utils:render_sql_params(TmplToken, Credential),
-    case emqx_resource:query(ResourceId, {prepared_query, ?PREPARE_KEY, Params, Timeout}) of
+    case
+        emqx_resource:simple_sync_query(ResourceId, {prepared_query, ?PREPARE_KEY, Params, Timeout})
+    of
         {ok, _Columns, []} ->
         {ok, _Columns, []} ->
             ignore;
             ignore;
         {ok, Columns, [Row | _]} ->
         {ok, Columns, [Row | _]} ->

+ 1 - 1
apps/emqx_authn/src/simple_authn/emqx_authn_pgsql.erl

@@ -120,7 +120,7 @@ authenticate(
     }
     }
 ) ->
 ) ->
     Params = emqx_authn_utils:render_sql_params(PlaceHolders, Credential),
     Params = emqx_authn_utils:render_sql_params(PlaceHolders, Credential),
-    case emqx_resource:query(ResourceId, {prepared_query, ResourceId, Params}) of
+    case emqx_resource:simple_sync_query(ResourceId, {prepared_query, ResourceId, Params}) of
         {ok, _Columns, []} ->
         {ok, _Columns, []} ->
             ignore;
             ignore;
         {ok, Columns, [Row | _]} ->
         {ok, Columns, [Row | _]} ->

+ 1 - 1
apps/emqx_authn/src/simple_authn/emqx_authn_redis.erl

@@ -139,7 +139,7 @@ authenticate(
 ) ->
 ) ->
     NKey = emqx_authn_utils:render_str(KeyTemplate, Credential),
     NKey = emqx_authn_utils:render_str(KeyTemplate, Credential),
     Command = [CommandName, NKey | Fields],
     Command = [CommandName, NKey | Fields],
-    case emqx_resource:query(ResourceId, {cmd, Command}) of
+    case emqx_resource:simple_sync_query(ResourceId, {cmd, Command}) of
         {ok, []} ->
         {ok, []} ->
             ignore;
             ignore;
         {ok, Values} ->
         {ok, Values} ->

+ 2 - 2
apps/emqx_authn/test/emqx_authn_mysql_SUITE.erl

@@ -516,13 +516,13 @@ init_seeds() ->
     ).
     ).
 
 
 q(Sql) ->
 q(Sql) ->
-    emqx_resource:query(
+    emqx_resource:simple_sync_query(
         ?MYSQL_RESOURCE,
         ?MYSQL_RESOURCE,
         {sql, Sql}
         {sql, Sql}
     ).
     ).
 
 
 q(Sql, Params) ->
 q(Sql, Params) ->
-    emqx_resource:query(
+    emqx_resource:simple_sync_query(
         ?MYSQL_RESOURCE,
         ?MYSQL_RESOURCE,
         {sql, Sql, Params}
         {sql, Sql, Params}
     ).
     ).

+ 2 - 2
apps/emqx_authn/test/emqx_authn_pgsql_SUITE.erl

@@ -594,13 +594,13 @@ create_user(Values) ->
     ok.
     ok.
 
 
 q(Sql) ->
 q(Sql) ->
-    emqx_resource:query(
+    emqx_resource:simple_sync_query(
         ?PGSQL_RESOURCE,
         ?PGSQL_RESOURCE,
         {query, Sql}
         {query, Sql}
     ).
     ).
 
 
 q(Sql, Params) ->
 q(Sql, Params) ->
-    emqx_resource:query(
+    emqx_resource:simple_sync_query(
         ?PGSQL_RESOURCE,
         ?PGSQL_RESOURCE,
         {query, Sql, Params}
         {query, Sql, Params}
     ).
     ).

+ 1 - 1
apps/emqx_authn/test/emqx_authn_redis_SUITE.erl

@@ -588,7 +588,7 @@ init_seeds() ->
     ).
     ).
 
 
 q(Command) ->
 q(Command) ->
-    emqx_resource:query(
+    emqx_resource:simple_sync_query(
         ?REDIS_RESOURCE,
         ?REDIS_RESOURCE,
         {cmd, Command}
         {cmd, Command}
     ).
     ).