From 3e9b91e53a694843d9f203786acb96d28ae6fc6a Mon Sep 17 00:00:00 2001
From: DDDHuang <44492639+DDDHuang@users.noreply.github.com>
Date: Fri, 8 Apr 2022 14:31:18 +0800
Subject: [PATCH] fix: disable server_name_indication suport

---
 apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src |  2 +-
 .../src/emqx_plugin_libs.appup.src                 |  4 ++--
 apps/emqx_plugin_libs/src/emqx_plugin_libs_ssl.erl | 14 ++++++++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src b/apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src
index f72ffc229..38d0bc324 100644
--- a/apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src
+++ b/apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src
@@ -1,6 +1,6 @@
 {application, emqx_plugin_libs,
  [{description, "EMQ X Plugin utility libs"},
-  {vsn, "4.3.2"},
+  {vsn, "4.3.3"},
   {modules, []},
   {applications, [kernel,stdlib]},
   {env, []}
diff --git a/apps/emqx_plugin_libs/src/emqx_plugin_libs.appup.src b/apps/emqx_plugin_libs/src/emqx_plugin_libs.appup.src
index 62d0ce4f0..cb61d66a8 100644
--- a/apps/emqx_plugin_libs/src/emqx_plugin_libs.appup.src
+++ b/apps/emqx_plugin_libs/src/emqx_plugin_libs.appup.src
@@ -2,13 +2,13 @@
 
 {VSN,
   [
-    {<<"4\\.3\\.[0-1]">>, [
+    {<<"4\\.3\\.[0-2]">>, [
       {load_module, emqx_plugin_libs_ssl, brutal_purge, soft_purge, []}
     ]},
     {<<".*">>, []}
   ],
   [
-    {<<"4\\.3\\.[0-1]">>, [
+    {<<"4\\.3\\.[0-2]">>, [
       {load_module, emqx_plugin_libs_ssl, brutal_purge, soft_purge, []}
     ]},
     {<<".*">>, []}
diff --git a/apps/emqx_plugin_libs/src/emqx_plugin_libs_ssl.erl b/apps/emqx_plugin_libs/src/emqx_plugin_libs_ssl.erl
index 8d5e2daa5..b459e0b69 100644
--- a/apps/emqx_plugin_libs/src/emqx_plugin_libs_ssl.erl
+++ b/apps/emqx_plugin_libs/src/emqx_plugin_libs_ssl.erl
@@ -66,13 +66,23 @@ save_files_return_opts(Options, Dir) ->
                   _ -> verify_peer
              end,
     SNI = case Get(<<"server_name_indication">>) of
+              <<"disable">> -> disable;
+              "disable" -> disable;
+              "" -> undefined;
+              <<>> -> undefined;
               undefined -> undefined;
               SNI0 -> ensure_str(SNI0)
           end,
     Versions = emqx_tls_lib:integral_versions(Get(<<"tls_versions">>)),
     Ciphers = emqx_tls_lib:integral_ciphers(Versions, Get(<<"ciphers">>)),
-    filter([{keyfile, Key}, {certfile, Cert}, {cacertfile, CA},
-            {verify, Verify}, {server_name_indication, SNI}, {versions, Versions}, {ciphers, Ciphers}]).
+    filter([ {keyfile, Key}
+           , {certfile, Cert}
+           , {cacertfile, CA}
+           , {verify, Verify}
+           , {server_name_indication, SNI}
+           , {versions, Versions}
+           , {ciphers, Ciphers}
+           ]).
 
 %% @doc Save a key or certificate file in data dir,
 %% and return path of the saved file.