diff --git a/html/webapp/functions/_middleware.ts b/html/webapp/functions/_middleware.ts deleted file mode 100644 index 559a2cc..0000000 --- a/html/webapp/functions/_middleware.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { CFP_ALLOWED_PATHS } from './constants'; -import { getCookieKeyValue } from './utils'; -import { getTemplate } from './template'; - -export async function onRequest(context: { - request: Request; - next: () => Promise; - env: { CFP_PASSWORD?: string }; -}): Promise { - const { request, next, env } = context; - const { pathname, searchParams } = new URL(request.url); - const { error } = Object.fromEntries(searchParams); - const cookie = request.headers.get('cookie') || ''; - const cookieKeyValue = await getCookieKeyValue(env.CFP_PASSWORD); - - if ( - cookie.includes(cookieKeyValue) || - CFP_ALLOWED_PATHS.includes(pathname) || - !env.CFP_PASSWORD - ) { - // Correct hash in cookie, allowed path, or no password set. - // Continue to next middleware. - return await next(); - } else { - // No cookie or incorrect hash in cookie. Redirect to login. - return new Response(getTemplate({ redirectPath: pathname, withError: error === '1' }), { - headers: { - 'content-type': 'text/html' - } - }); - } -} diff --git a/html/webapp/functions/cfp_login.ts b/html/webapp/functions/cfp_login.ts deleted file mode 100644 index 80724e3..0000000 --- a/html/webapp/functions/cfp_login.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { CFP_COOKIE_MAX_AGE } from './constants'; -import { sha256, getCookieKeyValue } from './utils'; - -export async function onRequestPost(context: { - request: Request; - env: { CFP_PASSWORD?: string }; -}): Promise { - const { request, env } = context; - const body = await request.formData(); - const { password, redirect } = Object.fromEntries(body); - const hashedPassword = await sha256(password.toString()); - const hashedCfpPassword = await sha256(env.CFP_PASSWORD); - const redirectPath = redirect.toString() || '/'; - - if (hashedPassword === hashedCfpPassword) { - // Valid password. Redirect to home page and set cookie with auth hash. - const cookieKeyValue = await getCookieKeyValue(env.CFP_PASSWORD); - - return new Response('', { - status: 302, - headers: { - 'Set-Cookie': `${cookieKeyValue}; Max-Age=${CFP_COOKIE_MAX_AGE}; Path=/; HttpOnly; Secure`, - 'Cache-Control': 'no-cache', - Location: redirectPath - } - }); - } else { - // Invalid password. Redirect to login page with error. - return new Response('', { - status: 302, - headers: { - 'Cache-Control': 'no-cache', - Location: `${redirectPath}?error=1` - } - }); - } -} diff --git a/html/webapp/functions/constants.ts b/html/webapp/functions/constants.ts deleted file mode 100644 index d29828c..0000000 --- a/html/webapp/functions/constants.ts +++ /dev/null @@ -1,16 +0,0 @@ -/** - * Key for the auth cookie. - */ -export const CFP_COOKIE_KEY = 'CFP-Auth-Key'; - -/** - * Max age of the auth cookie in seconds. - * Default: 1 week. - */ -export const CFP_COOKIE_MAX_AGE = 60 * 60 * 24 * 7; - -/** - * Paths that don't require authentication. - * The /cfp_login path must be included. - */ -export const CFP_ALLOWED_PATHS = ['/cfp_login']; diff --git a/html/webapp/functions/template.ts b/html/webapp/functions/template.ts deleted file mode 100644 index b3f67ac..0000000 --- a/html/webapp/functions/template.ts +++ /dev/null @@ -1,61 +0,0 @@ -export function getTemplate({ - redirectPath, - withError -}: { - redirectPath: string; - withError: boolean; -}): string { - return ` - - - - - - - Password Protected Site - - - - - - - - - -
-
-
-

Password

-

Please enter your password for this site.

-
- ${withError ? `

Incorrect password, please try again.

` : ''} -
- - - -
-
-
- - - - `; -} diff --git a/html/webapp/functions/utils.ts b/html/webapp/functions/utils.ts deleted file mode 100644 index d82bab7..0000000 --- a/html/webapp/functions/utils.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { CFP_COOKIE_KEY } from './constants'; - -export async function sha256(str: string): Promise { - const buf = await crypto.subtle.digest('SHA-256', new TextEncoder().encode(str)); - return Array.prototype.map - .call(new Uint8Array(buf), (x) => ('00' + x.toString(16)).slice(-2)) - .join(''); -} - -export async function getCookieKeyValue(password?: string): Promise { - const hash = await sha256(password); - return `${CFP_COOKIE_KEY}=${hash}`; -}