Add 'replace files with equal names'

Improve file uploading

Author: JojiiOfficial

go.mod

@@ -3,7 +3,7 @@ module github.com/DataManager-Go/DataManagerServer
 go 1.14
 
 require (
-	github.com/DataManager-Go/libdatamanager v1.3.7
+	github.com/DataManager-Go/libdatamanager v1.3.8
 	github.com/JojiiOfficial/configService v0.0.0-20200219132202-6e71512e2e28
 	github.com/JojiiOfficial/gaw v1.2.8
 	github.com/JojiiOfficial/shred v1.2.1

go.sum

@@ -1,7 +1,7 @@
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/DataManager-Go/libdatamanager v1.3.7 h1:EzS4jlomalvEE8nNZFLFEdUuwZCm1GmlhhY7l0FupQ4=
-github.com/DataManager-Go/libdatamanager v1.3.7/go.mod h1:DjxzXo2LkUjUWk6ihkRpdnGkm3jmKC31oNO0KqmgrTc=
+github.com/DataManager-Go/libdatamanager v1.3.8 h1:cWMnJqX+4JISVKBobINbbAvSVmEpn78qj96zRVc4KwA=
+github.com/DataManager-Go/libdatamanager v1.3.8/go.mod h1:DjxzXo2LkUjUWk6ihkRpdnGkm3jmKC31oNO0KqmgrTc=
 github.com/JojiiOfficial/configService v0.0.0-20200219132202-6e71512e2e28 h1:nYoIExG+Z/gSLS9Jbpu6lnrh+m6e9gTxQfGhanTsExE=
 github.com/JojiiOfficial/configService v0.0.0-20200219132202-6e71512e2e28/go.mod h1:j1kHFoYWAbLRPE5nyAAtODwUc0xwd2+ifPZ3uCAgv/g=
 github.com/JojiiOfficial/gaw v1.2.8 h1:crLd2hrRvTlCClZDtwqnr8AoVKs3uQAk8B2AdOfUCsg=

handlers/FileHandler.go

@@ -1,246 +1,20 @@
 package handlers
 
 import (
-	"database/sql"
-	"encoding/base64"
-	"encoding/json"
 	"io"
 	"net/http"
 	"os"
 	"strconv"
-	"strings"
 
 	"github.com/DataManager-Go/DataManagerServer/handlers/web"
 	"github.com/DataManager-Go/DataManagerServer/models"
 	libdm "github.com/DataManager-Go/libdatamanager"
 	"github.com/JojiiOfficial/gaw"
-	"github.com/gabriel-vasile/mimetype"
 	"github.com/gorilla/mux"
 	"github.com/h2non/filetype"
-	log "github.com/sirupsen/logrus"
 	"gorm.io/gorm"
 )
 
-//UploadfileHandler handler for uploading files
-func UploadfileHandler(handlerData web.HandlerData, w http.ResponseWriter, r *http.Request) error {
-	var request libdm.UploadRequestStruct
-
-	// Get data from header
-	requestData := r.Header.Get(libdm.HeaderRequest)
-	if len(requestData) == 0 {
-		return RErrBadRequest
-	}
-
-	// Decode header base64
-	rBaseBytes, err := base64.StdEncoding.DecodeString(requestData)
-	if err != nil {
-		return RErrBadRequest
-	}
-
-	// Parse json from request header
-	err = json.Unmarshal(rBaseBytes, &request)
-	if err != nil {
-		return RErrBadRequest
-	}
-
-	// Check requested encryption type
-	if len(request.Encryption) > 0 && !libdm.IsValidCipher(request.Encryption) {
-		return RErrNotSupported.Prepend("Encryption")
-	}
-
-	// Validating request, for desired upload Type
-	switch request.UploadType {
-	case libdm.FileUploadType:
-		{
-			// Check if user is allowed to upload files
-			if !handlerData.User.CanUploadFiles() {
-				return RErrNotAllowed.Append("to upload files")
-			}
-		}
-	case libdm.URLUploadType:
-		{
-			// Check if user is allowed to upload URLs
-			if !handlerData.User.AllowedToUploadURLs() {
-				return RErrNotAllowed.Append("to upload URLs")
-			}
-
-			// Check if url is set and valid
-			if len(request.URL) == 0 || !isValidHTTPURL(request.URL) {
-				return RErrMissing.Append("or malformed URL")
-			}
-		}
-	default:
-		{
-			// Send error if UploadType was not found
-			return RErrInvalid.Append("upload type")
-		}
-	}
-
-	var namespace *models.Namespace
-	var file *models.File
-	var replaceMode bool
-
-	if request.ReplaceFile > 0 {
-		replaceMode = true
-
-		// Find file
-		file, err = models.FindFile(handlerData.Db, request.ReplaceFile, handlerData.User.ID)
-		if err != nil || file == nil || file.Namespace == nil {
-			return RErrNotFound.Prepend("File")
-		}
-
-		// Use new name if set
-		if len(request.Name) > 0 {
-			file.Name = request.Name
-		}
-
-		// Select namespace
-		if len(request.Attributes.Namespace) > 0 {
-			// Find namespace specified by client
-			namespace = models.FindNamespace(handlerData.Db, request.Attributes.Namespace, handlerData.User)
-			file.Namespace = namespace
-		} else {
-			namespace = file.Namespace
-		}
-	} else {
-		if len(request.Name) == 0 {
-			request.Name = gaw.RandString(25)
-		}
-
-		// Select namespace
-		namespace = models.FindNamespace(handlerData.Db, request.Attributes.Namespace, handlerData.User)
-
-		// Generate file
-		file = &models.File{
-			Namespace: namespace,
-			Name:      request.Name,
-		}
-
-		// Pick a random, not already used name for file
-		if !file.SetUniqueFilename(handlerData.Db) {
-			sendServerError(w)
-			return nil
-		}
-	}
-
-	// Check if namespace is valid and user has access to it
-	if !handleNamespaceErorrs(namespace, handlerData.User, w) {
-		return nil
-	}
-
-	// Set Tags, Groups and encryption
-	if len(request.Attributes.Tags) > 0 {
-		file.Tags = models.TagsFromStringArr(request.Attributes.Tags, *namespace, handlerData.User)
-	}
-	if len(request.Attributes.Groups) > 0 {
-		file.Groups = models.GroupsFromStringArr(request.Attributes.Groups, *namespace, handlerData.User)
-	}
-	file.SetEncryption(request.Encryption)
-
-	if request.Public {
-		// Determine public name
-		publicName := request.PublicName
-		if len(publicName) == 0 {
-			publicName = gaw.RandString(25)
-		}
-
-		// Set file public name
-		file.PublicFilename = sql.NullString{
-			String: publicName,
-			Valid:  true,
-		}
-		file.IsPublic = true
-
-		// Check if public name already exists
-		_, found, _ := models.GetPublicFile(handlerData.Db, publicName)
-		if found {
-			return RErrAlreadyExists.Prepend("public name")
-		}
-	}
-
-	// Create local file
-	localFile := handlerData.Config.GetStorageFile(file.LocalName)
-	f, err := os.Create(localFile)
-	if err != nil {
-		return err
-	}
-
-	// Read from the desired source (file/url)
-	switch request.UploadType {
-	case libdm.FileUploadType:
-		{
-			// Read requestd file
-			size, checksum, err := readMultipartToFile(f, r.Body, w)
-
-			// Close file and log error only
-			LogError(f.Close())
-
-			// success is false if the calculated
-			// and provided hash are not equal
-			if err != nil {
-				// Only shredder file if not in replace mode
-				if request.ReplaceFile == 0 {
-					go models.ShredderFile(localFile, -1)
-				}
-
-				// If error is a timeout error, send timeout error and close connectio
-				if err == http.ErrHandlerTimeout {
-					err = RErrTimeout
-				}
-
-				return err
-			}
-
-			file.FileSize = size
-			file.Checksum = checksum
-		}
-	case libdm.URLUploadType:
-		{
-			// Read from HTTP request
-			status, err := downloadHTTP(handlerData.User, request.URL, f, file)
-			if err != nil {
-				return RErrBadRequest.Prepend(err.Error())
-			}
-
-			// Check statuscode
-			if status > 299 || status < 200 {
-				return NewRequestError("Non HTTP OK response: "+strconv.Itoa(status), http.StatusBadRequest)
-			}
-		}
-	}
-
-	// Detect mime type
-	mime, err := mimetype.DetectFile(handlerData.Config.GetStorageFile(file.LocalName))
-	if err != nil {
-		log.Info("Can't detect mime: ", err.Error())
-	} else {
-		file.FileType = strings.Split(mime.String(), ";")[0]
-	}
-
-	if replaceMode {
-		// Update file
-		err = file.Save(handlerData.Db)
-	} else {
-		// Insert file to DB
-		err = file.Insert(handlerData.Db, handlerData.User)
-	}
-
-	if err != nil {
-		return err
-	}
-
-	sendResponse(w, libdm.ResponseSuccess, "", libdm.UploadResponse{
-		FileID:         file.ID,
-		Filename:       file.Name,
-		PublicFilename: file.PublicFilename.String,
-		Checksum:       file.Checksum,
-		FileSize:       file.FileSize,
-		Namespace:      namespace.Name,
-	})
-
-	return nil
-}
-
 // ListFilesHandler handler for listing files
 func ListFilesHandler(handlerData web.HandlerData, w http.ResponseWriter, r *http.Request) error {
 	var request libdm.FileListRequest