Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Store app provenance for new files

Neeraj Gupta9bba0e4aa068
diff --git a/server/migrations/145_file_app_provenance.down.sql b/server/migrations/145_file_app_provenance.down.sql
new file mode 100644
index 0000000000..f3eb7b8031
--- /dev/null
+++ b/server/migrations/145_file_app_provenance.down.sql
@@ -0,0 +1,6 @@
+ALTER TABLE usage
+ DROP COLUMN file_app_ready;
+
+ALTER TABLE files
+ DROP CONSTRAINT files_app_supported,
+ DROP COLUMN app;
diff --git a/server/migrations/145_file_app_provenance.up.sql b/server/migrations/145_file_app_provenance.up.sql
new file mode 100644
index 0000000000..bd90419f73
--- /dev/null
+++ b/server/migrations/145_file_app_provenance.up.sql
@@ -0,0 +1,8 @@
+ALTER TABLE files
+ ADD COLUMN app app,
+ ADD CONSTRAINT files_app_supported
+ CHECK (app IN ('photos', 'locker'))
+ NOT VALID;
+
+ALTER TABLE usage
+ ADD COLUMN file_app_ready BOOLEAN NOT NULL DEFAULT FALSE;
diff --git a/server/pkg/controller/object_cleanup_test.go b/server/pkg/controller/object_cleanup_test.go
index 1a1e6daf3a..edaebd9547 100644
--- a/server/pkg/controller/object_cleanup_test.go
+++ b/server/pkg/controller/object_cleanup_test.go
@@ -17,6 +17,39 @@ import (
"github.com/spf13/viper"
)
+func TestFileRegistrationStoresApp(t *testing.T) {
+ _, fileRepo, db := setupObjectCleanupRaceTest(t, "http://127.0.0.1")
+ ownerID := testutil.InsertUser(t, db, testutil.UserFixture{
+ UserID: 1,
+ Email: "[email protected]",
+ CreationTime: 1,
+ })
+ testutil.InsertUsage(t, db, ownerID, 0)
+ collectionID := insertObjectCleanupTestCollection(t, db, ownerID)
+ const fileObjectKey = "1/file-app-file"
+ const thumbnailObjectKey = "1/file-app-thumbnail"
+ if _, err := db.Exec(`
+ INSERT INTO temp_objects(object_key, expiration_time, bucket_id)
+ VALUES ($1, 0, 'b2-eu-cen'), ($2, 0, 'b2-eu-cen')`, fileObjectKey, thumbnailObjectKey); err != nil {
+ t.Fatalf("failed to stage objects: %v", err)
+ }
+
+ file, _, err := fileRepo.Create(objectCleanupTestFile(
+ ownerID, collectionID, fileObjectKey, thumbnailObjectKey,
+ ), 100, 10, 110, ownerID, ente.Photos)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ var app string
+ if err := db.QueryRow(`SELECT app FROM files WHERE file_id = $1`, file.ID).Scan(&app); err != nil {
+ t.Fatal(err)
+ }
+ if app != string(ente.Photos) {
+ t.Fatalf("file app = %q, want %q", app, ente.Photos)
+ }
+}
+
func TestFileRegistrationRollsBackWhenCleanupWins(t *testing.T) {
cleanupDeleting := make(chan struct{})
releaseCleanup := make(chan struct{})
@@ -65,26 +98,9 @@ func TestFileRegistrationRollsBackWhenCleanupWins(t *testing.T) {
registrationDone := make(chan error, 1)
go func() {
- _, _, err := fileRepo.Create(ente.File{
- OwnerID: ownerID,
- CollectionID: collectionID,
- EncryptedKey: "encrypted-key",
- KeyDecryptionNonce: "key-nonce",
- File: ente.FileAttributes{
- ObjectKey: fileObjectKey,
- DecryptionHeader: "file-header",
- },
- Thumbnail: ente.FileAttributes{
- ObjectKey: thumbnailObjectKey,
- DecryptionHeader: "thumbnail-header",
- },
- Metadata: ente.FileAttributes{
- EncryptedData: "encrypted-metadata",
- DecryptionHeader: "metadata-header",
- },
- UpdationTime: 1,
- Info: &ente.FileInfo{FileSize: 100, ThumbnailSize: 10},
- }, 100, 10, 110, ownerID, ente.Photos)
+ _, _, err := fileRepo.Create(objectCleanupTestFile(
+ ownerID, collectionID, fileObjectKey, thumbnailObjectKey,
+ ), 100, 10, 110, ownerID, ente.Photos)
registrationDone <- err
}()
waitForTempObjectDeleteLock(t, db)
@@ -193,3 +209,26 @@ func insertObjectCleanupTestCollection(t *testing.T, db *sql.DB, ownerID int64)
}
return collectionID
}
+
+func objectCleanupTestFile(ownerID, collectionID int64, fileObjectKey, thumbnailObjectKey string) ente.File {
+ return ente.File{
+ OwnerID: ownerID,
+ CollectionID: collectionID,
+ EncryptedKey: "encrypted-key",
+ KeyDecryptionNonce: "key-nonce",
+ File: ente.FileAttributes{
+ ObjectKey: fileObjectKey,
+ DecryptionHeader: "file-header",
+ },
+ Thumbnail: ente.FileAttributes{
+ ObjectKey: thumbnailObjectKey,
+ DecryptionHeader: "thumbnail-header",
+ },
+ Metadata: ente.FileAttributes{
+ EncryptedData: "encrypted-metadata",
+ DecryptionHeader: "metadata-header",
+ },
+ UpdationTime: 1,
+ Info: &ente.FileInfo{FileSize: 100, ThumbnailSize: 10},
+ }
+}
diff --git a/server/pkg/repo/file.go b/server/pkg/repo/file.go
index 5b75c6086e..9c70f79e00 100644
--- a/server/pkg/repo/file.go
+++ b/server/pkg/repo/file.go
@@ -50,11 +50,11 @@ func (repo *FileRepository) Create(
defer tx.Rollback()
var fileID int64
err = tx.QueryRowContext(ctx, `INSERT INTO files
- (owner_id, encrypted_metadata,
+ (owner_id, app, encrypted_metadata,
file_decryption_header, thumbnail_decryption_header, metadata_decryption_header,
magic_metadata, pub_magic_metadata, info, updation_time)
- VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING file_id`,
- file.OwnerID, file.Metadata.EncryptedData, file.File.DecryptionHeader,
+ 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.UpdationTime).Scan(&fileID)
@@ -137,11 +137,11 @@ func (repo *FileRepository) CreateMetaFile(
ThumbnailSize: 0,
}
err = tx.QueryRowContext(ctx, `INSERT INTO files
- (owner_id, encrypted_metadata,
+ (owner_id, app, encrypted_metadata,
file_decryption_header, thumbnail_decryption_header, metadata_decryption_header,
magic_metadata, pub_magic_metadata, info, updation_time)
- VALUES($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING file_id`,
- metaFile.OwnerID, metaFile.Metadata.EncryptedData, "",
+ 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.UpdationTime).Scan(&fileID)
diff --git a/server/pkg/repo/file_usage_test.go b/server/pkg/repo/file_usage_test.go
index b5020c307b..66adb1457c 100644
--- a/server/pkg/repo/file_usage_test.go
+++ b/server/pkg/repo/file_usage_test.go
@@ -144,6 +144,20 @@ func TestCreateMetaFileUpdatesReadyLockerCount(t *testing.T) {
if storage != 10 || photos != 2 || locker != 4 || version != 8 {
t.Fatalf("usage state = (%d, %d, %d, %d), want (10, 2, 4, 8)", storage, photos, locker, version)
}
+ var app string
+ if err := db.QueryRow(`SELECT app FROM files WHERE owner_id = $1`, userID).Scan(&app); err != nil {
+ t.Fatal(err)
+ }
+ if app != string(ente.Locker) {
+ t.Fatalf("file app = %q, want %q", app, ente.Locker)
+ }
+ var ready bool
+ if err := db.QueryRow(`SELECT file_app_ready FROM usage WHERE user_id = $1`, userID).Scan(&ready); err != nil {
+ t.Fatal(err)
+ }
+ if ready {
+ t.Fatal("new usage row unexpectedly has file app provenance marked ready")
+ }
}
func setupFileUsageTest(t *testing.T) *sql.DB {