@crvouga/mockingbird-service-s3 4.2.0 → 4.2.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/CHANGELOG.md +8 -1
- package/dist/{auth-v2-YGYT7VVQ.js → auth-v2-RZJ4AKKC.js} +3 -2
- package/dist/{auth-v2-YGYT7VVQ.js.map → auth-v2-RZJ4AKKC.js.map} +1 -1
- package/dist/{chunk-UEXWQB6F.js → chunk-H3K742VW.js} +37 -18
- package/dist/chunk-H3K742VW.js.map +7 -0
- package/dist/{chunk-G5M33PF4.js → chunk-H77IK3F3.js} +4 -4
- package/dist/chunk-JX5VOLFN.js +7 -0
- package/dist/chunk-JX5VOLFN.js.map +7 -0
- package/dist/{chunk-Y75YGK7R.js → chunk-XPRD2L4L.js} +2 -2
- package/dist/{chunk-FX4JECRB.js → chunk-YHC3JBLQ.js} +13 -6
- package/dist/chunk-YHC3JBLQ.js.map +7 -0
- package/dist/cli.js +5 -4
- package/dist/cli.js.map +1 -1
- package/dist/digest-WAT7AX3C.js +12 -0
- package/dist/index.d.ts +3 -1368
- package/dist/index.js +4 -3
- package/dist/server.d.ts +61 -1408
- package/dist/server.js +5 -4
- package/dist/types-HwqI9Aq6.d.ts +1368 -0
- package/package.json +1 -1
- package/dist/chunk-FX4JECRB.js.map +0 -7
- package/dist/chunk-UEXWQB6F.js.map +0 -7
- package/dist/digest-VNY5VGIS.js +0 -11
- /package/dist/{chunk-G5M33PF4.js.map → chunk-H77IK3F3.js.map} +0 -0
- /package/dist/{chunk-Y75YGK7R.js.map → chunk-XPRD2L4L.js.map} +0 -0
- /package/dist/{digest-VNY5VGIS.js.map → digest-WAT7AX3C.js.map} +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,6 +1,13 @@
|
|
|
1
1
|
# Changelog — @crvouga/mockingbird-service-s3
|
|
2
2
|
|
|
3
|
-
## 4.2.
|
|
3
|
+
## 4.2.1 (2026-11-12)
|
|
4
|
+
|
|
5
|
+
### Fixes and improvements
|
|
6
|
+
|
|
7
|
+
- serve vendor brand data from each emulator instead of the docs site ([0c72a69](https://github.com/crvouga/mockingbird/commit/0c72a693fc76e612936150598faef9787ad1c824))
|
|
8
|
+
- take SIGINT/SIGTERM before readiness is published ([d5a98a0](https://github.com/crvouga/mockingbird/commit/d5a98a09a344e12818c5c94cbea03621b528f841))
|
|
9
|
+
|
|
10
|
+
## 4.2.0 (2026-11-11)
|
|
4
11
|
|
|
5
12
|
### Features
|
|
6
13
|
|
|
@@ -3,7 +3,8 @@ import {
|
|
|
3
3
|
checkKey,
|
|
4
4
|
fail,
|
|
5
5
|
hmacRaw
|
|
6
|
-
} from "./chunk-
|
|
6
|
+
} from "./chunk-XPRD2L4L.js";
|
|
7
|
+
import "./chunk-JX5VOLFN.js";
|
|
7
8
|
|
|
8
9
|
// src/auth-v2.ts
|
|
9
10
|
var encoder = new TextEncoder();
|
|
@@ -162,4 +163,4 @@ export {
|
|
|
162
163
|
requestAccessKeyV2,
|
|
163
164
|
verifyV2
|
|
164
165
|
};
|
|
165
|
-
//# sourceMappingURL=auth-v2-
|
|
166
|
+
//# sourceMappingURL=auth-v2-RZJ4AKKC.js.map
|
|
@@ -2,6 +2,6 @@
|
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/auth-v2.ts"],
|
|
4
4
|
"sourcesContent": ["/** AWS Signature Version 2 (header and presigned), as MinIO's `cmd/signature-v2.go` checks it. */\nimport { checkKey, hmacRaw, type Lookup, SIGN_V4, type SignedRequest } from \"./auth.js\"\nimport { fail } from \"./errors.js\"\n\nconst encoder = new TextEncoder()\n\n/** The sub-resources a V2 signature covers, in MinIO's `resourceList` order. */\nconst RESOURCES = [\n \"acl\",\n \"cors\",\n \"delete\",\n \"encryption\",\n \"legal-hold\",\n \"lifecycle\",\n \"location\",\n \"logging\",\n \"notification\",\n \"partNumber\",\n \"policy\",\n \"requestPayment\",\n \"response-cache-control\",\n \"response-content-disposition\",\n \"response-content-encoding\",\n \"response-content-language\",\n \"response-content-type\",\n \"response-expires\",\n \"retention\",\n \"select\",\n \"select-type\",\n \"tagging\",\n \"torrent\",\n \"uploadId\",\n \"uploads\",\n \"versionId\",\n \"versioning\",\n \"versions\",\n \"website\",\n]\n\nconst base64 = (bytes: Uint8Array) => btoa(String.fromCharCode(...bytes))\n\n/** Go's `url.QueryUnescape`: `+` is a space, a bad `%` escape is an error (`undefined`). */\nconst queryUnescape = (value: string) => {\n if (/%(?![0-9A-Fa-f]{2})/.test(value)) return undefined\n try {\n return decodeURIComponent(value.replace(/\\+/g, \" \"))\n } catch {\n // Go keeps invalid UTF-8 bytes; decode them one by one.\n return value\n .replace(/\\+/g, \" \")\n .replace(/%([0-9A-Fa-f]{2})/g, (_, code: string) =>\n String.fromCharCode(Number.parseInt(code, 16)),\n )\n }\n}\n\nconst unescapeQueries = (rawQuery: string) => {\n const out: string[] = []\n for (const query of rawQuery.split(\"&\")) {\n const value = queryUnescape(query)\n if (value === undefined) fail(\"InvalidQueryParams\")\n out.push(value as string)\n }\n return out\n}\n\n/** `x-amz-*` headers, lowercased, sorted, multi-values joined with `,`. */\nconst canonicalAmzHeaders = (headers: Headers) => {\n const lines: [string, string][] = []\n for (const [name, value] of headers) if (name.startsWith(\"x-amz-\")) lines.push([name, value])\n return lines\n .sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0))\n .map(([name, value]) => `${name}:${value}`)\n .join(\"\\n\")\n}\n\nconst canonicalResource = (resource: string, query: string) => {\n const values = new Map<string, string>()\n for (const entry of query.split(\"&\")) {\n const index = entry.indexOf(\"=\")\n if (index < 0) values.set(entry, \"\")\n else values.set(entry.slice(0, index), entry.slice(index + 1))\n }\n const parts: string[] = []\n for (const name of RESOURCES) {\n const value = values.get(name)\n if (value === undefined) continue\n parts.push(value === \"\" ? name : `${name}=${value}`)\n }\n return parts.length ? `${resource}?${parts.join(\"&\")}` : resource\n}\n\nconst stringToSign = (request: SignedRequest, query: string, date: string) => {\n let amz = canonicalAmzHeaders(request.headers)\n if (amz) amz += \"\\n\"\n return (\n [\n request.method,\n request.headers.get(\"content-md5\") ?? \"\",\n request.headers.get(\"content-type\") ?? \"\",\n date,\n amz,\n ].join(\"\\n\") + canonicalResource(request.rawPath, query)\n )\n}\n\nconst sign = async (secret: string, value: string) =>\n base64(await hmacRaw(\"SHA-1\", encoder.encode(secret), value))\n\n/** Go's `base64.StdEncoding.DecodeString`, or undefined. */\nconst decode64 = (value: string) => {\n if (!/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(value))\n return undefined\n return atob(value)\n}\nconst sameSignature = (a: string, b: string) => {\n const left = decode64(a)\n const right = decode64(b)\n return left !== undefined && right !== undefined && left === right\n}\n\n/** MinIO's `getReqAccessKeyV2`: the presigned `AWSAccessKeyId`, else `AWS <key>:<signature>`. */\nexport const requestAccessKeyV2 = (request: SignedRequest, lookup: Lookup) => {\n const presigned = request.query.get(\"AWSAccessKeyId\")\n if (presigned) {\n checkKey(lookup, presigned)\n return presigned\n }\n const fields = (request.headers.get(\"authorization\") ?? \"\").split(\" \")\n if (fields.length !== 2) fail(\"MissingFields\")\n const keySign = (fields[1] as string).trim().split(\":\")\n if (keySign.length !== 2) fail(\"MissingFields\")\n checkKey(lookup, keySign[0] as string)\n return keySign[0] as string\n}\n\n/** MinIO's `doesSignV2Match`. */\nconst verifyHeaderV2 = async (request: SignedRequest, lookup: Lookup) => {\n const header = request.headers.get(\"authorization\") ?? \"\"\n if (!header) fail(\"AuthHeaderEmpty\")\n if (!header.startsWith(\"AWS\") || header.startsWith(SIGN_V4)) fail(\"SignatureVersionNotSupported\")\n const accessKey = requestAccessKeyV2(request, lookup)\n const secret = checkKey(lookup, accessKey)\n const queries = unescapeQueries(request.rawQuery)\n const prefix = `AWS ${accessKey}:`\n if (!header.startsWith(prefix)) fail(\"SignatureDoesNotMatch\")\n const expected = await sign(\n secret,\n stringToSign(request, queries.join(\"&\"), request.headers.get(\"date\") ?? \"\"),\n )\n if (!sameSignature(header.slice(prefix.length), expected)) fail(\"SignatureDoesNotMatch\")\n return accessKey\n}\n\n/** MinIO's `doesPresignV2SignatureMatch`. */\nconst verifyPresignV2 = async (request: SignedRequest, lookup: Lookup, now: number) => {\n const filtered: string[] = []\n let signature = \"\"\n let expires = \"\"\n let accessKey = \"\"\n for (const query of unescapeQueries(request.rawQuery)) {\n const index = query.indexOf(\"=\")\n if (index < 0) fail(\"InvalidQueryParams\")\n const name = query.slice(0, index)\n const value = query.slice(index + 1)\n if (name === \"AWSAccessKeyId\") accessKey = value\n else if (name === \"Signature\") signature = value\n else if (name === \"Expires\") expires = value\n else filtered.push(query)\n }\n if (!accessKey || !signature || !expires) fail(\"InvalidQueryParams\")\n const secret = checkKey(lookup, accessKey)\n if (!/^[+-]?\\d+$/.test(expires)) fail(\"MalformedExpires\")\n if (Number(expires) < Math.floor(now / 1000)) fail(\"ExpiredPresignRequest\")\n const expected = await sign(secret, stringToSign(request, filtered.join(\"&\"), expires))\n if (!sameSignature(signature, expected)) fail(\"SignatureDoesNotMatch\")\n return accessKey\n}\n\n/** MinIO's `isReqAuthenticatedV2` then `getReqAccessKeyV2`: the verified access key. */\nexport const verifyV2 = async (\n request: SignedRequest,\n lookup: Lookup,\n now: number,\n presigned: boolean,\n): Promise<string> => {\n if (presigned) await verifyPresignV2(request, lookup, now)\n else await verifyHeaderV2(request, lookup)\n return requestAccessKeyV2(request, lookup)\n}\n"],
|
|
5
|
-
"mappings": "
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
S3_MAX_UPLOAD_BYTES,
|
|
3
3
|
createRuntime
|
|
4
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-H77IK3F3.js";
|
|
5
5
|
import {
|
|
6
6
|
createClock,
|
|
7
7
|
normalizeBootControls,
|
|
@@ -12,7 +12,7 @@ import {
|
|
|
12
12
|
parseFaultHeader,
|
|
13
13
|
resolveAdminPrefix,
|
|
14
14
|
restoreClock
|
|
15
|
-
} from "./chunk-
|
|
15
|
+
} from "./chunk-YHC3JBLQ.js";
|
|
16
16
|
|
|
17
17
|
// ../../adapters/node/dist/cli.js
|
|
18
18
|
import { readFile as readFile5 } from "node:fs/promises";
|
|
@@ -3082,7 +3082,7 @@ async function preflightFleet(config, options) {
|
|
|
3082
3082
|
break;
|
|
3083
3083
|
}
|
|
3084
3084
|
}
|
|
3085
|
-
targets.set(name, { ...target, packageVersion: packageVersion ?? "4.2.
|
|
3085
|
+
targets.set(name, { ...target, packageVersion: packageVersion ?? "4.2.1" });
|
|
3086
3086
|
} catch (error) {
|
|
3087
3087
|
throw new Error(`service ${name}: ${error instanceof Error ? error.message : String(error)}`, { cause: error });
|
|
3088
3088
|
}
|
|
@@ -4940,20 +4940,35 @@ var start = async (target, values, config) => {
|
|
|
4940
4940
|
console.log(`${target.name} ${line.replaceAll("/__admin", adminPrefix)}`);
|
|
4941
4941
|
return listening;
|
|
4942
4942
|
};
|
|
4943
|
-
var
|
|
4944
|
-
|
|
4943
|
+
var watchSignals = () => {
|
|
4944
|
+
let received = false;
|
|
4945
|
+
let wake = () => {
|
|
4946
|
+
};
|
|
4947
|
+
const on = () => {
|
|
4948
|
+
received = true;
|
|
4949
|
+
wake();
|
|
4950
|
+
};
|
|
4951
|
+
const dispose = () => {
|
|
4945
4952
|
;
|
|
4946
|
-
process.removeListener("SIGINT",
|
|
4947
|
-
process.removeListener("SIGTERM",
|
|
4948
|
-
const results = await Promise.allSettled(servers.map((s) => s.close()));
|
|
4949
|
-
for (const result of results)
|
|
4950
|
-
if (result.status === "rejected")
|
|
4951
|
-
console.error(result.reason instanceof Error ? result.reason.message : String(result.reason));
|
|
4952
|
-
resolve4(results.some((r) => r.status === "rejected") ? 1 : 0);
|
|
4953
|
+
process.removeListener("SIGINT", on);
|
|
4954
|
+
process.removeListener("SIGTERM", on);
|
|
4953
4955
|
};
|
|
4954
|
-
process.once("SIGINT",
|
|
4955
|
-
process.once("SIGTERM",
|
|
4956
|
-
|
|
4956
|
+
process.once("SIGINT", on);
|
|
4957
|
+
process.once("SIGTERM", on);
|
|
4958
|
+
return {
|
|
4959
|
+
dispose,
|
|
4960
|
+
async untilSignal(servers) {
|
|
4961
|
+
if (!received)
|
|
4962
|
+
await new Promise((resolve4) => wake = resolve4);
|
|
4963
|
+
dispose();
|
|
4964
|
+
const results = await Promise.allSettled(servers.map((s) => s.close()));
|
|
4965
|
+
for (const result of results)
|
|
4966
|
+
if (result.status === "rejected")
|
|
4967
|
+
console.error(result.reason instanceof Error ? result.reason.message : String(result.reason));
|
|
4968
|
+
return results.some((r) => r.status === "rejected") ? 1 : 0;
|
|
4969
|
+
}
|
|
4970
|
+
};
|
|
4971
|
+
};
|
|
4957
4972
|
var serveCommand = (target) => ({
|
|
4958
4973
|
fleetTarget: target,
|
|
4959
4974
|
summary: `Serve the ${target.name} emulator or a configured fleet`,
|
|
@@ -4966,6 +4981,7 @@ var serveCommand = (target) => ({
|
|
|
4966
4981
|
}
|
|
4967
4982
|
const configPath = asString(values.config);
|
|
4968
4983
|
if (configPath !== void 0) {
|
|
4984
|
+
const signals2 = watchSignals();
|
|
4969
4985
|
try {
|
|
4970
4986
|
const config = JSON.parse(await readFile5(configPath, "utf8"));
|
|
4971
4987
|
config.adminPrefix = resolveAdminPrefix(config.adminPrefix ?? asString(values["admin-prefix"]) ?? process.env.MOCKINGBIRD_ADMIN_PREFIX);
|
|
@@ -4995,8 +5011,9 @@ var serveCommand = (target) => ({
|
|
|
4995
5011
|
console.log(`${name} emulator listening on ${endpoint.url}`);
|
|
4996
5012
|
}
|
|
4997
5013
|
});
|
|
4998
|
-
return untilSignal([fleet]);
|
|
5014
|
+
return signals2.untilSignal([fleet]);
|
|
4999
5015
|
} catch (error) {
|
|
5016
|
+
signals2.dispose();
|
|
5000
5017
|
console.error(error instanceof Error ? error.message : String(error));
|
|
5001
5018
|
return 1;
|
|
5002
5019
|
}
|
|
@@ -5009,6 +5026,7 @@ var serveCommand = (target) => ({
|
|
|
5009
5026
|
const adminKey = asString(values["admin-key"]) ?? process.env.MOCKINGBIRD_ADMIN_KEY;
|
|
5010
5027
|
const seed = asString(values.seed) ?? process.env.MOCKINGBIRD_SEED;
|
|
5011
5028
|
let listening;
|
|
5029
|
+
const signals = watchSignals();
|
|
5012
5030
|
try {
|
|
5013
5031
|
const adminControls = await resolveServeControls(values);
|
|
5014
5032
|
const idBase = resolveServeIdBase(values);
|
|
@@ -5025,10 +5043,11 @@ var serveCommand = (target) => ({
|
|
|
5025
5043
|
log
|
|
5026
5044
|
});
|
|
5027
5045
|
} catch (error) {
|
|
5046
|
+
signals.dispose();
|
|
5028
5047
|
console.error(error instanceof Error ? error.message : String(error));
|
|
5029
5048
|
return 1;
|
|
5030
5049
|
}
|
|
5031
|
-
return untilSignal([listening]);
|
|
5050
|
+
return signals.untilSignal([listening]);
|
|
5032
5051
|
}
|
|
5033
5052
|
});
|
|
5034
5053
|
|
|
@@ -5094,4 +5113,4 @@ export {
|
|
|
5094
5113
|
createServer2 as createServer,
|
|
5095
5114
|
serveTarget
|
|
5096
5115
|
};
|
|
5097
|
-
//# sourceMappingURL=chunk-
|
|
5116
|
+
//# sourceMappingURL=chunk-H3K742VW.js.map
|