fix(browser-transfer): release the vault slot on every exit of put() and open() (01-07)
Early returns before resolve (invalid input, pre-aborted signal, byte-length mismatch) left the capability registered, so maxActiveCapabilities: 1 refused the next issuance. The public methods now release it once in a finally. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
6b589515f1
commit
0f35c985d8
@@ -174,9 +174,11 @@ URL을 발급하면 안 된다.
|
|||||||
더 빠르면 그 기기에서는 capability가 만료로 보인다.
|
더 빠르면 그 기기에서는 capability가 만료로 보인다.
|
||||||
- 만료/403은 임의 retry가 아니라 control plane의 새 capability 발급으로 복구한다.
|
- 만료/403은 임의 retry가 아니라 control plane의 새 capability 발급으로 복구한다.
|
||||||
- ambiguous network failure 뒤 upload part를 새 bytes로 덮어쓰지 않는다.
|
- ambiguous network failure 뒤 upload part를 새 bytes로 덮어쓰지 않는다.
|
||||||
- 실행기는 resolve한 capability를 어떤 경로로 끝나든 vault에서 뺀다. 성공하면
|
- 실행기의 `put()`·`open()`은 받은 capability를 어떤 경로로 끝나든 vault에서
|
||||||
`consume()`이, 바인딩 거절·만료·replay claim 실패·digest 중단이나 불일치로
|
뺀다. 성공하면 `consume()`이 빼고, 그 밖의 모든 경로(잘못된 입력, 이미 중단된
|
||||||
끝나면 `revoke()`가 뺀다(`presigned-transfer-executor.ts`). 실행기에 닿기 전에
|
signal, 바이트 길이 불일치, 바인딩 거절, 만료, replay claim 실패, digest 중단이나
|
||||||
|
불일치, 전송 실패)는 공개 메서드의 `finally`가 `revoke()`로 뺀다
|
||||||
|
(`presigned-transfer-executor.ts`의 `release`). 실행기에 닿기 전에
|
||||||
버려진 capability(runtime 응답 검증 실패, part 실행기 사전 검사 실패, fail-fast로
|
버려진 capability(runtime 응답 검증 실패, part 실행기 사전 검사 실패, fail-fast로
|
||||||
`put()` 전에 멈춘 형제 worker)는 만료까지 `maxActiveCapabilities` 자리를
|
`put()` 전에 멈춘 형제 worker)는 만료까지 `maxActiveCapabilities` 자리를
|
||||||
차지하고, 다음 `register()`가 만료 항목을 정리한다.
|
차지하고, 다음 `register()`가 만료 항목을 정리한다.
|
||||||
|
|||||||
@@ -104,10 +104,20 @@ export function createPresignedTransferExecutor(
|
|||||||
): PresignedTransferExecutor {
|
): PresignedTransferExecutor {
|
||||||
const resolve = options.vault.resolve.bind(options.vault);
|
const resolve = options.vault.resolve.bind(options.vault);
|
||||||
const consume = options.vault.consume.bind(options.vault);
|
const consume = options.vault.consume.bind(options.vault);
|
||||||
// 01-07. A resolved identity that is never consumed is retired on the way
|
// 01-07. The capability a call was handed is retired on the way out of
|
||||||
// out, so a refused, expired or aborted transfer does not hold a vault slot
|
// `open()` and `put()`, whichever path ends the call, so an invalid,
|
||||||
// until its expiry. Idempotent after consume().
|
// pre-aborted, refused, expired or failed transfer does not hold a vault
|
||||||
const revoke = options.vault.revoke.bind(options.vault);
|
// slot until its expiry. Idempotent after consume() and for identities the
|
||||||
|
// vault never issued.
|
||||||
|
const revokeVault = options.vault.revoke.bind(options.vault);
|
||||||
|
function release(capability: unknown): void {
|
||||||
|
if (capability === UNREADABLE_CAPABILITY) return;
|
||||||
|
try {
|
||||||
|
revokeVault(capability as PresignedTransferCapability);
|
||||||
|
} catch {
|
||||||
|
// Release is best effort; the entry still expires in the vault.
|
||||||
|
}
|
||||||
|
}
|
||||||
const claim = options.replayGuard.claim.bind(options.replayGuard);
|
const claim = options.replayGuard.claim.bind(options.replayGuard);
|
||||||
const hardMaxTransferBytes = positiveSafeInteger(
|
const hardMaxTransferBytes = positiveSafeInteger(
|
||||||
options.hardMaxTransferBytes,
|
options.hardMaxTransferBytes,
|
||||||
@@ -159,13 +169,12 @@ export function createPresignedTransferExecutor(
|
|||||||
|
|
||||||
async function openDownload(
|
async function openDownload(
|
||||||
input: Parameters<PresignedDownloadSourcePort["open"]>[0],
|
input: Parameters<PresignedDownloadSourcePort["open"]>[0],
|
||||||
|
capability: PresignedDownloadCapability,
|
||||||
): Promise<BrowserDataResult<PresignedDownloadByteSource>> {
|
): Promise<BrowserDataResult<PresignedDownloadByteSource>> {
|
||||||
let resourceId: string;
|
let resourceId: string;
|
||||||
let capability: PresignedDownloadCapability;
|
|
||||||
let signal: AbortSignal;
|
let signal: AbortSignal;
|
||||||
try {
|
try {
|
||||||
resourceId = input.resourceId;
|
resourceId = input.resourceId;
|
||||||
capability = input.capability;
|
|
||||||
signal = input.signal;
|
signal = input.signal;
|
||||||
if (!isAbortSignal(signal)) {
|
if (!isAbortSignal(signal)) {
|
||||||
throw new TypeError("Abort signal is invalid.");
|
throw new TypeError("Abort signal is invalid.");
|
||||||
@@ -187,7 +196,6 @@ export function createPresignedTransferExecutor(
|
|||||||
capability.binding.resourceId !== resourceId ||
|
capability.binding.resourceId !== resourceId ||
|
||||||
!validCommonBinding(binding, capability, hardMaxTransferBytes)
|
!validCommonBinding(binding, capability, hardMaxTransferBytes)
|
||||||
) {
|
) {
|
||||||
revoke(capability);
|
|
||||||
return browserDataFailure("POLICY_REJECTED", "PRESIGNED_TRANSFER");
|
return browserDataFailure("POLICY_REJECTED", "PRESIGNED_TRANSFER");
|
||||||
}
|
}
|
||||||
const active = validateExpiry(
|
const active = validateExpiry(
|
||||||
@@ -195,11 +203,9 @@ export function createPresignedTransferExecutor(
|
|||||||
minimumRemainingLifetimeMs,
|
minimumRemainingLifetimeMs,
|
||||||
now(),
|
now(),
|
||||||
);
|
);
|
||||||
const claimed = active.ok ? claim(capability) : active;
|
if (!active.ok) return active;
|
||||||
if (!claimed.ok) {
|
const claimed = claim(capability);
|
||||||
revoke(capability);
|
if (!claimed.ok) return claimed;
|
||||||
return claimed;
|
|
||||||
}
|
|
||||||
const consumed = consume(capability);
|
const consumed = consume(capability);
|
||||||
if (!consumed.ok) return consumed;
|
if (!consumed.ok) return consumed;
|
||||||
|
|
||||||
@@ -247,8 +253,8 @@ export function createPresignedTransferExecutor(
|
|||||||
|
|
||||||
async function putUploadPart(
|
async function putUploadPart(
|
||||||
input: Parameters<PresignedUploadPartPort["put"]>[0],
|
input: Parameters<PresignedUploadPartPort["put"]>[0],
|
||||||
|
capability: PresignedUploadPartCapability,
|
||||||
): Promise<BrowserDataResult<PresignedUploadPartOutcome>> {
|
): Promise<BrowserDataResult<PresignedUploadPartOutcome>> {
|
||||||
let capability: PresignedUploadPartCapability;
|
|
||||||
let bytes: Uint8Array<ArrayBuffer>;
|
let bytes: Uint8Array<ArrayBuffer>;
|
||||||
let request: Readonly<{
|
let request: Readonly<{
|
||||||
sessionId: string;
|
sessionId: string;
|
||||||
@@ -262,7 +268,6 @@ export function createPresignedTransferExecutor(
|
|||||||
signal: AbortSignal;
|
signal: AbortSignal;
|
||||||
}>;
|
}>;
|
||||||
try {
|
try {
|
||||||
capability = input.capability;
|
|
||||||
if (!(input.bytes instanceof Uint8Array)) {
|
if (!(input.bytes instanceof Uint8Array)) {
|
||||||
throw new TypeError("Upload bytes are invalid.");
|
throw new TypeError("Upload bytes are invalid.");
|
||||||
}
|
}
|
||||||
@@ -325,7 +330,6 @@ export function createPresignedTransferExecutor(
|
|||||||
capability.expectedSha256 !== request.checksumSha256 ||
|
capability.expectedSha256 !== request.checksumSha256 ||
|
||||||
bytes.byteLength !== capability.byteLength
|
bytes.byteLength !== capability.byteLength
|
||||||
) {
|
) {
|
||||||
revoke(capability);
|
|
||||||
return browserDataFailure("POLICY_REJECTED", "PRESIGNED_TRANSFER");
|
return browserDataFailure("POLICY_REJECTED", "PRESIGNED_TRANSFER");
|
||||||
}
|
}
|
||||||
// TR-RR-02. The abort scope is created first, so the digest — which can be
|
// TR-RR-02. The abort scope is created first, so the digest — which can be
|
||||||
@@ -421,7 +425,6 @@ export function createPresignedTransferExecutor(
|
|||||||
return transferFailure(request.signal, scope.timedOut());
|
return transferFailure(request.signal, scope.timedOut());
|
||||||
} finally {
|
} finally {
|
||||||
scope.release();
|
scope.release();
|
||||||
revoke(capability);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -430,8 +433,12 @@ export function createPresignedTransferExecutor(
|
|||||||
input: Parameters<PresignedDownloadSourcePort["open"]>[0],
|
input: Parameters<PresignedDownloadSourcePort["open"]>[0],
|
||||||
) {
|
) {
|
||||||
let result: BrowserDataResult<PresignedDownloadByteSource>;
|
let result: BrowserDataResult<PresignedDownloadByteSource>;
|
||||||
|
const capability = readCapability(input);
|
||||||
try {
|
try {
|
||||||
result = await openDownload(input);
|
result =
|
||||||
|
capability === UNREADABLE_CAPABILITY
|
||||||
|
? browserDataFailure("INVALID_INPUT", "PRESIGNED_TRANSFER")
|
||||||
|
: await openDownload(input, capability);
|
||||||
} catch {
|
} catch {
|
||||||
result = browserDataFailure(
|
result = browserDataFailure(
|
||||||
"UNAVAILABLE",
|
"UNAVAILABLE",
|
||||||
@@ -441,6 +448,8 @@ export function createPresignedTransferExecutor(
|
|||||||
recovery: "REISSUE_CAPABILITY",
|
recovery: "REISSUE_CAPABILITY",
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
} finally {
|
||||||
|
release(capability);
|
||||||
}
|
}
|
||||||
observeTransferResult(
|
observeTransferResult(
|
||||||
observer,
|
observer,
|
||||||
@@ -459,8 +468,12 @@ export function createPresignedTransferExecutor(
|
|||||||
input: Parameters<PresignedUploadPartPort["put"]>[0],
|
input: Parameters<PresignedUploadPartPort["put"]>[0],
|
||||||
) {
|
) {
|
||||||
let result: BrowserDataResult<PresignedUploadPartOutcome>;
|
let result: BrowserDataResult<PresignedUploadPartOutcome>;
|
||||||
|
const capability = readCapability(input);
|
||||||
try {
|
try {
|
||||||
result = await putUploadPart(input);
|
result =
|
||||||
|
capability === UNREADABLE_CAPABILITY
|
||||||
|
? browserDataFailure("INVALID_INPUT", "PRESIGNED_TRANSFER")
|
||||||
|
: await putUploadPart(input, capability);
|
||||||
} catch {
|
} catch {
|
||||||
result = browserDataFailure(
|
result = browserDataFailure(
|
||||||
"UNAVAILABLE",
|
"UNAVAILABLE",
|
||||||
@@ -470,6 +483,8 @@ export function createPresignedTransferExecutor(
|
|||||||
recovery: "REISSUE_CAPABILITY",
|
recovery: "REISSUE_CAPABILITY",
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
} finally {
|
||||||
|
release(capability);
|
||||||
}
|
}
|
||||||
// 01-10. One PUT attempt. The resumable runtime records the part's final
|
// 01-10. One PUT attempt. The resumable runtime records the part's final
|
||||||
// result as UPLOAD_PART, so the two layers never count the same event.
|
// result as UPLOAD_PART, so the two layers never count the same event.
|
||||||
@@ -1108,6 +1123,22 @@ async function digestSha256WithWebCrypto(
|
|||||||
).join("");
|
).join("");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 01-07. Reads the caller's capability once, so the identity released on the
|
||||||
|
* way out is the one the call resolved even if `capability` is an accessor.
|
||||||
|
*/
|
||||||
|
const UNREADABLE_CAPABILITY: unique symbol = Symbol("unreadable capability");
|
||||||
|
|
||||||
|
function readCapability<T>(
|
||||||
|
input: Readonly<{ capability: T }>,
|
||||||
|
): T | typeof UNREADABLE_CAPABILITY {
|
||||||
|
try {
|
||||||
|
return input.capability;
|
||||||
|
} catch {
|
||||||
|
return UNREADABLE_CAPABILITY;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function safeInputByteLength(value: unknown): number | undefined {
|
function safeInputByteLength(value: unknown): number | undefined {
|
||||||
try {
|
try {
|
||||||
if (!value || typeof value !== "object") return undefined;
|
if (!value || typeof value !== "object") return undefined;
|
||||||
|
|||||||
@@ -662,9 +662,23 @@ describe("presigned download stream lifecycle", () => {
|
|||||||
ok: false,
|
ok: false,
|
||||||
error: { code: "INVALID_INPUT" },
|
error: { code: "INVALID_INPUT" },
|
||||||
});
|
});
|
||||||
|
// 01-07. The refused open released the capability from the vault.
|
||||||
|
expect(
|
||||||
|
await executor.downloadSources.open({
|
||||||
|
resourceId: "resource-1",
|
||||||
|
capability: issuedDownload.value,
|
||||||
|
signal: new AbortController().signal,
|
||||||
|
}),
|
||||||
|
).toMatchObject({ ok: false, error: { code: "POLICY_REJECTED" } });
|
||||||
|
const reissuedDownload = await provider.issueDownload({
|
||||||
|
resourceId: "resource-1",
|
||||||
|
signal: new AbortController().signal,
|
||||||
|
});
|
||||||
|
expect(reissuedDownload.ok).toBe(true);
|
||||||
|
if (!reissuedDownload.ok) return;
|
||||||
const opened = await executor.downloadSources.open({
|
const opened = await executor.downloadSources.open({
|
||||||
resourceId: "resource-1",
|
resourceId: "resource-1",
|
||||||
capability: issuedDownload.value,
|
capability: reissuedDownload.value,
|
||||||
signal: new AbortController().signal,
|
signal: new AbortController().signal,
|
||||||
});
|
});
|
||||||
expect(opened.ok).toBe(true);
|
expect(opened.ok).toBe(true);
|
||||||
|
|||||||
@@ -723,6 +723,123 @@ describe("presigned vault slot release (01-07)", () => {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const earlyExits = {
|
||||||
|
"the caller signal is already aborted": {
|
||||||
|
override: { signal: AbortSignal.abort() },
|
||||||
|
code: "ABORTED",
|
||||||
|
},
|
||||||
|
"the byte length does not match the bytes": {
|
||||||
|
override: { byteLength: 4 },
|
||||||
|
code: "INTEGRITY_FAILED",
|
||||||
|
},
|
||||||
|
"the input is invalid": {
|
||||||
|
override: { idempotencyKey: "" },
|
||||||
|
code: "INVALID_INPUT",
|
||||||
|
},
|
||||||
|
"the signal is not an AbortSignal": {
|
||||||
|
override: { signal: {} as AbortSignal },
|
||||||
|
code: "INVALID_INPUT",
|
||||||
|
},
|
||||||
|
} as const;
|
||||||
|
|
||||||
|
it.each(Object.keys(earlyExits) as (keyof typeof earlyExits)[])(
|
||||||
|
"frees the only vault slot when put() returns early because %s",
|
||||||
|
async (name) => {
|
||||||
|
const bytes = new Uint8Array([9, 8, 7]);
|
||||||
|
const checksum = sha256Hex(bytes);
|
||||||
|
let issued = 0;
|
||||||
|
const fetcher = vi.fn(async (input: RequestInfo | URL) => {
|
||||||
|
if (String(input) !== CONTROL_ENDPOINT) {
|
||||||
|
throw new Error("no PUT is expected");
|
||||||
|
}
|
||||||
|
issued += 1;
|
||||||
|
return jsonResponse(
|
||||||
|
uploadCapabilityPayload(
|
||||||
|
{ bytes, checksum },
|
||||||
|
{ capabilityReceipt: `capability-upload-${issued}` },
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}) as unknown as typeof fetch;
|
||||||
|
const { provider, executor } = createHarness({
|
||||||
|
fetcher,
|
||||||
|
maxActiveCapabilities: 1,
|
||||||
|
});
|
||||||
|
const issue = async () =>
|
||||||
|
await provider.issueUploadPart({
|
||||||
|
sessionId: UPLOAD_SESSION_ID,
|
||||||
|
requestBindingSha256: REQUEST_BINDING_SHA256,
|
||||||
|
uploadBindingSha256: "b".repeat(64),
|
||||||
|
partNumber: 1,
|
||||||
|
offset: 0,
|
||||||
|
byteLength: bytes.byteLength,
|
||||||
|
checksumSha256: checksum,
|
||||||
|
mediaType: "application/octet-stream",
|
||||||
|
idempotencyKey: "part-attempt-1",
|
||||||
|
signal: new AbortController().signal,
|
||||||
|
});
|
||||||
|
const first = await issue();
|
||||||
|
if (!first.ok) throw new Error("issue failed");
|
||||||
|
|
||||||
|
const { override, code } = earlyExits[name];
|
||||||
|
const put = await executor.uploadParts.put({
|
||||||
|
capability: first.value,
|
||||||
|
sessionId: UPLOAD_SESSION_ID,
|
||||||
|
requestBindingSha256: REQUEST_BINDING_SHA256,
|
||||||
|
uploadBindingSha256: "b".repeat(64),
|
||||||
|
partNumber: 1,
|
||||||
|
offset: 0,
|
||||||
|
byteLength: bytes.byteLength,
|
||||||
|
checksumSha256: checksum,
|
||||||
|
idempotencyKey: "part-attempt-1",
|
||||||
|
bytes,
|
||||||
|
signal: new AbortController().signal,
|
||||||
|
...override,
|
||||||
|
});
|
||||||
|
expect(put).toMatchObject({ ok: false, error: { code } });
|
||||||
|
|
||||||
|
expect((await issue()).ok).toBe(true);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
it.each([
|
||||||
|
["the caller signal is already aborted", AbortSignal.abort(), "ABORTED"],
|
||||||
|
["the signal is not an AbortSignal", {} as AbortSignal, "INVALID_INPUT"],
|
||||||
|
] as const)(
|
||||||
|
"frees the only vault slot when open() returns early because %s",
|
||||||
|
async (_name, signal, code) => {
|
||||||
|
const bytes = new Uint8Array([1, 2, 3]);
|
||||||
|
let issued = 0;
|
||||||
|
const fetcher = vi.fn(async () => {
|
||||||
|
issued += 1;
|
||||||
|
return jsonResponse(
|
||||||
|
downloadCapabilityPayload(bytes, {
|
||||||
|
capabilityReceipt: `capability-download-${issued}`,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}) as unknown as typeof fetch;
|
||||||
|
const { provider, executor } = createHarness({
|
||||||
|
fetcher,
|
||||||
|
maxActiveCapabilities: 1,
|
||||||
|
});
|
||||||
|
const issue = async () =>
|
||||||
|
await provider.issueDownload({
|
||||||
|
resourceId: "resource-1",
|
||||||
|
signal: new AbortController().signal,
|
||||||
|
});
|
||||||
|
const first = await issue();
|
||||||
|
if (!first.ok) throw new Error("issue failed");
|
||||||
|
|
||||||
|
const opened = await executor.downloadSources.open({
|
||||||
|
resourceId: "resource-1",
|
||||||
|
capability: first.value,
|
||||||
|
signal,
|
||||||
|
});
|
||||||
|
expect(opened).toMatchObject({ ok: false, error: { code } });
|
||||||
|
|
||||||
|
expect((await issue()).ok).toBe(true);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
it("frees the only vault slot when a download open is refused", async () => {
|
it("frees the only vault slot when a download open is refused", async () => {
|
||||||
const bytes = new Uint8Array([1, 2, 3]);
|
const bytes = new Uint8Array([1, 2, 3]);
|
||||||
let issued = 0;
|
let issued = 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user