@gadicc/loom 2.1.0 → 2.1.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/.loom-source-manifest.json +1 -1
- package/esm/src/release/githubOidc.d.ts.map +1 -1
- package/esm/src/release/githubOidc.js +20 -8
- package/esm/src/release/githubOidc.js.map +1 -1
- package/package.json +2 -2
- package/skills/loom/references/release-trusted-sources.md +4 -1
- package/source/src/release/githubOidc.ts +18 -7
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 1,
|
|
3
|
-
"supportDigest": "
|
|
3
|
+
"supportDigest": "25da36f711d6283ffab58e8d18a6030ce07b0bd57f34b5ac53cbfb5934f54841",
|
|
4
4
|
"supportSources": [
|
|
5
5
|
"src/apiKeys/betterAuth.ts",
|
|
6
6
|
"src/apiKeys/permissions.ts",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"githubOidc.d.ts","sourceRoot":"","sources":["../../../source/src/release/githubOidc.ts"],"names":[],"mappings":"AAAA,qFAAqF;AACrF,MAAM,WAAW,6BAA6B;IAC5C,sFAAsF;IACtF,MAAM,EAAE,MAAM,CAAC;IACf,0EAA0E;IAC1E,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;IAClD,6EAA6E;IAC7E,oBAAoB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IAChC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAuCD;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,6BAA6B,
|
|
1
|
+
{"version":3,"file":"githubOidc.d.ts","sourceRoot":"","sources":["../../../source/src/release/githubOidc.ts"],"names":[],"mappings":"AAAA,qFAAqF;AACrF,MAAM,WAAW,6BAA6B;IAC5C,sFAAsF;IACtF,MAAM,EAAE,MAAM,CAAC;IACf,0EAA0E;IAC1E,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;IAClD,6EAA6E;IAC7E,oBAAoB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAChD,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IAChC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAuCD;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,6BAA6B,IAoHpC,MAAM,MAAM,GAAG,GAAG,EAClB,OAAM,WAAgB,KACrB,OAAO,CAAC,QAAQ,CAAC,CAqCrB"}
|
|
@@ -83,6 +83,7 @@ export function createGithubActionsOidcFetch(options) {
|
|
|
83
83
|
let cached;
|
|
84
84
|
let pending;
|
|
85
85
|
async function acquire() {
|
|
86
|
+
let phase = "transport";
|
|
86
87
|
try {
|
|
87
88
|
const response = await fetchImpl(endpoint, {
|
|
88
89
|
headers: {
|
|
@@ -93,16 +94,23 @@ export function createGithubActionsOidcFetch(options) {
|
|
|
93
94
|
cache: "no-store",
|
|
94
95
|
signal: AbortSignal.timeout(30_000),
|
|
95
96
|
});
|
|
96
|
-
if (!response.ok)
|
|
97
|
+
if (!response.ok) {
|
|
98
|
+
phase = `http-${response.status}`;
|
|
99
|
+
await response.body?.cancel();
|
|
97
100
|
throw new Error("Identity request denied");
|
|
101
|
+
}
|
|
102
|
+
phase = "response";
|
|
98
103
|
const token = object(await readJson(response)).value;
|
|
104
|
+
phase = "token";
|
|
99
105
|
if (typeof token !== "string" ||
|
|
100
106
|
!token ||
|
|
101
107
|
token.length > 32_768 ||
|
|
102
108
|
/[\r\n]/.test(token)) {
|
|
103
109
|
throw new Error("Invalid identity token");
|
|
104
110
|
}
|
|
111
|
+
phase = "masking";
|
|
105
112
|
mask(token);
|
|
113
|
+
phase = "token";
|
|
106
114
|
const segments = token.split(".");
|
|
107
115
|
if (segments.length !== 3 ||
|
|
108
116
|
segments.some((part) => !/^[A-Za-z0-9_-]+$/.test(part))) {
|
|
@@ -110,18 +118,22 @@ export function createGithubActionsOidcFetch(options) {
|
|
|
110
118
|
}
|
|
111
119
|
const claims = object(JSON.parse(atob(segments[1].replaceAll("-", "+").replaceAll("_", "/"))));
|
|
112
120
|
// Cache hints and configuration sanity only; these are not signature verification.
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
121
|
+
phase = "issuer";
|
|
122
|
+
if (claims.iss !== issuer)
|
|
123
|
+
throw new Error("Invalid identity issuer");
|
|
124
|
+
phase = "audience";
|
|
125
|
+
if (claims.aud !== audience)
|
|
126
|
+
throw new Error("Invalid identity audience");
|
|
127
|
+
phase = "expiry";
|
|
128
|
+
if (typeof claims.exp !== "number" ||
|
|
116
129
|
!Number.isSafeInteger(claims.exp) ||
|
|
117
|
-
claims.exp * 1000 <= now() + 30_000)
|
|
118
|
-
throw new Error("Invalid identity
|
|
119
|
-
}
|
|
130
|
+
claims.exp * 1000 <= now() + 30_000)
|
|
131
|
+
throw new Error("Invalid identity expiry");
|
|
120
132
|
return { token, expires: claims.exp * 1000 };
|
|
121
133
|
}
|
|
122
134
|
catch {
|
|
123
135
|
// Transport exceptions can contain request headers. Never expose their cause.
|
|
124
|
-
throw new Error(
|
|
136
|
+
throw new Error(`GitHub OIDC token acquisition failed (${phase})`);
|
|
125
137
|
}
|
|
126
138
|
}
|
|
127
139
|
async function token() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"githubOidc.js","sourceRoot":"","sources":["../../../source/src/release/githubOidc.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"githubOidc.js","sourceRoot":"","sources":["../../../source/src/release/githubOidc.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gadicc/loom",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.1",
|
|
4
4
|
"description": "Shared helpers and verification tooling for Next.js applications.",
|
|
5
5
|
"homepage": "https://github.com/gadicc/loom#readme",
|
|
6
6
|
"repository": {
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"url": "https://github.com/gadicc/loom/issues"
|
|
12
12
|
},
|
|
13
13
|
"loom": {
|
|
14
|
-
"gitCommit": "
|
|
14
|
+
"gitCommit": "8b6b284d205b77735bcf1235a0f20ed0fddca857"
|
|
15
15
|
},
|
|
16
16
|
"type": "module",
|
|
17
17
|
"main": "./esm/mod.js",
|
|
@@ -76,7 +76,10 @@ The helper masks the request credential and JWT before use, coalesces concurrent
|
|
|
76
76
|
identity requests and refreshes 30 seconds before expiry. It refuses other
|
|
77
77
|
origins, redirects that would follow, caller-supplied OIDC/bypass headers and
|
|
78
78
|
non-read-only requests. It returns manual redirect responses for app assertions,
|
|
79
|
-
uses bounded timeouts and sanitizes transport errors.
|
|
79
|
+
uses bounded timeouts and sanitizes transport errors. Acquisition errors expose
|
|
80
|
+
only a fixed phase (`transport`, `http-<status>`, `response`, `token`, `masking`,
|
|
81
|
+
`issuer`, `audience` or `expiry`), without response bodies, URLs or causes.
|
|
82
|
+
It has no bypass fallback.
|
|
80
83
|
JWT decoding only supplies cache/sanity hints; Vercel verifies signature and all
|
|
81
84
|
configured identity claims.
|
|
82
85
|
|
|
@@ -102,6 +102,7 @@ export function createGithubActionsOidcFetch(
|
|
|
102
102
|
let cached: { token: string; expires: number } | undefined;
|
|
103
103
|
let pending: Promise<{ token: string; expires: number }> | undefined;
|
|
104
104
|
async function acquire() {
|
|
105
|
+
let phase = "transport";
|
|
105
106
|
try {
|
|
106
107
|
const response = await fetchImpl(endpoint, {
|
|
107
108
|
headers: {
|
|
@@ -112,8 +113,14 @@ export function createGithubActionsOidcFetch(
|
|
|
112
113
|
cache: "no-store",
|
|
113
114
|
signal: AbortSignal.timeout(30_000),
|
|
114
115
|
});
|
|
115
|
-
if (!response.ok)
|
|
116
|
+
if (!response.ok) {
|
|
117
|
+
phase = `http-${response.status}`;
|
|
118
|
+
await response.body?.cancel();
|
|
119
|
+
throw new Error("Identity request denied");
|
|
120
|
+
}
|
|
121
|
+
phase = "response";
|
|
116
122
|
const token = object(await readJson(response)).value;
|
|
123
|
+
phase = "token";
|
|
117
124
|
if (
|
|
118
125
|
typeof token !== "string" ||
|
|
119
126
|
!token ||
|
|
@@ -122,7 +129,9 @@ export function createGithubActionsOidcFetch(
|
|
|
122
129
|
) {
|
|
123
130
|
throw new Error("Invalid identity token");
|
|
124
131
|
}
|
|
132
|
+
phase = "masking";
|
|
125
133
|
mask(token);
|
|
134
|
+
phase = "token";
|
|
126
135
|
const segments = token.split(".");
|
|
127
136
|
if (
|
|
128
137
|
segments.length !== 3 ||
|
|
@@ -134,19 +143,21 @@ export function createGithubActionsOidcFetch(
|
|
|
134
143
|
JSON.parse(atob(segments[1].replaceAll("-", "+").replaceAll("_", "/"))),
|
|
135
144
|
);
|
|
136
145
|
// Cache hints and configuration sanity only; these are not signature verification.
|
|
146
|
+
phase = "issuer";
|
|
147
|
+
if (claims.iss !== issuer) throw new Error("Invalid identity issuer");
|
|
148
|
+
phase = "audience";
|
|
149
|
+
if (claims.aud !== audience) throw new Error("Invalid identity audience");
|
|
150
|
+
phase = "expiry";
|
|
137
151
|
if (
|
|
138
|
-
claims.iss !== issuer ||
|
|
139
|
-
claims.aud !== audience ||
|
|
140
152
|
typeof claims.exp !== "number" ||
|
|
141
153
|
!Number.isSafeInteger(claims.exp) ||
|
|
142
154
|
claims.exp * 1000 <= now() + 30_000
|
|
143
|
-
)
|
|
144
|
-
throw new Error("Invalid identity
|
|
145
|
-
}
|
|
155
|
+
)
|
|
156
|
+
throw new Error("Invalid identity expiry");
|
|
146
157
|
return { token, expires: claims.exp * 1000 };
|
|
147
158
|
} catch {
|
|
148
159
|
// Transport exceptions can contain request headers. Never expose their cause.
|
|
149
|
-
throw new Error(
|
|
160
|
+
throw new Error(`GitHub OIDC token acquisition failed (${phase})`);
|
|
150
161
|
}
|
|
151
162
|
}
|
|
152
163
|
async function token() {
|