π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[server][cli] Typo in Struct Field β PubicMagicMetadata β PublicMagicMetadata
Adnan Omar0b66ea3f8e89
diff --git a/cli/internal/api/file_type.go b/cli/internal/api/file_type.goindex 018db35a64..1d6d76a495 100644--- a/cli/internal/api/file_type.go+++ b/cli/internal/api/file_type.go@@ -13,7 +13,7 @@ type File struct {IsDeleted bool `json:"isDeleted"`UpdationTime int64 `json:"updationTime"`MagicMetadata *MagicMetadata `json:"magicMetadata,omitempty"`- PubicMagicMetadata *MagicMetadata `json:"pubMagicMetadata,omitempty"`+ PublicMagicMetadata *MagicMetadata `json:"pubMagicMetadata,omitempty"`Info *FileInfo `json:"info,omitempty"`}diff --git a/cli/pkg/mapper/photo.go b/cli/pkg/mapper/photo.goindex 76cb8a398b..f730ae228e 100644--- a/cli/pkg/mapper/photo.go+++ b/cli/pkg/mapper/photo.go@@ -117,8 +117,8 @@ func MapApiFileToPhotoFile(ctx context.Context, album model.RemoteAlbum, file apreturn nil, err}}- if file.PubicMagicMetadata != nil {- _, encodedJsonBytes, err := eCrypto.DecryptChaChaBase64(file.PubicMagicMetadata.Data, fileKey, file.PubicMagicMetadata.Header)+ if file.PublicMagicMetadata != nil {+ _, encodedJsonBytes, err := eCrypto.DecryptChaChaBase64(file.PublicMagicMetadata.Data, fileKey, file.PublicMagicMetadata.Header)if err != nil {return nil, fmt.Errorf("failed to decrypt public magic metadata for file %d: %w", file.ID, err)}diff --git a/server/ente/file.go b/server/ente/file.goindex e0b27d09e2..383cd9b1ab 100644--- a/server/ente/file.go+++ b/server/ente/file.go@@ -22,7 +22,7 @@ type File struct {IsDeleted bool `json:"isDeleted"`UpdationTime int64 `json:"updationTime"`MagicMetadata *MagicMetadata `json:"magicMetadata,omitempty"`- PubicMagicMetadata *MagicMetadata `json:"pubMagicMetadata,omitempty"`+ PublicMagicMetadata *MagicMetadata `json:"pubMagicMetadata,omitempty"`Info *FileInfo `json:"info,omitempty"`// Action and ActionUser are optionally set to drive client-side behavior during diffsAction *string `json:"action,omitempty"`@@ -40,7 +40,7 @@ type MetaFile struct {IsDeleted bool `json:"isDeleted"`UpdationTime int64 `json:"updationTime"`MagicMetadata *MagicMetadata `json:"magicMetadata,omitempty"`- PubicMagicMetadata *MagicMetadata `json:"pubMagicMetadata,omitempty"`+ PublicMagicMetadata *MagicMetadata `json:"pubMagicMetadata,omitempty"`}type FileInfo struct {diff --git a/server/pkg/controller/collections/collection_test.go b/server/pkg/controller/collections/collection_test.goindex 2c72e7b52c..515656779d 100644--- a/server/pkg/controller/collections/collection_test.go+++ b/server/pkg/controller/collections/collection_test.go@@ -115,8 +115,8 @@ func TestGetFileForViewer(t *testing.T) {if viewerFile.MagicMetadata != nil || viewerFile.Action != nil || viewerFile.ActionUserID != nil {t.Fatalf("viewer received owner-private file fields: %+v", viewerFile)}- if viewerFile.PubicMagicMetadata == nil || viewerFile.PubicMagicMetadata.Data != "public-file" {- t.Fatalf("viewer public magic metadata = %+v", viewerFile.PubicMagicMetadata)+ if viewerFile.PublicMagicMetadata == nil || viewerFile.PublicMagicMetadata.Data != "public-file" {+ t.Fatalf("viewer public magic metadata = %+v", viewerFile.PublicMagicMetadata)}if viewerFile.EncryptedKey != "collection-file-key" || viewerFile.Metadata.EncryptedData != "encrypted-metadata" {t.Fatalf("viewer shared file fields were not preserved: %+v", viewerFile)diff --git a/server/pkg/controller/collections/files_diff_test.go b/server/pkg/controller/collections/files_diff_test.goindex 8663be842a..0cba0a839f 100644--- a/server/pkg/controller/collections/files_diff_test.go+++ b/server/pkg/controller/collections/files_diff_test.go@@ -104,7 +104,7 @@ func TestFileDiffScrubsDeletedFiles(t *testing.T) {if deleted.EncryptedKey != "" || deleted.KeyDecryptionNonce != "" ||deleted.File != (ente.FileAttributes{}) || deleted.Thumbnail != (ente.FileAttributes{}) ||deleted.Metadata != wantMetadata || deleted.MagicMetadata != nil ||- deleted.PubicMagicMetadata != nil || deleted.Info != nil {+ deleted.PublicMagicMetadata != nil || deleted.Info != nil {t.Fatalf("deleted file contents were returned: %+v", deleted)}assertFileDiffTestWireShape(t, deleted)diff --git a/server/pkg/controller/file_copy/file_copy.go b/server/pkg/controller/file_copy/file_copy.goindex 3220ca3431..8f759f924d 100644--- a/server/pkg/controller/file_copy/file_copy.go+++ b/server/pkg/controller/file_copy/file_copy.go@@ -57,7 +57,7 @@ func (fci fileCopyInternal) newFile(ownedID int64) ente.File {File: newFileAttributes,Thumbnail: newThumbAttributes,Metadata: fci.SourceFile.Metadata,- PubicMagicMetadata: fci.SourceFile.PubicMagicMetadata,+ PublicMagicMetadata: fci.SourceFile.PublicMagicMetadata,UpdationTime: enteTime.Microseconds(),IsDeleted: false,}diff --git a/server/pkg/controller/trash.go b/server/pkg/controller/trash.goindex 15f44e2fd4..3c3a292aae 100644--- a/server/pkg/controller/trash.go+++ b/server/pkg/controller/trash.go@@ -35,7 +35,7 @@ func (t *TrashController) GetDiff(userID int64, sinceTime int64, app ente.App) (for _, trashFile := range trashFilesDiff {if trashFile.IsDeleted {trashFile.File.MagicMetadata = nil- trashFile.File.PubicMagicMetadata = nil+ trashFile.File.PublicMagicMetadata = niltrashFile.File.Metadata = ente.FileAttributes{}trashFile.File.Info = nil}diff --git a/server/pkg/repo/file.go b/server/pkg/repo/file.goindex 0da4bcfa53..f2bb82a1e4 100644--- a/server/pkg/repo/file.go+++ b/server/pkg/repo/file.go@@ -56,7 +56,7 @@ func (repo *FileRepository) Create(VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) RETURNING file_id`,file.OwnerID, app, file.Metadata.EncryptedData, file.File.DecryptionHeader,file.Thumbnail.DecryptionHeader, file.Metadata.DecryptionHeader,- file.MagicMetadata, file.PubicMagicMetadata, file.Info,+ file.MagicMetadata, file.PublicMagicMetadata, file.Info,file.UpdationTime).Scan(&fileID)if err != nil {return file, -1, stacktrace.Propagate(err, "")@@ -143,7 +143,7 @@ func (repo *FileRepository) CreateMetaFile(VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) RETURNING file_id`,metaFile.OwnerID, app, metaFile.Metadata.EncryptedData, "","", metaFile.Metadata.DecryptionHeader,- metaFile.MagicMetadata, metaFile.PubicMagicMetadata, info,+ metaFile.MagicMetadata, metaFile.PublicMagicMetadata, info,metaFile.UpdationTime).Scan(&fileID)if err != nil {return nil, stacktrace.Propagate(err, "")@@ -175,7 +175,7 @@ func (repo *FileRepository) CreateMetaFile(UpdationTime: metaFile.UpdationTime,OwnerID: metaFile.OwnerID,Metadata: metaFile.Metadata,- PubicMagicMetadata: metaFile.PubicMagicMetadata,+ PublicMagicMetadata: metaFile.PublicMagicMetadata,MagicMetadata: metaFile.MagicMetadata,EncryptedKey: metaFile.EncryptedKey,KeyDecryptionNonce: metaFile.KeyDecryptionNonce,@@ -648,7 +648,7 @@ func (repo *FileRepository) GetFileAttributesForCopy(fileIDs []int64) ([]ente.Fidefer rows.Close()for rows.Next() {var file ente.File- err := rows.Scan(&file.ID, &file.OwnerID, &file.File.DecryptionHeader, &file.Thumbnail.DecryptionHeader, &file.Metadata.DecryptionHeader, &file.Metadata.EncryptedData, &file.PubicMagicMetadata)+ err := rows.Scan(&file.ID, &file.OwnerID, &file.File.DecryptionHeader, &file.Thumbnail.DecryptionHeader, &file.Metadata.DecryptionHeader, &file.Metadata.EncryptedData, &file.PublicMagicMetadata)if err != nil {return nil, stacktrace.Propagate(err, "")}@@ -660,7 +660,7 @@ func (repo *FileRepository) GetFileAttributesForCopy(fileIDs []int64) ([]ente.Fifunc (repo *FileRepository) GetFileAttributes(fileID int64) (*ente.File, error) {rows := repo.DB.QueryRow(`SELECT file_id, owner_id, file_decryption_header, thumbnail_decryption_header, metadata_decryption_header, encrypted_metadata, pub_magic_metadata, info FROM files WHERE file_id = $1`, fileID)var file ente.File- err := rows.Scan(&file.ID, &file.OwnerID, &file.File.DecryptionHeader, &file.Thumbnail.DecryptionHeader, &file.Metadata.DecryptionHeader, &file.Metadata.EncryptedData, &file.PubicMagicMetadata, &file.Info)+ err := rows.Scan(&file.ID, &file.OwnerID, &file.File.DecryptionHeader, &file.Thumbnail.DecryptionHeader, &file.Metadata.DecryptionHeader, &file.Metadata.EncryptedData, &file.PublicMagicMetadata, &file.Info)if err != nil {return nil, stacktrace.Propagate(err, "")}@@ -751,7 +751,7 @@ func convertRowsToFiles(rows *sql.Rows) ([]ente.File, error) {&file.EncryptedKey, &file.KeyDecryptionNonce,&file.File.DecryptionHeader, &file.Thumbnail.DecryptionHeader,&file.Metadata.DecryptionHeader,- &file.Metadata.EncryptedData, &file.MagicMetadata, &file.PubicMagicMetadata,+ &file.Metadata.EncryptedData, &file.MagicMetadata, &file.PublicMagicMetadata,&file.Info, &actionUser, &action, &file.IsDeleted, &updationTime, &addedAt)if err != nil {return files, stacktrace.Propagate(err, "")diff --git a/server/pkg/repo/trash.go b/server/pkg/repo/trash.goindex e45c8e9b39..27082c1073 100644--- a/server/pkg/repo/trash.go+++ b/server/pkg/repo/trash.go@@ -497,7 +497,7 @@ func convertRowsToTrash(rows *sql.Rows) ([]ente.Trash, error) {)err := rows.Scan(&trash.File.ID, &trash.File.OwnerID, &trash.File.CollectionID, &trash.File.EncryptedKey, &trash.File.KeyDecryptionNonce,&trash.File.File.DecryptionHeader, &trash.File.Thumbnail.DecryptionHeader, &trash.File.Metadata.DecryptionHeader,- &trash.File.Metadata.EncryptedData, &trash.File.MagicMetadata, &trash.File.PubicMagicMetadata, &trash.File.UpdationTime, &trash.File.Info, &trash.IsDeleted, &trash.IsRestored,+ &trash.File.Metadata.EncryptedData, &trash.File.MagicMetadata, &trash.File.PublicMagicMetadata, &trash.File.UpdationTime, &trash.File.Info, &trash.IsDeleted, &trash.IsRestored,&trash.CreatedAt, &trash.UpdatedAt, &trash.DeleteBy)if err != nil {return trashFiles, stacktrace.Propagate(err, "")