@balena/pinejs-webresource-s3 2.2.0 → 2.2.1-build-commit-validate-provider-data-93bb9aa954e5d5a9a75e8ad8fbbc019a812c2612-1
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/.versionbot/CHANGELOG.yml +19 -1
- package/CHANGELOG.md +5 -0
- package/build/index.js +11 -2
- package/build/index.js.map +1 -1
- package/lib/index.ts +21 -2
- package/package.json +2 -2
- package/test/index.test.ts +34 -3
|
@@ -1,3 +1,21 @@
|
|
|
1
|
+
- commits:
|
|
2
|
+
- subject: Validate `providerCommitData` before completing a multipart upload
|
|
3
|
+
hash: 93bb9aa954e5d5a9a75e8ad8fbbc019a812c2612
|
|
4
|
+
body: |
|
|
5
|
+
`providerCommitData` comes straight from the commitUpload request body
|
|
6
|
+
and was passed to CompleteMultipartUpload as-is, which its `any` typing
|
|
7
|
+
allowed. A missing or malformed value still made a round trip to S3
|
|
8
|
+
(`Parts: 'not-an-array'` was even serialized character by character)
|
|
9
|
+
and S3's error then surfaced as a 500. It is now checked to be a list
|
|
10
|
+
of parts with a `PartNumber` and `ETag`, rejecting anything else with a
|
|
11
|
+
400, and typed as `CompletedPart[]`.
|
|
12
|
+
footer:
|
|
13
|
+
Change-type: patch
|
|
14
|
+
change-type: patch
|
|
15
|
+
author: Pagan Gazzard
|
|
16
|
+
version: 2.2.1
|
|
17
|
+
title: ""
|
|
18
|
+
date: 2026-10-28T14:35:15.463Z
|
|
1
19
|
- commits:
|
|
2
20
|
- subject: Cap the signed url cache with `signedUrlCacheMaxEntries`
|
|
3
21
|
hash: 32fbfaa071ccd44f5a4bc4c5aa70e787ba2a0349
|
|
@@ -14,7 +32,7 @@
|
|
|
14
32
|
author: Pagan Gazzard
|
|
15
33
|
version: 2.2.0
|
|
16
34
|
title: ""
|
|
17
|
-
date: 2026-10-28T14:
|
|
35
|
+
date: 2026-10-28T14:25:05.563Z
|
|
18
36
|
- commits:
|
|
19
37
|
- subject: Do not cache failed url signings
|
|
20
38
|
hash: dca88b276c7c306465b9ccccc1246277efcc9606
|
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file
|
|
|
4
4
|
automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
|
|
5
5
|
This project adheres to [Semantic Versioning](http://semver.org/).
|
|
6
6
|
|
|
7
|
+
# v2.2.1
|
|
8
|
+
## (2026-10-28)
|
|
9
|
+
|
|
10
|
+
* Validate `providerCommitData` before completing a multipart upload [Pagan Gazzard]
|
|
11
|
+
|
|
7
12
|
# v2.2.0
|
|
8
13
|
## (2026-10-28)
|
|
9
14
|
|
package/build/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { DeleteObjectCommand, GetObjectCommand, S3Client, CreateMultipartUploadCommand, UploadPartCommand, CompleteMultipartUploadCommand, HeadObjectCommand, AbortMultipartUploadCommand, } from '@aws-sdk/client-s3';
|
|
2
2
|
import { Upload } from '@aws-sdk/lib-storage';
|
|
3
3
|
import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
|
|
4
|
-
import { webResourceHandler } from '@balena/pinejs';
|
|
4
|
+
import { errors, webResourceHandler } from '@balena/pinejs';
|
|
5
5
|
import memoize from 'memoizee';
|
|
6
6
|
import { randomUUID } from 'node:crypto';
|
|
7
7
|
const MAX_SIGNED_URL_EXPIRE_TIME_SECONDS = 7 * 24 * 60 * 60;
|
|
@@ -21,6 +21,11 @@ const getContentDisposition = (filename) => {
|
|
|
21
21
|
}).join('');
|
|
22
22
|
return `inline; filename="${asciiFilename}"; filename*=UTF-8''${encodedFilename}`;
|
|
23
23
|
};
|
|
24
|
+
const isCompletedPartList = (parts) => Array.isArray(parts) &&
|
|
25
|
+
parts.every((part) => typeof part === 'object' &&
|
|
26
|
+
part != null &&
|
|
27
|
+
Number.isSafeInteger(part.PartNumber) &&
|
|
28
|
+
typeof part.ETag === 'string');
|
|
24
29
|
export class S3Handler {
|
|
25
30
|
config;
|
|
26
31
|
bucket;
|
|
@@ -153,11 +158,15 @@ export class S3Handler {
|
|
|
153
158
|
};
|
|
154
159
|
},
|
|
155
160
|
commit: async ({ fileKey, uploadId, filename, providerCommitData, }) => {
|
|
161
|
+
const parts = providerCommitData?.Parts;
|
|
162
|
+
if (!isCompletedPartList(parts)) {
|
|
163
|
+
throw new errors.BadRequestError('providerCommitData must have `Parts` with a `PartNumber` and `ETag` for each uploaded part');
|
|
164
|
+
}
|
|
156
165
|
await this.client.send(new CompleteMultipartUploadCommand({
|
|
157
166
|
Bucket: this.bucket,
|
|
158
167
|
Key: fileKey,
|
|
159
168
|
UploadId: uploadId,
|
|
160
|
-
MultipartUpload:
|
|
169
|
+
MultipartUpload: { Parts: parts },
|
|
161
170
|
}));
|
|
162
171
|
const headResult = await this.client.send(new HeadObjectCommand({
|
|
163
172
|
Bucket: this.bucket,
|
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,mBAAmB,EACnB,gBAAgB,EAChB,QAAQ,EAGR,4BAA4B,EAC5B,iBAAiB,EACjB,8BAA8B,EAC9B,iBAAiB,EACjB,2BAA2B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"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"}
|
package/lib/index.ts
CHANGED
|
@@ -10,10 +10,11 @@ import {
|
|
|
10
10
|
HeadObjectCommand,
|
|
11
11
|
AbortMultipartUploadCommand,
|
|
12
12
|
type StorageClass,
|
|
13
|
+
type CompletedPart,
|
|
13
14
|
} from '@aws-sdk/client-s3';
|
|
14
15
|
import { Upload } from '@aws-sdk/lib-storage';
|
|
15
16
|
import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
|
|
16
|
-
import { webResourceHandler } from '@balena/pinejs';
|
|
17
|
+
import { errors, webResourceHandler } from '@balena/pinejs';
|
|
17
18
|
|
|
18
19
|
import type { WebResourceType as WebResource } from '@balena/sbvr-types';
|
|
19
20
|
import memoize from 'memoizee';
|
|
@@ -59,6 +60,16 @@ const getContentDisposition = (filename: string) => {
|
|
|
59
60
|
return `inline; filename="${asciiFilename}"; filename*=UTF-8''${encodedFilename}`;
|
|
60
61
|
};
|
|
61
62
|
|
|
63
|
+
const isCompletedPartList = (parts: unknown): parts is CompletedPart[] =>
|
|
64
|
+
Array.isArray(parts) &&
|
|
65
|
+
parts.every(
|
|
66
|
+
(part) =>
|
|
67
|
+
typeof part === 'object' &&
|
|
68
|
+
part != null &&
|
|
69
|
+
Number.isSafeInteger(part.PartNumber) &&
|
|
70
|
+
typeof part.ETag === 'string',
|
|
71
|
+
);
|
|
72
|
+
|
|
62
73
|
export class S3Handler implements webResourceHandler.WebResourceHandler {
|
|
63
74
|
private readonly config: S3ClientConfig;
|
|
64
75
|
private readonly bucket: string;
|
|
@@ -246,12 +257,20 @@ export class S3Handler implements webResourceHandler.WebResourceHandler {
|
|
|
246
257
|
filename,
|
|
247
258
|
providerCommitData,
|
|
248
259
|
}: webResourceHandler.CommitMultipartUploadPayload): Promise<WebResource> => {
|
|
260
|
+
// providerCommitData comes straight from the commitUpload request body
|
|
261
|
+
const parts = providerCommitData?.Parts;
|
|
262
|
+
if (!isCompletedPartList(parts)) {
|
|
263
|
+
throw new errors.BadRequestError(
|
|
264
|
+
'providerCommitData must have `Parts` with a `PartNumber` and `ETag` for each uploaded part',
|
|
265
|
+
);
|
|
266
|
+
}
|
|
267
|
+
|
|
249
268
|
await this.client.send(
|
|
250
269
|
new CompleteMultipartUploadCommand({
|
|
251
270
|
Bucket: this.bucket,
|
|
252
271
|
Key: fileKey,
|
|
253
272
|
UploadId: uploadId,
|
|
254
|
-
MultipartUpload:
|
|
273
|
+
MultipartUpload: { Parts: parts },
|
|
255
274
|
}),
|
|
256
275
|
);
|
|
257
276
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@balena/pinejs-webresource-s3",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.1-build-commit-validate-provider-data-93bb9aa954e5d5a9a75e8ad8fbbc019a812c2612-1",
|
|
4
4
|
"description": "A PineJS WebResource handler for storing & serving files on S3",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "build/index.js",
|
|
@@ -50,6 +50,6 @@
|
|
|
50
50
|
"@balena/pinejs": "^21.3.0 || ^22.0.0 || ^23.0.0 || ^24.0.0 || ^25.0.0"
|
|
51
51
|
},
|
|
52
52
|
"versionist": {
|
|
53
|
-
"publishedAt": "2026-10-28T14:
|
|
53
|
+
"publishedAt": "2026-10-28T14:35:15.543Z"
|
|
54
54
|
}
|
|
55
55
|
}
|
package/test/index.test.ts
CHANGED
|
@@ -17,7 +17,7 @@ import { S3Handler } from '../lib/index.js';
|
|
|
17
17
|
import { PassThrough } from 'stream';
|
|
18
18
|
import { inspect } from 'util';
|
|
19
19
|
import { Upload } from '@aws-sdk/lib-storage';
|
|
20
|
-
import type
|
|
20
|
+
import { errors, type webResourceHandler } from '@balena/pinejs';
|
|
21
21
|
|
|
22
22
|
chai.use(chaiAsPromised);
|
|
23
23
|
const s3Mock = mockClient(S3Client);
|
|
@@ -588,11 +588,15 @@ describe('S3Handler', function () {
|
|
|
588
588
|
.on(HeadObjectCommand)
|
|
589
589
|
.resolves({ ContentLength: 1024, ContentType: 'text/plain' });
|
|
590
590
|
|
|
591
|
+
const parts = [
|
|
592
|
+
{ PartNumber: 1, ETag: '"etag-1"' },
|
|
593
|
+
{ PartNumber: 2, ETag: '"etag-2"' },
|
|
594
|
+
];
|
|
591
595
|
const payload = {
|
|
592
596
|
fileKey: 'test-key',
|
|
593
597
|
uploadId: 'test-upload-id',
|
|
594
598
|
filename: 'file.txt',
|
|
595
|
-
providerCommitData: {},
|
|
599
|
+
providerCommitData: { Parts: parts },
|
|
596
600
|
};
|
|
597
601
|
const result = await s3Handler.multipartUpload.commit(payload);
|
|
598
602
|
|
|
@@ -609,9 +613,36 @@ describe('S3Handler', function () {
|
|
|
609
613
|
Bucket: 'test-bucket',
|
|
610
614
|
Key: 'test-key',
|
|
611
615
|
UploadId: 'test-upload-id',
|
|
612
|
-
MultipartUpload: {},
|
|
616
|
+
MultipartUpload: { Parts: parts },
|
|
613
617
|
});
|
|
614
618
|
});
|
|
619
|
+
|
|
620
|
+
const invalidProviderCommitData: Array<
|
|
621
|
+
webResourceHandler.CommitMultipartUploadPayload['providerCommitData']
|
|
622
|
+
> = [
|
|
623
|
+
undefined,
|
|
624
|
+
{},
|
|
625
|
+
{ Parts: 'not-an-array' },
|
|
626
|
+
{ Parts: [{ PartNumber: '1', ETag: '"etag-1"' }] },
|
|
627
|
+
{ Parts: [{ PartNumber: 1 }] },
|
|
628
|
+
{ Parts: [null] },
|
|
629
|
+
];
|
|
630
|
+
for (const providerCommitData of invalidProviderCommitData) {
|
|
631
|
+
it(`should reject providerCommitData ${inspect(providerCommitData, { breakLength: Infinity })} without contacting S3`, async function () {
|
|
632
|
+
await expect(
|
|
633
|
+
s3Handler.multipartUpload.commit({
|
|
634
|
+
fileKey: 'test-key',
|
|
635
|
+
uploadId: 'test-upload-id',
|
|
636
|
+
filename: 'file.txt',
|
|
637
|
+
providerCommitData,
|
|
638
|
+
}),
|
|
639
|
+
).to.be.rejectedWith(
|
|
640
|
+
errors.BadRequestError,
|
|
641
|
+
'providerCommitData must have `Parts` with a `PartNumber` and `ETag` for each uploaded part',
|
|
642
|
+
);
|
|
643
|
+
expect(s3Mock.calls()).to.have.lengthOf(0);
|
|
644
|
+
});
|
|
645
|
+
}
|
|
615
646
|
});
|
|
616
647
|
|
|
617
648
|
describe('cancel', function () {
|