From 7695a6f9d217347b782c9cb32c68599613c04dfe Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Thu, 15 Feb 2024 10:32:17 +0100
Subject: [PATCH] fix(kpro_connection): safer password parse

---
 rebar.config            |  2 +-
 src/kpro_connection.erl | 27 +++++++++++++++++++++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/rebar.config b/rebar.config
index 8ea33de..9813fce 100644
--- a/rebar.config
+++ b/rebar.config
@@ -4,7 +4,7 @@
   [ { test,
       [ {deps,
         [ {snappyer, "1.2.9"},
-          {lz4b, "0.0.8"}
+          {lz4b, "0.0.11"}
         ]}
       ]
     }
diff --git a/src/kpro_connection.erl b/src/kpro_connection.erl
index b8537cd..f48faf1 100644
--- a/src/kpro_connection.erl
+++ b/src/kpro_connection.erl
@@ -42,6 +42,7 @@
              ]).
 
 -include("kpro_private.hrl").
+-include_lib("eunit/include/eunit.hrl").
 
 -define(DEFAULT_CONNECT_TIMEOUT, timer:seconds(5)).
 -define(DEFAULT_REQUEST_TIMEOUT, timer:minutes(4)).
@@ -617,10 +618,18 @@ unwrap_pass(Pass) ->
 %% Second line is the password
 -spec read_sasl_file(file:name_all()) -> {binary(), binary()}.
 read_sasl_file(File) ->
-  {ok, Bin} = file:read_file(File),
-  Lines = binary:split(Bin, <<"\n">>, [global]),
-  [User, Pass] = lists:filter(fun(Line) -> Line =/= <<>> end, Lines),
-  {User, Pass}.
+  case file:read_file(File) of
+    {ok, Bin} ->
+      Lines = binary:split(Bin, <<"\n">>, [global]),
+      case lists:filter(fun(Line) -> Line =/= <<>> end, Lines) of
+        [User, Pass] ->
+          {User, Pass};
+        _ ->
+          erlang:error(#{reason => bad_format, file => File})
+      end;
+    {error, Reason} ->
+      erlang:error(#{reason => Reason, file => File})
+  end.
 
 %% Allow binary() host name.
 host(Host) when is_binary(Host) -> binary_to_list(Host);
@@ -642,6 +651,16 @@ deadline(Timeout) ->
 timeout(Deadline) ->
   erlang:max(0, Deadline - erlang:monotonic_time(millisecond)).
 
+-ifdef(TEST).
+read_sasl_file_test_() ->
+  Read = fun(Path) -> read_sasl_file(Path) end,
+  BadFile = "README.md",
+  [
+     ?_assertError(#{reason := enoent}, Read("nosuchfile")),
+     ?_assertError(#{reason := bad_format}, Read(BadFile))
+  ].
+-endif.
+
 %%%_* Emacs ====================================================================
 %%% Local Variables:
 %%% allout-layout: t