Added support for PKCE

.gitignore

@@ -1,5 +1,7 @@
 /node_modules/
 /coverage/
 /.vscode/
+/.idea
 /.cache/
 /dist/
+.idea

package.json

@@ -45,7 +45,8 @@
     "lint": "eslint --cache --cache-location .cache/ --ext=.ts src test --max-warnings 0",
     "prepack": "yarn build --tsBuildInfoFile null --incremental false",
     "pretest": "yarn lint",
-    "test": "yarn vitest --run  --coverage"
+    "test": "yarn vitest --run  --coverage",
+    "test:watch": "yarn vitest --watch"
   },
   "dependencies": {
     "basic-auth": "^2.0.1",

src/lib/helpers.ts

@@ -21,7 +21,8 @@ import { readFileSync } from 'fs';
 
 import { isPlainObject } from 'is-plain-object';
 
-import type { TokenRequest } from './types';
+import type { CodeChallenge, PKCEAlgorithm, TokenRequest } from './types';
+import { webcrypto as crypto } from 'crypto';
 
 export const defaultTokenTtl = 3600;
 
@@ -60,6 +61,17 @@ export function assertIsPlainObject(
   }
 }
 
+export async function pkceVerifierMatchesChallenge(
+  verifier: string,
+  challenge: CodeChallenge,
+) {
+  const generatedChallenge = await createPKCECodeChallenge(
+    verifier,
+    challenge.method,
+  );
+  return generatedChallenge === challenge.challenge;
+}
+
 export function assertIsValidTokenRequest(
   body: unknown,
 ): asserts body is TokenRequest {
@@ -111,3 +123,38 @@ export const readJsonFromFile = (filepath: string): Record<string, unknown> => {
 
   return maybeJson;
 };
+
+export const isValidPkceCodeVerifier = (verifier: string) => {
+  const PKCE_CHALLENGE_REGEX = /^[A-Za-z0-9\-._~]{43,128}$/;
+  return PKCE_CHALLENGE_REGEX.test(verifier);
+};
+
+export const createPKCEVerifier = () => {
+  const randomBytes = crypto.getRandomValues(new Uint8Array(32));
+  return Buffer.from(randomBytes).toString('base64url');
+};
+
+export const supportedPkceAlgorithms = ['plain', 'S256'] as const;
+
+export const createPKCECodeChallenge = async (
+  verifier: string = createPKCEVerifier(),
+  algorithm: PKCEAlgorithm = 'plain',
+) => {
+  let challenge: string;
+
+  switch (algorithm) {
+    case 'plain': {
+      challenge = verifier;
+      break;
+    }
+    case 'S256': {
+      const buffer = await crypto.subtle.digest(
+        'SHA-256',
+        new TextEncoder().encode(verifier),
+      );
+      challenge = Buffer.from(buffer).toString('base64url');
+      break;
+    }
+  }
+  return challenge;
+};

src/lib/oauth2-service.ts

@@ -32,19 +32,25 @@ import {
   assertIsStringOrUndefined,
   assertIsValidTokenRequest,
   defaultTokenTtl,
+  isValidPkceCodeVerifier,
+  pkceVerifierMatchesChallenge,
+  supportedPkceAlgorithms,
 } from './helpers';
 import type {
+  CodeChallenge,
   JwtTransform,
   MutableRedirectUri,
   MutableResponse,
   MutableToken,
   OAuth2Endpoints,
   OAuth2EndpointsInput,
+  PKCEAlgorithm,
   ScopesOrTransform,
   StatusCodeMutableResponse,
 } from './types';
 import { Events } from './types';
 import { InternalEvents } from './types-internals';
+import { AssertionError } from 'assert';
 
 const DEFAULT_ENDPOINTS: OAuth2Endpoints = Object.freeze({
   wellKnownDocument: '/.well-known/openid-configuration',
@@ -71,6 +77,7 @@ export class OAuth2Service extends EventEmitter {
   #issuer: OAuth2Issuer;
   #requestHandler: RequestListener;
   #nonce: Record<string, string>;
+  #codeChallenges: Map<string, CodeChallenge>;
   #endpoints: OAuth2Endpoints;
 
   constructor(oauth2Issuer: OAuth2Issuer, endpoints?: OAuth2EndpointsInput) {
@@ -80,6 +87,7 @@ export class OAuth2Service extends EventEmitter {
     this.#endpoints = { ...DEFAULT_ENDPOINTS, ...endpoints };
     this.#requestHandler = this.buildRequestHandler();
     this.#nonce = {};
+    this.#codeChallenges = new Map();
   }
 
   /**
@@ -169,6 +177,7 @@ export class OAuth2Service extends EventEmitter {
       subject_types_supported: ['public'],
       end_session_endpoint: `${this.issuer.url}${this.#endpoints.endSession}`,
       introspection_endpoint: `${this.issuer.url}${this.#endpoints.introspect}`,
+      code_challenge_methods_supported: supportedPkceAlgorithms,
     };
 
     return res.json(openidConfig);
@@ -190,6 +199,39 @@ export class OAuth2Service extends EventEmitter {
       let xfn: ScopesOrTransform | undefined;
 
       assertIsValidTokenRequest(req.body);
+
+      if ('code_verifier' in req.body && 'code' in req.body) {
+        try {
+          const code = req.body.code;
+          const verifier = req.body['code_verifier'];
+          const savedCodeChallenge = this.#codeChallenges.get(code);
+          if (savedCodeChallenge === undefined) {
+            throw new AssertionError({
+              message: 'code_challenge required',
+            });
+          }
+          this.#codeChallenges.delete(code);
+          if (!isValidPkceCodeVerifier(verifier)) {
+            throw new AssertionError({
+              message:
+                "Invalid 'code_verifier'. The verifier does not conform with the RFC7636 spec. Ref: https://datatracker.ietf.org/doc/html/rfc7636#section-4.1",
+            });
+          }
+          const doesVerifierMatchCodeChallenge =
+            await pkceVerifierMatchesChallenge(verifier, savedCodeChallenge);
+          if (!doesVerifierMatchCodeChallenge) {
+            throw new AssertionError({
+              message: 'code_verifier provided does not match code_challenge',
+            });
+          }
+        } catch (e) {
+          return res.status(400).json({
+            error: 'invalid_request',
+            error_description: (e as AssertionError).message,
+          });
+        }
+      }
+
       const reqBody = req.body;
 
       let { scope } = reqBody;
@@ -294,16 +336,46 @@ export class OAuth2Service extends EventEmitter {
       redirect_uri: redirectUri,
       response_type: responseType,
       state,
+      code_challenge,
+      code_challenge_method,
     } = req.query;
 
     assertIsString(redirectUri, 'Invalid redirectUri type');
     assertIsStringOrUndefined(nonce, 'Invalid nonce type');
     assertIsStringOrUndefined(scope, 'Invalid scope type');
     assertIsStringOrUndefined(state, 'Invalid state type');
+    assertIsStringOrUndefined(code_challenge, 'Invalid code_challenge type');
+    assertIsStringOrUndefined(
+      code_challenge_method,
+      'Invalid code_challenge_method type',
+    );
 
     const url = new URL(redirectUri);
 
     if (responseType === 'code') {
+      if (code_challenge) {
+        const codeChallengeMethod = code_challenge_method ?? 'plain';
+        assertIsString(
+          codeChallengeMethod,
+          "Invalid 'code_challenge_method' type",
+        );
+        if (
+          !supportedPkceAlgorithms.includes(
+            codeChallengeMethod as PKCEAlgorithm,
+          )
+        ) {
+          return res.status(400).json({
+            error: 'invalid_request',
+            error_description: `Unsupported code_challenge method ${codeChallengeMethod}. The one of the following code_challenge_method are supported: ${supportedPkceAlgorithms.join(
+              ', ',
+            )}`,
+          });
+        }
+        this.#codeChallenges.set(code, {
+          challenge: code_challenge,
+          method: codeChallengeMethod as PKCEAlgorithm,
+        });
+      }
       if (nonce !== undefined) {
         this.#nonce[code] = nonce;
       }

src/lib/types.ts

@@ -1,5 +1,6 @@
 import { ServerOptions } from 'https';
 import { JWKWithKid } from './types-internals';
+import { supportedPkceAlgorithms } from './helpers';
 
 export interface TokenRequest {
   scope?: string;
@@ -8,6 +9,7 @@ export interface TokenRequest {
   client_id?: unknown;
   code?: string;
   aud?: string[] | string;
+  code_verifier?: string;
 }
 
 export interface Options {
@@ -33,6 +35,7 @@ export interface MutableToken {
 
 export interface Header {
   kid: string;
+
   [key: string]: unknown;
 }
 
@@ -41,6 +44,7 @@ export interface Payload {
   iat: number;
   exp: number;
   nbf: number;
+
   [key: string]: unknown;
 }
 
@@ -106,3 +110,10 @@ export type OAuth2EndpointsInput = Partial<OAuth2Endpoints>;
 export interface OAuth2Options {
   endpoints?: OAuth2EndpointsInput;
 }
+
+export type PKCEAlgorithm = (typeof supportedPkceAlgorithms)[number];
+
+export interface CodeChallenge {
+  challenge: string;
+  method: PKCEAlgorithm;
+}

test/helpers.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import type { AddressInfo } from 'net';
 
 import {
@@ -7,8 +7,13 @@ import {
   assertIsString,
   assertIsStringOrUndefined,
   assertIsValidTokenRequest,
+  createPKCECodeChallenge,
+  createPKCEVerifier,
+  isValidPkceCodeVerifier,
+  pkceVerifierMatchesChallenge,
   shift,
 } from '../src/lib/helpers';
+import { CodeChallenge } from '../src';
 
 describe('helpers', () => {
   describe('assertIsString', () => {
@@ -97,7 +102,7 @@ describe('helpers', () => {
       { grant_type: "g", scope: "s", code: 1 },
       { grant_type: "g", scope: 1, code: "c" },
       { grant_type: "g", scope: "1", code: "c", aud: 1 },
-      { grant_type: "g", scope: "1", code: "c", aud: [1] },
+      { grant_type: "g", scope: "1", code: "c", aud: [1] }
     ])('throws on wrong values (%s)', (input) => {
       expect(() => assertIsValidTokenRequest(input)).toThrow();
     });
@@ -108,7 +113,7 @@ describe('helpers', () => {
       { grant_type: "g", scope: "s" },
       { grant_type: "g", scope: "s", code: "c" },
       { grant_type: "g", scope: "s", code: "c", aud: "a" },
-      { grant_type: "g", scope: "s", code: "c", aud: ["a", "b"] },
+      { grant_type: "g", scope: "s", code: "c", aud: ["a", "b"] }
     ])('does not throw on valid input (%s)', (input) => {
       expect(() => assertIsValidTokenRequest(input)).not.toThrow();
     });
@@ -127,4 +132,53 @@ describe('helpers', () => {
       expect(() => shift(["a"])).not.toThrow();
     });
   });
+
+  describe('pkce', () => {
+    describe('code_verifier', () => {
+      it('should accept a valid PKCE code_verifier', () => {
+        const verifier128 =
+          'PXa7p8YHHUAJGrcG2eW0x7FY_EBtRTlaUHnyz1jKWnNp0G-2HZt9KjA0UOp87DmuIqoV4Y_owVsM-QICvrSa5dWxOndVEhSsFMMgy68AYkw4PGHkGaN_aIRIHJ8mQ4EZ';
+        const verifier42 = 'xyo94uhy3zKvgB0NJwLms86SwcjtWviEOpkBnGgaLlo';
+        expect(isValidPkceCodeVerifier(verifier128)).toBe(true);
+        expect(isValidPkceCodeVerifier(verifier42)).toBe(true);
+
+        const verifierWith129chars = `${verifier128}a`;
+        expect(isValidPkceCodeVerifier(verifierWith129chars)).toBe(false);
+        expect(
+          isValidPkceCodeVerifier(verifier42.slice(0, verifier42.length - 1))
+        ).toBe(false);
+      });
+
+      it('should create a valid code_verifier', () => {
+        expect(isValidPkceCodeVerifier(createPKCEVerifier())).toBe(true);
+      });
+
+      it('should create a valid code_challenge', async () => {
+        const verifier = 'xyo94uhy3zKvgB0NJwLms86SwcjtWviEOpkBnGgaLlo';
+        const expectedChallenge = 'b7elB7ZyxIXgFyvBznKvxl7wOB-H17Pz0a3B62NIMFI';
+        const generatedCodeChallenge = await createPKCECodeChallenge(
+          verifier,
+          'S256'
+        );
+        expect(generatedCodeChallenge).toBe(expectedChallenge);
+        const expectedCodeLength = 43; // BASE64-urlencoded sha256 hashes should always be 43 characters in length.
+        expect(
+          await createPKCECodeChallenge(createPKCEVerifier(), 'S256')
+        ).toHaveLength(expectedCodeLength);
+      });
+
+      it('should match code_verifier and code_challenge', async () => {
+        const verifier = createPKCEVerifier();
+        const codeChallengeMethod = 'S256';
+        const challenge: CodeChallenge = {
+          challenge: await createPKCECodeChallenge(
+            verifier,
+            codeChallengeMethod
+          ),
+          method: codeChallengeMethod,
+        };
+        expect(await pkceVerifierMatchesChallenge(verifier, challenge)).toBe(true);
+      });
+    });
+  });
 });