@balena/pinejs-webresource-s3 2.2.5 → 2.2.6-build-commit-validate-provider-data-e02b3e1f7be3f3c4337f11e70ba27edf2f2d4b81-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: e02b3e1f7be3f3c4337f11e70ba27edf2f2d4b81
|
|
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.6
|
|
17
|
+
title: ""
|
|
18
|
+
date: 2026-10-28T17:27:37.570Z
|
|
1
19
|
- commits:
|
|
2
20
|
- subject: Switch from tsx to nodejs type stripping
|
|
3
21
|
hash: f6b11d556afb882d60e4d62900e65cc989e2b501
|
|
@@ -8,7 +26,7 @@
|
|
|
8
26
|
author: Pagan Gazzard
|
|
9
27
|
version: 2.2.5
|
|
10
28
|
title: ""
|
|
11
|
-
date: 2026-10-28T16:
|
|
29
|
+
date: 2026-10-28T16:43:04.574Z
|
|
12
30
|
- commits:
|
|
13
31
|
- subject: Take the WebResource type from pinejs rather than sbvr-types
|
|
14
32
|
hash: 65c1b71e8145a41e05e2a29c39a490d052bef5b4
|
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.6
|
|
8
|
+
## (2026-10-28)
|
|
9
|
+
|
|
10
|
+
* Validate `providerCommitData` before completing a multipart upload [Pagan Gazzard]
|
|
11
|
+
|
|
7
12
|
# v2.2.5
|
|
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;
|
|
@@ -18,6 +18,11 @@ const getContentDisposition = (filename) => {
|
|
|
18
18
|
}).join('');
|
|
19
19
|
return `inline; filename="${asciiFilename}"; filename*=UTF-8''${encodedFilename}`;
|
|
20
20
|
};
|
|
21
|
+
const isCompletedPartList = (parts) => Array.isArray(parts) &&
|
|
22
|
+
parts.every((part) => typeof part === 'object' &&
|
|
23
|
+
part != null &&
|
|
24
|
+
Number.isSafeInteger(part.PartNumber) &&
|
|
25
|
+
typeof part.ETag === 'string');
|
|
21
26
|
export class S3Handler {
|
|
22
27
|
endpoint;
|
|
23
28
|
bucket;
|
|
@@ -150,11 +155,15 @@ export class S3Handler {
|
|
|
150
155
|
};
|
|
151
156
|
},
|
|
152
157
|
commit: async ({ fileKey, uploadId, filename, providerCommitData, }) => {
|
|
158
|
+
const parts = providerCommitData?.Parts;
|
|
159
|
+
if (!isCompletedPartList(parts)) {
|
|
160
|
+
throw new errors.BadRequestError('providerCommitData must have `Parts` with a `PartNumber` and `ETag` for each uploaded part');
|
|
161
|
+
}
|
|
153
162
|
await this.client.send(new CompleteMultipartUploadCommand({
|
|
154
163
|
Bucket: this.bucket,
|
|
155
164
|
Key: fileKey,
|
|
156
165
|
UploadId: uploadId,
|
|
157
|
-
MultipartUpload:
|
|
166
|
+
MultipartUpload: { Parts: parts },
|
|
158
167
|
}));
|
|
159
168
|
const headResult = await this.client.send(new HeadObjectCommand({
|
|
160
169
|
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,EAER,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
|
@@ -9,10 +9,11 @@ import {
|
|
|
9
9
|
HeadObjectCommand,
|
|
10
10
|
AbortMultipartUploadCommand,
|
|
11
11
|
type StorageClass,
|
|
12
|
+
type CompletedPart,
|
|
12
13
|
} from '@aws-sdk/client-s3';
|
|
13
14
|
import { Upload } from '@aws-sdk/lib-storage';
|
|
14
15
|
import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
|
|
15
|
-
import { webResourceHandler } from '@balena/pinejs';
|
|
16
|
+
import { errors, webResourceHandler } from '@balena/pinejs';
|
|
16
17
|
import memoize from 'memoizee';
|
|
17
18
|
import { randomUUID } from 'node:crypto';
|
|
18
19
|
|
|
@@ -58,6 +59,16 @@ const getContentDisposition = (filename: string) => {
|
|
|
58
59
|
return `inline; filename="${asciiFilename}"; filename*=UTF-8''${encodedFilename}`;
|
|
59
60
|
};
|
|
60
61
|
|
|
62
|
+
const isCompletedPartList = (parts: unknown): parts is CompletedPart[] =>
|
|
63
|
+
Array.isArray(parts) &&
|
|
64
|
+
parts.every(
|
|
65
|
+
(part) =>
|
|
66
|
+
typeof part === 'object' &&
|
|
67
|
+
part != null &&
|
|
68
|
+
Number.isSafeInteger(part.PartNumber) &&
|
|
69
|
+
typeof part.ETag === 'string',
|
|
70
|
+
);
|
|
71
|
+
|
|
61
72
|
export class S3Handler implements webResourceHandler.WebResourceHandler {
|
|
62
73
|
private readonly endpoint: string;
|
|
63
74
|
private readonly bucket: string;
|
|
@@ -245,12 +256,20 @@ export class S3Handler implements webResourceHandler.WebResourceHandler {
|
|
|
245
256
|
filename,
|
|
246
257
|
providerCommitData,
|
|
247
258
|
}: webResourceHandler.CommitMultipartUploadPayload): Promise<WebResource> => {
|
|
259
|
+
// providerCommitData comes straight from the commitUpload request body
|
|
260
|
+
const parts = providerCommitData?.Parts;
|
|
261
|
+
if (!isCompletedPartList(parts)) {
|
|
262
|
+
throw new errors.BadRequestError(
|
|
263
|
+
'providerCommitData must have `Parts` with a `PartNumber` and `ETag` for each uploaded part',
|
|
264
|
+
);
|
|
265
|
+
}
|
|
266
|
+
|
|
248
267
|
await this.client.send(
|
|
249
268
|
new CompleteMultipartUploadCommand({
|
|
250
269
|
Bucket: this.bucket,
|
|
251
270
|
Key: fileKey,
|
|
252
271
|
UploadId: uploadId,
|
|
253
|
-
MultipartUpload:
|
|
272
|
+
MultipartUpload: { Parts: parts },
|
|
254
273
|
}),
|
|
255
274
|
);
|
|
256
275
|
|
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.6-build-commit-validate-provider-data-e02b3e1f7be3f3c4337f11e70ba27edf2f2d4b81-1",
|
|
4
4
|
"description": "A PineJS WebResource handler for storing & serving files on S3",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "build/index.js",
|
|
@@ -49,6 +49,6 @@
|
|
|
49
49
|
"@balena/pinejs": "^21.3.0 || ^22.0.0 || ^23.0.0 || ^24.0.0 || ^25.0.0"
|
|
50
50
|
},
|
|
51
51
|
"versionist": {
|
|
52
|
-
"publishedAt": "2026-10-
|
|
52
|
+
"publishedAt": "2026-10-28T17:27:37.665Z"
|
|
53
53
|
}
|
|
54
54
|
}
|
package/test/index.test.ts
CHANGED
|
@@ -17,7 +17,7 @@ import { S3Handler } from '../lib/index.ts';
|
|
|
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);
|
|
@@ -502,11 +502,15 @@ describe('S3Handler', function () {
|
|
|
502
502
|
.on(HeadObjectCommand)
|
|
503
503
|
.resolves({ ContentLength: 1024, ContentType: 'text/plain' });
|
|
504
504
|
|
|
505
|
+
const parts = [
|
|
506
|
+
{ PartNumber: 1, ETag: '"etag-1"' },
|
|
507
|
+
{ PartNumber: 2, ETag: '"etag-2"' },
|
|
508
|
+
];
|
|
505
509
|
const payload = {
|
|
506
510
|
fileKey: 'test-key',
|
|
507
511
|
uploadId: 'test-upload-id',
|
|
508
512
|
filename: 'file.txt',
|
|
509
|
-
providerCommitData: {},
|
|
513
|
+
providerCommitData: { Parts: parts },
|
|
510
514
|
};
|
|
511
515
|
const result = await s3Handler.multipartUpload.commit(payload);
|
|
512
516
|
|
|
@@ -523,9 +527,36 @@ describe('S3Handler', function () {
|
|
|
523
527
|
Bucket: 'test-bucket',
|
|
524
528
|
Key: 'test-key',
|
|
525
529
|
UploadId: 'test-upload-id',
|
|
526
|
-
MultipartUpload: {},
|
|
530
|
+
MultipartUpload: { Parts: parts },
|
|
527
531
|
});
|
|
528
532
|
});
|
|
533
|
+
|
|
534
|
+
const invalidProviderCommitData: Array<
|
|
535
|
+
webResourceHandler.CommitMultipartUploadPayload['providerCommitData']
|
|
536
|
+
> = [
|
|
537
|
+
undefined,
|
|
538
|
+
{},
|
|
539
|
+
{ Parts: 'not-an-array' },
|
|
540
|
+
{ Parts: [{ PartNumber: '1', ETag: '"etag-1"' }] },
|
|
541
|
+
{ Parts: [{ PartNumber: 1 }] },
|
|
542
|
+
{ Parts: [null] },
|
|
543
|
+
];
|
|
544
|
+
for (const providerCommitData of invalidProviderCommitData) {
|
|
545
|
+
it(`should reject providerCommitData ${inspect(providerCommitData, { breakLength: Infinity })} without contacting S3`, async function () {
|
|
546
|
+
await expect(
|
|
547
|
+
s3Handler.multipartUpload.commit({
|
|
548
|
+
fileKey: 'test-key',
|
|
549
|
+
uploadId: 'test-upload-id',
|
|
550
|
+
filename: 'file.txt',
|
|
551
|
+
providerCommitData,
|
|
552
|
+
}),
|
|
553
|
+
).to.be.rejectedWith(
|
|
554
|
+
errors.BadRequestError,
|
|
555
|
+
'providerCommitData must have `Parts` with a `PartNumber` and `ETag` for each uploaded part',
|
|
556
|
+
);
|
|
557
|
+
expect(s3Mock.calls()).to.have.lengthOf(0);
|
|
558
|
+
});
|
|
559
|
+
}
|
|
529
560
|
});
|
|
530
561
|
|
|
531
562
|
describe('cancel', function () {
|