From f5a335dc182e1fa6d29f9d2486a7954fe9c10f4e Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Fri, 16 Jun 2023 16:58:08 +0200 Subject: [PATCH] fix migrations after merging V8 --- .../resources/org/cryptomator/hub/flyway/V10__User_Keys.sql | 1 - .../org/cryptomator/hub/entities/EntityIntegrationTest.java | 2 +- .../resources/org/cryptomator/hub/flyway/V9999__Test_Data.sql | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/backend/src/main/resources/org/cryptomator/hub/flyway/V10__User_Keys.sql b/backend/src/main/resources/org/cryptomator/hub/flyway/V10__User_Keys.sql index 69e3051c..bd309fff 100644 --- a/backend/src/main/resources/org/cryptomator/hub/flyway/V10__User_Keys.sql +++ b/backend/src/main/resources/org/cryptomator/hub/flyway/V10__User_Keys.sql @@ -11,7 +11,6 @@ ALTER TABLE "access_token_legacy" RENAME CONSTRAINT "ACCESS_FK_VAULT" TO "ACCESS -- as soon as a device gets verified by its owner, the owner's private key will be encrypted for this device: ALTER TABLE "device" ADD "user_key" VARCHAR(2000) UNIQUE; -- private key, encrypted using device's public key (JWE ECDH-ES) -ALTER TABLE "device" ADD "type" VARCHAR(255) NOT NULL; ALTER TABLE "device" ADD "last_seen_time" TIMESTAMP WITH TIME ZONE NOT NULL; COMMENT ON COLUMN "device"."publickey" IS 'Note: This contains base64url-encoded data for historic reasons.'; diff --git a/backend/src/test/java/org/cryptomator/hub/entities/EntityIntegrationTest.java b/backend/src/test/java/org/cryptomator/hub/entities/EntityIntegrationTest.java index 6fde0ede..326aec2d 100644 --- a/backend/src/test/java/org/cryptomator/hub/entities/EntityIntegrationTest.java +++ b/backend/src/test/java/org/cryptomator/hub/entities/EntityIntegrationTest.java @@ -36,7 +36,7 @@ public void removingUserCascadesToAccess() throws SQLException { s.execute(""" INSERT INTO "authority" ("id", "type", "name") VALUES ('user999', 'USER', 'User 999'); INSERT INTO "user_details" ("id") VALUES ('user999'); - INSERT INTO "access_token" ("user_id", "vault_id", "vault_key_jwe") VALUES ('user999', '7E57C0DE-0000-4000-8000-000100001111', 'jwe4'); + INSERT INTO "access_token" ("user_id", "vault_id", "vault_key") VALUES ('user999', '7E57C0DE-0000-4000-8000-000100001111', 'jwe4'); """); } diff --git a/backend/src/test/resources/org/cryptomator/hub/flyway/V9999__Test_Data.sql b/backend/src/test/resources/org/cryptomator/hub/flyway/V9999__Test_Data.sql index 41fe95ef..399f24ab 100644 --- a/backend/src/test/resources/org/cryptomator/hub/flyway/V9999__Test_Data.sql +++ b/backend/src/test/resources/org/cryptomator/hub/flyway/V9999__Test_Data.sql @@ -44,13 +44,13 @@ VALUES ('7E57C0DE-0000-4000-8000-000100001111', 'user2', 'MEMBER'), ('7E57C0DE-0000-4000-8000-000100002222', 'group1', 'MEMBER'); -INSERT INTO "device" ("id", "owner_id", "name", "type", "publickey", "creation_time", "last_seen_time", "user_key_jwe") +INSERT INTO "device" ("id", "owner_id", "name", "type", "publickey", "creation_time", "last_seen_time", "user_key") VALUES ('device1', 'user1', 'Computer 1', 'DESKTOP', 'publickey1', '2020-02-20 20:20:20', '2023-01-11 22:33:44', 'jwe.jwe.jwe.user1.device1'), ('device2', 'user2', 'Computer 2', 'DESKTOP', 'publickey2', '2020-02-20 20:20:20', '2023-01-11 22:33:44', 'jwe.jwe.jwe.user2.device2'), ('device3', 'user1', 'Computer 3', 'DESKTOP', 'publickey3', '2020-02-20 20:20:20', '2023-01-11 22:33:44', NULL); -INSERT INTO "access_token" ("user_id", "vault_id", "vault_key_jwe") +INSERT INTO "access_token" ("user_id", "vault_id", "vault_key") VALUES ('user1', '7E57C0DE-0000-4000-8000-000100001111', 'jwe.jwe.jwe.vault1.user1'), -- direct access ('user2', '7E57C0DE-0000-4000-8000-000100001111', 'jwe.jwe.jwe.vault1.user2'), -- direct access