From 86236431b97134b52d7e0336a2e6b42adb631e3e Mon Sep 17 00:00:00 2001
From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Wed, 4 Jul 2018 08:55:52 +0300
Subject: [PATCH] mod_http_upload: Treat file and network errors differently

---
 src/ejabberd_http.erl   | 48 +++++++++++++++++++++--------------------
 src/mod_http_upload.erl |  8 +++++--
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/src/ejabberd_http.erl b/src/ejabberd_http.erl
index ef1888b12..7ce936d15 100644
--- a/src/ejabberd_http.erl
+++ b/src/ejabberd_http.erl
@@ -598,35 +598,37 @@ recv_file(#request{length = Len, data = Trail,
 		   sockmod = SockMod, socket = Socket}, Path) ->
     case file:open(Path, [write, exclusive, raw]) of
 	{ok, Fd} ->
-	    case file:write(Fd, Trail) of
-		ok ->
-		    NewLen = max(0, Len - byte_size(Trail)),
-		    case do_recv_file(NewLen, SockMod, Socket, Fd) of
-			ok ->
-			    ok;
-			{error, _} = Err ->
-			    file:delete(Path),
-			    Err
-		    end;
-		{error, _} = Err ->
-		    file:delete(Path),
-		    Err
-	    end;
+	    Res = case file:write(Fd, Trail) of
+		      ok ->
+			  NewLen = max(0, Len - byte_size(Trail)),
+			  do_recv_file(NewLen, SockMod, Socket, Fd);
+		      {error, _} = Err ->
+			  Err
+		  end,
+	    file:close(Fd),
+	    case Res of
+		ok -> ok;
+		{error, _} -> file:delete(Path)
+	    end,
+	    Res;
 	{error, _} = Err ->
 	    Err
     end.
 
-do_recv_file(0, _SockMod, _Socket, Fd) ->
-    file:close(Fd);
+do_recv_file(0, _SockMod, _Socket, _Fd) ->
+    ok;
 do_recv_file(Len, SockMod, Socket, Fd) ->
     ChunkLen = min(Len, ?RECV_BUF),
-    try
-	{ok, Data} = SockMod:recv(Socket, ChunkLen, timer:seconds(30)),
-	ok = file:write(Fd, Data),
-	do_recv_file(Len-size(Data), SockMod, Socket, Fd)
-    catch _:{badmatch, {error, _} = Err} ->
-	    file:close(Fd),
-	    Err
+    case SockMod:recv(Socket, ChunkLen, timer:seconds(30)) of
+	{ok, Data} ->
+	    case file:write(Fd, Data) of
+		ok ->
+		    do_recv_file(Len-size(Data), SockMod, Socket, Fd);
+		{error, _} = Err ->
+		    Err
+	    end;
+	{error, _} ->
+	    {error, closed}
     end.
 
 make_headers(State, Status, Reason, Headers, Data) ->
diff --git a/src/mod_http_upload.erl b/src/mod_http_upload.erl
index 55a51af86..bc88db593 100644
--- a/src/mod_http_upload.erl
+++ b/src/mod_http_upload.erl
@@ -390,9 +390,13 @@ process(_LocalPath, #request{method = 'PUT', host = Host, ip = IP,
 		    http_response(201, CustomHeaders);
 		{ok, Headers, OutData} ->
 		    http_response(201, Headers ++ CustomHeaders, OutData);
+		{error, closed} ->
+		    ?DEBUG("Cannot store file ~s from ~s for ~s: connection closed",
+			   [Path, ?ADDR_TO_STR(IP), Host]),
+		    http_response(404);
 		{error, Error} ->
-		    ?INFO_MSG("Cannot store file ~s from ~s for ~s: ~s",
-			      [Path, ?ADDR_TO_STR(IP), Host, format_error(Error)]),
+		    ?ERROR_MSG("Cannot store file ~s from ~s for ~s: ~s",
+			       [Path, ?ADDR_TO_STR(IP), Host, format_error(Error)]),
 		    http_response(500)
 	    end;
 	{error, size_mismatch} ->