From c0529ce11a35324e6edb2e3acf572397eb74e7d3 Mon Sep 17 00:00:00 2001 From: blaine-arcjet <146491715+blaine-arcjet@users.noreply.github.com> Date: Thu, 14 Dec 2023 11:25:50 -0700 Subject: [PATCH] feat: Implement ttl on ArcjetDecision & ArcjetRuleResults (#7) Co-authored-by: David Mytton --- arcjet/index.ts | 67 +++++++---- arcjet/test/index.edge.test.ts | 1 + arcjet/test/index.node.test.ts | 51 +++++++- .../.eslintrc.json | 3 + .../.gitignore | 36 ++++++ .../README.md | 30 +++++ .../app/api/arcjet/route.ts | 33 +++++ .../app/favicon.ico | Bin 0 -> 25931 bytes .../app/globals.css | 27 +++++ .../app/layout.tsx | 22 ++++ .../app/page.tsx | 113 ++++++++++++++++++ .../next.config.js | 4 + .../package.json | 28 +++++ .../postcss.config.js | 6 + .../public/next.svg | 1 + .../public/vercel.svg | 1 + .../tailwind.config.ts | 20 ++++ .../tsconfig.json | 27 +++++ package-lock.json | 33 +++++ protocol/convert.ts | 9 ++ .../gen/es/decide/v1alpha1/decide_pb.d.ts | 16 +++ protocol/gen/es/decide/v1alpha1/decide_pb.js | 2 + protocol/index.ts | 21 +++- 23 files changed, 524 insertions(+), 27 deletions(-) create mode 100644 examples/nextjs-14-app-dir-validate-email/.eslintrc.json create mode 100644 examples/nextjs-14-app-dir-validate-email/.gitignore create mode 100644 examples/nextjs-14-app-dir-validate-email/README.md create mode 100644 examples/nextjs-14-app-dir-validate-email/app/api/arcjet/route.ts create mode 100644 examples/nextjs-14-app-dir-validate-email/app/favicon.ico create mode 100644 examples/nextjs-14-app-dir-validate-email/app/globals.css create mode 100644 examples/nextjs-14-app-dir-validate-email/app/layout.tsx create mode 100644 examples/nextjs-14-app-dir-validate-email/app/page.tsx create mode 100644 examples/nextjs-14-app-dir-validate-email/next.config.js create mode 100644 examples/nextjs-14-app-dir-validate-email/package.json create mode 100644 examples/nextjs-14-app-dir-validate-email/postcss.config.js create mode 100644 examples/nextjs-14-app-dir-validate-email/public/next.svg create mode 100644 examples/nextjs-14-app-dir-validate-email/public/vercel.svg create mode 100644 examples/nextjs-14-app-dir-validate-email/tailwind.config.ts create mode 100644 examples/nextjs-14-app-dir-validate-email/tsconfig.json diff --git a/arcjet/index.ts b/arcjet/index.ts index f1440cf10..00bc16e32 100644 --- a/arcjet/index.ts +++ b/arcjet/index.ts @@ -60,8 +60,8 @@ class Cache { } get(key: string) { - const expiresAt = this.expires.get(key); - if (typeof expiresAt !== "undefined" && expiresAt > Date.now()) { + const ttl = this.ttl(key); + if (ttl > 0) { return this.data.get(key); } else { // Cleanup if expired @@ -74,6 +74,12 @@ class Cache { this.expires.set(key, Date.now() + ttl); this.data.set(key, value); } + + ttl(key: string): number { + const now = Date.now(); + const expiresAt = this.expires.get(key) ?? now; + return expiresAt - now; + } } function errorMessage(err: unknown): string { @@ -548,12 +554,14 @@ export function validateEmail( ): Promise { if (await analyze.isValidEmail(email, analyzeOpts)) { return new ArcjetRuleResult({ + ttl: 0, state: "RUN", conclusion: "ALLOW", reason: new ArcjetEmailReason({ emailTypes: [] }), }); } else { return new ArcjetRuleResult({ + ttl: 0, state: "RUN", conclusion: "DENY", reason: new ArcjetEmailReason({ @@ -640,6 +648,7 @@ export function detectBot( block.includes(BotType[botResult.bot_type] as ArcjetBotType) ) { return new ArcjetRuleResult({ + ttl: 60000, state: "RUN", conclusion: "DENY", reason: new ArcjetBotReason({ @@ -651,6 +660,7 @@ export function detectBot( }); } else { return new ArcjetRuleResult({ + ttl: 60000, state: "RUN", conclusion: "ALLOW", reason: new ArcjetBotReason({ @@ -763,9 +773,6 @@ export default function arcjet< // TODO(#132): Support configurable caching const blockCache = new Cache(); - // TTL for in-memory caching of decisions (in milliseconds) - const blockCacheTimeoutInMs = 60000; - const flatSortedRules = rules.flat(1).sort((a, b) => a.priority - b.priority); return Object.freeze({ @@ -802,6 +809,7 @@ export default function arcjet< log.error("Failure running rules. Only 10 rules may be specified."); const decision = new ArcjetErrorDecision({ + ttl: 0, reason: new ArcjetErrorReason("Only 10 rules may be specified"), // No results because the sorted rules were too long and we don't want // to instantiate a ton of NOT_RUN results @@ -824,6 +832,7 @@ export default function arcjet< // Default all rules to NOT_RUN/ALLOW before doing anything for (let idx = 0; idx < flatSortedRules.length; idx++) { results[idx] = new ArcjetRuleResult({ + ttl: 0, state: "NOT_RUN", conclusion: "ALLOW", reason: new ArcjetReason(), @@ -835,7 +844,7 @@ export default function arcjet< // some instances where the instance is not recycled immediately. If so, we // can take advantage of that. log.time("cache"); - const existingBlockReason = await blockCache.get(fingerprint); + const existingBlockReason = blockCache.get(fingerprint); log.timeEnd("cache"); // If already blocked then we can async log to the API and return the @@ -847,6 +856,7 @@ export default function arcjet< existingBlockReason, }); const decision = new ArcjetDenyDecision({ + ttl: blockCache.ttl(fingerprint), reason: existingBlockReason, // All results will be NOT_RUN because we used a cached decision results, @@ -903,6 +913,7 @@ export default function arcjet< ); results[idx] = new ArcjetRuleResult({ + ttl: 0, state: "RUN", conclusion: "ERROR", reason: new ArcjetErrorReason(err), @@ -915,8 +926,9 @@ export default function arcjet< log.timeEnd("local"); const decision = new ArcjetDenyDecision({ - results, + ttl: results[idx].ttl, reason: results[idx].reason, + results, }); // Only a DENY decision is reported to avoid creating 2 entries for a @@ -929,20 +941,22 @@ export default function arcjet< flatSortedRules, ); - // If we're not in DRY_RUN mode, we want to cache and return this DENY - // decision. + // If we're not in DRY_RUN mode, we want to cache non-zero TTL results + // and return this DENY decision. if (rule.mode !== "DRY_RUN") { - log.debug("Caching decision", { - fingerprint, - conclusion: decision.conclusion, - reason: decision.reason, - }); - - await blockCache.set( - fingerprint, - decision.reason, - blockCacheTimeoutInMs, - ); + if (results[idx].ttl > 0) { + log.debug("Caching decision for %d milliseconds", decision.ttl, { + fingerprint, + conclusion: decision.conclusion, + reason: decision.reason, + }); + + blockCache.set( + fingerprint, + decision.reason, + decision.ttl, + ); + } return decision; } @@ -974,19 +988,21 @@ export default function arcjet< fingerprint, path: details.path, runtime: runtime(), + ttl: decision.ttl, conclusion: decision.conclusion, reason: decision.reason, ruleResults: decision.results, }); - // If the decision is to block, we cache the block locally - if (decision.isDenied()) { - log.debug("decide: Caching block locally"); + // If the decision is to block and we have a non-zero TTL, we cache the + // block locally + if (decision.isDenied() && decision.ttl > 0) { + log.debug("decide: Caching block locally for %d milliseconds", decision.ttl); - await blockCache.set( + blockCache.set( fingerprint, decision.reason, - blockCacheTimeoutInMs, + decision.ttl, ); } @@ -997,6 +1013,7 @@ export default function arcjet< errorMessage(err), ); const decision = new ArcjetErrorDecision({ + ttl: 0, reason: new ArcjetErrorReason(err), results, }); diff --git a/arcjet/test/index.edge.test.ts b/arcjet/test/index.edge.test.ts index 6038e1b59..9ec353aef 100644 --- a/arcjet/test/index.edge.test.ts +++ b/arcjet/test/index.edge.test.ts @@ -18,6 +18,7 @@ describe("Arcjet: Env = Edge runtime", () => { const client = { decide: jest.fn(async () => { return new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); diff --git a/arcjet/test/index.node.test.ts b/arcjet/test/index.node.test.ts index 3f2f4ad31..e3083e909 100644 --- a/arcjet/test/index.node.test.ts +++ b/arcjet/test/index.node.test.ts @@ -117,7 +117,7 @@ class ArcjetInvalidDecision extends ArcjetDecision { conclusion: ArcjetConclusion; constructor() { - super({ results: [] }); + super({ ttl: 0, results: [] }); // @ts-expect-error this.conclusion = "INVALID"; this.reason = new ArcjetTestReason(); @@ -731,6 +731,7 @@ describe("createRemoteClient", () => { }), }); const decision = new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -798,6 +799,7 @@ describe("createRemoteClient", () => { }), }); const decision = new ArcjetDenyDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -865,6 +867,7 @@ describe("createRemoteClient", () => { }), }); const decision = new ArcjetErrorDecision({ + ttl: 0, reason: new ArcjetErrorReason("Failure"), results: [], }); @@ -939,6 +942,7 @@ describe("createRemoteClient", () => { }), }); const decision = new ArcjetChallengeDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -1070,9 +1074,11 @@ describe("createRemoteClient", () => { }); const decision = new ArcjetDenyDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [ new ArcjetRuleResult({ + ttl: 0, state: "RUN", conclusion: "DENY", reason: new ArcjetReason(), @@ -1151,6 +1157,7 @@ describe("createRemoteClient", () => { }), }); const decision = new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -1213,6 +1220,7 @@ describe("ArcjetHeaders", () => { describe("ArcjetDecision", () => { test("will default the `id` property if not specified", () => { const decision = new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -1222,6 +1230,7 @@ describe("ArcjetDecision", () => { test("the `id` property if to be specified to the constructor", () => { const decision = new ArcjetAllowDecision({ id: "abc_123", + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -1231,6 +1240,7 @@ describe("ArcjetDecision", () => { // TODO: This test doesn't make sense anymore test("an ERROR decision can be constructed with an Error object", () => { const decision = new ArcjetErrorDecision({ + ttl: 0, reason: new ArcjetErrorReason(new Error("Foo bar baz")), results: [], }); @@ -1243,6 +1253,7 @@ describe("ArcjetDecision", () => { // TODO: This test doesn't make sense anymore test("an ERROR decision can be constructed with a string message", () => { const decision = new ArcjetErrorDecision({ + ttl: 0, reason: new ArcjetErrorReason("Boom!"), results: [], }); @@ -1255,6 +1266,7 @@ describe("ArcjetDecision", () => { // TODO: This test doesn't make sense anymore test("use an unknown error for an ERROR decision constructed with other types", () => { const decision = new ArcjetErrorDecision({ + ttl: 0, reason: new ArcjetErrorReason(["not", "valid", "error"]), results: [], }); @@ -1266,6 +1278,7 @@ describe("ArcjetDecision", () => { test("`isAllowed()` returns true when type is ALLOW", () => { const decision = new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -1274,6 +1287,7 @@ describe("ArcjetDecision", () => { test("`isAllowed()` returns true when type is ERROR (fail open)", () => { const decision = new ArcjetErrorDecision({ + ttl: 0, reason: new ArcjetErrorReason("Something"), results: [], }); @@ -1282,6 +1296,7 @@ describe("ArcjetDecision", () => { test("`isAllowed()` returns false when type is DENY", () => { const decision = new ArcjetDenyDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -1290,6 +1305,7 @@ describe("ArcjetDecision", () => { test("`isDenied()` returns false when type is ALLOW", () => { const decision = new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -1298,6 +1314,7 @@ describe("ArcjetDecision", () => { test("`isDenied()` returns false when type is ERROR (fail open)", () => { const decision = new ArcjetErrorDecision({ + ttl: 0, reason: new ArcjetErrorReason("Something"), results: [], }); @@ -1306,6 +1323,7 @@ describe("ArcjetDecision", () => { test("`isDenied()` returns true when type is DENY", () => { const decision = new ArcjetDenyDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -1314,6 +1332,7 @@ describe("ArcjetDecision", () => { test("`isChallenged()` returns true when type is CHALLENGE", () => { const decision = new ArcjetChallengeDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -1322,6 +1341,7 @@ describe("ArcjetDecision", () => { test("`isErrored()` returns false when type is ALLOW", () => { const decision = new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -1330,6 +1350,7 @@ describe("ArcjetDecision", () => { test("`isErrored()` returns false when type is ERROR", () => { const decision = new ArcjetErrorDecision({ + ttl: 0, reason: new ArcjetErrorReason("Something"), results: [], }); @@ -1338,6 +1359,7 @@ describe("ArcjetDecision", () => { test("`isErrored()` returns false when type is DENY", () => { const decision = new ArcjetDenyDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -2289,6 +2311,7 @@ describe("SDK", () => { protect: jest.fn( async () => new ArcjetRuleResult({ + ttl: 0, state: "RUN", conclusion: "ALLOW", reason: new ArcjetTestReason(), @@ -2305,6 +2328,7 @@ describe("SDK", () => { protect: jest.fn( async () => new ArcjetRuleResult({ + ttl: 5000, state: "RUN", conclusion: "DENY", reason: new ArcjetTestReason(), @@ -2357,6 +2381,7 @@ describe("SDK", () => { validate: jest.fn(), protect: jest.fn(async () => { return new ArcjetRuleResult({ + ttl: 0, state: "RUN", conclusion: "DENY", reason: new ArcjetTestReason(), @@ -2369,6 +2394,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -2389,6 +2415,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -2423,6 +2450,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -2443,6 +2471,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -2463,6 +2492,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -2495,6 +2525,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -2535,6 +2566,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -2558,6 +2590,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -2580,6 +2613,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -2609,6 +2643,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -2649,6 +2684,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetErrorDecision({ + ttl: 0, reason: new ArcjetErrorReason("This decision not under test"), results: [], }); @@ -2691,6 +2727,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetErrorDecision({ + ttl: 0, reason: new ArcjetErrorReason("This decision not under test"), results: [], }); @@ -2736,6 +2773,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetErrorDecision({ + ttl: 0, reason: new ArcjetErrorReason("This decision not under test"), results: [], }); @@ -2784,6 +2822,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetErrorDecision({ + ttl: 0, reason: new ArcjetErrorReason("This decision not under test"), results: [], }); @@ -2819,6 +2858,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -2865,6 +2905,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetDenyDecision({ + ttl: 5000, reason: new ArcjetTestReason(), results: [], }); @@ -2913,6 +2954,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -2933,6 +2975,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -2975,6 +3018,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -3026,6 +3070,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -3077,6 +3122,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -3122,6 +3168,7 @@ describe("SDK", () => { const client = { decide: jest.fn(async () => { return new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -3229,6 +3276,7 @@ describe("Arcjet: Env = Serverless Node runtime on Vercel", () => { const client = { decide: jest.fn(async () => { return new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); @@ -3245,6 +3293,7 @@ describe("Arcjet: Env = Serverless Node runtime on Vercel", () => { const client = { decide: jest.fn(async () => { return new ArcjetAllowDecision({ + ttl: 0, reason: new ArcjetTestReason(), results: [], }); diff --git a/examples/nextjs-14-app-dir-validate-email/.eslintrc.json b/examples/nextjs-14-app-dir-validate-email/.eslintrc.json new file mode 100644 index 000000000..bffb357a7 --- /dev/null +++ b/examples/nextjs-14-app-dir-validate-email/.eslintrc.json @@ -0,0 +1,3 @@ +{ + "extends": "next/core-web-vitals" +} diff --git a/examples/nextjs-14-app-dir-validate-email/.gitignore b/examples/nextjs-14-app-dir-validate-email/.gitignore new file mode 100644 index 000000000..fd3dbb571 --- /dev/null +++ b/examples/nextjs-14-app-dir-validate-email/.gitignore @@ -0,0 +1,36 @@ +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. + +# dependencies +/node_modules +/.pnp +.pnp.js +.yarn/install-state.gz + +# testing +/coverage + +# next.js +/.next/ +/out/ + +# production +/build + +# misc +.DS_Store +*.pem + +# debug +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# local env files +.env*.local + +# vercel +.vercel + +# typescript +*.tsbuildinfo +next-env.d.ts diff --git a/examples/nextjs-14-app-dir-validate-email/README.md b/examples/nextjs-14-app-dir-validate-email/README.md new file mode 100644 index 000000000..76483ae7d --- /dev/null +++ b/examples/nextjs-14-app-dir-validate-email/README.md @@ -0,0 +1,30 @@ + + + + Arcjet Logo + + + +# Arcjet email verification with Next.js 14 using the App Router + +This example shows how to use Arcjet with a Next.js [route +handler](https://nextjs.org/docs/app/building-your-application/routing/route-handlers). + +## How to use + +1. From the root of the project, install the dependencies. + + ```bash + npm ci + ``` + +2. Enter this directory and start the dev server. + + ```bash + cd examples/nextjs-14-app-dir-validate-email + npm run dev + ``` + +3. Visit `http://localhost:3000/api/arcjet`. +4. Refresh the page to see the email verification fail due to no MX records + existing on the domain. diff --git a/examples/nextjs-14-app-dir-validate-email/app/api/arcjet/route.ts b/examples/nextjs-14-app-dir-validate-email/app/api/arcjet/route.ts new file mode 100644 index 000000000..05f95d49d --- /dev/null +++ b/examples/nextjs-14-app-dir-validate-email/app/api/arcjet/route.ts @@ -0,0 +1,33 @@ +import arcjet, { validateEmail } from "@arcjet/next"; +import { NextResponse } from "next/server"; + +const aj = arcjet({ + key: "ajkey_yourkey", + rules: [ + validateEmail({ + mode: "LIVE", + block: ["NO_MX_RECORDS"], + }), + ], +}); + +export async function GET(req: Request) { + const decision = await aj.protect(req, { + email: "test@arcjet.co", + }); + + if (decision.isDenied()) { + return NextResponse.json( + { + error: "Forbidden", + }, + { + status: 403, + }, + ); + } + + return NextResponse.json({ + message: "Hello world", + }); +} diff --git a/examples/nextjs-14-app-dir-validate-email/app/favicon.ico b/examples/nextjs-14-app-dir-validate-email/app/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..718d6fea4835ec2d246af9800eddb7ffb276240c GIT binary patch literal 25931 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 LrJugUA?W`A8`#=m literal 0 HcmV?d00001 diff --git a/examples/nextjs-14-app-dir-validate-email/app/globals.css b/examples/nextjs-14-app-dir-validate-email/app/globals.css new file mode 100644 index 000000000..fd81e8858 --- /dev/null +++ b/examples/nextjs-14-app-dir-validate-email/app/globals.css @@ -0,0 +1,27 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; + +:root { + --foreground-rgb: 0, 0, 0; + --background-start-rgb: 214, 219, 220; + --background-end-rgb: 255, 255, 255; +} + +@media (prefers-color-scheme: dark) { + :root { + --foreground-rgb: 255, 255, 255; + --background-start-rgb: 0, 0, 0; + --background-end-rgb: 0, 0, 0; + } +} + +body { + color: rgb(var(--foreground-rgb)); + background: linear-gradient( + to bottom, + transparent, + rgb(var(--background-end-rgb)) + ) + rgb(var(--background-start-rgb)); +} diff --git a/examples/nextjs-14-app-dir-validate-email/app/layout.tsx b/examples/nextjs-14-app-dir-validate-email/app/layout.tsx new file mode 100644 index 000000000..323bd9c95 --- /dev/null +++ b/examples/nextjs-14-app-dir-validate-email/app/layout.tsx @@ -0,0 +1,22 @@ +import type { Metadata } from "next"; +import { Inter } from "next/font/google"; +import "./globals.css"; + +const inter = Inter({ subsets: ["latin"] }); + +export const metadata: Metadata = { + title: "Create Next App", + description: "Generated by create next app", +}; + +export default function RootLayout({ + children, +}: { + children: React.ReactNode; +}) { + return ( + + {children} + + ); +} diff --git a/examples/nextjs-14-app-dir-validate-email/app/page.tsx b/examples/nextjs-14-app-dir-validate-email/app/page.tsx new file mode 100644 index 000000000..f870fe109 --- /dev/null +++ b/examples/nextjs-14-app-dir-validate-email/app/page.tsx @@ -0,0 +1,113 @@ +import Image from "next/image"; + +export default function Home() { + return ( +
+
+

+ Get started by editing  + app/page.tsx +

+ +
+ +
+ Next.js Logo +
+ + +
+ ); +} diff --git a/examples/nextjs-14-app-dir-validate-email/next.config.js b/examples/nextjs-14-app-dir-validate-email/next.config.js new file mode 100644 index 000000000..658404ac6 --- /dev/null +++ b/examples/nextjs-14-app-dir-validate-email/next.config.js @@ -0,0 +1,4 @@ +/** @type {import('next').NextConfig} */ +const nextConfig = {}; + +module.exports = nextConfig; diff --git a/examples/nextjs-14-app-dir-validate-email/package.json b/examples/nextjs-14-app-dir-validate-email/package.json new file mode 100644 index 000000000..8ef213f01 --- /dev/null +++ b/examples/nextjs-14-app-dir-validate-email/package.json @@ -0,0 +1,28 @@ +{ + "name": "nextjs-14-app-dir-validate-email", + "version": "0.1.0", + "private": true, + "scripts": { + "dev": "next dev", + "build": "next build", + "start": "next start", + "lint": "next lint" + }, + "dependencies": { + "@arcjet/next": "*", + "react": "^18", + "react-dom": "^18", + "next": "14.0.4" + }, + "devDependencies": { + "typescript": "^5", + "@types/node": "^20", + "@types/react": "^18", + "@types/react-dom": "^18", + "autoprefixer": "^10.0.1", + "postcss": "^8", + "tailwindcss": "^3.3.0", + "eslint": "^8", + "eslint-config-next": "14.0.4" + } +} diff --git a/examples/nextjs-14-app-dir-validate-email/postcss.config.js b/examples/nextjs-14-app-dir-validate-email/postcss.config.js new file mode 100644 index 000000000..12a703d90 --- /dev/null +++ b/examples/nextjs-14-app-dir-validate-email/postcss.config.js @@ -0,0 +1,6 @@ +module.exports = { + plugins: { + tailwindcss: {}, + autoprefixer: {}, + }, +}; diff --git a/examples/nextjs-14-app-dir-validate-email/public/next.svg b/examples/nextjs-14-app-dir-validate-email/public/next.svg new file mode 100644 index 000000000..db773047f --- /dev/null +++ b/examples/nextjs-14-app-dir-validate-email/public/next.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/examples/nextjs-14-app-dir-validate-email/public/vercel.svg b/examples/nextjs-14-app-dir-validate-email/public/vercel.svg new file mode 100644 index 000000000..4bc795bda --- /dev/null +++ b/examples/nextjs-14-app-dir-validate-email/public/vercel.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/examples/nextjs-14-app-dir-validate-email/tailwind.config.ts b/examples/nextjs-14-app-dir-validate-email/tailwind.config.ts new file mode 100644 index 000000000..7e4bd91a0 --- /dev/null +++ b/examples/nextjs-14-app-dir-validate-email/tailwind.config.ts @@ -0,0 +1,20 @@ +import type { Config } from "tailwindcss"; + +const config: Config = { + content: [ + "./pages/**/*.{js,ts,jsx,tsx,mdx}", + "./components/**/*.{js,ts,jsx,tsx,mdx}", + "./app/**/*.{js,ts,jsx,tsx,mdx}", + ], + theme: { + extend: { + backgroundImage: { + "gradient-radial": "radial-gradient(var(--tw-gradient-stops))", + "gradient-conic": + "conic-gradient(from 180deg at 50% 50%, var(--tw-gradient-stops))", + }, + }, + }, + plugins: [], +}; +export default config; diff --git a/examples/nextjs-14-app-dir-validate-email/tsconfig.json b/examples/nextjs-14-app-dir-validate-email/tsconfig.json new file mode 100644 index 000000000..c71469637 --- /dev/null +++ b/examples/nextjs-14-app-dir-validate-email/tsconfig.json @@ -0,0 +1,27 @@ +{ + "compilerOptions": { + "target": "es5", + "lib": ["dom", "dom.iterable", "esnext"], + "allowJs": true, + "skipLibCheck": true, + "strict": true, + "noEmit": true, + "esModuleInterop": true, + "module": "esnext", + "moduleResolution": "bundler", + "resolveJsonModule": true, + "isolatedModules": true, + "jsx": "preserve", + "incremental": true, + "plugins": [ + { + "name": "next" + } + ], + "paths": { + "@/*": ["./*"] + } + }, + "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"], + "exclude": ["node_modules"] +} diff --git a/package-lock.json b/package-lock.json index 4cb242671..b4cbe4253 100644 --- a/package-lock.json +++ b/package-lock.json @@ -352,6 +352,35 @@ } } }, + "examples/nextjs-14-app-dir-validate-email": { + "version": "0.1.0", + "dependencies": { + "@arcjet/next": "*", + "next": "14.0.4", + "react": "^18", + "react-dom": "^18" + }, + "devDependencies": { + "@types/node": "^20", + "@types/react": "^18", + "@types/react-dom": "^18", + "autoprefixer": "^10.0.1", + "eslint": "^8", + "eslint-config-next": "14.0.4", + "postcss": "^8", + "tailwindcss": "^3.3.0", + "typescript": "^5" + } + }, + "examples/nextjs-14-app-dir-validate-email/node_modules/@types/node": { + "version": "20.10.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.4.tgz", + "integrity": "sha512-D08YG6rr8X90YB56tSIuBaddy/UXAA9RKJoFvrsnogAum/0pmjkgi4+2nx96A330FmioegBWmEYQ+syqCFaveg==", + "dev": true, + "dependencies": { + "undici-types": "~5.26.4" + } + }, "examples/nextjs-14-pages-wrap": { "version": "0.1.0", "dependencies": { @@ -6315,6 +6344,10 @@ "resolved": "examples/nextjs-14-app-dir-rl", "link": true }, + "node_modules/nextjs-14-app-dir-validate-email": { + "resolved": "examples/nextjs-14-app-dir-validate-email", + "link": true + }, "node_modules/nextjs-14-pages-wrap": { "resolved": "examples/nextjs-14-pages-wrap", "link": true diff --git a/protocol/convert.ts b/protocol/convert.ts index 65f651242..17a291a0b 100644 --- a/protocol/convert.ts +++ b/protocol/convert.ts @@ -355,6 +355,7 @@ export function ArcjetRuleResultToProtocol( ): RuleResult { return new RuleResult({ ruleId: ruleResult.ruleId, + ttl: ruleResult.ttl, state: ArcjetRuleStateToProtocol(ruleResult.state), conclusion: ArcjetConclusionToProtocol(ruleResult.conclusion), reason: ArcjetReasonToProtocol(ruleResult.reason), @@ -365,6 +366,7 @@ export function ArcjetRuleResultFromProtocol( proto: RuleResult, ): ArcjetRuleResult { return new ArcjetRuleResult({ + ttl: proto.ttl, state: ArcjetRuleStateFromProtocol(proto.state), conclusion: ArcjetConclusionFromProtocol(proto.conclusion), reason: ArcjetReasonFromProtocol(proto.reason), @@ -374,6 +376,7 @@ export function ArcjetRuleResultFromProtocol( export function ArcjetDecisionToProtocol(decision: ArcjetDecision): Decision { return new Decision({ id: decision.id, + ttl: decision.ttl, conclusion: ArcjetConclusionToProtocol(decision.conclusion), reason: ArcjetReasonToProtocol(decision.reason), ruleResults: decision.results.map(ArcjetRuleResultToProtocol), @@ -386,6 +389,7 @@ export function ArcjetDecisionFromProtocol( if (typeof decision === "undefined") { return new ArcjetErrorDecision({ reason: new ArcjetErrorReason("Missing Decision"), + ttl: 0, results: [], }); } @@ -396,30 +400,35 @@ export function ArcjetDecisionFromProtocol( case Conclusion.ALLOW: return new ArcjetAllowDecision({ id: decision.id, + ttl: decision.ttl, reason: ArcjetReasonFromProtocol(decision.reason), results, }); case Conclusion.DENY: return new ArcjetDenyDecision({ id: decision.id, + ttl: decision.ttl, reason: ArcjetReasonFromProtocol(decision.reason), results, }); case Conclusion.CHALLENGE: return new ArcjetChallengeDecision({ id: decision.id, + ttl: decision.ttl, reason: ArcjetReasonFromProtocol(decision.reason), results, }); case Conclusion.ERROR: return new ArcjetErrorDecision({ id: decision.id, + ttl: decision.ttl, reason: new ArcjetErrorReason(decision.reason), results, }); case Conclusion.UNSPECIFIED: return new ArcjetErrorDecision({ id: decision.id, + ttl: decision.ttl, reason: new ArcjetErrorReason("Invalid Conclusion"), results, }); diff --git a/protocol/gen/es/decide/v1alpha1/decide_pb.d.ts b/protocol/gen/es/decide/v1alpha1/decide_pb.d.ts index 130dfe744..2e98489c0 100644 --- a/protocol/gen/es/decide/v1alpha1/decide_pb.d.ts +++ b/protocol/gen/es/decide/v1alpha1/decide_pb.d.ts @@ -873,6 +873,14 @@ export declare class RuleResult extends Message { */ reason?: Reason; + /** + * The duration in milliseconds this result should be considered valid, also + * known as time-to-live. + * + * @generated from field: int32 ttl = 5; + */ + ttl: number; + constructor(data?: PartialMessage); static readonly runtime: typeof proto3; @@ -989,6 +997,14 @@ export declare class Decision extends Message { */ ruleResults: RuleResult[]; + /** + * The duration in milliseconds this decision should be considered valid, + * also known as time-to-live. + * + * @generated from field: int32 ttl = 5; + */ + ttl: number; + constructor(data?: PartialMessage); static readonly runtime: typeof proto3; diff --git a/protocol/gen/es/decide/v1alpha1/decide_pb.js b/protocol/gen/es/decide/v1alpha1/decide_pb.js index 61d41352a..634f4a527 100644 --- a/protocol/gen/es/decide/v1alpha1/decide_pb.js +++ b/protocol/gen/es/decide/v1alpha1/decide_pb.js @@ -287,6 +287,7 @@ export const RuleResult = proto3.makeMessageType( { no: 2, name: "state", kind: "enum", T: proto3.getEnumType(RuleState) }, { no: 3, name: "conclusion", kind: "enum", T: proto3.getEnumType(Conclusion) }, { no: 4, name: "reason", kind: "message", T: Reason }, + { no: 5, name: "ttl", kind: "scalar", T: 5 /* ScalarType.INT32 */ }, ], ); @@ -322,6 +323,7 @@ export const Decision = proto3.makeMessageType( { no: 2, name: "conclusion", kind: "enum", T: proto3.getEnumType(Conclusion) }, { no: 3, name: "reason", kind: "message", T: Reason }, { no: 4, name: "rule_results", kind: "message", T: RuleResult, repeated: true }, + { no: 5, name: "ttl", kind: "scalar", T: 5 /* ScalarType.INT32 */ }, ], ); diff --git a/protocol/index.ts b/protocol/index.ts index 0796f4dfc..edddf14bf 100644 --- a/protocol/index.ts +++ b/protocol/index.ts @@ -217,11 +217,17 @@ export class ArcjetErrorReason extends ArcjetReason { export class ArcjetRuleResult { ruleId: string; + /** + * The duration in milliseconds this result should be considered valid, also + * known as time-to-live. + */ + ttl: number; state: ArcjetRuleState; conclusion: ArcjetConclusion; reason: ArcjetReason; constructor(init: { + ttl: number, state: ArcjetRuleState; conclusion: ArcjetConclusion; reason: ArcjetReason; @@ -229,6 +235,7 @@ export class ArcjetRuleResult { // TODO(#230): Generated, stable IDs for Rules this.ruleId = ""; + this.ttl = init.ttl; this.state = init.state; this.conclusion = init.conclusion; this.reason = init.reason; @@ -250,17 +257,24 @@ export class ArcjetRuleResult { * decision. One of: {@link ArcjetRateLimitReason}, {@link ArcjetEdgeRuleReason}, * {@link ArcjetBotReason}, {@link ArcjetSuspiciousReason}, * {@link ArcjetEmailReason}, or {@link ArcjetErrorReason}. + * @property `ttl` - The duration in milliseconds this decision should be + * considered valid, also known as time-to-live. * @property `results` - Each separate {@link ArcjetRuleResult} can be found here * or by logging into the Arcjet dashboard and searching for the decision `id`. */ export abstract class ArcjetDecision { id: string; + /** + * The duration in milliseconds this decision should be considered valid, also + * known as time-to-live. + */ + ttl: number; results: ArcjetRuleResult[]; abstract conclusion: ArcjetConclusion; abstract reason: ArcjetReason; - constructor(init: { id?: string; results: ArcjetRuleResult[] }) { + constructor(init: { id?: string; results: ArcjetRuleResult[]; ttl: number }) { if (typeof init.id === "string") { this.id = init.id; } else { @@ -268,6 +282,7 @@ export abstract class ArcjetDecision { } this.results = init.results; + this.ttl = init.ttl; } isAllowed(): this is ArcjetAllowDecision | ArcjetErrorDecision { @@ -294,6 +309,7 @@ export class ArcjetAllowDecision extends ArcjetDecision { constructor(init: { id?: string; results: ArcjetRuleResult[]; + ttl: number; reason: ArcjetReason; }) { super(init); @@ -309,6 +325,7 @@ export class ArcjetDenyDecision extends ArcjetDecision { constructor(init: { id?: string; results: ArcjetRuleResult[]; + ttl: number; reason: ArcjetReason; }) { super(init); @@ -323,6 +340,7 @@ export class ArcjetChallengeDecision extends ArcjetDecision { constructor(init: { id?: string; results: ArcjetRuleResult[]; + ttl: number; reason: ArcjetReason; }) { super(init); @@ -338,6 +356,7 @@ export class ArcjetErrorDecision extends ArcjetDecision { constructor(init: { id?: string; results: ArcjetRuleResult[]; + ttl: number, reason: ArcjetErrorReason; }) { super(init);