mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-10-30 21:49:18 +01:00
## Thinking Path > - Paperclip is the open source app people use to manage AI agents for work. > - The server keeps attachments and other files in a storage provider. Hosted instances use the S3 provider. > - Sentry received `SignatureDoesNotMatch` errors from the S3 provider on two staging hosts. > - The events have only AWS SDK stack frames. They do not show which S3 call failed, the HTTP status, or the S3 request ID. > - Without these facts, we cannot find the cause or make a safe fix. > - This pull request records a small, fixed-shape failure record on the S3 error and sends it with the Sentry event. > - The benefit is that the next event shows the failed operation and the provider request ID, and no private data goes to Sentry. ## Linked Issues or Issue Description **What happened?** The S3 storage provider threw `SignatureDoesNotMatch` four times on staging. The Sentry events do not identify the S3 operation or the caller. **Expected behavior** A storage provider failure in Sentry shows which storage call failed and the provider's correlation fields. **Steps to reproduce** 1. Configure the S3 storage provider against an endpoint that rejects the request signature. 2. Read, write, check, or delete a stored file. 3. Look at the Sentry event. It has no first-party stack frame and no operation name. No public GitHub issue exists. I searched open and closed pull requests for `SignatureDoesNotMatch` and storage failure diagnostics. No pull request covers this. ## What Changed - Add `server/src/storage/failure-diagnostics.ts`. It keeps a frozen, fixed-shape record for each failed storage error in a `WeakMap`. - Add `server/src/storage/s3-failure.ts`. It wraps each S3 call and records the operation, error code, HTTP status, request ID, and SDK attempt count. It reads only data properties. A value that does not match its bounded format becomes `unknown` or `null`. - Wrap `PutObject`, `GetObject`, `HeadObject`, `DeleteObject`, `CreateMultipartUpload`, `UploadPart`, and `CompleteMultipartUpload`. - In `captureException`, add the `storage_operation` and `storage_error_code` tags and a `storage_failure` context to the event of that error only. The original error and its default grouping do not change. - Document the new context in `doc/observability.md`. ## Verification - `pnpm exec vitest run src/__tests__/storage-s3-failure-diagnostics.test.ts src/__tests__/sentry.test.ts` (in `server/`): 37 passed, 5 skipped. The skipped tests are the existing real-SDK tests, which need an environment flag. - `pnpm exec vitest run src/__tests__/storage-s3-multipart.test.ts src/__tests__/storage-local-provider.test.ts`: 8 passed. - The new tests use a local HTTP server that returns a real S3 `SignatureDoesNotMatch` XML body with a `StringToSign` field. The tests make sure that the record has the operation, code, status and request ID, and that it does not contain the private string. - I typechecked the changed source files with a scoped `tsc` project. They have no errors. I could not run the full `pnpm -r typecheck` and `pnpm build` in my sandbox: it has a 4 GiB memory limit and no `cargo` for the runner binary. CI runs the full checks. ## Risks - Low risk. The change adds a `try`/`catch` that records data and throws the same error again. Storage behavior, not-found handling, and HTTP responses do not change. - Secret-sensitive routes replace the error before reporting, so those events do not get the record. This is intended. - The record never contains the bucket, object key, endpoint, credentials, error message, or provider response body. ## Model Used - Claude Opus 5.5 (`claude-opus-5-5`), Anthropic. Used through Claude Code with tool use (shell, file edit) and extended reasoning. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have searched GitHub for duplicate or related PRs and linked them above - [x] I have either (a) linked existing issues with `Fixes: #` / `Closes #` / `Refs #` OR (b) described the issue in-PR following the relevant issue template - [x] I have not referenced internal/instance-local Paperclip issues or links (only public GitHub `#NNN` / `github.com/paperclipai/paperclip` URLs) - [x] My branch name describes the change (e.g. `docs/...`, `fix/...`) and contains no internal Paperclip ticket id or instance-derived details - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [ ] All Paperclip CI gates are green - [ ] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [x] I will address all Greptile and reviewer comments before requesting merge 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: devinfoley <139239+devinfoley@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
113 lines
5.2 KiB
TypeScript
113 lines
5.2 KiB
TypeScript
import { createServer, type IncomingMessage, type ServerResponse } from "node:http";
|
|
import type { AddressInfo } from "node:net";
|
|
import { Readable } from "node:stream";
|
|
import { CreateMultipartUploadCommand, S3Client, UploadPartCommand } from "@aws-sdk/client-s3";
|
|
import { afterAll, beforeAll, describe, expect, it, vi } from "vitest";
|
|
import { storageFailureDiagnosticsFor } from "../storage/failure-diagnostics.js";
|
|
import { createS3StorageProvider } from "../storage/s3-provider.js";
|
|
import { putS3Multipart } from "../storage/s3-multipart.js";
|
|
|
|
const SIGNATURE_MISMATCH = `<?xml version="1.0" encoding="UTF-8"?>
|
|
<Error><Code>SignatureDoesNotMatch</Code><Message>The request signature we calculated does not match the signature you provided. Check your key and signing method.</Message><StringToSign>private string to sign</StringToSign><RequestId>req-4G-1</RequestId></Error>`;
|
|
|
|
let handler: (req: IncomingMessage, res: ServerResponse) => void = (_req, res) => res.end();
|
|
const server = createServer((req, res) => {
|
|
req.resume();
|
|
req.on("end", () => handler(req, res));
|
|
});
|
|
let endpoint = "";
|
|
const savedEnv = { ...process.env };
|
|
|
|
beforeAll(async () => {
|
|
await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
|
|
endpoint = `http://127.0.0.1:${(server.address() as AddressInfo).port}`;
|
|
process.env.AWS_ACCESS_KEY_ID = "fixture-access-key";
|
|
process.env.AWS_SECRET_ACCESS_KEY = "fixture-secret-key";
|
|
delete process.env.AWS_SESSION_TOKEN;
|
|
delete process.env.AWS_PROFILE;
|
|
});
|
|
|
|
afterAll(async () => {
|
|
process.env = savedEnv;
|
|
await new Promise<void>((resolve) => server.close(() => resolve()));
|
|
});
|
|
|
|
function provider() {
|
|
return createS3StorageProvider({ bucket: "bucket", region: "us-east-1", endpoint, forcePathStyle: true });
|
|
}
|
|
|
|
function rejectSignature(req: IncomingMessage, res: ServerResponse) {
|
|
res.writeHead(403, { "content-type": "application/xml", "x-amz-request-id": "req-4G-1" });
|
|
res.end(req.method === "HEAD" ? undefined : SIGNATURE_MISMATCH);
|
|
}
|
|
|
|
describe("S3 storage failure diagnostics", () => {
|
|
it("records the failed operation and provider correlation fields on the original SDK error", async () => {
|
|
handler = rejectSignature;
|
|
const error = await provider().getObject({ objectKey: "company/asset.png" }).catch((err: unknown) => err);
|
|
|
|
expect(error).toMatchObject({ name: "SignatureDoesNotMatch" });
|
|
expect(storageFailureDiagnosticsFor(error)).toEqual({
|
|
provider: "s3",
|
|
operation: "get_object",
|
|
errorCode: "SignatureDoesNotMatch",
|
|
httpStatus: 403,
|
|
requestId: "req-4G-1",
|
|
attempts: 1,
|
|
});
|
|
expect(JSON.stringify(storageFailureDiagnosticsFor(error))).not.toContain("private");
|
|
});
|
|
|
|
it("names each single-request operation", async () => {
|
|
handler = rejectSignature;
|
|
const s3 = provider();
|
|
const put = await s3.putObject({ objectKey: "k", body: Buffer.from("abc"), contentType: "text/plain", contentLength: 3 }).catch((err: unknown) => err);
|
|
const head = await s3.headObject({ objectKey: "k" }).catch((err: unknown) => err);
|
|
const remove = await s3.deleteObject({ objectKey: "k" }).catch((err: unknown) => err);
|
|
|
|
expect(storageFailureDiagnosticsFor(put)).toMatchObject({ operation: "put_object", errorCode: "SignatureDoesNotMatch", httpStatus: 403 });
|
|
// A HEAD response has no body, so the SDK can only report the status.
|
|
expect(storageFailureDiagnosticsFor(head)).toMatchObject({ operation: "head_object", httpStatus: 403, requestId: "req-4G-1" });
|
|
expect(storageFailureDiagnosticsFor(remove)).toMatchObject({ operation: "delete_object", errorCode: "SignatureDoesNotMatch" });
|
|
});
|
|
|
|
it("keeps not-found handling unchanged", async () => {
|
|
handler = (_req, res) => {
|
|
res.writeHead(404, { "content-type": "application/xml" });
|
|
res.end(`<?xml version="1.0" encoding="UTF-8"?><Error><Code>NoSuchKey</Code><Message>missing</Message></Error>`);
|
|
};
|
|
const s3 = provider();
|
|
|
|
await expect(s3.getObject({ objectKey: "missing" })).rejects.toMatchObject({ status: 404 });
|
|
await expect(s3.headObject({ objectKey: "missing" })).resolves.toEqual({ exists: false });
|
|
});
|
|
|
|
it("names the multipart step that failed and ignores unsafe provider fields", async () => {
|
|
const client = new S3Client({ region: "us-east-1" });
|
|
const failure = Object.assign(new Error("private provider message"), {
|
|
name: "Signature mismatch <private>",
|
|
$metadata: { httpStatusCode: 403, requestId: "private request id with spaces", attempts: 2 },
|
|
});
|
|
const send = vi.spyOn(client, "send").mockImplementation(async (command: unknown) => {
|
|
if (command instanceof CreateMultipartUploadCommand) return { UploadId: "upload" };
|
|
if (command instanceof UploadPartCommand) throw failure;
|
|
return {};
|
|
});
|
|
try {
|
|
const body = Readable.from([Buffer.from("abc")]);
|
|
await expect(putS3Multipart(client, "bucket", "key", { objectKey: "key", contentType: "text/plain", contentLength: 3, body })).rejects.toBe(failure);
|
|
expect(storageFailureDiagnosticsFor(failure)).toEqual({
|
|
provider: "s3",
|
|
operation: "upload_part",
|
|
errorCode: "unknown",
|
|
httpStatus: 403,
|
|
requestId: null,
|
|
attempts: 2,
|
|
});
|
|
} finally {
|
|
send.mockRestore();
|
|
client.destroy();
|
|
}
|
|
});
|
|
});
|