From 0f271ac2fbe3b04f4e7fca15354008e1b75ae1e6 Mon Sep 17 00:00:00 2001 From: Evan Reichard Date: Mon, 30 Oct 2023 23:35:37 -0400 Subject: [PATCH] [fix] copy error --- api/app-routes.go | 44 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/api/app-routes.go b/api/app-routes.go index 7ff4bca..6a77cd9 100644 --- a/api/app-routes.go +++ b/api/app-routes.go @@ -4,6 +4,7 @@ import ( "crypto/md5" "database/sql" "fmt" + "io" "mime/multipart" "net/http" "os" @@ -413,6 +414,7 @@ func (api *API) uploadNewDocument(c *gin.Context) { errorPage(c, http.StatusInternalServerError, "Unable to create temp file.") return } + defer os.Remove(tempFile.Name()) defer tempFile.Close() // Save Temp @@ -474,12 +476,19 @@ func (api *API) uploadNewDocument(c *gin.Context) { // Derive & Sanitize File Name fileName = "." + filepath.Clean(fmt.Sprintf("/%s [%s]%s", fileName, partialMD5, fileExtension)) - // Generate Storage Path + // Generate Storage Path & Open File safePath := filepath.Join(api.Config.DataPath, "documents", fileName) + destFile, err := os.Create(safePath) + if err != nil { + log.Error("[uploadNewDocument] Dest File Error:", err) + errorPage(c, http.StatusInternalServerError, "Unable to save file.") + return + } + defer destFile.Close() - // Move File - if err := os.Rename(tempFile.Name(), safePath); err != nil { - log.Error("[uploadNewDocument] Move Temp File Error:", err) + // Copy File + if _, err = io.Copy(destFile, tempFile); err != nil { + log.Error("[uploadNewDocument] Copy Temp File Error:", err) errorPage(c, http.StatusInternalServerError, "Unable to save file.") return } @@ -770,12 +779,29 @@ func (api *API) saveNewDocument(c *gin.Context) { // Derive & Sanitize File Name fileName = "." + filepath.Clean(fmt.Sprintf("/%s [%s]%s", fileName, partialMD5, fileExtension)) - // Generate Storage Path - safePath := filepath.Join(api.Config.DataPath, "documents", fileName) + // Open Source File + sourceFile, err := os.Open(tempFilePath) + if err != nil { + log.Error("[saveNewDocument] Source File Error:", err) + errorPage(c, http.StatusInternalServerError, "Unable to save file.") + return + } + defer os.Remove(tempFilePath) + defer sourceFile.Close() - // Move File - if err := os.Rename(tempFilePath, safePath); err != nil { - log.Warn("[saveNewDocument] Move Temp File Error: ", err) + // Generate Storage Path & Open File + safePath := filepath.Join(api.Config.DataPath, "documents", fileName) + destFile, err := os.Create(safePath) + if err != nil { + log.Error("[saveNewDocument] Dest File Error:", err) + errorPage(c, http.StatusInternalServerError, "Unable to save file.") + return + } + defer destFile.Close() + + // Copy File + if _, err = io.Copy(destFile, sourceFile); err != nil { + log.Error("[saveNewDocument] Copy Temp File Error:", err) errorPage(c, http.StatusInternalServerError, "Unable to save file.") return }