Bläddra i källkod

chore: deprecate user_lookup_fun for client SSL option

zmstone 1 år sedan
förälder
incheckning
092ea2fe56

+ 18 - 10
apps/emqx/src/emqx_schema.erl

@@ -2248,16 +2248,6 @@ common_ssl_opts_schema(Defaults, Type) ->
             )},
         {"versions", tls_versions_schema(Collection)},
         {"ciphers", ciphers_schema(D(ciphers))},
-        {"user_lookup_fun",
-            sc(
-                typerefl:alias("string", any()),
-                #{
-                    default => <<"emqx_tls_psk:lookup">>,
-                    converter => fun ?MODULE:user_lookup_fun_tr/2,
-                    importance => ?IMPORTANCE_HIDDEN,
-                    desc => ?DESC(common_ssl_opts_schema_user_lookup_fun)
-                }
-            )},
         {"secure_renegotiate",
             sc(
                 boolean(),
@@ -2335,6 +2325,16 @@ server_ssl_opts_schema(Defaults, IsRanchListener) ->
                         default => Df(handshake_timeout, <<"15s">>),
                         desc => ?DESC(server_ssl_opts_schema_handshake_timeout)
                     }
+                )},
+            {"user_lookup_fun",
+                sc(
+                    typerefl:alias("string", any()),
+                    #{
+                        default => <<"emqx_tls_psk:lookup">>,
+                        converter => fun ?MODULE:user_lookup_fun_tr/2,
+                        importance => ?IMPORTANCE_HIDDEN,
+                        desc => ?DESC(common_ssl_opts_schema_user_lookup_fun)
+                    }
                 )}
         ] ++
         [
@@ -2452,6 +2452,14 @@ client_ssl_opts_schema(Defaults) ->
                         validator => fun emqx_schema:non_empty_string/1,
                         desc => ?DESC(client_ssl_opts_schema_server_name_indication)
                     }
+                )},
+            {"user_lookup_fun",
+                sc(
+                    string(),
+                    #{
+                        deprecated => {since, "5.8.1"},
+                        importance => ?IMPORTANCE_HIDDEN
+                    }
                 )}
         ].
 

+ 0 - 2
apps/emqx_management/test/emqx_mgmt_api_configs_SUITE.erl

@@ -423,8 +423,6 @@ t_create_webhook_v1_bridges_api(Config) ->
                                     <<"log_level">> => <<"notice">>,
                                     <<"reuse_sessions">> => true,
                                     <<"secure_renegotiate">> => true,
-                                    <<"user_lookup_fun">> =>
-                                        <<"emqx_tls_psk:lookup">>,
                                     <<"verify">> => <<"verify_none">>,
                                     <<"versions">> =>
                                         [