Merge branch 'dev/v4.3.14' into fix_patter_match_v4.3

.ci/build_packages/tests.sh

@@ -89,11 +89,6 @@ emqx_test(){
             "rpm")
                 packagename=$(basename "${PACKAGE_PATH}/${EMQX_NAME}"-*.rpm)
 
-                if [[ "${ARCH}" == "amd64" && $(rpm -E '%{rhel}') == 7 ]] ; then
-                    # EMQX OTP requires openssl11 to have TLS1.3 support
-                    yum install -y openssl11
-                fi
-
                 rpm -ivh "${PACKAGE_PATH}/${packagename}"
                 if ! rpm -q emqx | grep -q emqx; then
                     echo "package install error"

CHANGES-4.3.md

@@ -10,12 +10,28 @@ File format:
 - One list item per change topic
   Change log ends with a list of github PRs
 
+## v4.3.14
+
+### Enhancements
+
+* In order to fix the execution order of exhook, e.g. before/after other plugins/modules,
+  ExHook now supports user customizing emqx_hook execute priority.
+
+### Bug fixes
+
+* Prohibit empty topics in strict mode
+
 ## v4.3.13
 
 ### Important changes
 
 * For docker image, /opt/emqx/etc has been removed from the VOLUME list,
   this made it easier for the users to rebuild image on top with changed configs.
+* CentOS 7 Erlang runtime is rebuilt on OpenSSL-1.1.1n (previously on 1.0),
+  Prior to v4.3.13, EMQX pick certain cipher suites proposed by the clients,
+  but then fail to handshake resulting in a `malformed_handshake_data` exception.
+* CentOS 8 Erlang runtime is rebuilt on RockyLinux 8.
+  'centos8' will remain in the package name to keep it backward compatible.
 
 ### Enhancements
 

Makefile

@@ -99,6 +99,7 @@ $(PROFILES:%=clean-%):
 .PHONY: clean-all
 clean-all:
 	@rm -rf _build
+	@rm rebar.lock
 
 .PHONY: deps-all
 deps-all: $(REBAR) $(PROFILES:%=deps-%)

apps/emqx_auth_jwt/src/emqx_auth_jwt.app.src

