@shivaedev/platform 0.30.0 → 0.32.0

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.
Files changed (49) hide show
  1. package/CHANGELOG.md +18 -0
  2. package/README.md +65 -17
  3. package/dist/server/appHostHttp.d.ts +39 -39
  4. package/dist/server/appHostHttp.d.ts.map +1 -1
  5. package/dist/server/appHostHttp.js +17 -15
  6. package/dist/server/appHostHttp.js.map +1 -1
  7. package/dist/server/better-auth/bearerSessions.d.ts +9 -0
  8. package/dist/server/better-auth/bearerSessions.d.ts.map +1 -0
  9. package/dist/server/better-auth/bearerSessions.js +38 -0
  10. package/dist/server/better-auth/bearerSessions.js.map +1 -0
  11. package/dist/server/better-auth/mount.d.ts +3 -2
  12. package/dist/server/better-auth/mount.d.ts.map +1 -1
  13. package/dist/server/better-auth/mount.js +11 -17
  14. package/dist/server/better-auth/mount.js.map +1 -1
  15. package/dist/server/better-auth/mountRoutes.d.ts +20 -0
  16. package/dist/server/better-auth/mountRoutes.d.ts.map +1 -0
  17. package/dist/server/better-auth/mountRoutes.js +43 -0
  18. package/dist/server/better-auth/mountRoutes.js.map +1 -0
  19. package/dist/server/hostOptions.d.ts +1 -0
  20. package/dist/server/hostOptions.d.ts.map +1 -1
  21. package/dist/server/hostTransport.d.ts +16 -0
  22. package/dist/server/hostTransport.d.ts.map +1 -0
  23. package/dist/server/hostTransport.js +16 -0
  24. package/dist/server/hostTransport.js.map +1 -0
  25. package/dist/server/nativeClientOrigins.d.ts +4 -0
  26. package/dist/server/nativeClientOrigins.d.ts.map +1 -0
  27. package/dist/server/nativeClientOrigins.js +38 -0
  28. package/dist/server/nativeClientOrigins.js.map +1 -0
  29. package/dist/server/rpc-server/local.d.ts +2 -1
  30. package/dist/server/rpc-server/local.d.ts.map +1 -1
  31. package/dist/server/rpc-server/local.js +12 -5
  32. package/dist/server/rpc-server/local.js.map +1 -1
  33. package/dist/server/rpc-server/roles.d.ts +4 -1
  34. package/dist/server/rpc-server/roles.d.ts.map +1 -1
  35. package/dist/server/rpc-server/roles.js +14 -0
  36. package/dist/server/rpc-server/roles.js.map +1 -1
  37. package/dist/server/rpc-server/sensitive.js +1 -1
  38. package/dist/server/rpc-server/sensitive.js.map +1 -1
  39. package/package.json +3 -3
  40. package/src/server/appHostHttp.ts +23 -20
  41. package/src/server/better-auth/bearerSessions.ts +50 -0
  42. package/src/server/better-auth/mount.ts +12 -25
  43. package/src/server/better-auth/mountRoutes.ts +62 -0
  44. package/src/server/hostOptions.ts +1 -0
  45. package/src/server/hostTransport.ts +26 -0
  46. package/src/server/nativeClientOrigins.ts +44 -0
  47. package/src/server/rpc-server/local.ts +16 -5
  48. package/src/server/rpc-server/roles.ts +20 -0
  49. package/src/server/rpc-server/sensitive.ts +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"sensitive.js","sourceRoot":"","sources":["../../../src/server/rpc-server/sensitive.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sensitive.js","sourceRoot":"","sources":["../../../src/server/rpc-server/sensitive.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/platform",
3
- "version": "0.30.0",
3
+ "version": "0.32.0",
4
4
  "description": "Opinionated Effect application infrastructure for ShivaeDev services",
5
5
  "homepage": "https://github.com/ShivaeDev/platform/tree/main/packages/platform#readme",
6
6
  "bugs": {
@@ -55,12 +55,12 @@
55
55
  "@prisma-next/sql-contract": "0.16.0",
56
56
  "@prisma-next/sql-orm-client": "0.16.0",
57
57
  "@prisma-next/target-postgres": "0.16.0",
58
- "@shivaedev/effect-pg-boss": "0.18.2",
58
+ "@shivaedev/effect-pg-boss": "0.19.0",
59
59
  "@shivaedev/effect-prisma": "0.10.6",
60
60
  "@shivaedev/effect-test": "0.9.0",
61
61
  "@shivaedev/effect-test-sql": "0.9.3",
62
62
  "@shivaedev/effect-trpc": "0.8.6",
63
- "@shivaedev/quality": "0.39.2",
63
+ "@shivaedev/quality": "0.40.0",
64
64
  "@shivaedev/test-story": "0.20.0",
65
65
  "@trpc/client": "11.19.0",
66
66
  "@trpc/server": "11.19.0",
@@ -1,7 +1,7 @@
1
1
  import { createServer } from "node:http";
2
2
  import { NodeHttpServer, NodeServices } from "@effect/platform-node";
3
- import { ByteSize, Config, Effect, Layer, Option, Schema } from "effect";
4
- import { HttpIncomingMessage, HttpRouter, HttpServerRequest, HttpStaticServer } from "effect/http";
3
+ import { ByteSize, Config, Effect, Layer } from "effect";
4
+ import { HttpEffect, HttpIncomingMessage, HttpRouter, HttpServerRequest, HttpServerResponse, HttpStaticServer } from "effect/http";
5
5
  import { type Rpc, RpcSerialization, RpcServer } from "effect/rpc";
6
6
  import type { Authenticated, MaybeAuthenticated, RequestTracing } from "#rpc/middleware.ts";
7
7
  import type { AppChanges, AppHttpHostOptions } from "#server/appHost.ts";
@@ -10,7 +10,9 @@ import type { databaseLayer } from "#server/databaseLayer.ts";
10
10
  import { healthRoute } from "#server/healthRoute.ts";
11
11
  import { hostChanges } from "#server/hostChanges.ts";
12
12
  import type { HostOptions, HostPolicy } from "#server/hostOptions.ts";
13
+ import { hostTransport } from "#server/hostTransport.ts";
13
14
  import type { MigrationOptions } from "#server/MigrationOptions.ts";
15
+ import { nativeClientOrigins } from "#server/nativeClientOrigins.ts";
14
16
  import { otlpTracing } from "#server/otlpTracing.ts";
15
17
  import { RedactionPolicy } from "#server/RedactionPolicy.ts";
16
18
  import { redactingDiagnostics } from "#server/redactingDiagnostics.ts";
@@ -18,9 +20,12 @@ import { redactingRpcSerialization } from "#server/redactingRpcSerialization.ts"
18
20
  import { localRpcGuard } from "#server/rpc-server/local.ts";
19
21
  import { authenticatedLayer, maybeAuthenticatedLayer, type SessionShape } from "#server/rpc-server/session.ts";
20
22
  import { requestTracingLayer } from "#server/rpc-server/tracing.ts";
21
- import { TrustedProxy } from "#server/rpc-server/trustedProxy.ts";
22
23
  import { schemaSensitiveKeys } from "#server/schemaSensitiveKeys.ts";
23
24
  import { tracedGroup } from "#server/tracedGroup.ts";
25
+
26
+ const rpcCacheControl: HttpEffect.PreResponseHandler = (_, response) =>
27
+ Effect.succeed(HttpServerResponse.setHeader(response, "cache-control", "private, no-store"));
28
+
24
29
  export function appHostHttp<
25
30
  TRpcs extends Rpc.Any,
26
31
  THandlers,
@@ -37,17 +42,7 @@ export function appHostHttp<
37
42
  const sensitive = schemaSensitiveKeys(options.group, options.config?.sensitiveKeys);
38
43
  return Layer.unwrap(
39
44
  Effect.gen(function* () {
40
- const maxBodySize = options.config?.maxBodySize ?? (yield* Config.Int("MAX_BODY_SIZE").pipe(Config.withDefault(1024 * 1024)));
41
- const bodySize = yield* Schema.decodeUnknownEffect(Schema.Int.check(Schema.isGreaterThanOrEqualTo(0)))(maxBodySize).pipe(
42
- Effect.mapError((cause) => new Config.ConfigError(cause)),
43
- );
44
- const trustedProxy =
45
- options.policy === "loopback"
46
- ? undefined
47
- : (options.config?.trustedProxy ?? Option.getOrUndefined(yield* Config.String("TRUSTED_PROXY").pipe(Config.option)));
48
- if (trustedProxy !== undefined) {
49
- yield* Schema.decodeUnknownEffect(TrustedProxy)(trustedProxy).pipe(Effect.mapError((cause) => new Config.ConfigError(cause)));
50
- }
45
+ const { bodySize, trustedProxy, nativeOrigins } = yield* hostTransport(options);
51
46
  const middleware: Layer.Layer<RequestTracing> | Layer.Layer<Authenticated | MaybeAuthenticated | RequestTracing> =
52
47
  options.policy === "loopback"
53
48
  ? requestTracingLayer({ sensitive })
@@ -58,18 +53,23 @@ export function appHostHttp<
58
53
  const handler = yield* RpcServer.toHttpEffect(tracedGroup(options.group)).pipe(
59
54
  Effect.provideService(RpcSerialization.RpcSerialization, wire),
60
55
  );
61
- const guarded = localRpcGuard(handler, trustedProxy);
62
- yield* router.add("POST", options.rpcPath ?? "/rpc", (request) =>
63
- guarded.pipe(
56
+ const guarded = localRpcGuard(handler, trustedProxy, nativeOrigins);
57
+ if (nativeOrigins.length > 0) {
58
+ yield* router.add("OPTIONS", options.rpcPath ?? "/rpc", HttpServerResponse.text("Local same-origin requests only", { status: 403 }));
59
+ }
60
+ yield* router.add("POST", options.rpcPath ?? "/rpc", (request) => {
61
+ HttpEffect.appendPreResponseHandlerUnsafe(request, rpcCacheControl);
62
+ return guarded.pipe(
64
63
  Effect.provideService(HttpIncomingMessage.MaxBodySize, ByteSize.bytes(bodySize)),
65
64
  Effect.provideService(HttpServerRequest.HttpServerRequest, boundedRpcRequest(request)),
66
65
  Effect.provideService(RpcSerialization.RpcSerialization, wire),
67
- ),
68
- );
66
+ );
67
+ });
69
68
  }),
70
69
  ).pipe(
71
70
  Layer.provide(Layer.merge(middleware, hostChanges(options.group, changesService).pipe(Layer.provideMerge(options.handlers)))),
72
71
  Layer.provide(RpcSerialization.layerNdjson),
72
+ Layer.provide(nativeClientOrigins(nativeOrigins, trustedProxy)),
73
73
  );
74
74
  const assets =
75
75
  options.assets === undefined
@@ -89,7 +89,10 @@ export function appHostHttp<
89
89
  });
90
90
  }),
