@farm.js/auth0 0.1.30 → 0.1.34

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.
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAuC,KAAK,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAgChG,MAAM,WAAW,aAAa;IAC5B,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,QAAQ,GAAG,IAAI,CAAC;IACzE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACpC;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,uBAAuB,CAAC,EAAE,MAAM,GAAG,qBAAqB,GAAG,oBAAoB,GAAG,MAAM,CAAC;IACzF,GAAG,CAAC,EAAE,qBAAqB,CAAC;CAC7B;AAED,UAAU,gBAAgB;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AA6PD,wBAAgB,KAAK,CAAC,KAAK,GAAE,qBAA0B;;;;;;;yBAU5B,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBAsSH,OAAO;;mDAmBrC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAuC,KAAK,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAgChG,MAAM,WAAW,aAAa;IAC5B,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,QAAQ,GAAG,IAAI,CAAC;IACzE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACpC;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,uBAAuB,CAAC,EAAE,MAAM,GAAG,qBAAqB,GAAG,oBAAoB,GAAG,MAAM,CAAC;IACzF,GAAG,CAAC,EAAE,qBAAqB,CAAC;CAC7B;AAED,UAAU,gBAAgB;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAmRD,wBAAgB,KAAK,CAAC,KAAK,GAAE,qBAA0B;;;;;;;yBAU5B,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;yBA0SH,OAAO;;mDAmBrC"}
package/dist/index.js CHANGED
@@ -58,12 +58,14 @@ function createCodeVerifier() {
58
58
  function createCodeChallenge(verifier) {
59
59
  return createHash("sha256").update(verifier).digest("base64url");
60
60
  }
61
- function signValue(value, secret) {
61
+ function signPayload(payload, secret, purpose) {
62
+ return createHmac("sha256", secret).update(`farm-auth0:${purpose}.${payload}`).digest("hex");
63
+ }
64
+ function signValue(value, secret, purpose) {
62
65
  const payload = Buffer.from(JSON.stringify(value), "utf8").toString("base64url");
63
- const signature = createHmac("sha256", secret).update(payload).digest("hex");
64
- return `${payload}.${signature}`;
66
+ return `${payload}.${signPayload(payload, secret, purpose)}`;
65
67
  }
66
- function unsignValue(signed, secret) {
68
+ function unsignValue(signed, secret, purpose) {
67
69
  if (!signed) {
68
70
  return null;
69
71
  }
@@ -73,11 +75,13 @@ function unsignValue(signed, secret) {
73
75
  }
74
76
  const payload = signed.slice(0, separator);
75
77
  const signature = signed.slice(separator + 1);
76
- const expected = createHmac("sha256", secret).update(payload).digest("hex");
77
- if (signature.length !== expected.length) {
78
- return null;
79
- }
80
- if (!timingSafeEqual(Buffer.from(signature, "utf8"), Buffer.from(expected, "utf8"))) {
78
+ const expected = signPayload(payload, secret, purpose);
79
+ // Compare byte lengths: a multibyte signature can match the hex digest's
80
+ // character count, and timingSafeEqual throws on unequal buffers.
81
+ const signatureBytes = Buffer.from(signature, "utf8");
82
+ const expectedBytes = Buffer.from(expected, "utf8");
83
+ if (signatureBytes.length !== expectedBytes.length ||
84
+ !timingSafeEqual(signatureBytes, expectedBytes)) {
81
85
  return null;
82
86
  }
83
87
  try {
@@ -104,8 +108,14 @@ function decodeJwtPayload(token) {
104
108
  }
105
109
  function getSession(request, cookieName, secret) {
106
110
  const cookies = parseCookieHeaderMap(request.headers.get("cookie"));
107
- const session = unsignValue(cookies[cookieName], secret);
108
- if (!session) {
111
+ const session = unsignValue(cookies[cookieName], secret, "session");
112
+ if (!session ||
113
+ typeof session !== "object" ||
114
+ typeof session.expiresAt !== "number" ||
115
+ !Number.isFinite(session.expiresAt) ||
116
+ !session.user ||
117
+ typeof session.user !== "object" ||
118
+ Array.isArray(session.user)) {
109
119
  return null;
110
120
  }
111
121
  if (session.expiresAt <= Date.now()) {
@@ -228,7 +238,7 @@ export function auth0(input = {}) {
228
238
  authorizeUrl.searchParams.set("screen_hint", screenHint);
229
239
  }
230
240
  const headers = new Headers();
231
- headers.append("set-cookie", createRequestCookie(stateCookieName, signValue({ state, returnTo, codeVerifier }, secret), request, { maxAge: 600 }));
241
+ headers.append("set-cookie", createRequestCookie(stateCookieName, signValue({ state, returnTo, codeVerifier }, secret, "state"), request, { maxAge: 600 }));
232
242
  return {
233
243
  redirectTo: authorizeUrl.toString(),
234
244
  headers,
@@ -320,7 +330,7 @@ export function auth0(input = {}) {
320
330
  return new Response("Missing Auth0 authorization code or state.", { status: 400 });
321
331
  }
322
332
  const cookies = parseCookieHeaderMap(request.headers.get("cookie"));
323
- const statePayload = unsignValue(cookies[stateCookieName], secret);
333
+ const statePayload = unsignValue(cookies[stateCookieName], secret, "state");
324
334
  if (!statePayload || statePayload.state !== state) {
325
335
  return new Response("Invalid Auth0 state.", { status: 400 });
326
336
  }
@@ -330,7 +340,7 @@ export function auth0(input = {}) {
330
340
  const user = await createUserProfile(domain, tokenResponse.access_token, tokenResponse.id_token);
331
341
  const expiresAt = Date.now() + Math.max(tokenResponse.expires_in || 3600, 60) * 1000;
332
342
  const headers = new Headers();
333
- headers.append("set-cookie", createRequestCookie(sessionCookieName, signValue({ user, expiresAt }, secret), request, {
343
+ headers.append("set-cookie", createRequestCookie(sessionCookieName, signValue({ user, expiresAt }, secret, "session"), request, {
334
344
  maxAge: Math.max((expiresAt - Date.now()) / 1000, 60),
335
345
  }));
336
346
  headers.append("set-cookie", clearRequestCookie(stateCookieName, request));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@farm.js/auth0",
3
- "version": "0.1.30",
3
+ "version": "0.1.34",
4
4
  "description": "Auth0 integration for Farm.js",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -29,8 +29,8 @@
29
29
  "access": "public"
30
30
  },
31
31
  "dependencies": {
32
- "@farm.js/core": "0.1.30",
33
- "@farm.js/integration-utils": "0.1.30"
32
+ "@farm.js/core": "0.1.34",
33
+ "@farm.js/integration-utils": "0.1.34"
34
34
  },
35
35
  "scripts": {
36
36
  "build": "node -e \"require('node:fs').rmSync('dist', { recursive: true, force: true })\" && tsc",