Bläddra i källkod

[server] Fix validation for fileUpdate (#1512)

## Description

## Tests
Neeraj Gupta 1 år sedan
förälder
incheckning
8d5a0317ec
1 ändrade filer med 5 tillägg och 2 borttagningar
  1. 5 2
      server/pkg/controller/file.go

+ 5 - 2
server/pkg/controller/file.go

@@ -64,8 +64,11 @@ func (c *FileController) validateFileCreateOrUpdateReq(userID int64, file ente.F
 	if !strings.HasPrefix(file.File.ObjectKey, objectPathPrefix) || !strings.HasPrefix(file.Thumbnail.ObjectKey, objectPathPrefix) {
 	if !strings.HasPrefix(file.File.ObjectKey, objectPathPrefix) || !strings.HasPrefix(file.Thumbnail.ObjectKey, objectPathPrefix) {
 		return stacktrace.Propagate(ente.ErrBadRequest, "Incorrect object key reported")
 		return stacktrace.Propagate(ente.ErrBadRequest, "Incorrect object key reported")
 	}
 	}
-	if file.EncryptedKey == "" || file.KeyDecryptionNonce == "" {
-		return stacktrace.Propagate(ente.ErrBadRequest, "EncryptedKey and KeyDecryptionNonce are required")
+	// Check for attributes for fileCreation. We don't send key details on update
+	if file.ID == 0 {
+		if file.EncryptedKey == "" || file.KeyDecryptionNonce == "" {
+			return stacktrace.Propagate(ente.ErrBadRequest, "EncryptedKey and KeyDecryptionNonce are required")
+		}
 	}
 	}
 	if file.File.DecryptionHeader == "" || file.Thumbnail.DecryptionHeader == "" {
 	if file.File.DecryptionHeader == "" || file.Thumbnail.DecryptionHeader == "" {
 		return stacktrace.Propagate(ente.ErrBadRequest, "DecryptionHeader for file & thumb is required")
 		return stacktrace.Propagate(ente.ErrBadRequest, "DecryptionHeader for file & thumb is required")