91
91
  );
92
- return HttpRouter.serve(Layer.mergeAll(routes, healthRoute, assets, options.routes ?? Layer.empty), { disableLogger: true }).pipe(
92
+ const applicationRoutes = (options.routes ?? Layer.empty).pipe(
93
+ Layer.provide(options.nativeOrigins === undefined ? Layer.empty : nativeClientOrigins(nativeOrigins, trustedProxy, true)),
94
+ );
95
+ return HttpRouter.serve(Layer.mergeAll(routes, healthRoute, assets, applicationRoutes), { disableLogger: true }).pipe(
93
96
  Layer.provideMerge(application),
94
97
  Layer.provideMerge(server),
95
98
  Layer.provide(NodeServices.layer),
@@ -0,0 +1,50 @@
1
+ import type { BetterAuthOptions } from "better-auth";
2
+ import { bearer } from "better-auth/plugins/bearer";
3
+
4
+ export interface BearerSessionsOptions {
5
+ readonly origins: readonly string[];
6
+ }
7
+
8
+ export function withBearerSessions<TOptions extends BetterAuthOptions>(options: TOptions, enabled: boolean): TOptions {
9
+ return enabled ? { ...options, plugins: [...(options.plugins ?? []), bearer({ requireSignature: true })] } : options;
10
+ }
11
+
12
+ export function hasSessionCookie(headers: Headers, cookieName: string): boolean {
13
+ return (
14
+ headers
15
+ .get("cookie")
16
+ ?.split(";")
17
+ .some((cookie) => cookie.trim().startsWith(`${cookieName}=`)) === true
18
+ );
19
+ }
20
+
21
+ export function sessionHeaders(headers: Headers, cookieName: string): Headers {
22
+ const result = new Headers(headers);
23
+ if (hasSessionCookie(headers, cookieName)) {
24
+ result.delete("authorization");
25
+ } else if (/^bearer\s/iu.test(headers.get("authorization") ?? "")) {
26
+ result.delete("cookie");
27
+ }
28
+ return result;
29
+ }
30
+
31
+ export async function cookieSessionResponse(response: Response): Promise<Response> {
32
+ const headers = new Headers(response.headers);
33
+ headers.delete("set-auth-token");
34
+ const exposed = headers.get("access-control-expose-headers");
35
+ if (exposed !== null) {
36
+ headers.set(
37
+ "access-control-expose-headers",
38
+ exposed
39
+ .split(",")
40
+ .filter((header) => header.trim().toLowerCase() !== "set-auth-token")
41
+ .join(","),
42
+ );
43
+ }
44
+ if (!headers.get("content-type")?.includes("application/json")) {
45
+ return new Response(response.body, { headers, status: response.status });
46
+ }
47
+ const body: unknown = JSON.parse(await response.text(), (key, value: unknown) => (key === "token" ? undefined : value));
48
+ headers.delete("content-length");
49
+ return Response.json(body, { headers, status: response.status });
50
+ }
@@ -1,17 +1,18 @@
1
1
  import { type BetterAuthOptions, betterAuth } from "better-auth";
2
2
  import { Config, Effect, Option, Redacted } from "effect";
3
- import { HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/http";
4
3
  import { Pool, type PoolClient, type PoolConfig } from "pg";
4
+ import { type BearerSessionsOptions, sessionHeaders, withBearerSessions } from "#server/better-auth/bearerSessions.ts";
5
5
  import { memoryRateLimit } from "#server/better-auth/memoryRateLimit.ts";
6
+ import { mountRoutes } from "#server/better-auth/mountRoutes.ts";
6
7
  import { type RevokeUnadmitted, revokeUnadmitted } from "#server/better-auth/revokeUnadmitted.ts";
7
8
  import { type PolicyStorage, type SignInPolicy, signInGate } from "#server/better-auth/signInGate.ts";
8
9
  import { signInPolicyOptions } from "#server/better-auth/signInPolicy.ts";
9
10
  import type { GetSession } from "#server/rpc-server/adapters/betterAuthSessions.ts";
10
- import { trustedProxyPeer, trustedProxyRanges } from "#server/rpc-server/local.ts";
11
- import { redact } from "#server/rpc-server/redact.ts";
11
+ import { trustedProxyRanges } from "#server/rpc-server/local.ts";
12
12
  import type { SessionShape } from "#server/rpc-server/session.ts";
13
13
 
14
14
  export interface BetterAuthMountOptions<E = never, R = never> {
15
+ readonly bearerSessions?: BearerSessionsOptions | undefined;
15
16
  readonly signIn?: SignInPolicy<E, R> | undefined;
16
17
  }
17
18
 
@@ -25,7 +26,6 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* <
25
26
  const trustedProxy = Option.getOrUndefined(yield* Config.String("TRUSTED_PROXY").pipe(Config.option));
26
27
  const clientIpHeader = yield* Config.String("AUTH_CLIENT_IP_HEADER").pipe(Config.withDefault("x-forwarded-for"));
27
28
  const rateLimitEnabled = yield* Config.Boolean("AUTH_RATE_LIMIT_ENABLED").pipe(Config.withDefault(true));
28
- const isTrustedProxy = trustedProxyPeer(trustedProxy);
29
29
  const trustedProxies = trustedProxyRanges(trustedProxy);
30
30
  const context = yield* Effect.context<R>();
31
31
  const run = Effect.runPromiseWith(context);
@@ -39,7 +39,7 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* <
39
39
  const customStorage =
40
40
  rateLimit?.customStorage ?? (rateLimit?.storage === undefined || rateLimit.storage === "memory" ? yield* memoryRateLimit : undefined);
41
41
  const auth = betterAuth({
42
- ...options,
42
+ ...withBearerSessions(options, mount.bearerSessions !== undefined),
43
43
  advanced: {
44
44
  useSecureCookies: Option.isSome(publicUrl) && publicUrl.value.protocol === "https:",
45
45
  ...options.advanced,
@@ -56,32 +56,19 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* <
56
56
  trustedOrigins: options.trustedOrigins ?? [Option.getOrElse(origin, () => "http://127.0.0.1:*")],
57
57
  user: gate.active ? gated.user : options.user,
58
58
  });
59
- const routes = HttpRouter.use((router) =>
60
- router.add("*", "/api/auth/*", (request) =>
61
- Effect.gen(function* () {
62
- const web = yield* HttpServerRequest.toWeb(request);
63
- if (!Option.exists(request.remoteAddress, isTrustedProxy)) {
64
- web.headers.delete("x-forwarded-for");
65
- web.headers.delete(clientIpHeader);
66
- }
67
- return HttpServerResponse.fromWeb(
68
- yield* Effect.tryPromise(() => auth.handler(web)).pipe(
69
- Effect.tapError((error) => Effect.logError("Authentication provider failed", redact(error.cause))),
70
- ),
71
- );
72
- }).pipe(Effect.catch(() => Effect.succeed(HttpServerResponse.text("Authentication is temporarily unavailable", { status: 503 })))),
73
- ),
74
- );
59
+ const routes = mountRoutes(auth, { bearerSessions: mount.bearerSessions, clientIpHeader, trustedProxy });
75
60
  function admittedSessions<TSession extends SessionShape>(getSession: GetSession<TSession>): GetSession<TSession> {
76
- if (!gate.active) {
61
+ if (!gate.active && mount.bearerSessions === undefined) {
77
62
  return getSession;
78
63
  }
79
64
  return (headers) =>
80
65
  run(
81
66
  Effect.gen(function* () {
82
- const session = yield* Effect.tryPromise(() => getSession(headers));
83
- if (session === null) {
84
- return null;
67
+ const { authCookies } = yield* Effect.promise(() => auth.$context);
68
+ const selected = mount.bearerSessions === undefined ? headers : sessionHeaders(headers, authCookies.sessionToken.name);
69
+ const session = yield* Effect.tryPromise(() => getSession(selected));
70
+ if (!gate.active || session === null) {
71
+ return session;
85
72
  }
86
73
  const storage = yield* Effect.tryPromise(() => auth.$context);
87
74
  if (yield* gate.admitsUser(storage, session.user.id)) {
@@ -0,0 +1,62 @@
1
+ import { Effect, Option } from "effect";
2
+ import { HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/http";
3
+ import { type BearerSessionsOptions, cookieSessionResponse, hasSessionCookie, sessionHeaders } from "#server/better-auth/bearerSessions.ts";
4
+ import { trustedProxyPeer } from "#server/rpc-server/local.ts";
5
+ import { redact } from "#server/rpc-server/redact.ts";
6
+
7
+ interface MountedAuth {
8
+ readonly $context: Promise<{ readonly authCookies: { readonly sessionToken: { readonly name: string } } }>;
9
+ readonly handler: (request: Request) => Promise<Response>;
10
+ }
11
+ interface MountRouteOptions {
12
+ readonly bearerSessions?: BearerSessionsOptions | undefined;
13
+ readonly clientIpHeader: string;
14
+ readonly trustedProxy?: string | undefined;
15
+ }
16
+ function replacesSession(request: Request, response: Response, native: boolean) {
17
+ return (
18
+ native
19
+ && response.ok
20
+ && response.headers.has("set-auth-token")
21
+ && request.headers.has("authorization")
22
+ && new URL(request.url).pathname.startsWith("/api/auth/sign-in/")
23
+ );
24
+ }
25
+ async function authResponse(auth: MountedAuth, web: Request, options: MountRouteOptions) {
26
+ if (options.bearerSessions === undefined) {
27
+ return auth.handler(web);
28
+ }
29
+ const { authCookies } = await auth.$context;
30
+ const cookieName = authCookies.sessionToken.name;
31
+ const headers = sessionHeaders(web.headers, cookieName);
32
+ const native = options.bearerSessions.origins.includes(web.headers.get("origin") ?? "") && !hasSessionCookie(web.headers, cookieName);
33
+ const request = new Request(web, { headers });
34
+ const response = await auth.handler(request);
35
+ if (replacesSession(request, response, native)) {
36
+ const revoked = await auth.handler(new Request(new URL("/api/auth/sign-out", web.url), { body: "{}", headers, method: "POST" }));
37
+ await revoked.body?.cancel();
38
+ if (!revoked.ok) {
39
+ throw new Error("Session replacement failed");
40
+ }
41
+ }
42
+ return native ? response : cookieSessionResponse(response);
43
+ }
44
+ export function mountRoutes(auth: MountedAuth, options: MountRouteOptions) {
45
+ const isTrustedProxy = trustedProxyPeer(options.trustedProxy);
46
+ return HttpRouter.use((router) =>
47
+ router.add("*", "/api/auth/*", (request) =>
48
+ Effect.gen(function* () {
49
+ const web = yield* HttpServerRequest.toWeb(request);
50
+ if (!Option.exists(request.remoteAddress, isTrustedProxy)) {
51
+ web.headers.delete("x-forwarded-for");
52
+ web.headers.delete(options.clientIpHeader);
53
+ }
54
+ return HttpServerResponse.fromWeb(
55
+ yield* Effect.tryPromise(() => authResponse(auth, web, options)).pipe(
56
+ Effect.tapError((error) => Effect.logError("Authentication provider failed", redact(error.cause))),
57
+ ),
58
+ );
59
+ }).pipe(Effect.catch(() => Effect.succeed(HttpServerResponse.text("Authentication is temporarily unavailable", { status: 503 })))),
60
+ ),
61
+ );
62
+ }
@@ -16,6 +16,7 @@ export type HostOptions<TRpcs extends Rpc.Any, THandlers, THandlerError, THandle
16
16
  };
17
17
  readonly group: RpcGroup.RpcGroup<TRpcs>;
18
18
  readonly handlers: Layer.Layer<THandlers, THandlerError, THandlerRequirements>;
19
+ readonly nativeOrigins?: readonly string[];
19
20
  readonly routes?: Layer.Layer<never, never, HttpRouter.HttpRouter | HttpRouter.Request<"Error", unknown>>;
20
21
  readonly rpcPath?: HttpRouter.PathInput;
21
22
  } & (
@@ -0,0 +1,26 @@
1
+ import { Config, Effect, Option, Schema } from "effect";
2
+ import { NativeOrigins } from "#server/nativeClientOrigins.ts";
3
+ import { TrustedProxy } from "#server/rpc-server/trustedProxy.ts";
4
+
5
+ interface Options {
6
+ readonly config?: { readonly maxBodySize?: number; readonly trustedProxy?: string };
7
+ readonly nativeOrigins?: readonly string[];
8
+ readonly policy?: "loopback" | undefined;
9
+ }
10
+ export const hostTransport = Effect.fn("Platform.hostTransport")(function* (options: Options) {
11
+ const maxBodySize = options.config?.maxBodySize ?? (yield* Config.Int("MAX_BODY_SIZE").pipe(Config.withDefault(1024 * 1024)));
12
+ const bodySize = yield* Schema.decodeUnknownEffect(Schema.Int.check(Schema.isGreaterThanOrEqualTo(0)))(maxBodySize).pipe(
13
+ Effect.mapError((cause) => new Config.ConfigError(cause)),
14
+ );
15
+ const trustedProxy =
16
+ options.policy === "loopback"
17
+ ? undefined
18
+ : (options.config?.trustedProxy ?? Option.getOrUndefined(yield* Config.String("TRUSTED_PROXY").pipe(Config.option)));
19
+ if (trustedProxy !== undefined) {
20
+ yield* Schema.decodeUnknownEffect(TrustedProxy)(trustedProxy).pipe(Effect.mapError((cause) => new Config.ConfigError(cause)));
21
+ }
22
+ const nativeOrigins = yield* Schema.decodeUnknownEffect(NativeOrigins)(options.nativeOrigins ?? []).pipe(
23
+ Effect.mapError((cause) => new Config.ConfigError(cause)),
24
+ );
25
+ return { bodySize, nativeOrigins, trustedProxy };
26
+ });
@@ -0,0 +1,44 @@
1
+ import { Effect, Schema } from "effect";
2
+ import { Headers, HttpMiddleware, HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/http";
3
+ import { localTransport } from "#server/rpc-server/local.ts";
4
+
5
+ export const NativeOrigins = Schema.Array(
6
+ Schema.String.check(
7
+ Schema.makeFilter((origin) => {
8
+ try {
9
+ const url = new URL(origin);
10
+ const authority = url.origin === "null" ? `${url.protocol}//${url.host}` : url.origin;
11
+ return url.host !== "" && !origin.includes("*") && authority === origin;
12
+ } catch {
13
+ return false;
14
+ }
15
+ }),
16
+ ),
17
+ );
18
+
19
+ export function nativeClientOrigins(origins: readonly string[], trustedProxy: string | undefined, auth = false) {
20
+ const allowed = localTransport(trustedProxy, origins);
21
+ const cors = HttpMiddleware.cors({
22
+ allowedHeaders: ["Authorization", "Content-Type"],
23
+ allowedMethods: auth ? ["GET", "POST"] : ["POST"],
24
+ allowedOrigins: (origin) => origins.includes(origin),
25
+ credentials: false,
26
+ exposedHeaders: auth ? ["set-auth-token"] : [],
27
+ });
28
+ return HttpRouter.middleware((effect) =>
29
+ Effect.gen(function* () {
30
+ const request = yield* HttpServerRequest.HttpServerRequest;
31
+ if (auth && !request.url.split("?")[0]?.startsWith("/api/auth/")) {
32
+ return yield* effect;
33
+ }
34
+ if ((auth || request.method === "OPTIONS") && !allowed(request)) {
35
+ return HttpServerResponse.text("Local same-origin requests only", { status: 403 });
36
+ }
37
+ if (!origins.includes(request.headers.origin ?? "")) {
38
+ return yield* effect;
39
+ }
40
+ const native = request.modify({ headers: Headers.remove(request.headers, "cookie") });
41
+ return yield* cors(effect).pipe(Effect.provideService(HttpServerRequest.HttpServerRequest, native));
42
+ }),
43
+ ).layer;
44
+ }
@@ -50,7 +50,7 @@ export function trustedProxyRanges(trustedProxy?: string): string[] {
50
50
  return normalizedRanges(trustedProxy);
51
51
  }
52
52
 
53
- function proxyOrigin(request: HttpServerRequest.HttpServerRequest, isTrustedProxy: (address: string) => boolean): boolean {
53
+ function proxyOrigin(request: HttpServerRequest.HttpServerRequest, isTrustedProxy: (address: string) => boolean, native: boolean): boolean {
54
54
  if (!Option.exists(request.remoteAddress, isTrustedProxy)) {
55
55
  return false;
56
56
  }
@@ -61,19 +61,30 @@ function proxyOrigin(request: HttpServerRequest.HttpServerRequest, isTrustedProx
61
61
  }
62
62
  try {
63
63
  const url = new URL(`${protocol}://${host}`);
64
- return request.headers.origin === undefined || request.headers.origin === url.origin;
64
+ return native || request.headers.origin === undefined || request.headers.origin === url.origin;
65
65
  } catch {
66
66
  return false;
67
67
  }
68
68
  }
69
- export function localRpcGuard<E, R>(effect: Effect.Effect<HttpServerResponse.HttpServerResponse, E, R>, trustedProxy?: string) {
69
+ export function localTransport(trustedProxy?: string, nativeOrigins: readonly string[] = []) {
70
70
  const isTrustedProxy = trustedProxyPeer(trustedProxy);
71
+ return (request: HttpServerRequest.HttpServerRequest): boolean => {
72
+ const native = nativeOrigins.includes(request.headers.origin ?? "");
73
+ const local = loopbackHost(request.headers.host) && Option.exists(request.remoteAddress, loopbackAddress);
74
+ return (local && (native || sameOrigin(request))) || proxyOrigin(request, isTrustedProxy, native);
75
+ };
76
+ }
77
+ export function localRpcGuard<E, R>(
78
+ effect: Effect.Effect<HttpServerResponse.HttpServerResponse, E, R>,
79
+ trustedProxy?: string,
80
+ nativeOrigins: readonly string[] = [],
81
+ ) {
82
+ const allowed = localTransport(trustedProxy, nativeOrigins);
71
83
  return Effect.gen(function* () {
72
84
  const request = yield* HttpServerRequest.HttpServerRequest;
73
85
  const serialization = yield* RpcSerialization.RpcSerialization;
74
- const local = loopbackHost(request.headers.host) && Option.exists(request.remoteAddress, loopbackAddress);
75
86
  const contentType = request.headers["content-type"]?.split(";")[0]?.trim().toLowerCase();
76
- return ((local && sameOrigin(request)) || proxyOrigin(request, isTrustedProxy)) && contentType === serialization.contentType
87
+ return allowed(request) && contentType === serialization.contentType
77
88
  ? yield* continueHttpTrace(effect, request)
78
89
  : HttpServerResponse.text("Local same-origin requests only", { status: 403 });
79
90
  });
@@ -1,9 +1,11 @@
1
1
  import { Effect, Layer, Option } from "effect";
2
+ import { type HttpServerRequest, HttpServerResponse } from "effect/http";
2
3
  import type { RpcMiddleware } from "effect/rpc";
3
4
  import { type AuthUnavailable, Forbidden, type Unauthorized } from "#errors/taxonomy.ts";
4
5
  import { hasRole } from "#rpc/hasRole.ts";
5
6
  import { Identity, SessionUser, type SessionUserValue } from "#rpc/identity.ts";
6
7
  import { AuthenticatedAdmin, AuthenticatedOwner } from "#rpc/middleware.ts";
8
+ import { requireAdmin } from "#rpc/requireAdmin.ts";
7
9
  import { sessionCommandChanges } from "#server/commandChanges.ts";
8
10
  import { revalidateStream } from "./revalidateStream.ts";
9
11
  import { resolveSession, type SessionPolicy, type UserSessionShape, withSessionUser } from "./session.ts";
@@ -30,6 +32,24 @@ function requiringRole<TSession extends UserSessionShape>(
30
32
  export function authenticatedAdminLayer<TSession extends UserSessionShape>(policy: SessionPolicy<TSession>): Layer.Layer<AuthenticatedAdmin> {
31
33
  return Layer.succeed(AuthenticatedAdmin, requiringRole(policy, "admin", "Administrator role required"));
32
34
  }
35
+ function adminRejection(error: Unauthorized | Forbidden | AuthUnavailable) {
36
+ return HttpServerResponse.empty({
37
+ headers: { "cache-control": "private, no-store" },
38
+ status: { AuthUnavailable: 503, Forbidden: 403, Unauthorized: 401 }[error._tag],
39
+ });
40
+ }
41
+
42
+ export function adminRoute<TSession extends UserSessionShape>(policy: SessionPolicy<TSession>) {
43
+ return <E, R>(handler: (request: HttpServerRequest.HttpServerRequest) => Effect.Effect<HttpServerResponse.HttpServerResponse, E, R>) =>
44
+ (request: HttpServerRequest.HttpServerRequest): Effect.Effect<HttpServerResponse.HttpServerResponse, E, Exclude<R, Identity | SessionUser>> =>
45
+ Effect.andThen(requireAdmin, Effect.context<Identity | SessionUser>()).pipe(
46
+ withSessionUser(policy, request.headers, request.url),
47
+ Effect.matchEffect({
48
+ onFailure: (error) => Effect.succeed(adminRejection(error)),
49
+ onSuccess: (context) => Effect.provideContext(handler(request), context),
50
+ }),
51
+ );
52
+ }
33
53
  export function authenticatedOwnerLayer<TSession extends UserSessionShape>(policy: SessionPolicy<TSession>): Layer.Layer<AuthenticatedOwner> {
34
54
  return Layer.succeed(AuthenticatedOwner, requiringRole(policy, "owner", "Owner role required"));
35
55
  }
@@ -38,7 +38,7 @@ export function isSensitiveKey(key: string): boolean {
38
38
  || wordsOf(key).some((word) => SENSITIVE_WORDS.includes(word))
39
39
  );
40
40
  }
41
- const AUTH_SCHEME = /\b(?<scheme>Bearer|Basic)\s+[A-Za-z0-9._~+/-]+=*/giu;
41
+ const AUTH_SCHEME = /\b(?<scheme>Bearer|Basic)\s+[A-Za-z0-9%._~+/-]+=*/giu;
42
42
  const JWT = /\beyJ[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]*/gu;
43
43
  const PRIVATE_KEY = /-----BEGIN (?<kind>(?:[A-Z0-9]+ )*PRIVATE KEY)-----[\s\S]*?-----END \k<kind>-----/gu;
44
44
  const URL_PASSWORD = /(?<authority>\/\/[^:/\s@]+:)[^@/\s]+@/gu;