DEK를 AES-256-KW를 이용해 암호화하는 것으로 변경

This commit is contained in:
static
2025-01-02 06:41:01 +09:00
parent b07d67b958
commit baf48579b8
12 changed files with 39 additions and 30 deletions

View File

@@ -1,5 +1,9 @@
import { error, json } from "@sveltejs/kit";
import { tokenUpgradeRequest, tokenUpgradeResponse } from "$lib/server/schemas/auth";
import {
tokenUpgradeRequest,
tokenUpgradeResponse,
type TokenUpgradeResponse,
} from "$lib/server/schemas/auth";
import { createTokenUpgradeChallenge } from "$lib/server/services/auth";
import type { RequestHandler } from "./$types";
@@ -17,5 +21,5 @@ export const POST: RequestHandler = async ({ request, cookies, getClientAddress
encPubKey,
sigPubKey,
);
return json(tokenUpgradeResponse.parse({ challenge }));
return json(tokenUpgradeResponse.parse({ challenge } satisfies TokenUpgradeResponse));
};

View File

@@ -1,11 +1,11 @@
import { json } from "@sveltejs/kit";
import { authenticate } from "$lib/server/modules/auth";
import { clientListResponse } from "$lib/server/schemas/client";
import { clientListResponse, type ClientListResponse } from "$lib/server/schemas/client";
import { getUserClientList } from "$lib/server/services/client";
import type { RequestHandler } from "@sveltejs/kit";
export const GET: RequestHandler = async ({ cookies }) => {
const { userId } = authenticate(cookies);
const { userClients } = await getUserClientList(userId);
return json(clientListResponse.parse({ clients: userClients }));
return json(clientListResponse.parse({ clients: userClients } satisfies ClientListResponse));
};

View File

@@ -1,6 +1,10 @@
import { error, json } from "@sveltejs/kit";
import { authenticate } from "$lib/server/modules/auth";
import { clientRegisterRequest, clientRegisterResponse } from "$lib/server/schemas/client";
import {
clientRegisterRequest,
clientRegisterResponse,
type ClientRegisterResponse,
} from "$lib/server/schemas/client";
import { registerUserClient } from "$lib/server/services/client";
import type { RequestHandler } from "./$types";
@@ -15,5 +19,5 @@ export const POST: RequestHandler = async ({ request, cookies, getClientAddress
const { encPubKey, sigPubKey } = zodRes.data;
const { challenge } = await registerUserClient(userId, getClientAddress(), encPubKey, sigPubKey);
return json(clientRegisterResponse.parse({ challenge }));
return json(clientRegisterResponse.parse({ challenge } satisfies ClientRegisterResponse));
};

View File

@@ -1,6 +1,6 @@
import { error, json } from "@sveltejs/kit";
import { authenticate } from "$lib/server/modules/auth";
import { clientStatusResponse } from "$lib/server/schemas/client";
import { clientStatusResponse, type ClientStatusResponse } from "$lib/server/schemas/client";
import { getUserClientStatus } from "$lib/server/services/client";
import type { RequestHandler } from "@sveltejs/kit";
@@ -11,5 +11,11 @@ export const GET: RequestHandler = async ({ cookies }) => {
}
const { state, isInitialMekNeeded } = await getUserClientStatus(userId, clientId);
return json(clientStatusResponse.parse({ id: clientId, state, isInitialMekNeeded }));
return json(
clientStatusResponse.parse({
id: clientId,
state,
isInitialMekNeeded,
} satisfies ClientStatusResponse),
);
};

View File

@@ -1,7 +1,7 @@
import { error, json } from "@sveltejs/kit";
import { z } from "zod";
import { authorize } from "$lib/server/modules/auth";
import { directroyEntriesResponse } from "$lib/server/schemas/directory";
import { directroyInfoResponse, type DirectroyInfoResponse } from "$lib/server/schemas/directory";
import { getDirectroyInformation } from "$lib/server/services/file";
import type { RequestHandler } from "./$types";
@@ -18,17 +18,16 @@ export const GET: RequestHandler = async ({ cookies, params }) => {
const { metadata, directories, files } = await getDirectroyInformation(userId, id);
return json(
directroyEntriesResponse.parse({
directroyInfoResponse.parse({
metadata: metadata && {
createdAt: metadata.createdAt,
mekVersion: metadata.mekVersion,
dek: metadata.encDek.ciphertext,
dekIv: metadata.encDek.iv,
dek: metadata.encDek,
name: metadata.encName.ciphertext,
nameIv: metadata.encName.iv,
},
subDirectories: directories,
files,
}),
} satisfies DirectroyInfoResponse),
);
};

View File

@@ -7,7 +7,7 @@ import type { RequestHandler } from "./$types";
export const POST: RequestHandler = async ({ request, cookies }) => {
const { userId, clientId } = await authorize(cookies, "activeClient");
const { parentId, mekVersion, dek, dekIv, name, nameIv } = await parseSignedRequest(
const { parentId, mekVersion, dek, name, nameIv } = await parseSignedRequest(
clientId,
await request.json(),
directoryCreateRequest,
@@ -18,7 +18,6 @@ export const POST: RequestHandler = async ({ request, cookies }) => {
parentId,
mekVersion,
encDek: dek,
encDekIv: dekIv,
encName: name,
encNameIv: nameIv,
});

View File

@@ -1,6 +1,6 @@
import { json } from "@sveltejs/kit";
import { authorize } from "$lib/server/modules/auth";
import { masterKeyListResponse } from "$lib/server/schemas/mek";
import { masterKeyListResponse, type MasterKeyListResponse } from "$lib/server/schemas/mek";
import { getClientMekList } from "$lib/server/services/mek";
import type { RequestHandler } from "./$types";
@@ -15,6 +15,6 @@ export const GET: RequestHandler = async ({ cookies }) => {
mek: encMek,
mekSig: encMekSig,
})),
}),
} satisfies MasterKeyListResponse),
);
};