From da1fb032a77b029243b6030e4cb456da1f867f13 Mon Sep 17 00:00:00 2001 From: Marc Ole Bulling Date: Wed, 29 May 2024 13:04:06 +0200 Subject: [PATCH] Dont display unexpected EOF error when user stops upload/download --- internal/storage/FileServing.go | 3 ++- internal/webserver/Webserver.go | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/storage/FileServing.go b/internal/storage/FileServing.go index c8d8562..d056cf9 100644 --- a/internal/storage/FileServing.go +++ b/internal/storage/FileServing.go @@ -428,7 +428,8 @@ func generateHashAndEncrypt(fileContent io.Reader, fileHeader *multipart.FileHea if isEncryptionRequested() { tempFileEnc, err := os.CreateTemp(configuration.Get().DataDir, "upload") helper.Check(err) - encryption.Encrypt(&encInfo, tempFile, tempFileEnc) + err = encryption.Encrypt(&encInfo, tempFile, tempFileEnc) + helper.Check(err) err = os.Remove(tempFile.Name()) helper.Check(err) hash.Write([]byte(configuration.Get().Authentication.SaltFiles)) diff --git a/internal/webserver/Webserver.go b/internal/webserver/Webserver.go index 8ac94b8..0bc839e 100644 --- a/internal/webserver/Webserver.go +++ b/internal/webserver/Webserver.go @@ -677,7 +677,9 @@ func responseError(w http.ResponseWriter, err error) { if err != nil { w.WriteHeader(http.StatusBadRequest) _, _ = io.WriteString(w, "{\"Result\":\"error\",\"ErrorMessage\":\""+err.Error()+"\"}") - log.Println(err) + if !errors.Is(err, io.ErrUnexpectedEOF) { + log.Println(err) + } } }