@@ -1,6 +1,6 @@
 {application, emqx_auth_jwt,
  [{description, "EMQ X Authentication with JWT"},
-  {vsn, "4.3.1"}, % strict semver, bump manually!
+  {vsn, "4.3.2"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_auth_jwt_sup]},
   {applications, [kernel,stdlib,jose]},

apps/emqx_auth_jwt/src/emqx_auth_jwt.appup.src

@@ -1,13 +1,13 @@
 %% -*-: erlang -*-
 {VSN,
  [
-    {"4.3.0", [
+    {"4.3.[0-1]", [
       {load_module, emqx_auth_jwt_svr, brutal_purge, soft_purge, []}
     ]},
     {<<".*">>, []}
  ],
  [
-    {"4.3.0", [
+    {"4.3.[0-1]", [
       {load_module, emqx_auth_jwt_svr, brutal_purge, soft_purge, []}
     ]},
     {<<".*">>, []}

apps/emqx_auth_jwt/src/emqx_auth_jwt_svr.erl

@@ -91,7 +91,7 @@ do_init_jwks(Options) ->
                                   [K, V, Reason]),
                              undefined;
                          J -> J
-                     catch T:R:_ ->
+                     catch T:R ->
                          ?LOG(warning, "Build ~p JWK ~p failed: {~p, ~p}~n",
                               [K, V, T, R]),
                          undefined

apps/emqx_exhook/etc/emqx_exhook.conf

@@ -24,6 +24,17 @@
 ## Value: false | Duration
 #exhook.auto_reconnect = 60s
 
+## The exhook execution priority on the Chain of the emqx hooks.
+##
+## Modify the field to fix the exhook execute order before/after other plugins/modules.
+## By default, most hooks registered by plugins or modules have a priority of 0.
+##
+## With the same priority of 0, the execute order depends on hookpoints mount order.
+## Scilicet is the loaded order of plugins/ modules.
+##
+## Default: 0
+## Value: Integer
+#exhook.hook_priority = 0
 
 ##--------------------------------------------------------------------
 ## The Hook callback servers

apps/emqx_exhook/include/emqx_exhook.hrl

@@ -41,4 +41,6 @@
       , {'message.dropped',     {emqx_exhook_handler, on_message_dropped,      []}}
       ]).
 
+-define(DEFAULT_HOOK_PRIORITY, 0).
+
 -endif.

apps/emqx_exhook/priv/emqx_exhook.schema

@@ -15,6 +15,11 @@
   {datatype, string}
 ]}.
 
+{mapping, "exhook.hook_priority", "emqx_exhook.hook_priority", [
+  {default, 0},
+  {datatype, integer}
+]}.
+
 {translation, "emqx_exhook.auto_reconnect", fun(Conf) ->
   case cuttlefish:conf_get("exhook.auto_reconnect", Conf) of
       "false" -> false;

apps/emqx_exhook/src/emqx_exhook.app.src

@@ -1,6 +1,6 @@
 {application, emqx_exhook,
  [{description, "EMQ X Extension for Hook"},
-  {vsn, "4.3.4"},
+  {vsn, "4.3.5"},
   {modules, []},
   {registered, []},
   {mod, {emqx_exhook_app, []}},

apps/emqx_exhook/src/emqx_exhook.appup.src

@@ -1,13 +1,23 @@
-%% -*-: erlang -*-
+%% -*- mode: erlang -*-
 {VSN,
  [
-    {<<"4.3.[0-3]">>, [
+    {"4.3.4", [
+        {load_module, emqx_exhook_sup, brutal_purge,soft_purge,[]},
+        {load_module, emqx_exhook_server, brutal_purge,soft_purge,[]},
+        {update, emqx_exhook_mngr, {advanced, ["4.3.4"]}}
+    ]},
+    {<<"4\\.3\\.[0-3]">>, [
         {restart_application, emqx_exhook}
     ]},
     {<<".*">>, []}
  ],
  [
-    {<<"4.3.[0-3]">>, [
+    {"4.3.4", [
+        {load_module, emqx_exhook_sup, brutal_purge,soft_purge,[]},
+        {load_module, emqx_exhook_server, brutal_purge,soft_purge,[]},
+        {update, emqx_exhook_mngr, {advanced, ["4.3.4"]}}
+    ]},
+    {<<"4\\.3\\.[0-3]">>, [
          {restart_application, emqx_exhook}
     ]},
     {<<".*">>, []}

apps/emqx_exhook/src/emqx_exhook_mngr.erl

@@ -23,7 +23,7 @@
 -include_lib("emqx/include/logger.hrl").
 
 %% APIs
--export([start_link/3]).
+-export([start_link/4]).
 
 %% Mgmt API
 -export([ enable/2
@@ -59,9 +59,14 @@
           %% Request options
           request_options :: grpc_client:options(),
           %% Timer references
-          trefs :: map()
+          trefs :: map(),
+          %% Hooks execute options
+          hooks_options :: hooks_options()
          }).
 
+-export_type([ server_options/0
+             , hooks_options/0]).
+
 -type servers() :: [{Name :: atom(), server_options()}].
 
 -type server_options() :: [ {scheme, http | https}
@@ -69,6 +74,10 @@
                           | {port, inet:port_number()}
                           ].
 
+-type hooks_options() :: #{hook_priority => integer()}.
+
+-define(DEFAULT_HOOK_OPTS, #{hook_priority => ?DEFAULT_HOOK_PRIORITY}).
+
 -define(DEFAULT_TIMEOUT, 60000).
 
 -define(CNTER, emqx_exhook_counter).
@@ -77,12 +86,12 @@
 %% APIs
 %%--------------------------------------------------------------------
 
--spec start_link(servers(), false | non_neg_integer(), grpc_client:options())
+-spec start_link(servers(), false | non_neg_integer(), grpc_client:options(), hooks_options())
     ->ignore
      | {ok, pid()}
      | {error, any()}.
-start_link(Servers, AutoReconnect, ReqOpts) ->
+start_link(Servers, AutoReconnect, ReqOpts, HooksOpts) ->
-    gen_server:start_link(?MODULE, [Servers, AutoReconnect, ReqOpts], []).
+    gen_server:start_link(?MODULE, [Servers, AutoReconnect, ReqOpts, HooksOpts], []).
 
 -spec enable(pid(), atom()|string()) -> ok | {error, term()}.
 enable(Pid, Name) ->
@@ -102,7 +111,7 @@ call(Pid, Req) ->
 %% gen_server callbacks
 %%--------------------------------------------------------------------
 
-init([Servers, AutoReconnect, ReqOpts0]) ->
+init([Servers, AutoReconnect, ReqOpts0, HooksOpts]) ->
     process_flag(trap_exit, true),
     %% XXX: Due to the ExHook Module in the enterprise,
     %% this process may start multiple times and they will share this table
@@ -120,32 +129,33 @@ init([Servers, AutoReconnect, ReqOpts0]) ->
 
     %% Load the hook servers
     ReqOpts = maps:without([request_failed_action], ReqOpts0),
-    {Waiting, Running} = load_all_servers(Servers, ReqOpts),
+    {Waiting, Running} = load_all_servers(Servers, ReqOpts, HooksOpts),
     {ok, ensure_reload_timer(
            #state{waiting = Waiting,
                   running = Running,
                   stopped = #{},
                   request_options = ReqOpts,
                   auto_reconnect = AutoReconnect,
-                  trefs = #{}
+                  trefs = #{},
+                  hooks_options = HooksOpts
                  }
           )}.
 
 %% @private
-load_all_servers(Servers, ReqOpts) ->
+load_all_servers(Servers, ReqOpts, HooksOpts) ->
-    load_all_servers(Servers, ReqOpts, #{}, #{}).
+    load_all_servers(Servers, ReqOpts, HooksOpts, #{}, #{}).
-load_all_servers([], _Request, Waiting, Running) ->
+load_all_servers([], _Request, _HooksOpts, Waiting, Running) ->
     {Waiting, Running};
-load_all_servers([{Name, Options}|More], ReqOpts, Waiting, Running) ->
+load_all_servers([{Name, Options} | More], ReqOpts, HooksOpts, Waiting, Running) ->
     {NWaiting, NRunning} =
-        case emqx_exhook_server:load(Name, Options, ReqOpts) of
+        case emqx_exhook_server:load(Name, Options, ReqOpts, HooksOpts) of
             {ok, ServerState} ->
                 save(Name, ServerState),
                 {Waiting, Running#{Name => Options}};
             {error, _} ->
                 {Waiting#{Name => Options}, Running}
         end,
-    load_all_servers(More, ReqOpts, NWaiting, NRunning).
+    load_all_servers(More, ReqOpts, HooksOpts, NWaiting, NRunning).
 
 handle_call({load, Name}, _From, State) ->
     {Result, NState} = do_load_server(Name, State),
@@ -199,8 +209,27 @@ terminate(_Reason, State = #state{running = Running}) ->
     _ = unload_exhooks(),
     ok.
 
-code_change(_OldVsn, State, _Extra) ->
+%% in the emqx_exhook:v4.3.5, we have added one new field in the state last:
-    {ok, State}.
+%%  - hooks_options :: map()
+code_change({down, _Vsn}, State, [ToVsn]) ->
+    case re:run(ToVsn, "4\\.3\\.[0-4]") of
+        {match, _} ->
+            NState = list_to_tuple(
+                       lists:droplast(
+                         tuple_to_list(State))),
+            {ok, NState};
+        _ ->
+            {ok, State}
+    end;
+code_change(_Vsn, State, [FromVsn]) ->
+    case re:run(FromVsn, "4\\.3\\.[0-4]") of
+        {match, _} ->
+            NState = list_to_tuple(
+                       tuple_to_list(State) ++ [?DEFAULT_HOOK_OPTS]),
+            {ok, NState};
+        _ ->
+            {ok, State}
+    end.
 
 %%--------------------------------------------------------------------
 %% Internal funcs
@@ -214,7 +243,8 @@ do_load_server(Name, State0 = #state{
                                  waiting = Waiting,
                                  running = Running,
                                  stopped = Stopped,
-                                 request_options = ReqOpts}) ->
+                                 request_options = ReqOpts,
+                                 hooks_options = HooksOpts}) ->
     State = clean_reload_timer(Name, State0),
     case maps:get(Name, Running, undefined) of
         undefined ->
@@ -223,7 +253,7 @@ do_load_server(Name, State0 = #state{
                 undefined ->
                     {{error, not_found}, State};
                 Options ->
-                    case emqx_exhook_server:load(Name, Options, ReqOpts) of
+                    case emqx_exhook_server:load(Name, Options, ReqOpts, HooksOpts) of
                         {ok, ServerState} ->
                             save(Name, ServerState),
                             ?LOG(info, "Load exhook callback server "

apps/emqx_exhook/src/emqx_exhook_server.erl

@@ -25,7 +25,7 @@
 -define(PB_CLIENT_MOD, emqx_exhook_v_1_hook_provider_client).
 
 %% Load/Unload
--export([ load/3
+-export([ load/4
         , unload/1
         ]).
 
@@ -81,8 +81,9 @@
 %% Load/Unload APIs
 %%--------------------------------------------------------------------
 
--spec load(atom(), list(), map()) -> {ok, server()} | {error, term()} .
+-spec load(atom(), emqx_exhook_mngr:server_options(), grpc_client:options(), emqx_exhook_mngr:hooks_options())
-load(Name0, Opts0, ReqOpts) ->
+          -> {ok, server()} | {error, term()} .
+load(Name0, Opts0, ReqOpts, HooksOpts) ->
     Name = to_list(Name0),
     {SvrAddr, ClientOpts} = channel_opts(Opts0),
     case emqx_exhook_sup:start_grpc_client_channel(
@@ -97,7 +98,7 @@ load(Name0, Opts0, ReqOpts) ->
                                io_lib:format("exhook.~s.", [Name])),
                     ensure_metrics(Prefix, HookSpecs),
                     %% Ensure hooks
-                    ensure_hooks(HookSpecs),
+                    ensure_hooks(HookSpecs, maps:get(hook_priority, HooksOpts, ?DEFAULT_HOOK_PRIORITY)),
                     {ok, #server{name = Name,
                                  options = ReqOpts,
                                  channel = _ChannPoolPid,
@@ -174,7 +175,7 @@ resovle_hookspec(HookSpecs) when is_list(HookSpecs) ->
         case maps:get(name, HookSpec, undefined) of
             undefined -> Acc;
             Name0 ->
-                Name = try binary_to_existing_atom(Name0, utf8) catch T:R:_ -> {T,R} end,
+                Name = try binary_to_existing_atom(Name0, utf8) catch T:R -> {T,R} end,
                 case lists:member(Name, AvailableHooks) of
                     true ->
                         case lists:member(Name, MessageHooks) of
@@ -193,13 +194,13 @@ ensure_metrics(Prefix, HookSpecs) ->
             || Hookpoint <- maps:keys(HookSpecs)],
     lists:foreach(fun emqx_metrics:ensure/1, Keys).
 
-ensure_hooks(HookSpecs) ->
+ensure_hooks(HookSpecs, Priority) ->
     lists:foreach(fun(Hookpoint) ->
         case lists:keyfind(Hookpoint, 1, ?ENABLED_HOOKS) of
             false ->
                 ?LOG(error, "Unknown name ~s to hook, skip it!", [Hookpoint]);
             {Hookpoint, {M, F, A}} ->
-                emqx_hooks:put(Hookpoint, {M, F, A}),
+                emqx_hooks:put(Hookpoint, {M, F, A}, Priority),
                 ets:update_counter(?CNTER, Hookpoint, {2, 1}, {Hookpoint, 0})
         end
     end, maps:keys(HookSpecs)).

apps/emqx_exhook/src/emqx_exhook_sup.erl

@@ -18,6 +18,8 @@
 
 -behaviour(supervisor).
 
+-include("emqx_exhook.hrl").
+
 -export([ start_link/0
         , init/1
         ]).
@@ -43,7 +45,7 @@ start_link() ->
 
 init([]) ->
     Mngr = ?CHILD(emqx_exhook_mngr, worker,
-                  [servers(), auto_reconnect(), request_options()]),
+                  [servers(), auto_reconnect(), request_options(), hooks_options()]),
     {ok, {{one_for_one, 10, 100}, [Mngr]}}.
 
 servers() ->
@@ -57,6 +59,10 @@ request_options() ->
       request_failed_action => env(request_failed_action, deny)
      }.
 
+hooks_options() ->
+    #{hook_priority => env(hook_priority, ?DEFAULT_HOOK_PRIORITY)
+     }.
+
 env(Key, Def) ->
     application:get_env(emqx_exhook, Key, Def).
 

apps/emqx_exhook/test/emqx_exhook_SUITE.erl

@@ -98,10 +98,31 @@ t_cli_stats(_) ->
     _ = emqx_exhook_cli:cli(x),
     unmeck_print().
 
+t_priority(_) ->
+    restart_exhook_with_envs([{emqx_exhook, hook_priority, 1}]),
+
+    emqx_exhook:disable(default),
+    ok = emqx_exhook:enable(default),
+    [Callback | _] = emqx_hooks:lookup('client.connected'),
+    1 = emqx_hooks:callback_priority(Callback).
+
 %%--------------------------------------------------------------------
 %% Utils
 %%--------------------------------------------------------------------
 
+%% TODO: make it more general and move to `emqx_ct_helpers`
+restart_exhook_with_envs(Envs) ->
+    emqx_ct_helpers:stop_apps([emqx_exhook]),
+    SetPriorityFun
+        = fun(emqx) ->
+                  set_special_cfgs(emqx);
+             (emqx_exhook) ->
+                  lists:foreach(fun({App, Key, Val}) ->
+                                        application:set_env(App, Key, Val)
+                                end, Envs)
+          end,
+    emqx_ct_helpers:start_apps([emqx_exhook], SetPriorityFun).
+
 meck_print() ->
     meck:new(emqx_ctl, [passthrough, no_history, no_link]),
     meck:expect(emqx_ctl, print, fun(_) -> ok end),

apps/emqx_rule_engine/src/emqx_rule_engine.app.src

@@ -1,6 +1,6 @@
 {application, emqx_rule_engine,
  [{description, "EMQ X Rule Engine"},
-  {vsn, "4.3.8"}, % strict semver, bump manually!
+  {vsn, "4.3.9"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_rule_engine_sup, emqx_rule_registry]},
   {applications, [kernel,stdlib,rulesql,getopt]},

apps/emqx_rule_engine/src/emqx_rule_engine.appup.src

@@ -1,7 +1,14 @@
 %% -*- mode: erlang -*-
 %% Unless you know what you are doing, DO NOT edit manually!!
 {VSN,
-  [{"4.3.7",
+  [{"4.3.8",
+    [{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_events,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]}]},
+   {"4.3.7",
     [{load_module,emqx_rule_events,brutal_purge,soft_purge,[]},
      {load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
      {load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]},
@@ -79,7 +86,14 @@
      {load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]},
      {load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]},
    {<<".*">>,[]}],
-  [{"4.3.7",
+  [{"4.3.8",
+    [{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_utils,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_engine,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_events,brutal_purge,soft_purge,[]},
+     {load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]}]},
+   {"4.3.7",
     [{load_module,emqx_rule_events,brutal_purge,soft_purge,[]},
      {load_module,emqx_rule_funcs,brutal_purge,soft_purge,[]},
      {load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]},

apps/emqx_rule_engine/src/emqx_rule_engine.erl

@@ -37,6 +37,7 @@
         , test_resource/1
         , start_resource/1
         , get_resource_status/1
+        , is_source_alive/1
         , get_resource_params/1
         , delete_resource/1
         , update_resource/2
@@ -314,24 +315,37 @@ start_resource(ResId) ->
     end.
 
 -spec(test_resource(#{type := _, config := _, _ => _}) -> ok | {error, Reason :: term()}).
-test_resource(#{type := Type, config := Config0}) ->
+test_resource(#{type := Type} = Params) ->
     case emqx_rule_registry:find_resource_type(Type) of
-        {ok, #resource_type{on_create = {ModC, Create},
+        {ok, #resource_type{}} ->
-                            on_destroy = {ModD, Destroy},
+            ResId = maps:get(id, Params, resource_id()),
-                            params_spec = ParamSpec}} ->
-            Config = emqx_rule_validator:validate_params(Config0, ParamSpec),
-            ResId = resource_id(),
             try
-                _ = ?CLUSTER_CALL(init_resource, [ModC, Create, ResId, Config]),
+                _ = create_resource(maps:put(id, ResId, Params)),
-                _ = ?CLUSTER_CALL(clear_resource, [ModD, Destroy, ResId]),
+                true = is_source_alive(ResId),
                 ok
-            catch
+            catch E:R:S ->
-                throw:Reason -> {error, Reason}
+                ?LOG(warning, "test resource failed, ~0p:~0p ~0p", [E, R, S]),
+                {error, R}
+            after
+                _ = ?CLUSTER_CALL(delete_resource, [ResId])
             end;
         not_found ->
             {error, {resource_type_not_found, Type}}
     end.
 
+is_source_alive(ResId) ->
+    case rpc:multicall(ekka_mnesia:running_nodes(), ?MODULE, get_resource_status, [ResId], 5000) of
+        {ResL, []} ->
+            is_source_alive_(ResL);
+        {_, _Errors} ->
+            false
+    end.
+
+is_source_alive_([]) -> true;
+is_source_alive_([{ok, #{is_alive := true}} | ResL]) -> is_source_alive_(ResL);
+is_source_alive_([{ok, #{is_alive := false}} | _ResL]) -> false;
+is_source_alive_([_Error | _ResL]) -> false.
+
 -spec(get_resource_status(resource_id()) -> {ok, resource_status()} | {error, Reason :: term()}).
 get_resource_status(ResId) ->
     case emqx_rule_registry:find_resource_params(ResId) of

apps/emqx_rule_engine/src/emqx_rule_engine_api.erl

@@ -296,7 +296,7 @@ do_create_resource(Create, ParsedParams) ->
 list_resources(#{}, _Params) ->
     Data0 = lists:foldr(fun maybe_record_to_map/2, [], emqx_rule_registry:get_resources()),
     Data = lists:map(fun(Res = #{id := ResId}) ->
-               Status = get_aggregated_status(ResId),
+               Status = emqx_rule_engine:is_source_alive(ResId),
                maps:put(status, Status, Res)
            end, Data0),
     return({ok, Data}).
@@ -304,14 +304,6 @@ list_resources(#{}, _Params) ->
 list_resources_by_type(#{type := Type}, _Params) ->
     return_all(emqx_rule_registry:get_resources_by_type(Type)).
 
-get_aggregated_status(ResId) ->
-    lists:all(fun(Node) ->
-        case rpc:call(Node, emqx_rule_engine, get_resource_status, [ResId]) of
-            {ok, #{is_alive := true}} -> true;
-            _ -> false
-        end
-    end, ekka_mnesia:running_nodes()).
-
 show_resource(#{id := Id}, _Params) ->
     case emqx_rule_registry:find_resource(Id) of
         {ok, R} ->

apps/emqx_rule_engine/src/emqx_rule_funcs.erl

@@ -197,6 +197,9 @@
         , rfc3339_to_unix_ts/2
         , now_timestamp/0
         , now_timestamp/1
+        , mongo_date/0
+        , mongo_date/1
+        , mongo_date/2
         ]).
 
 %% Proc Dict Func
@@ -900,6 +903,24 @@ time_unit(<<"millisecond">>) -> millisecond;
 time_unit(<<"microsecond">>) -> microsecond;
 time_unit(<<"nanosecond">>) -> nanosecond.
 
+mongo_date() ->
+    erlang:timestamp().
+
+mongo_date(MillisecondsTimestamp) ->
+    convert_timestamp(MillisecondsTimestamp).
+
+mongo_date(Timestamp, Unit) ->
+    InsertedTimeUnit = time_unit(Unit),
+    ScaledEpoch = erlang:convert_time_unit(Timestamp, InsertedTimeUnit, millisecond),
+    convert_timestamp(ScaledEpoch).
+
+convert_timestamp(MillisecondsTimestamp) ->
+    MicroTimestamp = MillisecondsTimestamp * 1000,
+    MegaSecs = MicroTimestamp div 1000_000_000_000,
+    Secs = MicroTimestamp div 1000_000 - MegaSecs*1000_000,
+    MicroSecs = MicroTimestamp rem 1000_000,
+    {MegaSecs, Secs, MicroSecs}.
+
 %% @doc This is for sql funcs that should be handled in the specific modules.
 %% Here the emqx_rule_funcs module acts as a proxy, forwarding
 %% the function handling to the worker module.

include/emqx_release.hrl

@@ -29,7 +29,7 @@
 
 -ifndef(EMQX_ENTERPRISE).
 
--define(EMQX_RELEASE, {opensource, "4.3.13-rc.2"}).
+-define(EMQX_RELEASE, {opensource, "4.3.13-rc.3"}).
 
 -else.
 

priv/emqx.schema

@@ -258,6 +258,28 @@ end}.
 {validator, "range4ports", "must be 1024 to 134217727",
  fun(X) -> X >= 1024 andalso X =< 134217727 end}.
 
+{validator, "range:0-2", "must be 0 to 2",
+ fun(X) -> X >= 0 andalso X =< 2 end}.
+
+{validator, "range:0-128", "must be 0 to 128",
+  fun(X) -> X >= 0 andalso X =< 128 end}.
+
+{validator, "range:0-65535", "must be 0 to 65535",
+ fun(X) -> X >= 0 andalso X =< 65535 end}.
+
+{validator, "range:1-65535", "must be 1 to 65535",
+  fun(X) -> X >= 1 andalso X =< 65535 end}.
+
+{validator, "range:1-9", "must be 1 to 9",
+  fun(X) -> X >= 1 andalso X =< 9 end}.
+
+{validator, "range:8-15", "must be 8 to 15",
+    fun(X) -> X >= 8 andalso X =< 15 end}.
+
+{validator, "range:0-1024", "must be 0 to 1024",
+  fun(X) -> X >= 0 andalso X =< 1024 end}.
+
+
 %% @doc http://www.erlang.org/doc/man/erl.html#%2bzdbbl
 {mapping, "node.dist_buffer_size", "vm_args.+zdbbl", [
   {datatype, bytesize},
@@ -293,10 +315,10 @@ end}.
   {default, 1000},
   {datatype, integer},
   hidden,
-  {validators, ["positive_integer"]}
+  {validators, ["range:0-inf"]}
 ]}.
 
-{validator, "positive_integer", "must be a positive integer",
+{validator, "range:0-inf", "must be a non neg_integer",
   fun(X) -> X >= 0 end}.
 
 %% Note: OTP R15 and earlier uses -env ERL_MAX_ETS_TABLES,
@@ -801,7 +823,8 @@ end}.
 %% @doc Set the Maximum topic levels.
 {mapping, "mqtt.max_topic_levels", "emqx.max_topic_levels", [
   {default, 128},
-  {datatype, integer}
+  {datatype, integer},
+  {validators, ["range:0-inf"]}
 ]}.
 
 %% @doc Set the Maximum QoS allowed.
@@ -814,7 +837,8 @@ end}.
 %% @doc Set the Maximum Topic Alias.
 {mapping, "mqtt.max_topic_alias", "emqx.max_topic_alias", [
   {default, 65535},
-  {datatype, integer}
+  {datatype, integer},
+  {validators, ["range:0-65535"]}
 ]}.
 
 %% @doc Whether the server supports MQTT retained messages.
@@ -911,7 +935,8 @@ end}.
 
 %% @doc Set the Maximum topic levels.
 {mapping, "zone.$name.max_topic_levels", "emqx.zones", [
-  {datatype, integer}
+  {datatype, integer},
+  {validators, ["range:0-128"]}
 ]}.
 
 %% @doc Set the Maximum QoS allowed.

scripts/update-appup.sh

@@ -93,6 +93,7 @@ if [ "$NEW_COPY" = 'no' ]; then
     REMOTE="$(git remote -v | grep "${GIT_REPO}" | head -1 | awk '{print $1}')"
     git fetch "$REMOTE"
 fi
+git reset --hard
 git clean -fdx
 git checkout "${PREV_TAG}"
 make "$PROFILE"

src/emqx.app.src

@@ -6,7 +6,7 @@
   %% the emqx `release' version, which in turn is comprised of several
   %% apps, one of which is this.  See `emqx_release.hrl' for more
   %% info.
-  {vsn, "4.3.14"}, % strict semver, bump manually!
+  {vsn, "4.3.15"}, % strict semver, bump manually!
   {modules, []},
   {registered, []},
   {applications, [ kernel

src/emqx_cm_locker.erl

@@ -28,6 +28,11 @@
         , unlock/1
         ]).
 
+%% for testing
+-ifdef(TEST).
+-export([strategy/0]).
+-endif.
+
 -spec(start_link() -> startlink_ret()).
 start_link() ->
     ekka_locker:start_link(?MODULE).
@@ -63,4 +68,3 @@ unlock(ClientId) ->
 -spec(strategy() -> local | leader | quorum | all).
 strategy() ->
     emqx:get_env(session_locking_strategy, quorum).
-

src/emqx_flapping.erl

@@ -38,6 +38,10 @@
         , code_change/3
         ]).
 
+%% for testing
+-ifdef(TEST).
+-export([get_policy/0]).
+-endif.
 %% Tab
 -define(FLAPPING_TAB, ?MODULE).
 %% Default Policy
@@ -160,4 +164,4 @@ code_change(_OldVsn, State, _Extra) ->
 ensure_timer(State) ->
     Timeout = maps:get(duration, get_policy()),
     TRef = emqx_misc:start_timer(Timeout, expired_detecting),
-    State#{expired_timer => TRef}.
+    State#{expired_timer => TRef}.

src/emqx_frame.erl

@@ -265,7 +265,7 @@ parse_packet(#mqtt_packet_header{type = ?CONNACK}, <<AckFlags:8, ReasonCode:8, R
 
 parse_packet(#mqtt_packet_header{type = ?PUBLISH, qos = QoS}, Bin,
              #{strict_mode := StrictMode, version := Ver}) ->
-    {TopicName, Rest} = parse_utf8_string(Bin, StrictMode),
+    {TopicName, Rest} = parse_topic_name(Bin, StrictMode),
     {PacketId, Rest1} = case QoS of
                             ?QOS_0 -> {undefined, Rest};
                             _ -> parse_packet_id(Rest)
@@ -357,7 +357,7 @@ parse_will_message(Packet = #mqtt_packet_connect{will_flag = true,
                                                  proto_ver = Ver},
                    Bin, StrictMode) ->
     {Props, Rest} = parse_properties(Bin, Ver, StrictMode),
-    {Topic, Rest1} = parse_utf8_string(Rest, StrictMode),
+    {Topic, Rest1} = parse_topic_name(Rest, StrictMode),
     {Payload, Rest2} = parse_binary_data(Rest1),
     {Packet#mqtt_packet_connect{will_props   = Props,
                                 will_topic   = Topic,
@@ -524,6 +524,14 @@ parse_binary_data(Bin)
   when 2 > byte_size(Bin) ->
     error(malformed_binary_data_length).
 
+parse_topic_name(Bin, false) ->
+    parse_utf8_string(Bin, false);
+parse_topic_name(Bin, true) ->
+    case parse_utf8_string(Bin, true) of
+        {<<>>, _Rest} -> error(empty_topic_name);
+        Result -> Result
+    end.
+
 %%--------------------------------------------------------------------
 %% Serialize MQTT Packet
 %%--------------------------------------------------------------------

src/emqx_hooks.erl

@@ -32,6 +32,8 @@
         , add/3
         , add/4
         , put/2
+        , put/3
+        , put/4
         , del/2
         , run/2
         , run_fold/3
@@ -75,6 +77,8 @@
           priority :: integer()
          }).
 
+-type callback() :: #callback{}.
+
 -record(hook, {
           name :: hookpoint(),
           callbacks :: list(#callback{})
@@ -110,7 +114,7 @@ callback_priority(#callback{priority= P}) -> P.
 %%--------------------------------------------------------------------
 
 %% @doc Register a callback
--spec(add(hookpoint(), action() | #callback{}) -> ok_or_error(already_exists)).
+-spec(add(hookpoint(), action() | callback()) -> ok_or_error(already_exists)).
 add(HookPoint, Callback) when is_record(Callback, callback) ->
     gen_server:call(?SERVER, {add, HookPoint, Callback}, infinity);
 add(HookPoint, Action) when is_function(Action); is_tuple(Action) ->
@@ -131,12 +135,24 @@ add(HookPoint, Action, Filter, Priority) when is_integer(Priority) ->
     add(HookPoint, #callback{action = Action, filter = Filter, priority = Priority}).
 
 %% @doc Like add/2, it register a callback, discard 'already_exists' error.
--spec(put(hookpoint(), action() | #callback{}) -> ok).
+-spec put(hookpoint(), action() | callback()) -> ok.
-put(HookPoint, Callback) ->
+put(HookPoint, Callback) when is_record(Callback, callback) ->
     case add(HookPoint, Callback) of
         ok -> ok;
         {error, already_exists} -> ok
-    end.
+    end;
+put(HookPoint, Action) when is_function(Action); is_tuple(Action) ->
+    ?MODULE:put(HookPoint, #callback{action = Action, priority = 0}).
+
+-spec put(hookpoint(), action(), filter() | integer() | list()) -> ok.
+put(HookPoint, Action, {_M, _F, _A} = Filter) ->
+    ?MODULE:put(HookPoint, #callback{action = Action, filter = Filter, priority = 0});
+put(HookPoint, Action, Priority) when is_integer(Priority) ->
+    ?MODULE:put(HookPoint, #callback{action = Action, priority = Priority}).
+
+-spec put(hookpoint(), action(), filter(), integer()) -> ok.
+put(HookPoint, Action, Filter, Priority) when is_integer(Priority) ->
+    ?MODULE:put(HookPoint, #callback{action = Action, filter = Filter, priority = Priority}).
 
 %% @doc Unregister a callback.
 -spec(del(hookpoint(), action() | {module(), atom()}) -> ok).
@@ -205,7 +221,7 @@ execute({M, F, A}, Args) ->
     erlang:apply(M, F, Args ++ A).
 
 %% @doc Lookup callbacks.
--spec(lookup(hookpoint()) -> [#callback{}]).
+-spec(lookup(hookpoint()) -> [callback()]).
 lookup(HookPoint) ->
     case ets:lookup(?TAB, HookPoint) of
         [#hook{callbacks = Callbacks}] ->
@@ -288,4 +304,3 @@ del_callback(Func, [#callback{action = {Func, _A}} | Callbacks], Acc) ->
     del_callback(Func, Callbacks, Acc);
 del_callback(Action, [Callback | Callbacks], Acc) ->
     del_callback(Action, Callbacks, [Callback | Acc]).
-

src/emqx_limiter.erl

@@ -23,7 +23,8 @@
         , init/4 %% XXX: Compatible with before 4.2 version
         , info/1
         , check/2
-        , update_overall_limiter/4
+        , update_overall_limiter/3
+        , delete_overall_limiter/1
         ]).
 
 -record(limiter, {
@@ -154,14 +155,18 @@ is_message_limiter(conn_messages_routing) -> true;
 is_message_limiter(overall_messages_routing) -> true;
 is_message_limiter(_) -> false.
 
-update_overall_limiter(Zone, Name, Capacity, Interval) ->
+update_overall_limiter(Zone, Capacity, Interval) ->
-    case is_overall_limiter(Name) of
+    try
-        false -> false;
+        esockd_limiter:update({Zone, overall_messages_routing}, Capacity, Interval),
-        _ ->
+        true
-            try
+    catch _:_ ->
-                esockd_limiter:update({Zone, Name}, Capacity, Interval),
+        false
-                true
+    end.
-            catch _:_:_ ->
+
-                    false
+delete_overall_limiter(Zone) ->
-            end
+    try
+        esockd_limiter:delete({Zone, overall_messages_routing}),
+        true
+    catch _:_ ->
+        false
     end.

src/emqx_listeners.erl

@@ -29,6 +29,7 @@
 -export([ start_listener/1
         , start_listener/3
         , stop_listener/1
+        , update_listeners_env/2
         , restart_listener/1
         , restart_listener/3
         ]).
@@ -187,6 +188,20 @@ with_port(Port, Opts = #{socket_opts := SocketOption}) when is_integer(Port) ->
 with_port({Addr, Port}, Opts = #{socket_opts := SocketOption}) ->
     Opts#{socket_opts => [{ip, Addr}, {port, Port}| SocketOption]}.
 
+update_listeners_env(Action, NewConf = #{name := NewName, proto := NewProto}) ->
+    Listener = emqx:get_env(listeners, []),
+    Listener1 = lists:filter(
+        fun(#{name := Name, proto := Proto}) ->
+            not (Name =:= NewName andalso Proto =:= NewProto)
+        end, Listener),
+    Listener2 =
+        case Action of
+            update -> [NewConf | Listener1];
+            delete -> Listener1
+        end,
+    application:set_env(emqx, listeners, Listener2),
+    ok.
+
 %% @doc Restart all listeners
 -spec(restart() -> ok).
 restart() ->

src/emqx_shared_sub.erl

@@ -47,7 +47,7 @@
         ]).
 
 %% for testing
--export([subscribers/2]).
+-export([subscribers/2, ack_enabled/0]).
 
 %% gen_server callbacks
 -export([ init/1

test/emqx_frame_SUITE.erl

@@ -162,6 +162,14 @@ t_parse_malformed_utf8_string(_) ->
     ParseState = emqx_frame:initial_parse_state(#{strict_mode => true}),
     ?catch_error(utf8_string_invalid, emqx_frame:parse(MalformedPacket, ParseState)).
 
+t_parse_empty_topic_name(_) ->
+    Packet = <<48, 4, 0, 0, 0, 1>>,
+    NormalState = emqx_frame:initial_parse_state(#{strict_mode => false}),
+    ?assertMatch({_, _}, emqx_frame:parse(Packet, NormalState)),
+
+    StrictState = emqx_frame:initial_parse_state(#{strict_mode => true}),
+    ?catch_error(empty_topic_name, emqx_frame:parse(Packet, StrictState)).
+
 t_parse_frame_proxy_protocol(_) ->
     BinList = [ <<"PROXY TCP4 ">>, <<"PROXY TCP6 ">>, <<"PROXY UNKNOWN">>
               , <<"\r\n\r\n\0\r\nQUIT\n">>],