dev work
This commit is contained in:
parent
6e7977997e
commit
07dda5bc38
16 changed files with 257 additions and 99 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
FROM oven/bun:1 AS base
|
FROM oven/bun:1@sha256:50317d83cd5a5ae1d8b35b3379c69f57ce1a0dbf4def91f0965653d767851834 AS base
|
||||||
WORKDIR /usr/src/app
|
WORKDIR /usr/src/app
|
||||||
|
|
||||||
# install dependencies into temp directory
|
# install dependencies into temp directory
|
||||||
|
|
@ -24,10 +24,10 @@ ENV NODE_ENV=production
|
||||||
#RUN bun test
|
#RUN bun test
|
||||||
RUN bun run build-remote
|
RUN bun run build-remote
|
||||||
|
|
||||||
# copy production dependencies and source code into final image
|
# copy production dependencies and source code into final image
|
||||||
# and run with node to avoid some random issues with bun
|
# and run with node to avoid some random issues with bun
|
||||||
# (e.g. bun's fetch doesn't support dispatchers)
|
# (e.g. bun's fetch doesn't support dispatchers)
|
||||||
FROM node:20-slim AS release
|
FROM node:24-slim@sha256:44a253901c13323953b4a0e1df5afe08bf8ac4ac086edd500422b54cb6e6eeb0 AS release
|
||||||
WORKDIR /usr/src/app
|
WORKDIR /usr/src/app
|
||||||
COPY --from=install /temp/prod/node_modules node_modules
|
COPY --from=install /temp/prod/node_modules node_modules
|
||||||
COPY --from=prerelease /usr/src/app/dist ./dist
|
COPY --from=prerelease /usr/src/app/dist ./dist
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
import htmx from "astro-htmx";
|
import htmx from "astro-htmx";
|
||||||
// @ts-check
|
// @ts-check
|
||||||
import { defineConfig, envField } from "astro/config";
|
import { defineConfig, sessionDrivers, envField } from "astro/config";
|
||||||
import alpinejs from "@astrojs/alpinejs";
|
import alpinejs from "@astrojs/alpinejs";
|
||||||
import sitemap from "@astrojs/sitemap";
|
import sitemap from "@astrojs/sitemap";
|
||||||
import bun from "@nurodev/astro-bun";
|
import bun from "@nurodev/astro-bun";
|
||||||
|
|
@ -23,13 +23,11 @@ export default defineConfig({
|
||||||
prefetch: {
|
prefetch: {
|
||||||
prefetchAll: true,
|
prefetchAll: true,
|
||||||
},
|
},
|
||||||
security: {
|
|
||||||
checkOrigin: false,
|
|
||||||
},
|
|
||||||
session: {
|
session: {
|
||||||
driver: "lru-cache",
|
driver: sessionDrivers.lruCache({
|
||||||
ttl: 3600,
|
ttl: 3600,
|
||||||
maxEntries: 1000,
|
maxEntries: 1000,
|
||||||
|
}),
|
||||||
},
|
},
|
||||||
server: {
|
server: {
|
||||||
host: true,
|
host: true,
|
||||||
|
|
@ -61,8 +59,6 @@ export default defineConfig({
|
||||||
},
|
},
|
||||||
integrations: [alpinejs(), sitemap(), htmx(), db()],
|
integrations: [alpinejs(), sitemap(), htmx(), db()],
|
||||||
experimental: {
|
experimental: {
|
||||||
preserveScriptOrder: true,
|
|
||||||
chromeDevtoolsWorkspace: true,
|
chromeDevtoolsWorkspace: true,
|
||||||
failOnPrerenderConflict: true,
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
||||||
BIN
bun.lockb
BIN
bun.lockb
Binary file not shown.
|
|
@ -7,21 +7,20 @@ services:
|
||||||
- ./db:/db
|
- ./db:/db
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
# healthcheck:
|
healthcheck:
|
||||||
# test:
|
test:
|
||||||
# [
|
[
|
||||||
# "CMD",
|
"node",
|
||||||
# "curl",
|
"-e",
|
||||||
# "-f",
|
"fetch('http://localhost:4321/health').then(r=>process.exit(r.ok?0:1))",
|
||||||
# "-s",
|
]
|
||||||
# "--max-time",
|
interval: 30s
|
||||||
# "5",
|
timeout: 15s
|
||||||
# "http://localhost:4321/health",
|
retries: 3
|
||||||
# ]
|
start_period: 120s
|
||||||
# interval: 30s
|
cap_drop: [ALL]
|
||||||
# timeout: 15s
|
security_opt: [no-new-privileges:true]
|
||||||
# retries: 3
|
read_only: true
|
||||||
# start_period: 120s
|
|
||||||
wireguard:
|
wireguard:
|
||||||
image: qmcgaw/gluetun
|
image: qmcgaw/gluetun
|
||||||
cap_add:
|
cap_add:
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ services:
|
||||||
personal-site:
|
personal-site:
|
||||||
build: .
|
build: .
|
||||||
ports:
|
ports:
|
||||||
- 4321:4321
|
- 127.0.0.1:4321:4321
|
||||||
restart: no
|
restart: no
|
||||||
logging:
|
logging:
|
||||||
options:
|
options:
|
||||||
|
|
|
||||||
34
package.json
34
package.json
|
|
@ -14,34 +14,34 @@
|
||||||
"astro": "astro"
|
"astro": "astro"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@astrojs/alpinejs": "^0.4.9",
|
"@astrojs/alpinejs": "^1.0.0",
|
||||||
"@astrojs/check": "^0.9.6",
|
"@astrojs/check": "^0.9.9",
|
||||||
"@astrojs/db": "^0.18.3",
|
"@astrojs/db": "^0.21.3",
|
||||||
"@astrojs/node": "^9.5.4",
|
"@astrojs/node": "^11.0.2",
|
||||||
"@astrojs/partytown": "^2.1.4",
|
"@astrojs/partytown": "^2.1.7",
|
||||||
"@astrojs/sitemap": "^3.7.0",
|
"@astrojs/sitemap": "^3.7.3",
|
||||||
"@astrojs/ts-plugin": "^1.10.6",
|
"@astrojs/ts-plugin": "^1.10.10",
|
||||||
"@cap.js/server": "^4.0.5",
|
"@cap.js/server": "^4.0.5",
|
||||||
"@cap.js/widget": "^0.1.35",
|
"@cap.js/widget": "^0.1.56",
|
||||||
"@nurodev/astro-bun": "^2.1.2",
|
"@nurodev/astro-bun": "^2.1.2",
|
||||||
"@types/alpinejs": "^3.13.11",
|
"@types/alpinejs": "^3.13.11",
|
||||||
"alpinejs": "^3.15.8",
|
"alpinejs": "^3.15.12",
|
||||||
"android-sms-gateway": "^3.0.0",
|
"android-sms-gateway": "^3.0.0",
|
||||||
"astro": "^5.18.0",
|
"astro": "^7.0.6",
|
||||||
"astro-htmx": "^1.0.6",
|
"astro-htmx": "^1.0.6",
|
||||||
"htmx.org": "^2.0.8",
|
"htmx.org": "^2.0.10",
|
||||||
"iconify-icon": "^3.0.2",
|
"iconify-icon": "^3.0.2",
|
||||||
"ofetch": "^1.5.1",
|
"ofetch": "^1.5.1",
|
||||||
"otplib": "^12.0.1",
|
"otplib": "12.0.1",
|
||||||
"typescript": "^5.9.3",
|
"typescript": "^6.0.3",
|
||||||
"undici": "^7.22.0",
|
"undici": "^8.6.0",
|
||||||
"validator": "^13.15.26"
|
"validator": "^13.15.35"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/bun": "^1.3.9",
|
"@types/bun": "^1.3.14",
|
||||||
"@types/validator": "^13.15.10",
|
"@types/validator": "^13.15.10",
|
||||||
"doiuse": "^6.0.6",
|
"doiuse": "^6.0.6",
|
||||||
"prettier": "^3.8.1",
|
"prettier": "^3.9.4",
|
||||||
"prettier-plugin-astro": "^0.14.1"
|
"prettier-plugin-astro": "^0.14.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
6
public/.well-known/mta-sts.txt
Normal file
6
public/.well-known/mta-sts.txt
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
version: STSv1
|
||||||
|
mode: enforce
|
||||||
|
mx: mx.zoho.com
|
||||||
|
mx: mx2.zoho.com
|
||||||
|
mx: mx3.zoho.com
|
||||||
|
max_age: 604800
|
||||||
6
public/crt.svg
Normal file
6
public/crt.svg
Normal file
|
|
@ -0,0 +1,6 @@
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" viewBox="0 0 512 512">
|
||||||
|
<title>CRT Icon</title>
|
||||||
|
<desc>An icon of a CRT monitor, representing retro technology.</desc>
|
||||||
|
<rect width="512" height="512" fill="none"/>
|
||||||
|
<path fill="currentColor" d="m132.992 48.756l-9.984 14.976l77.287 51.524c4.32-4.192 9.542-8.012 15.703-11.162zm246.016 0l-83.006 55.338c6.16 3.15 11.383 6.97 15.703 11.162l77.287-51.524zM256 113.244c-22 0-35.334 7.06-43.637 15.363c-4.703 4.704-7.58 9.97-9.316 14.637h105.906c-1.736-4.668-4.613-9.933-9.316-14.637c-8.303-8.303-21.637-15.363-43.637-15.363m-191.936 48c-5.044 0-11.106 2.784-15.697 7.37c-4.59 4.584-7.367 10.63-7.367 15.63v279h430V184.2c.026-5.457-2.764-11.393-7.227-15.87s-10.346-7.086-14.826-7.086zm30.295 23h257.745c10.374 0 20.79 6.818 26.776 16H112c-16 0-32 16-32 32v160c25.924-162.54 145.877-185.697 299.016-191.795c3.106 4.836 4.984 10.315 4.984 15.794v192c0 16-16 32-33.88 32H95.35c-15.35 0-31.35-16-31.35-32v-192c0-16 16-32 30.36-32zm328.663 7c13.7 0 25 11.3 25 25s-11.3 25-25 25s-25-11.3-25-25s11.3-25 25-25m-23.023 144h48v18h-48zm0 32h48v18h-48zm0 32h48v18h-48z"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.1 KiB |
10
public/hi-res.svg
Normal file
10
public/hi-res.svg
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
|
||||||
|
<title>Hi-Res Icon</title>
|
||||||
|
<desc>An icon of a modern monitor, indicating high resolution.</desc>
|
||||||
|
<rect width="24" height="24" fill="none"/>
|
||||||
|
<g fill="none">
|
||||||
|
<path fill="#444" d="M2.435 11.522V1.957A.957.957 0 0 1 3.39 1h17.22a.956.956 0 0 1 .957.957v9.565z"/>
|
||||||
|
<path fill="#777" d="M17.261 1H3.391a.957.957 0 0 0-.956.957v9.565h4.304z"/>
|
||||||
|
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M7.696 18.218h8.609m-13.87-6.696h19.13M20.609 1a.956.956 0 0 1 .957.957v11.478a.957.957 0 0 1-.957.957H3.391a.957.957 0 0 1-.956-.957V1.957A.957.957 0 0 1 3.39 1zM12 20.13V23m-7.652 0h15.304" stroke-width="1"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 743 B |
|
|
@ -3,13 +3,15 @@ import { z } from "astro/zod";
|
||||||
import type { ActionAPIContext } from "astro:actions";
|
import type { ActionAPIContext } from "astro:actions";
|
||||||
import validator from "validator";
|
import validator from "validator";
|
||||||
import SmsClient from "@lib/SmsGatewayClient.ts";
|
import SmsClient from "@lib/SmsGatewayClient.ts";
|
||||||
import Otp, { verifyOtp } from "@lib/Otp.ts";
|
import Otp, { verifyOtp, normalizePhone } from "@lib/Otp.ts";
|
||||||
import { createCap } from "@lib/CapAdapter";
|
import { createCap } from "@lib/CapAdapter";
|
||||||
import {
|
import {
|
||||||
OTP_SUPER_SECRET_SALT,
|
OTP_SUPER_SECRET_SALT,
|
||||||
ANDROID_SMS_GATEWAY_RECIPIENT_PHONE,
|
ANDROID_SMS_GATEWAY_RECIPIENT_PHONE,
|
||||||
} from "astro:env/server";
|
} from "astro:env/server";
|
||||||
|
|
||||||
|
const MAX_OTP_VERIFY_ATTEMPTS = 5;
|
||||||
|
|
||||||
const isValidMobilePhone: [(data: string) => any, { message: string }] = [
|
const isValidMobilePhone: [(data: string) => any, { message: string }] = [
|
||||||
(value: string) =>
|
(value: string) =>
|
||||||
validator.isMobilePhone(value, ["en-US", "en-CA"]) &&
|
validator.isMobilePhone(value, ["en-US", "en-CA"]) &&
|
||||||
|
|
@ -39,7 +41,11 @@ const captcha_input = z.string().trim().nonempty();
|
||||||
|
|
||||||
const sendOtpAction = z.object({
|
const sendOtpAction = z.object({
|
||||||
action: z.literal("send_otp"),
|
action: z.literal("send_otp"),
|
||||||
name: z.string().trim().min(5).max(32).transform(stripDisallowedCharacters),
|
name: z
|
||||||
|
.string()
|
||||||
|
.trim()
|
||||||
|
.transform(stripDisallowedCharacters)
|
||||||
|
.pipe(z.string().min(5).max(32)),
|
||||||
phone: z
|
phone: z
|
||||||
.string()
|
.string()
|
||||||
.trim()
|
.trim()
|
||||||
|
|
@ -47,11 +53,16 @@ const sendOtpAction = z.object({
|
||||||
msg: z
|
msg: z
|
||||||
.string()
|
.string()
|
||||||
.trim()
|
.trim()
|
||||||
.min(25)
|
|
||||||
.max(512)
|
|
||||||
.transform(stripDisallowedCharacters)
|
.transform(stripDisallowedCharacters)
|
||||||
.refine(...noYelling)
|
.pipe(
|
||||||
.refine(...noExcessiveRepetitions),
|
z
|
||||||
|
.string()
|
||||||
|
.min(25)
|
||||||
|
.max(512)
|
||||||
|
|
||||||
|
.refine(...noYelling)
|
||||||
|
.refine(...noExcessiveRepetitions),
|
||||||
|
),
|
||||||
captcha: captcha_input,
|
captcha: captcha_input,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -63,6 +74,7 @@ const sendMsgAction = z.object({
|
||||||
|
|
||||||
const resetAction = z.object({
|
const resetAction = z.object({
|
||||||
action: z.literal("reset"),
|
action: z.literal("reset"),
|
||||||
|
captcha: captcha_input,
|
||||||
});
|
});
|
||||||
|
|
||||||
const formAction = z.discriminatedUnion("action", [
|
const formAction = z.discriminatedUnion("action", [
|
||||||
|
|
@ -73,7 +85,10 @@ const formAction = z.discriminatedUnion("action", [
|
||||||
|
|
||||||
const submitActionDefinition = {
|
const submitActionDefinition = {
|
||||||
input: formAction,
|
input: formAction,
|
||||||
handler: async (input: any, context: ActionAPIContext) => {
|
handler: async (
|
||||||
|
input: z.infer<typeof formAction>,
|
||||||
|
context: ActionAPIContext,
|
||||||
|
) => {
|
||||||
if (!OTP_SUPER_SECRET_SALT || !ANDROID_SMS_GATEWAY_RECIPIENT_PHONE) {
|
if (!OTP_SUPER_SECRET_SALT || !ANDROID_SMS_GATEWAY_RECIPIENT_PHONE) {
|
||||||
throw new ActionError({
|
throw new ActionError({
|
||||||
code: "INTERNAL_SERVER_ERROR",
|
code: "INTERNAL_SERVER_ERROR",
|
||||||
|
|
@ -83,12 +98,10 @@ const submitActionDefinition = {
|
||||||
|
|
||||||
const cap = createCap(context.session ?? null);
|
const cap = createCap(context.session ?? null);
|
||||||
|
|
||||||
if (
|
if (!(
|
||||||
!(
|
/^[a-fA-F0-9]{16}:[a-fA-F0-9]{30}$/.test(input.captcha) &&
|
||||||
/^[a-fA-F0-9]{16}:[a-fA-F0-9]{30}$/.test(input.captcha) &&
|
(await cap.validateToken(input.captcha))
|
||||||
(await cap.validateToken(input.captcha))
|
)) {
|
||||||
)
|
|
||||||
) {
|
|
||||||
throw new ActionError({
|
throw new ActionError({
|
||||||
code: "BAD_REQUEST",
|
code: "BAD_REQUEST",
|
||||||
message: "Invalid Captcha Token.",
|
message: "Invalid Captcha Token.",
|
||||||
|
|
@ -96,7 +109,19 @@ const submitActionDefinition = {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (input.action === "send_otp") {
|
if (input.action === "send_otp") {
|
||||||
const { name, phone, msg } = input;
|
const { name, msg } = input;
|
||||||
|
const phone = normalizePhone(input.phone);
|
||||||
|
|
||||||
|
if (
|
||||||
|
Otp.isRateLimitedGlobally() ||
|
||||||
|
Otp.isRateLimitedForOtp(phone) ||
|
||||||
|
Otp.isRateLimitedForMsgs(phone)
|
||||||
|
) {
|
||||||
|
throw new ActionError({
|
||||||
|
code: "TOO_MANY_REQUESTS",
|
||||||
|
message: "Too many requests. Try again later.",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
const otp = Otp.generateOtp(phone, OTP_SUPER_SECRET_SALT);
|
const otp = Otp.generateOtp(phone, OTP_SUPER_SECRET_SALT);
|
||||||
const stepSeconds = Otp.getOtpStep();
|
const stepSeconds = Otp.getOtpStep();
|
||||||
|
|
@ -107,6 +132,9 @@ const submitActionDefinition = {
|
||||||
remainingSeconds != 0 ? " " + remainingSeconds + " seconds." : "."
|
remainingSeconds != 0 ? " " + remainingSeconds + " seconds." : "."
|
||||||
}`;
|
}`;
|
||||||
|
|
||||||
|
Otp.recordOtpRequest(phone);
|
||||||
|
Otp.recordGlobalOtpSend();
|
||||||
|
|
||||||
const result = await new SmsClient().sendSMS(phone, message);
|
const result = await new SmsClient().sendSMS(phone, message);
|
||||||
|
|
||||||
if (result.success) {
|
if (result.success) {
|
||||||
|
|
@ -118,15 +146,16 @@ const submitActionDefinition = {
|
||||||
nextAction: "send_msg",
|
nextAction: "send_msg",
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
|
console.error("OTP SMS send failed:", result.message);
|
||||||
throw new ActionError({
|
throw new ActionError({
|
||||||
code: "SERVICE_UNAVAILABLE",
|
code: "SERVICE_UNAVAILABLE",
|
||||||
message: "Verification code failed to send: " + result.message,
|
message: "Verification code failed to send. Try again later.",
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else if (input.action === "send_msg") {
|
} else if (input.action === "send_msg") {
|
||||||
const { otp } = input;
|
const { otp } = input;
|
||||||
const name = await context.session?.get("name");
|
const name = await context.session?.get("name");
|
||||||
const phone = await context.session?.get("phone");
|
const phone = normalizePhone((await context.session?.get("phone")) ?? "");
|
||||||
const msg = await context.session?.get("msg");
|
const msg = await context.session?.get("msg");
|
||||||
|
|
||||||
if (!name || !otp || !msg || !phone) {
|
if (!name || !otp || !msg || !phone) {
|
||||||
|
|
@ -136,20 +165,38 @@ const submitActionDefinition = {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (Otp.isRateLimitedForOtp(phone) || Otp.isRateLimitedForMsgs(phone)) {
|
||||||
|
throw new ActionError({
|
||||||
|
code: "TOO_MANY_REQUESTS",
|
||||||
|
message: "Too many requests. Try again later.",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
const isVerified = verifyOtp(phone, OTP_SUPER_SECRET_SALT, otp);
|
const isVerified = verifyOtp(phone, OTP_SUPER_SECRET_SALT, otp);
|
||||||
if (!isVerified) {
|
if (!isVerified) {
|
||||||
|
const attempts = ((await context.session?.get("otpAttempts")) ?? 0) + 1;
|
||||||
|
if (attempts >= MAX_OTP_VERIFY_ATTEMPTS) {
|
||||||
|
context.session?.delete("phone");
|
||||||
|
context.session?.delete("name");
|
||||||
|
context.session?.delete("msg");
|
||||||
|
context.session?.delete("otpAttempts");
|
||||||
|
return {
|
||||||
|
nextAction: "send_otp",
|
||||||
|
error: "Too many incorrect codes. Please start over.",
|
||||||
|
field: "otp",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
context.session?.set("otpAttempts", attempts);
|
||||||
return {
|
return {
|
||||||
nextAction: "send_msg",
|
nextAction: "send_msg",
|
||||||
error: "Invalid or expired verification code.",
|
error: "Invalid or expired verification code.",
|
||||||
field: "otp",
|
field: "otp",
|
||||||
};
|
};
|
||||||
// throw new ActionError({
|
|
||||||
// code: "BAD_REQUEST",
|
|
||||||
// message: "Invalid or expired verification code.",
|
|
||||||
// });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const message = `Web message from ${name} ( ${phone} ):\n\n${msg}`;
|
const message = `Web message from ${name} (${phone}):\n\n${msg}`;
|
||||||
|
|
||||||
|
Otp.recordMsgSubmission(phone);
|
||||||
|
|
||||||
const smsClient = new SmsClient();
|
const smsClient = new SmsClient();
|
||||||
const result = await smsClient.sendSMS(
|
const result = await smsClient.sendSMS(
|
||||||
|
|
@ -158,8 +205,6 @@ const submitActionDefinition = {
|
||||||
);
|
);
|
||||||
|
|
||||||
if (result.success) {
|
if (result.success) {
|
||||||
Otp.recordMsgSubmission(phone);
|
|
||||||
|
|
||||||
context.session?.delete("phone");
|
context.session?.delete("phone");
|
||||||
context.session?.delete("name");
|
context.session?.delete("name");
|
||||||
context.session?.delete("msg");
|
context.session?.delete("msg");
|
||||||
|
|
@ -169,6 +214,7 @@ const submitActionDefinition = {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.error("Contact SMS send failed:", result.message);
|
||||||
throw new ActionError({
|
throw new ActionError({
|
||||||
code: "SERVICE_UNAVAILABLE",
|
code: "SERVICE_UNAVAILABLE",
|
||||||
message: "Message failed to send.",
|
message: "Message failed to send.",
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,44 @@
|
||||||
import { authenticator } from "otplib";
|
import { authenticator } from "otplib";
|
||||||
import { createHash } from "crypto";
|
import { createHash } from "crypto";
|
||||||
|
|
||||||
const submissionTimestamps = new Map();
|
const submissionTimestamps = new Map<string, number[]>();
|
||||||
const otpRequestTimestamps = new Map();
|
const otpRequestTimestamps = new Map<string, number[]>();
|
||||||
const ONE_WEEK_IN_MS: number = 7 * 24 * 60 * 60 * 1000;
|
const ONE_WEEK_IN_MS: number = 7 * 24 * 60 * 60 * 1000;
|
||||||
const ONE_HOUR_IN_MS: number = 60 * 60 * 1000;
|
const ONE_HOUR_IN_MS: number = 60 * 60 * 1000;
|
||||||
const MAX_OTP_REQUESTS_PER_HOUR: number = 3;
|
const MAX_OTP_REQUESTS_PER_HOUR: number = 3;
|
||||||
const MAX_MESSAGES_PER_WEEK: number = 3;
|
const MAX_MESSAGES_PER_WEEK: number = 3;
|
||||||
const OTP_STEP_IN_SEC: number = 300;
|
const OTP_STEP_IN_SEC: number = 300;
|
||||||
const VALID_PAST_OTP_STEPS: number = 1;
|
const VALID_PAST_OTP_STEPS: number = 1;
|
||||||
const VALID_FUTURE_OTP_STEPS: number = 1;
|
const VALID_FUTURE_OTP_STEPS: number = 0;
|
||||||
const OTP_NUM_DIGITS: number = 6;
|
const OTP_NUM_DIGITS: number = 6;
|
||||||
|
const MAX_GLOBAL_OTP_SENDS_PER_HOUR: number = 10;
|
||||||
|
let globalOtpSendTimestamps: number[] = [];
|
||||||
|
|
||||||
|
export function isRateLimitedGlobally(): boolean {
|
||||||
|
const now = Date.now();
|
||||||
|
globalOtpSendTimestamps = globalOtpSendTimestamps.filter(
|
||||||
|
(t) => now - t < ONE_HOUR_IN_MS,
|
||||||
|
);
|
||||||
|
return globalOtpSendTimestamps.length >= MAX_GLOBAL_OTP_SENDS_PER_HOUR;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function recordGlobalOtpSend() {
|
||||||
|
globalOtpSendTimestamps.push(Date.now());
|
||||||
|
}
|
||||||
|
|
||||||
|
function cleanupStaleEntries(map: Map<string, number[]>, windowMs: number) {
|
||||||
|
const now = Date.now();
|
||||||
|
for (const [key, timestamps] of map) {
|
||||||
|
const recent = timestamps.filter((t) => now - t < windowMs);
|
||||||
|
if (recent.length === 0) map.delete(key);
|
||||||
|
else if (recent.length !== timestamps.length) map.set(key, recent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
setInterval(() => {
|
||||||
|
cleanupStaleEntries(submissionTimestamps, ONE_WEEK_IN_MS);
|
||||||
|
cleanupStaleEntries(otpRequestTimestamps, ONE_HOUR_IN_MS);
|
||||||
|
}, ONE_HOUR_IN_MS).unref?.();
|
||||||
|
|
||||||
authenticator.options = {
|
authenticator.options = {
|
||||||
step: OTP_STEP_IN_SEC,
|
step: OTP_STEP_IN_SEC,
|
||||||
|
|
@ -30,15 +58,14 @@ function getUserSecret(phoneNumber: string, salt: string): string {
|
||||||
}
|
}
|
||||||
|
|
||||||
export function normalizePhone(phone: string) {
|
export function normalizePhone(phone: string) {
|
||||||
const result = phone.replace(/[^\d]/g, "").trim().startsWith("1")
|
let digits = phone.replace(/\D/g, "");
|
||||||
? phone.substring(1)
|
if (digits.length === 11 && digits.startsWith("1")) {
|
||||||
: phone;
|
digits = digits.slice(1);
|
||||||
|
}
|
||||||
if (result.length !== 10) {
|
if (digits.length !== 10) {
|
||||||
throw new Error("Invalid phone number.");
|
throw new Error("Invalid phone number.");
|
||||||
}
|
}
|
||||||
|
return digits;
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function isValidPhone(phone: string): boolean {
|
export function isValidPhone(phone: string): boolean {
|
||||||
|
|
@ -46,9 +73,13 @@ export function isValidPhone(phone: string): boolean {
|
||||||
const match = phone.match(/(\d{3})(\d{3})(\d{4})/);
|
const match = phone.match(/(\d{3})(\d{3})(\d{4})/);
|
||||||
const [, prefix, exchange, station] = match ?? [];
|
const [, prefix, exchange, station] = match ?? [];
|
||||||
const isValidNANPFormat =
|
const isValidNANPFormat =
|
||||||
/^[2-7][0-8][0-9]$/.test(prefix) && /^[2-9][0-9]{2}$/.test(exchange);
|
/^[2-9][0-9]{2}$/.test(prefix) && /^[2-9][0-9]{2}$/.test(exchange);
|
||||||
const isNotAllSameDigit = !/^(.)\1{6}$/.test(exchange + station);
|
const isNotAllSameDigit = !/^(.)\1{6}$/.test(exchange + station);
|
||||||
const isNot911Number = prefix !== "911" && exchange !== "911";
|
const isNot911Number = prefix !== "911" && exchange !== "911";
|
||||||
|
const isNotTollFreeNumber = !(
|
||||||
|
/^[8-9][0-9]{2}$/.test(prefix) &&
|
||||||
|
/^(99|88|77|66|55|44|33|22|11|00)$/.test(prefix.slice(1, 2))
|
||||||
|
);
|
||||||
const isNot555Number = prefix !== "555" && exchange !== "555";
|
const isNot555Number = prefix !== "555" && exchange !== "555";
|
||||||
const isNotPopSongNumber = exchange !== "867" && station !== "5309";
|
const isNotPopSongNumber = exchange !== "867" && station !== "5309";
|
||||||
|
|
||||||
|
|
@ -57,6 +88,7 @@ export function isValidPhone(phone: string): boolean {
|
||||||
isNotAllSameDigit &&
|
isNotAllSameDigit &&
|
||||||
isNot911Number &&
|
isNot911Number &&
|
||||||
isNot555Number &&
|
isNot555Number &&
|
||||||
|
isNotTollFreeNumber &&
|
||||||
isNotPopSongNumber
|
isNotPopSongNumber
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
@ -153,4 +185,6 @@ export default {
|
||||||
recordMsgSubmission,
|
recordMsgSubmission,
|
||||||
isRateLimitedForOtp,
|
isRateLimitedForOtp,
|
||||||
isRateLimitedForMsgs,
|
isRateLimitedForMsgs,
|
||||||
|
isRateLimitedGlobally,
|
||||||
|
recordGlobalOtpSend,
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,29 @@
|
||||||
import { defineMiddleware } from "astro:middleware";
|
import { defineMiddleware } from "astro:middleware";
|
||||||
import { getActionContext } from "astro:actions";
|
import { getActionContext } from "astro:actions";
|
||||||
|
import type { APIContext, MiddlewareNext } from "astro";
|
||||||
|
|
||||||
export const onRequest = defineMiddleware(async (context, next) => {
|
// htmz -> frame-ancestors 'self' & X-Frame-Options SAMEORIGIN
|
||||||
|
// astro -> 'unsafe-inline'
|
||||||
|
const SECURITY_HEADERS: Record<string, string> = {
|
||||||
|
"Content-Security-Policy": [
|
||||||
|
"default-src 'self'",
|
||||||
|
"script-src 'self' 'unsafe-inline'",
|
||||||
|
"style-src 'self' 'unsafe-inline'",
|
||||||
|
"img-src 'self' data: https://badblocks.goatcounter.com",
|
||||||
|
"font-src 'self'",
|
||||||
|
"connect-src 'self' https://badblocks.goatcounter.com https://api.iconify.design",
|
||||||
|
"object-src 'none'",
|
||||||
|
"frame-ancestors 'self'",
|
||||||
|
"base-uri 'self'",
|
||||||
|
"form-action 'self'",
|
||||||
|
].join("; "),
|
||||||
|
"X-Content-Type-Options": "nosniff",
|
||||||
|
"X-Frame-Options": "SAMEORIGIN",
|
||||||
|
"Referrer-Policy": "strict-origin-when-cross-origin",
|
||||||
|
"Permissions-Policy": "camera=(), microphone=(), geolocation=()",
|
||||||
|
};
|
||||||
|
|
||||||
|
async function handle(context: APIContext, next: MiddlewareNext) {
|
||||||
if (context.isPrerendered) return next();
|
if (context.isPrerendered) return next();
|
||||||
|
|
||||||
const { action, setActionResult, serializeActionResult } =
|
const { action, setActionResult, serializeActionResult } =
|
||||||
|
|
@ -10,10 +32,11 @@ export const onRequest = defineMiddleware(async (context, next) => {
|
||||||
const currentAction = await context.session?.get("currentAction");
|
const currentAction = await context.session?.get("currentAction");
|
||||||
|
|
||||||
if (currentAction) {
|
if (currentAction) {
|
||||||
const { actionName, actionResult } = JSON.parse(currentAction);
|
|
||||||
setActionResult(actionName, actionResult);
|
|
||||||
|
|
||||||
context.session?.delete("currentAction");
|
context.session?.delete("currentAction");
|
||||||
|
try {
|
||||||
|
const { actionName, actionResult } = JSON.parse(currentAction);
|
||||||
|
setActionResult(actionName, actionResult);
|
||||||
|
} catch {}
|
||||||
return next();
|
return next();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -39,13 +62,14 @@ export const onRequest = defineMiddleware(async (context, next) => {
|
||||||
|
|
||||||
context.session?.set("contactFormDraft", draft);
|
context.session?.set("contactFormDraft", draft);
|
||||||
|
|
||||||
const referer = context.request.headers.get("Referer");
|
let redirectPath = context.originPathname;
|
||||||
if (!referer) {
|
try {
|
||||||
throw new Error(
|
const referer = new URL(context.request.headers.get("Referer") ?? "");
|
||||||
"Internal: Referer unexpectedly missing from Action POST request.",
|
if (referer.origin === context.url.origin) {
|
||||||
);
|
redirectPath = referer.pathname;
|
||||||
}
|
}
|
||||||
return context.redirect(referer);
|
} catch {}
|
||||||
|
return context.redirect(redirectPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
context.session?.delete("contactFormDraft");
|
context.session?.delete("contactFormDraft");
|
||||||
|
|
@ -53,4 +77,12 @@ export const onRequest = defineMiddleware(async (context, next) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
return next();
|
return next();
|
||||||
|
}
|
||||||
|
|
||||||
|
export const onRequest = defineMiddleware(async (context, next) => {
|
||||||
|
const response = await handle(context, next);
|
||||||
|
for (const [header, value] of Object.entries(SECURITY_HEADERS)) {
|
||||||
|
response.headers.set(header, value);
|
||||||
|
}
|
||||||
|
return response;
|
||||||
});
|
});
|
||||||
|
|
|
||||||
8
src/pages/ai.astro
Normal file
8
src/pages/ai.astro
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
---
|
||||||
|
import Layout from "@layouts/BaseLayout.astro";
|
||||||
|
---
|
||||||
|
|
||||||
|
<Layout>
|
||||||
|
<title slot="head">AI Policy</title>
|
||||||
|
<Fragment slot="main"> </Fragment>
|
||||||
|
</Layout>
|
||||||
|
|
@ -10,8 +10,21 @@ export const POST: APIRoute = async (context) => {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const { token, solutions } = await context.request.json();
|
let body: { token?: unknown; solutions?: unknown };
|
||||||
if (!token || !solutions) {
|
try {
|
||||||
|
body = await context.request.json();
|
||||||
|
} catch {
|
||||||
|
return new Response(JSON.stringify({ success: false }), { status: 400 });
|
||||||
|
}
|
||||||
|
|
||||||
|
const { token, solutions } = body ?? {};
|
||||||
|
if (
|
||||||
|
typeof token !== "string" ||
|
||||||
|
token.length > 256 ||
|
||||||
|
!Array.isArray(solutions) ||
|
||||||
|
solutions.length > 128 ||
|
||||||
|
!solutions.every((s) => typeof s === "number")
|
||||||
|
) {
|
||||||
return new Response(JSON.stringify({ success: false }), { status: 400 });
|
return new Response(JSON.stringify({ success: false }), { status: 400 });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -168,8 +168,11 @@ const msgValue = pickValue("msg");
|
||||||
name="name"
|
name="name"
|
||||||
aria-describedby="name"
|
aria-describedby="name"
|
||||||
placeholder="Alice Bob"
|
placeholder="Alice Bob"
|
||||||
|
value={nameValue}
|
||||||
/>
|
/>
|
||||||
{error.name && <p id="error_name">{error.name.join(",")}</p>}
|
{"name" in error && error.name && (
|
||||||
|
<p id="error_name">{error.name}</p>
|
||||||
|
)}
|
||||||
</label>
|
</label>
|
||||||
<label for="phone">
|
<label for="phone">
|
||||||
Phone
|
Phone
|
||||||
|
|
@ -179,21 +182,26 @@ const msgValue = pickValue("msg");
|
||||||
name="phone"
|
name="phone"
|
||||||
aria-describedby="error_phone"
|
aria-describedby="error_phone"
|
||||||
placeholder="555-555-5555"
|
placeholder="555-555-5555"
|
||||||
|
value={phoneValue}
|
||||||
/>
|
/>
|
||||||
{error.phone && <p id="error_phone">{error.phone.join(",")}</p>}
|
{"phone" in error && error.phone && (
|
||||||
|
<p id="error_phone">{error.phone}</p>
|
||||||
|
)}
|
||||||
</label>
|
</label>
|
||||||
<label for="msg">
|
<label for="msg">
|
||||||
Msg
|
Msg
|
||||||
<div class="textarea-wrapper">
|
<div class="textarea-wrapper" data-replicated-value={msgValue}>
|
||||||
<textarea
|
<textarea
|
||||||
id="msg"
|
id="msg"
|
||||||
name="msg"
|
name="msg"
|
||||||
oninput="this.parentNode.dataset.replicatedValue = this.value"
|
oninput="this.parentNode.dataset.replicatedValue = this.value"
|
||||||
aria-describedby="error_msg"
|
aria-describedby="error_msg"
|
||||||
placeholder="I think badblocks rocks! Lorem ipsum dolor sit amet, consectetur adipiscing elit."
|
placeholder="I think badblocks rocks! Lorem ipsum dolor sit amet, consectetur adipiscing elit."
|
||||||
/>
|
>
|
||||||
|
{msgValue}
|
||||||
|
</textarea>
|
||||||
</div>
|
</div>
|
||||||
{error.msg && <p id="error_msg">{error.msg.join(",")}</p>}
|
{"msg" in error && error.msg && <p id="error_msg">{error.msg}</p>}
|
||||||
</label>
|
</label>
|
||||||
<button
|
<button
|
||||||
id="send_otp"
|
id="send_otp"
|
||||||
|
|
@ -215,7 +223,7 @@ const msgValue = pickValue("msg");
|
||||||
name="otp"
|
name="otp"
|
||||||
aria-describedby="error_otp"
|
aria-describedby="error_otp"
|
||||||
/>
|
/>
|
||||||
{error.otp && <p id="error_otp">{error.otp.join(",")}</p>}
|
{"otp" in error && error.otp && <p id="error_otp">{error.otp}</p>}
|
||||||
</label>
|
</label>
|
||||||
<button
|
<button
|
||||||
id="reset"
|
id="reset"
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ import Layout from "@layouts/BaseLayout.astro";
|
||||||
<title slot="head">Home</title>
|
<title slot="head">Home</title>
|
||||||
<Fragment slot="main">
|
<Fragment slot="main">
|
||||||
<article id="hero">
|
<article id="hero">
|
||||||
<h2>Under Construction</h2>
|
<h2>It's badblocks!</h2>
|
||||||
<p>Pardon the dust!</p>
|
<p>Pardon the dust!</p>
|
||||||
</article>
|
</article>
|
||||||
</Fragment>
|
</Fragment>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue