From 83cc3ffeb0a570f2a8fd101f9501fad6c7e0415f Mon Sep 17 00:00:00 2001
From: firest <enlanubo@gmail.com>
Date: Fri, 12 Jul 2024 13:58:14 +0800
Subject: [PATCH] fix(banned): let the bootfile of banned be optional

---
 apps/emqx/src/emqx_banned.erl | 6 ++++--
 apps/emqx/src/emqx_schema.erl | 4 +---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/emqx/src/emqx_banned.erl b/apps/emqx/src/emqx_banned.erl
index 5e3545b93..4d7a37869 100644
--- a/apps/emqx/src/emqx_banned.erl
+++ b/apps/emqx/src/emqx_banned.erl
@@ -240,7 +240,7 @@ who(peerhost_net, CIDR) when is_binary(CIDR) ->
 %%--------------------------------------------------------------------
 %% Import From CSV
 %%--------------------------------------------------------------------
-init_from_csv(<<>>) ->
+init_from_csv(undefined) ->
     ok;
 init_from_csv(File) ->
     maybe
@@ -365,7 +365,9 @@ init([]) ->
     {ok, ensure_expiry_timer(#{expiry_timer => undefined}), {continue, init_from_csv}}.
 
 handle_continue(init_from_csv, State) ->
-    File = emqx_schema:naive_env_interpolation(emqx:get_config([banned, bootstrap_file], <<>>)),
+    File = emqx_schema:naive_env_interpolation(
+        emqx:get_config([banned, bootstrap_file], undefined)
+    ),
     _ = init_from_csv(File),
     {noreply, State}.
 
diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index 379696c05..0204b7de4 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -1777,7 +1777,7 @@ fields("banned") ->
                 binary(),
                 #{
                     desc => ?DESC("banned_bootstrap_file"),
-                    default => <<>>
+                    require => false
                 }
             )}
     ].
@@ -3355,8 +3355,6 @@ default_listener(SSLListener) ->
 %% otherwise always return string.
 naive_env_interpolation(undefined) ->
     undefined;
-naive_env_interpolation(<<>>) ->
-    <<>>;
 naive_env_interpolation(Bin) when is_binary(Bin) ->
     naive_env_interpolation(unicode:characters_to_list(Bin, utf8));
 naive_env_interpolation("$" ++ Maybe = Original) ->