merge: task 7 attachments and crypto

Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
Lucas Winther
2026-10-30 19:27:30 +01:00
co-authored by Claude Opus 5.5
5 changed files with 434 additions and 0 deletions
+176
View File
@@ -0,0 +1,176 @@
import { mkdir, rename, rm } from "node:fs/promises";
import { dirname, join } from "node:path";
import type { Db } from "@sttracker/db/db";
import { newId, nowIso } from "@sttracker/db/ids";
import type { AttachmentEntity, AttachmentsTable } from "@sttracker/db/schema";
import { ValidationError } from "./errors.ts";
export type Attachment = AttachmentsTable;
const MAX_BYTES = 25 * 1024 * 1024;
/** Lowercase and strip parameters (`; charset=...`). */
function normalizeMime(mime: string): string {
return (mime.split(";")[0] ?? "").trim().toLowerCase();
}
function mimeAllowed(mime: string): boolean {
if (mime === "image/svg+xml") return false; // scriptable; never serve user SVG
return mime.startsWith("image/") || mime === "application/pdf" || mime === "text/plain";
}
const locks = new Map<string, Promise<void>>();
/** Serialise file mutations per sha within this process. */
async function withLock<T>(key: string, fn: () => Promise<T>): Promise<T> {
const prev = locks.get(key) ?? Promise.resolve();
const run = prev.then(fn, fn);
const tail = run.then(
() => undefined,
() => undefined,
);
locks.set(key, tail);
try {
return await run;
} finally {
if (locks.get(key) === tail) locks.delete(key);
}
}
function pathFor(dataDir: string, sha: string): string {
return join(dataDir, "attachments", sha.slice(0, 2), sha.slice(2, 4), sha);
}
/**
* Store a file content-addressed by sha256 (deduplicated on disk) and link it to an entity.
* Each call creates a new attachment row and link; identical bytes share one file.
*/
export async function storeAttachment(
db: Db,
dataDir: string,
userId: string,
file: { bytes: Uint8Array; mime: string; filename: string; caption?: string; takenAt?: string },
link: { entity: AttachmentEntity; entityId: string },
): Promise<Attachment> {
const mime = normalizeMime(file.mime);
if (!mimeAllowed(mime)) throw new ValidationError("mime", "unsupported file type");
if (file.bytes.byteLength > MAX_BYTES) throw new ValidationError("file", "larger than 25 MB");
const sha256 = new Bun.CryptoHasher("sha256").update(file.bytes).digest("hex");
const path = pathFor(dataDir, sha256);
const row: Attachment = {
id: newId(),
user_id: userId,
sha256,
mime,
size: file.bytes.byteLength,
filename: file.filename,
caption: file.caption ?? null,
taken_at: file.takenAt ?? null,
visibility: null,
created_at: nowIso(),
};
await withLock(sha256, async () => {
if (!(await Bun.file(path).exists())) {
await mkdir(dirname(path), { recursive: true });
const tmp = `${path}.tmp-${newId()}`;
try {
await Bun.write(tmp, file.bytes);
await rename(tmp, path);
} catch (e) {
await rm(tmp, { force: true });
throw e;
}
}
await db.k.transaction().execute(async (tx) => {
await tx.insertInto("attachments").values(row).execute();
await tx
.insertInto("attachment_links")
.values({ id: newId(), attachment_id: row.id, entity: link.entity, entity_id: link.entityId })
.execute();
});
});
return row;
}
/** Open an attachment's file. Returns null when it does not exist or belongs to another user. */
export async function readAttachment(
db: Db,
dataDir: string,
userId: string,
id: string,
): Promise<{ file: ReturnType<typeof Bun.file>; mime: string } | null> {
const row = await db.k
.selectFrom("attachments")
.select(["sha256", "mime"])
.where("id", "=", id)
.where("user_id", "=", userId)
.executeTakeFirst();
if (!row) return null;
return { file: Bun.file(pathFor(dataDir, row.sha256)), mime: row.mime };
}
/** Attachments of `userId` linked to the given entity, oldest first. */
export async function listAttachments(
db: Db,
userId: string,
entity: AttachmentEntity,
entityId: string,
): Promise<Attachment[]> {
return db.k
.selectFrom("attachments")
.innerJoin("attachment_links", "attachment_links.attachment_id", "attachments.id")
.selectAll("attachments")
.where("attachments.user_id", "=", userId)
.where("attachment_links.entity", "=", entity)
.where("attachment_links.entity_id", "=", entityId)
.orderBy("attachments.created_at")
.orderBy("attachments.id")
.execute();
}
/**
* Remove an attachment's link to an entity. When no links remain the attachment row is
* deleted, and the file too if no other row references its content. No-op for other users.
*/
export async function unlinkAttachment(
db: Db,
dataDir: string,
userId: string,
attachmentId: string,
entity: AttachmentEntity,
entityId: string,
): Promise<void> {
const att = await db.k
.selectFrom("attachments")
.select("sha256")
.where("id", "=", attachmentId)
.where("user_id", "=", userId)
.executeTakeFirst();
if (!att) return;
await withLock(att.sha256, async () => {
const orphan = await db.k.transaction().execute(async (tx) => {
await tx
.deleteFrom("attachment_links")
.where("attachment_id", "=", attachmentId)
.where("entity", "=", entity)
.where("entity_id", "=", entityId)
.execute();
const left = await tx
.selectFrom("attachment_links")
.select("id")
.where("attachment_id", "=", attachmentId)
.executeTakeFirst();
if (left) return false;
await tx.deleteFrom("attachments").where("id", "=", attachmentId).execute();
const shared = await tx
.selectFrom("attachments")
.select("id")
.where("sha256", "=", att.sha256)
.executeTakeFirst();
return !shared;
});
if (orphan) await rm(pathFor(dataDir, att.sha256), { force: true });
});
}
+45
View File
@@ -0,0 +1,45 @@
import { CryptoError } from "./errors.ts";
const SALT = new TextEncoder().encode("sttracker-v1");
const INFO = new TextEncoder().encode("sttracker-credentials");
function b64(bytes: Uint8Array): string {
return Buffer.from(bytes).toString("base64");
}
async function deriveKey(secret: string): Promise<CryptoKey> {
const material = await crypto.subtle.importKey("raw", new TextEncoder().encode(secret), "HKDF", false, [
"deriveKey",
]);
return crypto.subtle.deriveKey(
{ name: "HKDF", hash: "SHA-256", salt: SALT, info: INFO },
material,
{ name: "AES-GCM", length: 256 },
false,
["encrypt", "decrypt"],
);
}
/** Encrypt a JSON value with AES-256-GCM. Returns `v1.<b64 iv>.<b64 ciphertext>`. */
export async function encryptJson(secret: string, value: unknown): Promise<string> {
const key = await deriveKey(secret);
const iv = crypto.getRandomValues(new Uint8Array(12));
const plain = new TextEncoder().encode(JSON.stringify(value));
const ct = new Uint8Array(await crypto.subtle.encrypt({ name: "AES-GCM", iv }, key, plain));
return `v1.${b64(iv)}.${b64(ct)}`;
}
/** Decrypt a blob from {@link encryptJson}. Throws `CryptoError` on a wrong secret or bad blob. */
export async function decryptJson<T>(secret: string, blob: string): Promise<T> {
const parts = blob.split(".");
if (parts.length !== 3 || parts[0] !== "v1") throw new CryptoError("malformed credential blob");
try {
const iv = new Uint8Array(Buffer.from(parts[1]!, "base64"));
const ct = new Uint8Array(Buffer.from(parts[2]!, "base64"));
const key = await deriveKey(secret);
const plain = await crypto.subtle.decrypt({ name: "AES-GCM", iv }, key, ct);
return JSON.parse(new TextDecoder().decode(plain)) as T;
} catch (cause) {
throw new CryptoError("decryption failed", { cause });
}
}