fauxqs 1.11.0 → 1.12.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +6 -2
- package/dist/s3/actions/completeMultipartUpload.d.ts.map +1 -1
- package/dist/s3/actions/completeMultipartUpload.js +25 -16
- package/dist/s3/actions/completeMultipartUpload.js.map +1 -1
- package/dist/s3/actions/createMultipartUpload.d.ts.map +1 -1
- package/dist/s3/actions/createMultipartUpload.js +9 -1
- package/dist/s3/actions/createMultipartUpload.js.map +1 -1
- package/dist/s3/actions/getObject.d.ts.map +1 -1
- package/dist/s3/actions/getObject.js +19 -0
- package/dist/s3/actions/getObject.js.map +1 -1
- package/dist/s3/actions/getObjectAttributes.d.ts +9 -0
- package/dist/s3/actions/getObjectAttributes.d.ts.map +1 -0
- package/dist/s3/actions/getObjectAttributes.js +68 -0
- package/dist/s3/actions/getObjectAttributes.js.map +1 -0
- package/dist/s3/actions/headObject.d.ts.map +1 -1
- package/dist/s3/actions/headObject.js +7 -0
- package/dist/s3/actions/headObject.js.map +1 -1
- package/dist/s3/actions/listObjects.js +1 -1
- package/dist/s3/actions/listObjects.js.map +1 -1
- package/dist/s3/actions/putObject.d.ts.map +1 -1
- package/dist/s3/actions/putObject.js +34 -3
- package/dist/s3/actions/putObject.js.map +1 -1
- package/dist/s3/actions/uploadPart.d.ts.map +1 -1
- package/dist/s3/actions/uploadPart.js +15 -5
- package/dist/s3/actions/uploadPart.js.map +1 -1
- package/dist/s3/checksum.d.ts +19 -0
- package/dist/s3/checksum.d.ts.map +1 -0
- package/dist/s3/checksum.js +67 -0
- package/dist/s3/checksum.js.map +1 -0
- package/dist/s3/chunkedEncoding.d.ts +7 -2
- package/dist/s3/chunkedEncoding.d.ts.map +1 -1
- package/dist/s3/chunkedEncoding.js +27 -4
- package/dist/s3/chunkedEncoding.js.map +1 -1
- package/dist/s3/s3Router.d.ts.map +1 -1
- package/dist/s3/s3Router.js +4 -0
- package/dist/s3/s3Router.js.map +1 -1
- package/dist/s3/s3Store.d.ts +11 -3
- package/dist/s3/s3Store.d.ts.map +1 -1
- package/dist/s3/s3Store.js +48 -17
- package/dist/s3/s3Store.js.map +1 -1
- package/dist/s3/s3Types.d.ts +7 -0
- package/dist/s3/s3Types.d.ts.map +1 -1
- package/dist/sns/actions/publish.d.ts.map +1 -1
- package/dist/sns/actions/publish.js +5 -1
- package/dist/sns/actions/publish.js.map +1 -1
- package/dist/sns/actions/setSubscriptionAttributes.d.ts.map +1 -1
- package/dist/sns/actions/setSubscriptionAttributes.js +4 -0
- package/dist/sns/actions/setSubscriptionAttributes.js.map +1 -1
- package/dist/sns/filter.d.ts.map +1 -1
- package/dist/sns/filter.js +6 -1
- package/dist/sns/filter.js.map +1 -1
- package/dist/sns/snsTypes.d.ts +2 -0
- package/dist/sns/snsTypes.d.ts.map +1 -1
- package/dist/sqs/sqsStore.d.ts.map +1 -1
- package/dist/sqs/sqsStore.js +3 -2
- package/dist/sqs/sqsStore.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
<img src="logo-readme.jpg" alt="fauxqs" width="360" />
|
|
2
2
|
|
|
3
|
+
[](https://www.npmjs.com/package/fauxqs)
|
|
4
|
+
|
|
3
5
|
# fauxqs
|
|
4
6
|
|
|
5
7
|
Local SNS/SQS/S3 emulator for development and testing. Point your `@aws-sdk/client-sqs`, `@aws-sdk/client-sns`, and `@aws-sdk/client-s3` clients at fauxqs instead of real AWS.
|
|
@@ -938,9 +940,9 @@ Platform application, SMS, and phone number actions are not supported.
|
|
|
938
940
|
| UploadPartCopy | Yes |
|
|
939
941
|
| CompleteMultipartUpload | Yes |
|
|
940
942
|
| AbortMultipartUpload | Yes |
|
|
943
|
+
| GetObjectAttributes | Yes |
|
|
941
944
|
| GetBucketLocation | No |
|
|
942
945
|
| ListObjectVersions | No |
|
|
943
|
-
| GetObjectAttributes | No |
|
|
944
946
|
| SelectObjectContent | No |
|
|
945
947
|
| RestoreObject | No |
|
|
946
948
|
| RenameObject | No |
|
|
@@ -998,7 +1000,9 @@ Returns a mock identity with account `000000000000` and ARN `arn:aws:iam::000000
|
|
|
998
1000
|
- **User metadata** — `x-amz-meta-*` headers are stored and returned on GetObject and HeadObject
|
|
999
1001
|
- **Bulk delete** — DeleteObjects for batch key deletion with proper XML entity handling
|
|
1000
1002
|
- **Keys with slashes** — full support for slash-delimited keys (e.g., `path/to/file.txt`)
|
|
1001
|
-
- **Stream uploads** — handles AWS chunked transfer encoding (`Content-Encoding: aws-chunked`) for stream bodies
|
|
1003
|
+
- **Stream uploads** — handles AWS chunked transfer encoding (`Content-Encoding: aws-chunked`) for stream bodies, including trailing header parsing for checksums
|
|
1004
|
+
- **Checksums** — CRC32, SHA1, and SHA256 checksums are stored on upload (PutObject, UploadPart) and returned on download (GetObject, HeadObject with `x-amz-checksum-mode: ENABLED`). Multipart uploads compute composite checksums. GetObjectAttributes supports the `Checksum` attribute. CRC32C and CRC64NVME are silently ignored. Checksums are stored and returned as-is — no body validation is performed.
|
|
1005
|
+
- **GetObjectAttributes** — selective metadata retrieval via `x-amz-object-attributes` header: ETag, StorageClass, ObjectSize, ObjectParts (with pagination), and Checksum (including per-part checksums for multipart objects)
|
|
1002
1006
|
- **Path-style and virtual-hosted-style** — both S3 URL styles are supported (see below)
|
|
1003
1007
|
|
|
1004
1008
|
### S3 URL styles
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completeMultipartUpload.d.ts","sourceRoot":"","sources":["../../../src/s3/actions/completeMultipartUpload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAG5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"completeMultipartUpload.d.ts","sourceRoot":"","sources":["../../../src/s3/actions/completeMultipartUpload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAG5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAY7C,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,cAAc,CAAC;IAAE,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC,EACpE,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE,OAAO,GACb,IAAI,CAiEN"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { escapeXml } from "../../common/xml.js";
|
|
2
|
+
import { checksumHeaderName } from "../checksum.js";
|
|
2
3
|
function unescapeXml(str) {
|
|
3
4
|
return str
|
|
4
5
|
.replaceAll("&", "&")
|
|
@@ -16,22 +17,19 @@ export function completeMultipartUpload(request, reply, store) {
|
|
|
16
17
|
? request.body.toString("utf-8")
|
|
17
18
|
: request.body;
|
|
18
19
|
// Parse <Part> elements from XML body
|
|
20
|
+
// Extract each <Part>...</Part> block, then find PartNumber and ETag within it
|
|
21
|
+
// (order varies, and optional elements like ChecksumCRC32 may appear between them)
|
|
19
22
|
const parts = [];
|
|
20
|
-
const
|
|
23
|
+
const partBlockRegex = /<Part>([\s\S]*?)<\/Part>/g;
|
|
21
24
|
let match;
|
|
22
|
-
while ((match =
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
}
|
|
28
|
-
// Also handle reversed order (ETag before PartNumber)
|
|
29
|
-
if (parts.length === 0) {
|
|
30
|
-
const altRegex = /<Part>\s*<ETag>([\s\S]*?)<\/ETag>\s*<PartNumber>(\d+)<\/PartNumber>\s*<\/Part>/g;
|
|
31
|
-
while ((match = altRegex.exec(body)) !== null) {
|
|
25
|
+
while ((match = partBlockRegex.exec(body)) !== null) {
|
|
26
|
+
const block = match[1];
|
|
27
|
+
const pnMatch = block.match(/<PartNumber>(\d+)<\/PartNumber>/);
|
|
28
|
+
const etagMatch = block.match(/<ETag>([\s\S]*?)<\/ETag>/);
|
|
29
|
+
if (pnMatch && etagMatch) {
|
|
32
30
|
parts.push({
|
|
33
|
-
partNumber: parseInt(
|
|
34
|
-
etag: unescapeXml(
|
|
31
|
+
partNumber: parseInt(pnMatch[1], 10),
|
|
32
|
+
etag: unescapeXml(etagMatch[1]),
|
|
35
33
|
});
|
|
36
34
|
}
|
|
37
35
|
}
|
|
@@ -44,16 +42,27 @@ export function completeMultipartUpload(request, reply, store) {
|
|
|
44
42
|
Key: key,
|
|
45
43
|
ETag: obj.etag,
|
|
46
44
|
};
|
|
47
|
-
const
|
|
45
|
+
const xmlParts = [
|
|
48
46
|
`<?xml version="1.0" encoding="UTF-8"?>`,
|
|
49
47
|
`<CompleteMultipartUploadResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/">`,
|
|
50
48
|
` <Location>${escapeXml(result.Location)}</Location>`,
|
|
51
49
|
` <Bucket>${escapeXml(result.Bucket)}</Bucket>`,
|
|
52
50
|
` <Key>${escapeXml(result.Key)}</Key>`,
|
|
53
51
|
` <ETag>${escapeXml(result.ETag)}</ETag>`,
|
|
54
|
-
|
|
55
|
-
|
|
52
|
+
];
|
|
53
|
+
if (obj.checksumAlgorithm && obj.checksumValue) {
|
|
54
|
+
const tag = `Checksum${obj.checksumAlgorithm}`;
|
|
55
|
+
xmlParts.push(` <${tag}>${obj.checksumValue}</${tag}>`);
|
|
56
|
+
if (obj.checksumType) {
|
|
57
|
+
xmlParts.push(` <ChecksumType>${obj.checksumType}</ChecksumType>`);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
xmlParts.push(`</CompleteMultipartUploadResult>`);
|
|
61
|
+
const xml = xmlParts.join("\n");
|
|
56
62
|
reply.header("content-type", "application/xml");
|
|
63
|
+
if (obj.checksumAlgorithm && obj.checksumValue) {
|
|
64
|
+
reply.header(checksumHeaderName(obj.checksumAlgorithm), obj.checksumValue);
|
|
65
|
+
}
|
|
57
66
|
reply.status(200).send(xml);
|
|
58
67
|
}
|
|
59
68
|
//# sourceMappingURL=completeMultipartUpload.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completeMultipartUpload.js","sourceRoot":"","sources":["../../../src/s3/actions/completeMultipartUpload.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"completeMultipartUpload.js","sourceRoot":"","sources":["../../../src/s3/actions/completeMultipartUpload.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createMultipartUpload.d.ts","sourceRoot":"","sources":["../../../src/s3/actions/createMultipartUpload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAG5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"createMultipartUpload.d.ts","sourceRoot":"","sources":["../../../src/s3/actions/createMultipartUpload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAG5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAwC7C,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,cAAc,CAAC;IAAE,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC,EACpE,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE,OAAO,GACb,IAAI,CA+CN"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { escapeXml } from "../../common/xml.js";
|
|
2
|
+
const SUPPORTED_CHECKSUM_ALGORITHMS = new Set(["CRC32", "SHA1", "SHA256"]);
|
|
2
3
|
function extractMetadata(headers) {
|
|
3
4
|
const metadata = {};
|
|
4
5
|
for (const [key, value] of Object.entries(headers)) {
|
|
@@ -35,7 +36,11 @@ export function createMultipartUpload(request, reply, store) {
|
|
|
35
36
|
const contentType = request.headers["content-type"] ?? "application/octet-stream";
|
|
36
37
|
const metadata = extractMetadata(request.headers);
|
|
37
38
|
const systemMeta = extractSystemMetadata(request.headers);
|
|
38
|
-
const
|
|
39
|
+
const checksumAlgoHeader = request.headers["x-amz-checksum-algorithm"]?.toUpperCase();
|
|
40
|
+
const checksumAlgorithm = checksumAlgoHeader && SUPPORTED_CHECKSUM_ALGORITHMS.has(checksumAlgoHeader)
|
|
41
|
+
? checksumAlgoHeader
|
|
42
|
+
: undefined;
|
|
43
|
+
const uploadId = store.createMultipartUpload(bucket, key, contentType, metadata, systemMeta, checksumAlgorithm);
|
|
39
44
|
const result = {
|
|
40
45
|
Bucket: bucket,
|
|
41
46
|
Key: key,
|
|
@@ -50,6 +55,9 @@ export function createMultipartUpload(request, reply, store) {
|
|
|
50
55
|
`</InitiateMultipartUploadResult>`,
|
|
51
56
|
].join("\n");
|
|
52
57
|
reply.header("content-type", "application/xml");
|
|
58
|
+
if (checksumAlgorithm) {
|
|
59
|
+
reply.header("x-amz-checksum-algorithm", checksumAlgorithm);
|
|
60
|
+
}
|
|
53
61
|
reply.status(200).send(xml);
|
|
54
62
|
}
|
|
55
63
|
//# sourceMappingURL=createMultipartUpload.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createMultipartUpload.js","sourceRoot":"","sources":["../../../src/s3/actions/createMultipartUpload.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"createMultipartUpload.js","sourceRoot":"","sources":["../../../src/s3/actions/createMultipartUpload.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getObject.d.ts","sourceRoot":"","sources":["../../../src/s3/actions/getObject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"getObject.d.ts","sourceRoot":"","sources":["../../../src/s3/actions/getObject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAG7C,wBAAgB,SAAS,CACvB,OAAO,EAAE,cAAc,CAAC;IAAE,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC,EACpE,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE,OAAO,GACb,IAAI,CAgIN"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { S3Error } from "../../common/errors.js";
|
|
2
|
+
import { checksumHeaderName } from "../checksum.js";
|
|
2
3
|
export function getObject(request, reply, store) {
|
|
3
4
|
const bucket = request.params.bucket;
|
|
4
5
|
const key = request.params["*"];
|
|
@@ -29,6 +30,17 @@ export function getObject(request, reply, store) {
|
|
|
29
30
|
for (const [metaKey, metaValue] of Object.entries(obj.metadata)) {
|
|
30
31
|
reply.header(`x-amz-meta-${metaKey}`, metaValue);
|
|
31
32
|
}
|
|
33
|
+
const checksumModePartNum = request.headers["x-amz-checksum-mode"];
|
|
34
|
+
if (checksumModePartNum?.toUpperCase() === "ENABLED" &&
|
|
35
|
+
obj.checksumAlgorithm &&
|
|
36
|
+
obj.partChecksums) {
|
|
37
|
+
// For partNumber requests, return the individual part's checksum
|
|
38
|
+
const partIdx = obj.parts.findIndex((p) => p.partNumber === pn);
|
|
39
|
+
if (partIdx >= 0 && partIdx < obj.partChecksums.length) {
|
|
40
|
+
reply.header(checksumHeaderName(obj.checksumAlgorithm), obj.partChecksums[partIdx]);
|
|
41
|
+
reply.header("x-amz-checksum-type", "FULL_OBJECT");
|
|
42
|
+
}
|
|
43
|
+
}
|
|
32
44
|
reply.status(206).send(partBody);
|
|
33
45
|
return;
|
|
34
46
|
}
|
|
@@ -97,6 +109,13 @@ export function getObject(request, reply, store) {
|
|
|
97
109
|
reply.status(206).send(sliced);
|
|
98
110
|
return;
|
|
99
111
|
}
|
|
112
|
+
// Checksum headers when x-amz-checksum-mode: ENABLED (only on full-object responses, not ranges)
|
|
113
|
+
const checksumMode = request.headers["x-amz-checksum-mode"];
|
|
114
|
+
if (checksumMode?.toUpperCase() === "ENABLED" && obj.checksumAlgorithm && obj.checksumValue) {
|
|
115
|
+
reply.header(checksumHeaderName(obj.checksumAlgorithm), obj.checksumValue);
|
|
116
|
+
if (obj.checksumType)
|
|
117
|
+
reply.header("x-amz-checksum-type", obj.checksumType);
|
|
118
|
+
}
|
|
100
119
|
reply.header("content-length", obj.contentLength);
|
|
101
120
|
reply.status(200).send(obj.body);
|
|
102
121
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getObject.js","sourceRoot":"","sources":["../../../src/s3/actions/getObject.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"getObject.js","sourceRoot":"","sources":["../../../src/s3/actions/getObject.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { FastifyRequest, FastifyReply } from "fastify";
|
|
2
|
+
import type { S3Store } from "../s3Store.ts";
|
|
3
|
+
export declare function getObjectAttributes(request: FastifyRequest<{
|
|
4
|
+
Params: {
|
|
5
|
+
bucket: string;
|
|
6
|
+
"*": string;
|
|
7
|
+
};
|
|
8
|
+
}>, reply: FastifyReply, store: S3Store): void;
|
|
9
|
+
//# sourceMappingURL=getObjectAttributes.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getObjectAttributes.d.ts","sourceRoot":"","sources":["../../../src/s3/actions/getObjectAttributes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,cAAc,CAAC;IAAE,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC,EACpE,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE,OAAO,GACb,IAAI,CAoFN"}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
export function getObjectAttributes(request, reply, store) {
|
|
2
|
+
const bucket = request.params.bucket;
|
|
3
|
+
const key = request.params["*"];
|
|
4
|
+
const obj = store.getObject(bucket, key);
|
|
5
|
+
const requestedAttrs = (request.headers["x-amz-object-attributes"] ?? "")
|
|
6
|
+
.split(",")
|
|
7
|
+
.map((s) => s.trim())
|
|
8
|
+
.filter(Boolean);
|
|
9
|
+
const requested = new Set(requestedAttrs);
|
|
10
|
+
const parts = [];
|
|
11
|
+
parts.push('<GetObjectAttributesResponse xmlns="http://s3.amazonaws.com/doc/2006-03-01/">');
|
|
12
|
+
if (requested.has("ETag")) {
|
|
13
|
+
// AWS returns unquoted ETags in GetObjectAttributes
|
|
14
|
+
const unquoted = obj.etag.replaceAll('"', "");
|
|
15
|
+
parts.push(` <ETag>${unquoted}</ETag>`);
|
|
16
|
+
}
|
|
17
|
+
if (requested.has("StorageClass")) {
|
|
18
|
+
parts.push(" <StorageClass>STANDARD</StorageClass>");
|
|
19
|
+
}
|
|
20
|
+
if (requested.has("ObjectSize")) {
|
|
21
|
+
parts.push(` <ObjectSize>${obj.contentLength}</ObjectSize>`);
|
|
22
|
+
}
|
|
23
|
+
if (requested.has("Checksum") && obj.checksumAlgorithm && obj.checksumValue) {
|
|
24
|
+
const tag = `Checksum${obj.checksumAlgorithm}`;
|
|
25
|
+
parts.push(" <Checksum>");
|
|
26
|
+
parts.push(` <${tag}>${obj.checksumValue}</${tag}>`);
|
|
27
|
+
if (obj.checksumType) {
|
|
28
|
+
parts.push(` <ChecksumType>${obj.checksumType}</ChecksumType>`);
|
|
29
|
+
}
|
|
30
|
+
parts.push(" </Checksum>");
|
|
31
|
+
}
|
|
32
|
+
if (requested.has("ObjectParts") && obj.parts) {
|
|
33
|
+
const maxParts = parseInt(request.headers["x-amz-max-parts"] ?? "1000", 10);
|
|
34
|
+
const partNumberMarker = parseInt(request.headers["x-amz-part-number-marker"] ?? "0", 10);
|
|
35
|
+
const filtered = obj.parts.filter((p) => p.partNumber > partNumberMarker);
|
|
36
|
+
const truncated = filtered.length > maxParts;
|
|
37
|
+
const paginated = filtered.slice(0, maxParts);
|
|
38
|
+
parts.push(" <ObjectParts>");
|
|
39
|
+
parts.push(` <PartsCount>${obj.parts.length}</PartsCount>`);
|
|
40
|
+
parts.push(` <IsTruncated>${truncated}</IsTruncated>`);
|
|
41
|
+
parts.push(` <MaxParts>${maxParts}</MaxParts>`);
|
|
42
|
+
parts.push(` <PartNumberMarker>${partNumberMarker}</PartNumberMarker>`);
|
|
43
|
+
const nextMarker = paginated.length > 0 ? paginated[paginated.length - 1].partNumber : 0;
|
|
44
|
+
parts.push(` <NextPartNumberMarker>${nextMarker}</NextPartNumberMarker>`);
|
|
45
|
+
for (let i = 0; i < paginated.length; i++) {
|
|
46
|
+
const p = paginated[i];
|
|
47
|
+
// partChecksums are indexed by original part order (0-based starting from partNumberMarker offset)
|
|
48
|
+
const partIdx = obj.parts.indexOf(p);
|
|
49
|
+
parts.push(" <Part>");
|
|
50
|
+
parts.push(` <PartNumber>${p.partNumber}</PartNumber>`);
|
|
51
|
+
parts.push(` <Size>${p.length}</Size>`);
|
|
52
|
+
if (obj.checksumAlgorithm &&
|
|
53
|
+
obj.partChecksums &&
|
|
54
|
+
partIdx >= 0 &&
|
|
55
|
+
partIdx < obj.partChecksums.length) {
|
|
56
|
+
const tag = `Checksum${obj.checksumAlgorithm}`;
|
|
57
|
+
parts.push(` <${tag}>${obj.partChecksums[partIdx]}</${tag}>`);
|
|
58
|
+
}
|
|
59
|
+
parts.push(" </Part>");
|
|
60
|
+
}
|
|
61
|
+
parts.push(" </ObjectParts>");
|
|
62
|
+
}
|
|
63
|
+
parts.push("</GetObjectAttributesResponse>");
|
|
64
|
+
reply.header("content-type", "application/xml");
|
|
65
|
+
reply.header("last-modified", obj.lastModified.toUTCString());
|
|
66
|
+
reply.status(200).send(parts.join("\n"));
|
|
67
|
+
}
|
|
68
|
+
//# sourceMappingURL=getObjectAttributes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getObjectAttributes.js","sourceRoot":"","sources":["../../../src/s3/actions/getObjectAttributes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headObject.d.ts","sourceRoot":"","sources":["../../../src/s3/actions/headObject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"headObject.d.ts","sourceRoot":"","sources":["../../../src/s3/actions/headObject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAG7C,wBAAgB,UAAU,CACxB,OAAO,EAAE,cAAc,CAAC;IAAE,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC,EACpE,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE,OAAO,GACb,IAAI,CAwBN"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { checksumHeaderName } from "../checksum.js";
|
|
1
2
|
export function headObject(request, reply, store) {
|
|
2
3
|
const bucket = request.params.bucket;
|
|
3
4
|
const key = request.params["*"];
|
|
@@ -19,6 +20,12 @@ export function headObject(request, reply, store) {
|
|
|
19
20
|
reply.header("content-encoding", obj.contentEncoding);
|
|
20
21
|
if (obj.parts)
|
|
21
22
|
reply.header("x-amz-mp-parts-count", String(obj.parts.length));
|
|
23
|
+
const checksumMode = request.headers["x-amz-checksum-mode"];
|
|
24
|
+
if (checksumMode?.toUpperCase() === "ENABLED" && obj.checksumAlgorithm && obj.checksumValue) {
|
|
25
|
+
reply.header(checksumHeaderName(obj.checksumAlgorithm), obj.checksumValue);
|
|
26
|
+
if (obj.checksumType)
|
|
27
|
+
reply.header("x-amz-checksum-type", obj.checksumType);
|
|
28
|
+
}
|
|
22
29
|
reply.status(200).send();
|
|
23
30
|
}
|
|
24
31
|
//# sourceMappingURL=headObject.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headObject.js","sourceRoot":"","sources":["../../../src/s3/actions/headObject.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"headObject.js","sourceRoot":"","sources":["../../../src/s3/actions/headObject.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,MAAM,UAAU,UAAU,CACxB,OAAoE,EACpE,KAAmB,EACnB,KAAc;IAEd,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;IACrC,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAEhC,MAAM,GAAG,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE1C,KAAK,CAAC,MAAM,CAAC,cAAc,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAC9C,KAAK,CAAC,MAAM,CAAC,gBAAgB,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC;IAClD,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;IAC/B,KAAK,CAAC,MAAM,CAAC,eAAe,EAAE,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IAC9D,KAAK,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QAChE,KAAK,CAAC,MAAM,CAAC,cAAc,OAAO,EAAE,EAAE,SAAS,CAAC,CAAC;IACnD,CAAC;IACD,IAAI,GAAG,CAAC,eAAe;QAAE,KAAK,CAAC,MAAM,CAAC,kBAAkB,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC;IAC/E,IAAI,GAAG,CAAC,kBAAkB;QAAE,KAAK,CAAC,MAAM,CAAC,qBAAqB,EAAE,GAAG,CAAC,kBAAkB,CAAC,CAAC;IACxF,IAAI,GAAG,CAAC,YAAY;QAAE,KAAK,CAAC,MAAM,CAAC,eAAe,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IACtE,IAAI,GAAG,CAAC,eAAe;QAAE,KAAK,CAAC,MAAM,CAAC,kBAAkB,EAAE,GAAG,CAAC,eAAe,CAAC,CAAC;IAC/E,IAAI,GAAG,CAAC,KAAK;QAAE,KAAK,CAAC,MAAM,CAAC,sBAAsB,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9E,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAuB,CAAC;IAClF,IAAI,YAAY,EAAE,WAAW,EAAE,KAAK,SAAS,IAAI,GAAG,CAAC,iBAAiB,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;QAC5F,KAAK,CAAC,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC;QAC3E,IAAI,GAAG,CAAC,YAAY;YAAE,KAAK,CAAC,MAAM,CAAC,qBAAqB,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IAC9E,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;AAC3B,CAAC"}
|
|
@@ -6,7 +6,7 @@ export function listObjects(request, reply, store) {
|
|
|
6
6
|
const prefix = query["prefix"] ?? "";
|
|
7
7
|
const delimiter = query["delimiter"];
|
|
8
8
|
const maxKeysStr = query["max-keys"];
|
|
9
|
-
const maxKeys = maxKeysStr ? parseInt(maxKeysStr, 10) : 1000;
|
|
9
|
+
const maxKeys = Math.min(maxKeysStr ? parseInt(maxKeysStr, 10) : 1000, 1000);
|
|
10
10
|
if (listType === "2") {
|
|
11
11
|
listObjectsV2(bucket, prefix, delimiter, maxKeys, query, reply, store);
|
|
12
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listObjects.js","sourceRoot":"","sources":["../../../src/s3/actions/listObjects.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGhD,MAAM,UAAU,WAAW,CACzB,OAAuD,EACvD,KAAmB,EACnB,KAAc;IAEd,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;IACrC,MAAM,KAAK,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAA2B,CAAC;IAE9D,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACrC,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;IACrC,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;IACrC,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"listObjects.js","sourceRoot":"","sources":["../../../src/s3/actions/listObjects.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"putObject.d.ts","sourceRoot":"","sources":["../../../src/s3/actions/putObject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAG5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"putObject.d.ts","sourceRoot":"","sources":["../../../src/s3/actions/putObject.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAG5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AA+C7C,wBAAgB,SAAS,CACvB,OAAO,EAAE,cAAc,CAAC;IAAE,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC,EACpE,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE,OAAO,GACb,IAAI,CAgIN"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { S3Error } from "../../common/errors.js";
|
|
2
2
|
import { decodeAwsChunked } from "../chunkedEncoding.js";
|
|
3
|
+
import { extractChecksumFromHeaders, checksumHeaderName } from "../checksum.js";
|
|
3
4
|
function extractMetadata(headers) {
|
|
4
5
|
const metadata = {};
|
|
5
6
|
for (const [key, value] of Object.entries(headers)) {
|
|
@@ -59,7 +60,23 @@ export function putObject(request, reply, store) {
|
|
|
59
60
|
...(srcObj.cacheControl && { cacheControl: srcObj.cacheControl }),
|
|
60
61
|
...(srcObj.contentEncoding && { contentEncoding: srcObj.contentEncoding }),
|
|
61
62
|
};
|
|
62
|
-
|
|
63
|
+
// Checksum: COPY preserves source checksum, REPLACE reads from request headers
|
|
64
|
+
let checksumData;
|
|
65
|
+
if (metadataDirective === "REPLACE") {
|
|
66
|
+
const cksum = extractChecksumFromHeaders(request.headers);
|
|
67
|
+
if (cksum) {
|
|
68
|
+
checksumData = { algorithm: cksum.algorithm, value: cksum.value, type: "FULL_OBJECT" };
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
else if (srcObj.checksumAlgorithm && srcObj.checksumValue && srcObj.checksumType) {
|
|
72
|
+
checksumData = {
|
|
73
|
+
algorithm: srcObj.checksumAlgorithm,
|
|
74
|
+
value: srcObj.checksumValue,
|
|
75
|
+
type: srcObj.checksumType,
|
|
76
|
+
...(srcObj.partChecksums && { partChecksums: srcObj.partChecksums }),
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
const obj = store.putObject(bucket, key, srcObj.body, destContentType, metadata, systemMeta, checksumData);
|
|
63
80
|
if (store.spy) {
|
|
64
81
|
store.spy.addMessage({
|
|
65
82
|
service: "s3",
|
|
@@ -88,14 +105,28 @@ export function putObject(request, reply, store) {
|
|
|
88
105
|
}
|
|
89
106
|
let body = Buffer.isBuffer(request.body) ? request.body : Buffer.from(request.body);
|
|
90
107
|
// Decode aws-chunked encoding if present
|
|
108
|
+
let trailers = {};
|
|
91
109
|
const contentEncoding = request.headers["content-encoding"];
|
|
92
110
|
if (contentEncoding && contentEncoding.includes("aws-chunked")) {
|
|
93
|
-
|
|
111
|
+
const decoded = decodeAwsChunked(body);
|
|
112
|
+
body = decoded.body;
|
|
113
|
+
trailers = decoded.trailers;
|
|
94
114
|
}
|
|
95
115
|
const metadata = extractMetadata(request.headers);
|
|
96
116
|
const systemMeta = extractSystemMetadata(request.headers);
|
|
97
|
-
|
|
117
|
+
// Extract checksum from trailing headers first, then regular headers
|
|
118
|
+
const cksum = extractChecksumFromHeaders(trailers) ??
|
|
119
|
+
extractChecksumFromHeaders(request.headers);
|
|
120
|
+
const checksumData = cksum
|
|
121
|
+
? { algorithm: cksum.algorithm, value: cksum.value, type: "FULL_OBJECT" }
|
|
122
|
+
: undefined;
|
|
123
|
+
const obj = store.putObject(bucket, key, body, contentType, metadata, systemMeta, checksumData);
|
|
98
124
|
reply.header("etag", obj.etag);
|
|
125
|
+
if (obj.checksumAlgorithm && obj.checksumValue) {
|
|
126
|
+
reply.header(checksumHeaderName(obj.checksumAlgorithm), obj.checksumValue);
|
|
127
|
+
if (obj.checksumType)
|
|
128
|
+
reply.header("x-amz-checksum-type", obj.checksumType);
|
|
129
|
+
}
|
|
99
130
|
reply.status(200).send();
|
|
100
131
|
}
|
|
101
132
|
//# sourceMappingURL=putObject.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"putObject.js","sourceRoot":"","sources":["../../../src/s3/actions/putObject.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"putObject.js","sourceRoot":"","sources":["../../../src/s3/actions/putObject.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploadPart.d.ts","sourceRoot":"","sources":["../../../src/s3/actions/uploadPart.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"uploadPart.d.ts","sourceRoot":"","sources":["../../../src/s3/actions/uploadPart.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAI7C,wBAAgB,UAAU,CACxB,OAAO,EAAE,cAAc,CAAC;IAAE,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC,EACpE,KAAK,EAAE,YAAY,EACnB,KAAK,EAAE,OAAO,GACb,IAAI,CAwFN"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { S3Error } from "../../common/errors.js";
|
|
2
2
|
import { decodeAwsChunked } from "../chunkedEncoding.js";
|
|
3
|
+
import { extractChecksumFromHeaders, checksumHeaderName } from "../checksum.js";
|
|
3
4
|
export function uploadPart(request, reply, store) {
|
|
4
5
|
const query = (request.query ?? {});
|
|
5
6
|
const uploadId = query["uploadId"];
|
|
@@ -38,11 +39,11 @@ export function uploadPart(request, reply, store) {
|
|
|
38
39
|
else {
|
|
39
40
|
partBody = srcObj.body;
|
|
40
41
|
}
|
|
41
|
-
const
|
|
42
|
+
const result = store.uploadPart(uploadId, partNumber, partBody);
|
|
42
43
|
const xml = [
|
|
43
44
|
`<?xml version="1.0" encoding="UTF-8"?>`,
|
|
44
45
|
`<CopyPartResult>`,
|
|
45
|
-
` <ETag>${etag}</ETag>`,
|
|
46
|
+
` <ETag>${result.etag}</ETag>`,
|
|
46
47
|
` <LastModified>${new Date().toISOString()}</LastModified>`,
|
|
47
48
|
`</CopyPartResult>`,
|
|
48
49
|
].join("\n");
|
|
@@ -52,12 +53,21 @@ export function uploadPart(request, reply, store) {
|
|
|
52
53
|
}
|
|
53
54
|
let body = Buffer.isBuffer(request.body) ? request.body : Buffer.from(request.body);
|
|
54
55
|
// Decode aws-chunked encoding if present
|
|
56
|
+
let trailers = {};
|
|
55
57
|
const contentEncoding = request.headers["content-encoding"];
|
|
56
58
|
if (contentEncoding && contentEncoding.includes("aws-chunked")) {
|
|
57
|
-
|
|
59
|
+
const decoded = decodeAwsChunked(body);
|
|
60
|
+
body = decoded.body;
|
|
61
|
+
trailers = decoded.trailers;
|
|
62
|
+
}
|
|
63
|
+
// Extract checksum from trailing headers first, then regular headers
|
|
64
|
+
const cksum = extractChecksumFromHeaders(trailers) ??
|
|
65
|
+
extractChecksumFromHeaders(request.headers);
|
|
66
|
+
const result = store.uploadPart(uploadId, partNumber, body, cksum?.value);
|
|
67
|
+
reply.header("etag", result.etag);
|
|
68
|
+
if (cksum && result.checksumValue) {
|
|
69
|
+
reply.header(checksumHeaderName(cksum.algorithm), result.checksumValue);
|
|
58
70
|
}
|
|
59
|
-
const etag = store.uploadPart(uploadId, partNumber, body);
|
|
60
|
-
reply.header("etag", etag);
|
|
61
71
|
reply.status(200).send();
|
|
62
72
|
}
|
|
63
73
|
//# sourceMappingURL=uploadPart.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uploadPart.js","sourceRoot":"","sources":["../../../src/s3/actions/uploadPart.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"uploadPart.js","sourceRoot":"","sources":["../../../src/s3/actions/uploadPart.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { ChecksumAlgorithm } from "./s3Types.ts";
|
|
2
|
+
/**
|
|
3
|
+
* Compute CRC32 of a buffer, returning a uint32.
|
|
4
|
+
* Uses zlib.crc32 (Node 22.2+) when available, otherwise falls back to a lookup table.
|
|
5
|
+
*/
|
|
6
|
+
declare let crc32: (data: Buffer) => number;
|
|
7
|
+
export { crc32 };
|
|
8
|
+
/** Compute a base64-encoded checksum of data. */
|
|
9
|
+
export declare function computeChecksum(algorithm: ChecksumAlgorithm, data: Buffer): string;
|
|
10
|
+
/** Compute composite checksum for multipart uploads. */
|
|
11
|
+
export declare function computeCompositeChecksum(algorithm: ChecksumAlgorithm, partChecksums: string[]): string;
|
|
12
|
+
/** Extract checksum algorithm+value from request headers or trailing headers. */
|
|
13
|
+
export declare function extractChecksumFromHeaders(headers: Record<string, string | string[] | undefined>): {
|
|
14
|
+
algorithm: ChecksumAlgorithm;
|
|
15
|
+
value: string;
|
|
16
|
+
} | undefined;
|
|
17
|
+
/** Return the response header name for a checksum algorithm. */
|
|
18
|
+
export declare function checksumHeaderName(algorithm: ChecksumAlgorithm): string;
|
|
19
|
+
//# sourceMappingURL=checksum.d.ts.map
|