Include files/text from YF Send in admin console, fix email config

benbusby · benbusby · commit 502bf34c2316 · 2025-02-04T11:57:53.000-07:00
diff --git a/backend/db/expiry.go b/backend/db/expiry.go
@@ -11,14 +11,12 @@ type FileExpiry struct {
 	Date      time.Time
 }
 
-func SetFileExpiry(id string, downloads int, date time.Time) {
+func SetFileExpiry(id string, downloads int, date time.Time) error {
 	s := `INSERT INTO expiry
 	      (id, downloads, date)
 	      VALUES ($1, $2, $3)`
 	_, err := db.Exec(s, id, downloads, date)
-	if err != nil {
-		panic(err)
-	}
+	return err
 }
 
 func DecrementDownloads(id string) int {
diff --git a/backend/db/metadata.go b/backend/db/metadata.go
@@ -29,9 +29,9 @@ type FileMetadata struct {
 
 // InsertMetadata creates a new metadata entry in the db and returns a unique ID for
 // that entry.
-func InsertMetadata(chunks int, name string, plaintext bool) (string, error) {
+func InsertMetadata(chunks int, ownerID, name string, textOnly bool) (string, error) {
 	prefix := constants.FileIDPrefix
-	if plaintext {
+	if textOnly {
 		prefix = constants.PlaintextIDPrefix
 	}
 
@@ -43,9 +43,9 @@ func InsertMetadata(chunks int, name string, plaintext bool) (string, error) {
 	}
 
 	s := `INSERT INTO metadata
-	      (id, chunks, filename, b2_id, length)
-	      VALUES ($1, $2, $3, $4, $5)`
-	_, err := db.Exec(s, id, chunks, name, "", -1)
+	      (id, chunks, filename, b2_id, length, owner_id, modified)
+	      VALUES ($1, $2, $3, $4, $5, $6, $7)`
+	_, err := db.Exec(s, id, chunks, name, "", -1, ownerID, time.Now().UTC())
 	if err != nil {
 		panic(err)
 	}
@@ -70,7 +70,7 @@ func MetadataIDExists(id string) bool {
 }
 
 func RetrieveMetadata(id string) (FileMetadata, error) {
-	s := `SELECT m.*, e.downloads, e.date
+	s := `SELECT m.id, m.chunks, m.filename, m.b2_id, m.length, e.downloads, e.date
 	      FROM metadata m
 	      JOIN expiry e on m.id = e.id
 	      WHERE m.id = $1`
@@ -146,3 +146,65 @@ func DeleteMetadata(id string) bool {
 
 	return true
 }
+
+func AdminRetrieveSendMetadata(fileID string) (shared.AdminFileInfoResponse, error) {
+	var (
+		id       string
+		name     string
+		length   int64
+		ownerID  string
+		modified time.Time
+	)
+
+	s := `SELECT id, filename, length, owner_id, modified FROM metadata WHERE id=$1`
+	err := db.QueryRow(s, fileID).Scan(&id, &name, &length, &ownerID, &modified)
+	return shared.AdminFileInfoResponse{
+		ID:         id,
+		BucketName: name,
+		Size:       shared.ReadableFileSize(length),
+		OwnerID:    ownerID,
+		Modified:   modified,
+
+		RawSize: length,
+	}, err
+}
+
+func AdminFetchSentFiles(userID string) ([]shared.AdminFileInfoResponse, error) {
+	result := []shared.AdminFileInfoResponse{}
+
+	s := `SELECT id, filename, length, owner_id, modified
+	      FROM metadata
+	      WHERE owner_id=$1`
+
+	rows, err := db.Query(s, userID)
+	if err != nil {
+		return result, err
+	}
+
+	defer rows.Close()
+	for rows.Next() {
+		var (
+			id       string
+			filename string
+			length   int64
+			ownerID  string
+			modified time.Time
+		)
+
+		err = rows.Scan(&id, &filename, &length, &ownerID, &modified)
+		if err != nil {
+			return result, err
+		}
+
+		result = append(result, shared.AdminFileInfoResponse{
+			ID:         id,
+			BucketName: filename,
+			Size:       shared.ReadableFileSize(length),
+			OwnerID:    ownerID,
+			Modified:   modified,
+			RawSize:    length,
+		})
+	}
+
+	return result, nil
+}
diff --git a/backend/db/scripts/migrations/4_send_metadata.sql b/backend/db/scripts/migrations/4_send_metadata.sql
@@ -0,0 +1,5 @@
+ALTER TABLE metadata ADD COLUMN owner_id text DEFAULT '';
+UPDATE metadata SET owner_id = '';
+
+ALTER TABLE metadata ADD COLUMN modified TIMESTAMP DEFAULT now();
+UPDATE metadata SET modified = now();
diff --git a/backend/db/vault.go b/backend/db/vault.go
@@ -357,7 +357,8 @@ func AdminDeleteFile(id string) error {
 	return err
 }
 
-func AdminFetchFiles(userID string) ([]shared.AdminFileInfoResponse, error) {
+// AdminFetchVaultFiles fetches all files for a specific user
+func AdminFetchVaultFiles(userID string) ([]shared.AdminFileInfoResponse, error) {
 	response := []shared.AdminFileInfoResponse{}
 
 	s := `SELECT id, name, length, owner_id, modified FROM vault WHERE owner_id=$1`
diff --git a/backend/server/admin/file_actions.go b/backend/server/admin/file_actions.go
@@ -0,0 +1,50 @@
+package admin
+
+import (
+	"database/sql"
+	"log"
+	"yeetfile/backend/db"
+	"yeetfile/shared"
+)
+
+func deleteFile(fileID string) error {
+	metadata, err := db.AdminRetrieveMetadata(fileID)
+	if err == nil {
+		// Delete vault file
+		err = db.AdminDeleteFile(fileID)
+		if err != nil {
+			log.Printf("Error deleting file: %v\n", err)
+			return err
+		}
+
+		_ = db.UpdateStorageUsed(metadata.OwnerID, -metadata.RawSize)
+	} else {
+		// Attempt to delete Send file instead
+		metadata, err := db.RetrieveMetadata(fileID)
+		if err != nil {
+			return err
+		}
+
+		db.DeleteFileByMetadata(metadata)
+	}
+
+	return nil
+}
+
+func fetchFileMetadata(fileID string) (shared.AdminFileInfoResponse, error) {
+	fileInfo, err := db.AdminRetrieveMetadata(fileID)
+	if err != nil && err != sql.ErrNoRows {
+		return shared.AdminFileInfoResponse{}, err
+	} else if err == nil {
+		return fileInfo, nil
+	}
+
+	sendFileInfo, err := db.AdminRetrieveSendMetadata(fileID)
+	if err != nil && err != sql.ErrNoRows {
+		return shared.AdminFileInfoResponse{}, err
+	} else if err == nil {
+		return sendFileInfo, nil
+	}
+
+	return shared.AdminFileInfoResponse{}, err
+}
diff --git a/backend/server/admin/handlers.go b/backend/server/admin/handlers.go
@@ -6,7 +6,6 @@ import (
 	"log"
 	"net/http"
 	"strings"
-	"yeetfile/backend/db"
 	"yeetfile/shared"
 )
 
@@ -40,11 +39,7 @@ func UserActionHandler(w http.ResponseWriter, req *http.Request, id string) {
 			return
 		}
 
-		files, err := db.AdminFetchFiles(userID)
-		if err != nil {
-			log.Printf("Error fetching user files: %v\n", err)
-		}
-
+		files := fetchAllFiles(userID)
 		userResponse := shared.AdminUserInfoResponse{
 			ID:          user.ID,
 			Email:       user.Email,
@@ -64,31 +59,19 @@ func FileActionHandler(w http.ResponseWriter, req *http.Request, _ string) {
 
 	switch req.Method {
 	case http.MethodDelete:
-		metadata, err := db.AdminRetrieveMetadata(fileID)
-		if err != nil {
-			log.Printf("Error fetching file: %v\n", err)
-			http.Error(w, "Failed to fetch file", http.StatusInternalServerError)
-			return
-		}
-
-		err = db.AdminDeleteFile(fileID)
+		err := deleteFile(fileID)
 		if err != nil {
-			log.Printf("Error deleting file: %v\n", err)
-			http.Error(w, "Failed to delete file", http.StatusInternalServerError)
+			http.Error(w, "Error deleting file", http.StatusInternalServerError)
 			return
 		}
-
-		_ = db.UpdateStorageUsed(metadata.OwnerID, -metadata.RawSize)
 	case http.MethodGet:
-		fileInfo, err := db.AdminRetrieveMetadata(fileID)
-		if err != nil {
-			log.Printf("Error fetching file: %v\n", err)
-			if err == sql.ErrNoRows {
-				http.Error(w, "No match found", http.StatusNotFound)
-				return
-			}
-
-			http.Error(w, "Failed to fetch file info", http.StatusInternalServerError)
+		fileInfo, err := fetchFileMetadata(fileID)
+		if err == sql.ErrNoRows {
+			http.Error(w, "No match found", http.StatusNotFound)
+			return
+		} else if err != nil {
+			log.Printf("Error fetching file metadata: %v\n", err)
+			http.Error(w, "Error fetching file metadata", http.StatusInternalServerError)
 			return
 		}
 
diff --git a/backend/server/admin/user_actions.go b/backend/server/admin/user_actions.go
@@ -1,6 +1,7 @@
 package admin
 
 import (
+	"log"
 	"strings"
 	"yeetfile/backend/db"
 	"yeetfile/backend/server/auth"
@@ -11,6 +12,28 @@ func deleteUser(userID string) error {
 	return auth.DeleteUser(userID, shared.DeleteAccount{Identifier: userID})
 }
 
+func fetchAllFiles(userID string) []shared.AdminFileInfoResponse {
+	if strings.Contains(userID, "@") {
+		userID, _ = db.GetUserIDByEmail(userID)
+	}
+
+	files := []shared.AdminFileInfoResponse{}
+	vaultFiles, err := db.AdminFetchVaultFiles(userID)
+	if err != nil {
+		log.Printf("Error fetching user files: %v\n", err)
+	}
+
+	files = append(files, vaultFiles...)
+
+	sendFiles, err := db.AdminFetchSentFiles(userID)
+	if err != nil {
+		log.Printf("Error fetching user send files: %v\n", err)
+	}
+
+	files = append(files, sendFiles...)
+	return files
+}
+
 func getUserInfo(userID string) (db.User, error) {
 	var err error
 	if strings.Contains(userID, "@") {
diff --git a/backend/server/auth/auth.go b/backend/server/auth/auth.go
@@ -125,7 +125,7 @@ func IsInstanceAdmin(currentUserID string) bool {
 	adminID := config.InstanceAdmin
 	if len(adminID) > 0 {
 		if strings.Contains(adminID, "@") {
-			adminID, _ = db.GetUserIDByEmail(currentUserID)
+			adminID, _ = db.GetUserIDByEmail(adminID)
 		}
 
 		return adminID == currentUserID
diff --git a/backend/server/transfer/send/handlers.go b/backend/server/transfer/send/handlers.go
@@ -20,7 +20,7 @@ import (
 
 // UploadMetadataHandler handles a POST request to /u with the metadata required to set
 // up a file for uploading. This is defined in the UploadMetadata struct.
-func UploadMetadataHandler(w http.ResponseWriter, req *http.Request, _ string) {
+func UploadMetadataHandler(w http.ResponseWriter, req *http.Request, userID string) {
 	var meta shared.UploadMetadata
 	data, _ := utils.LimitedReader(w, req.Body)
 	err := json.Unmarshal(data, &meta)
@@ -48,11 +48,16 @@ func UploadMetadataHandler(w http.ResponseWriter, req *http.Request, _ string) {
 		return
 	}
 
-	id, _ := db.InsertMetadata(meta.Chunks, meta.Name, false)
+	id, _ := db.InsertMetadata(meta.Chunks, userID, meta.Name, false)
 	b2Upload := db.CreateNewUpload(id, meta.Name)
 
 	exp := utils.StrToDuration(meta.Expiration, config.IsDebugMode)
-	db.SetFileExpiry(id, meta.Downloads, time.Now().Add(exp).UTC())
+	err = db.SetFileExpiry(id, meta.Downloads, time.Now().Add(exp).UTC())
+	if err != nil {
+		log.Printf("Error setting file expiry: %v\n", err)
+		http.Error(w, "Server error", http.StatusInternalServerError)
+		return
+	}
 
 	var b2Err error
 	if meta.Chunks == 1 {
@@ -143,11 +148,21 @@ func UploadPlaintextHandler(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	id, _ := db.InsertMetadata(1, plaintextUpload.Name, true)
+	id, err := db.InsertMetadata(1, "", plaintextUpload.Name, true)
+	if err != nil {
+		log.Printf("Error inserting new text-only upload metadata: %v\n", err)
+		http.Error(w, "Unable to init metadata", http.StatusInternalServerError)
+		return
+	}
 	b2Upload := db.CreateNewUpload(id, plaintextUpload.Name)
 
 	exp := utils.StrToDuration(plaintextUpload.Expiration, config.IsDebugMode)
-	db.SetFileExpiry(id, plaintextUpload.Downloads, time.Now().Add(exp).UTC())
+	err = db.SetFileExpiry(id, plaintextUpload.Downloads, time.Now().UTC().Add(exp))
+	if err != nil {
+		log.Printf("Error setting file expiry: %v\n", err)
+		http.Error(w, "Server error", http.StatusInternalServerError)
+		return
+	}
 
 	err = transfer.InitB2Upload(b2Upload)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,8 @@ func AdminDeleteFile(id string) error {`
`357`	`357`	`return err`
`358`	`358`	`}`
`359`	`359`
`360`		`-func AdminFetchFiles(userID string) ([]shared.AdminFileInfoResponse, error) {`
	`360`	`+// AdminFetchVaultFiles fetches all files for a specific user`
	`361`	`+func AdminFetchVaultFiles(userID string) ([]shared.AdminFileInfoResponse, error) {`
`361`	`362`	`response := []shared.AdminFileInfoResponse{}`
`362`	`363`
`363`	`364`	s := `SELECT id, name, length, owner_id, modified FROM vault WHERE owner_id=$1`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ func IsInstanceAdmin(currentUserID string) bool {`
`125`	`125`	`adminID := config.InstanceAdmin`
`126`	`126`	`if len(adminID) > 0 {`
`127`	`127`	`if strings.Contains(adminID, "@") {`
`128`		`- adminID, _ = db.GetUserIDByEmail(currentUserID)`
	`128`	`+ adminID, _ = db.GetUserIDByEmail(adminID)`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`return adminID == currentUserID`