From 3c1254d873089a89271c639eaf4ce48924eb748b Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Fri, 17 Mar 2023 14:31:43 +0800
Subject: [PATCH] fix: newly created listeners have no limiter restrictions

---
 .../src/emqx_limiter/src/emqx_limiter.app.src |  2 +-
 .../emqx_limiter/src/emqx_limiter_schema.erl  | 30 ++++++++++++++-----
 apps/emqx/src/emqx_schema.erl                 |  5 +---
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/apps/emqx/src/emqx_limiter/src/emqx_limiter.app.src b/apps/emqx/src/emqx_limiter/src/emqx_limiter.app.src
index 69c1c6fb0..4d3dee84e 100644
--- a/apps/emqx/src/emqx_limiter/src/emqx_limiter.app.src
+++ b/apps/emqx/src/emqx_limiter/src/emqx_limiter.app.src
@@ -2,7 +2,7 @@
 {application, emqx_limiter, [
     {description, "EMQX Hierarchical Limiter"},
     % strict semver, bump manually!
-    {vsn, "1.0.0"},
+    {vsn, "1.0.1"},
     {modules, []},
     {registered, [emqx_limiter_sup]},
     {applications, [kernel, stdlib, emqx]},
diff --git a/apps/emqx/src/emqx_limiter/src/emqx_limiter_schema.erl b/apps/emqx/src/emqx_limiter/src/emqx_limiter_schema.erl
index ddfc55f7a..f45fc55b6 100644
--- a/apps/emqx/src/emqx_limiter/src/emqx_limiter_schema.erl
+++ b/apps/emqx/src/emqx_limiter/src/emqx_limiter_schema.erl
@@ -35,6 +35,12 @@
 ]).
 
 -define(KILOBYTE, 1024).
+-define(BUCKET_KEYS, [
+    {bytes_in, bucket_infinity},
+    {message_in, bucket_infinity},
+    {connection, bucket_limit},
+    {message_routing, bucket_infinity}
+]).
 
 -type limiter_type() ::
     bytes_in
@@ -126,12 +132,18 @@ fields(client_fields) ->
             })}
      || Type <- types()
     ];
-fields(bucket_opts) ->
+fields(bucket_infinity) ->
     [
         {rate, ?HOCON(rate(), #{desc => ?DESC(rate), default => <<"infinity">>})},
         {capacity, ?HOCON(capacity(), #{desc => ?DESC(capacity), default => <<"infinity">>})},
         {initial, ?HOCON(initial(), #{default => <<"0">>, desc => ?DESC(initial)})}
     ];
+fields(bucket_limit) ->
+    [
+        {rate, ?HOCON(rate(), #{desc => ?DESC(rate), default => <<"1000/s">>})},
+        {capacity, ?HOCON(capacity(), #{desc => ?DESC(capacity), default => <<"1000">>})},
+        {initial, ?HOCON(initial(), #{default => <<"0">>, desc => ?DESC(initial)})}
+    ];
 fields(client_opts) ->
     [
         {rate, ?HOCON(rate(), #{default => <<"infinity">>, desc => ?DESC(rate)})},
@@ -179,9 +191,9 @@ fields(client_opts) ->
             )}
     ];
 fields(listener_fields) ->
-    bucket_fields([bytes_in, message_in, connection, message_routing], listener_client_fields);
+    bucket_fields(?BUCKET_KEYS, listener_client_fields);
 fields(listener_client_fields) ->
-    client_fields([bytes_in, message_in, connection, message_routing]);
+    client_fields(?BUCKET_KEYS);
 fields(Type) ->
     bucket_field(Type).
 
@@ -189,8 +201,10 @@ desc(limiter) ->
     "Settings for the rate limiter.";
 desc(node_opts) ->
     "Settings for the limiter of the node level.";
-desc(bucket_opts) ->
+desc(bucket_infinity) ->
     "Settings for the bucket.";
+desc(bucket_limit) ->
+    desc(bucket_infinity);
 desc(client_opts) ->
     "Settings for the client in bucket level.";
 desc(client_fields) ->
@@ -337,7 +351,7 @@ apply_unit("gb", Val) -> Val * ?KILOBYTE * ?KILOBYTE * ?KILOBYTE;
 apply_unit(Unit, _) -> throw("invalid unit:" ++ Unit).
 
 bucket_field(Type) when is_atom(Type) ->
-    fields(bucket_opts) ++
+    fields(bucket_infinity) ++
         [
             {client,
                 ?HOCON(
@@ -351,11 +365,11 @@ bucket_field(Type) when is_atom(Type) ->
 bucket_fields(Types, ClientRef) ->
     [
         {Type,
-            ?HOCON(?R_REF(?MODULE, bucket_opts), #{
+            ?HOCON(?R_REF(?MODULE, Opts), #{
                 desc => ?DESC(?MODULE, Type),
                 required => false
             })}
-     || Type <- Types
+     || {Type, Opts} <- Types
     ] ++
         [
             {client,
@@ -375,5 +389,5 @@ client_fields(Types) ->
                 desc => ?DESC(Type),
                 required => false
             })}
-     || Type <- Types
+     || {Type, _} <- Types
     ].
diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index 275a9592e..b18534a42 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -1903,10 +1903,7 @@ base_listener(Bind) ->
                     listener_fields
                 ),
                 #{
-                    desc => ?DESC(base_listener_limiter),
-                    default => #{
-                        <<"connection">> => #{<<"rate">> => <<"1000/s">>, <<"capacity">> => 1000}
-                    }
+                    desc => ?DESC(base_listener_limiter)
                 }
             )},
         {"enable_authn",