From ad4b70c27e5b0e2fd76c25a54a4577f8dab7f584 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Fri, 29 Apr 2022 13:37:29 +0800
Subject: [PATCH 1/2] fix(auth): mongo field `filter` not required and have
 default value

---
 apps/emqx_authn/src/simple_authn/emqx_authn_mongodb.erl | 4 ++++
 apps/emqx_authz/src/emqx_authz_api_schema.erl           | 4 ++++
 apps/emqx_authz/src/emqx_authz_schema.erl               | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/emqx_authn/src/simple_authn/emqx_authn_mongodb.erl b/apps/emqx_authn/src/simple_authn/emqx_authn_mongodb.erl
index 1faabf75d..f515a12e9 100644
--- a/apps/emqx_authn/src/simple_authn/emqx_authn_mongodb.erl
+++ b/apps/emqx_authn/src/simple_authn/emqx_authn_mongodb.erl
@@ -90,6 +90,10 @@ filter(type) ->
     map();
 filter(desc) ->
     ?DESC(?FUNCTION_NAME);
+filter(required) ->
+    false;
+filter(default) ->
+    #{};
 filter(_) ->
     undefined.
 
diff --git a/apps/emqx_authz/src/emqx_authz_api_schema.erl b/apps/emqx_authz/src/emqx_authz_api_schema.erl
index bed953dbb..ff015cee2 100644
--- a/apps/emqx_authz/src/emqx_authz_api_schema.erl
+++ b/apps/emqx_authz/src/emqx_authz_api_schema.erl
@@ -193,6 +193,10 @@ filter(type) ->
     map();
 filter(desc) ->
     ?DESC(?FUNCTION_NAME);
+filter(required) ->
+    false;
+filter(default) ->
+    #{};
 filter(_) ->
     undefined.
 
diff --git a/apps/emqx_authz/src/emqx_authz_schema.erl b/apps/emqx_authz/src/emqx_authz_schema.erl
index 089afba4d..d5cb86a9f 100644
--- a/apps/emqx_authz/src/emqx_authz_schema.erl
+++ b/apps/emqx_authz/src/emqx_authz_schema.erl
@@ -279,7 +279,8 @@ mongo_common_fields() ->
         }},
         {filter, #{
             type => map(),
-            required => true,
+            required => false,
+            default => #{},
             desc => ?DESC(filter)
         }}
     ].

From 22c25fc7e8ddb4df3dadbc23ed8e6c533c24b6fb Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Fri, 29 Apr 2022 14:05:55 +0800
Subject: [PATCH 2/2] fix(tls_lib): ssl file key list contains atom and bin

---
 apps/emqx/src/emqx_tls_lib.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/emqx/src/emqx_tls_lib.erl b/apps/emqx/src/emqx_tls_lib.erl
index ed37bbb06..27373eb7c 100644
--- a/apps/emqx/src/emqx_tls_lib.erl
+++ b/apps/emqx/src/emqx_tls_lib.erl
@@ -289,7 +289,7 @@ ensure_ssl_files(Dir, SSL, Opts) ->
     RequiredKeys = maps:get(required_keys, Opts, []),
     case ensure_ssl_file_key(SSL, RequiredKeys) of
         ok ->
-            Keys = ?SSL_FILE_OPT_NAMES ++ ?SSL_FILE_OPT_NAMES,
+            Keys = ?SSL_FILE_OPT_NAMES ++ ?SSL_FILE_OPT_NAMES_A,
             ensure_ssl_files(Dir, SSL, Keys, Opts);
         {error, _} = Error ->
             Error