@shivaedev/identity 0.4.0 → 0.5.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 (108) hide show
  1. package/README.md +19 -13
  2. package/dist/identity.d.ts +19 -6
  3. package/dist/identity.d.ts.map +1 -1
  4. package/dist/identity.js +9 -1
  5. package/dist/identity.js.map +1 -1
  6. package/dist/middleware.d.ts +2 -0
  7. package/dist/middleware.d.ts.map +1 -1
  8. package/dist/middleware.js +5 -4
  9. package/dist/middleware.js.map +1 -1
  10. package/dist/permission.d.ts +7 -8
  11. package/dist/permission.d.ts.map +1 -1
  12. package/dist/permission.js +4 -12
  13. package/dist/permission.js.map +1 -1
  14. package/dist/server/adapters/betterAuthSessions.d.ts +1 -1
  15. package/dist/server/adapters/betterAuthSessions.d.ts.map +1 -1
  16. package/dist/server/adapters/betterAuthSessions.js +4 -7
  17. package/dist/server/adapters/betterAuthSessions.js.map +1 -1
  18. package/dist/server/better-auth/admittedSessions.d.ts +14 -0
  19. package/dist/server/better-auth/admittedSessions.d.ts.map +1 -0
  20. package/dist/server/better-auth/admittedSessions.js +32 -0
  21. package/dist/server/better-auth/admittedSessions.js.map +1 -0
  22. package/dist/server/better-auth/clientIp.d.ts.map +1 -1
  23. package/dist/server/better-auth/clientIp.js +2 -1
  24. package/dist/server/better-auth/clientIp.js.map +1 -1
  25. package/dist/server/better-auth/mount.d.ts +8 -7
  26. package/dist/server/better-auth/mount.d.ts.map +1 -1
  27. package/dist/server/better-auth/mount.js +6 -24
  28. package/dist/server/better-auth/mount.js.map +1 -1
  29. package/dist/server/better-auth/mountRoutes.d.ts.map +1 -1
  30. package/dist/server/better-auth/mountRoutes.js +6 -6
  31. package/dist/server/better-auth/mountRoutes.js.map +1 -1
  32. package/dist/server/better-auth/mountedSessions.d.ts +9 -5
  33. package/dist/server/better-auth/mountedSessions.d.ts.map +1 -1
  34. package/dist/server/better-auth/mountedSessions.js +5 -5
  35. package/dist/server/better-auth/mountedSessions.js.map +1 -1
  36. package/dist/server/better-auth/sessionPermissions.d.ts +2 -1
  37. package/dist/server/better-auth/sessionPermissions.d.ts.map +1 -1
  38. package/dist/server/better-auth/sessionPermissions.js +6 -5
  39. package/dist/server/better-auth/sessionPermissions.js.map +1 -1
  40. package/dist/server/better-auth/signInGate.d.ts +1 -1
  41. package/dist/server/better-auth/signInGate.d.ts.map +1 -1
  42. package/dist/server/better-auth/signInGate.js +2 -3
  43. package/dist/server/better-auth/signInGate.js.map +1 -1
  44. package/dist/server/better-auth/userProfiles.d.ts +1 -1
  45. package/dist/server/better-auth/userProfiles.d.ts.map +1 -1
  46. package/dist/server/better-auth/userProfiles.js +2 -3
  47. package/dist/server/better-auth/userProfiles.js.map +1 -1
  48. package/dist/server/commandChanges.d.ts.map +1 -1
  49. package/dist/server/commandChanges.js +11 -6
  50. package/dist/server/commandChanges.js.map +1 -1
  51. package/dist/server/local.d.ts +4 -3
  52. package/dist/server/local.d.ts.map +1 -1
  53. package/dist/server/local.js +0 -4
  54. package/dist/server/local.js.map +1 -1
  55. package/dist/server/origin.d.ts +7 -2
  56. package/dist/server/origin.d.ts.map +1 -1
  57. package/dist/server/origin.js +14 -5
  58. package/dist/server/origin.js.map +1 -1
  59. package/dist/server/permissions.d.ts +1 -1
  60. package/dist/server/permissions.d.ts.map +1 -1
  61. package/dist/server/permissions.js +7 -8
  62. package/dist/server/permissions.js.map +1 -1
  63. package/dist/server/providerFailure.d.ts +4 -0
  64. package/dist/server/providerFailure.d.ts.map +1 -0
  65. package/dist/server/providerFailure.js +10 -0
  66. package/dist/server/providerFailure.js.map +1 -0
  67. package/dist/server/resolveRole.d.ts +4 -5
  68. package/dist/server/resolveRole.d.ts.map +1 -1
  69. package/dist/server/resolveRole.js +1 -2
  70. package/dist/server/resolveRole.js.map +1 -1
  71. package/dist/server/session.d.ts +1 -1
  72. package/dist/server/session.d.ts.map +1 -1
  73. package/dist/server/session.js +10 -11
  74. package/dist/server/session.js.map +1 -1
  75. package/dist/server/tracing.d.ts.map +1 -1
  76. package/dist/server/tracing.js +6 -2
  77. package/dist/server/tracing.js.map +1 -1
  78. package/dist/server/trustedProxy.d.ts +0 -1
  79. package/dist/server/trustedProxy.d.ts.map +1 -1
  80. package/dist/server/trustedProxy.js +1 -4
  81. package/dist/server/trustedProxy.js.map +1 -1
  82. package/package.json +8 -8
  83. package/src/identity.ts +10 -8
  84. package/src/middleware.ts +7 -4
  85. package/src/permission.ts +5 -17
  86. package/src/server/adapters/betterAuthSessions.ts +4 -10
  87. package/src/server/better-auth/admittedSessions.ts +38 -0
  88. package/src/server/better-auth/clientIp.ts +2 -1
  89. package/src/server/better-auth/mount.ts +8 -38
  90. package/src/server/better-auth/mountRoutes.ts +6 -10
  91. package/src/server/better-auth/mountedSessions.ts +19 -10
  92. package/src/server/better-auth/sessionPermissions.ts +10 -6
  93. package/src/server/better-auth/signInGate.ts +3 -10
  94. package/src/server/better-auth/userProfiles.ts +3 -10
  95. package/src/server/commandChanges.ts +46 -33
  96. package/src/server/local.ts +5 -7
  97. package/src/server/origin.ts +23 -6
  98. package/src/server/permissions.ts +17 -14
  99. package/src/server/providerFailure.ts +13 -0
  100. package/src/server/resolveRole.ts +4 -2
  101. package/src/server/session.ts +10 -10
  102. package/src/server/tracing.ts +8 -2
  103. package/src/server/trustedProxy.ts +1 -5
  104. package/dist/server/sessionProfile.d.ts +0 -3
  105. package/dist/server/sessionProfile.d.ts.map +0 -1
  106. package/dist/server/sessionProfile.js +0 -4
  107. package/dist/server/sessionProfile.js.map +0 -1
  108. package/src/server/sessionProfile.ts +0 -5
@@ -1,21 +1,30 @@
1
1
  import { Schema } from "effect";
2
2
  import type { RoleSet } from "@shivaedev/access/roleSet.ts";
3
- import { betterAuthSessions, type GetSession } from "#server/adapters/betterAuthSessions.ts";
4
- import type { SessionShape } from "#server/session.ts";
3
+ import { SessionUserSchema } from "#identity.ts";
4
+ import type { GetSession } from "#server/adapters/betterAuthSessions.ts";
5
+ import type { SessionProvider, SessionShape } from "#server/session.ts";
5
6
 
6
- const AuthSession = Schema.NullOr(
7
- Schema.Struct({
8
- user: Schema.Struct({ email: Schema.String, id: Schema.String, name: Schema.String, role: Schema.optionalKey(Schema.NullOr(Schema.String)) }),
9
- }),
10
- );
7
+ const AuthSession = Schema.NullOr(Schema.Struct({ user: SessionUserSchema }));
8
+ type SessionLookup = (options: {
9
+ readonly asResponse: false;
10
+ readonly headers: Headers;
11
+ readonly query: { readonly disableCookieCache: true };
12
+ readonly returnHeaders: false;
13
+ }) => Promise<unknown>;
14
+ const SessionLookup = Schema.declare((value): value is SessionLookup => typeof value === "function");
11
15
 
12
16
  export function mountedSessions(
13
- lookup: (headers: Headers) => Promise<unknown>,
14
- admit: <TSession extends SessionShape>(getSession: GetSession<TSession>) => GetSession<TSession>,
17
+ lookup: unknown,
18
+ admit: <TSession extends SessionShape>(getSession: GetSession<TSession>) => SessionProvider<TSession>,
15
19
  roles?: RoleSet,
16
20
  ) {
21
+ const getSession = Schema.decodeUnknownSync(SessionLookup)(lookup);
17
22
  return {
18
23
  ...(roles === undefined ? {} : { roles }),
19
- provider: betterAuthSessions(admit(async (headers) => Schema.decodeUnknownSync(AuthSession)(await lookup(headers)))),
24
+ provider: admit(async (headers) =>
25
+ Schema.decodeUnknownSync(AuthSession)(
26
+ await getSession({ asResponse: false, headers, query: { disableCookieCache: true }, returnHeaders: false }),
27
+ ),
28
+ ),
20
29
  };
21
30
  }
@@ -1,18 +1,22 @@
1
- import { Effect, Schema } from "effect";
1
+ import { type Cause, Effect, Schema } from "effect";
2
2
  import type { RoleSet } from "@shivaedev/access/roleSet.ts";
3
+ import { SessionUserSchema } from "#identity.ts";
3
4
  import { resolveRole } from "#server/resolveRole.ts";
4
5
 
5
6
  const Fields = Schema.Record(Schema.String, Schema.Unknown);
6
- const SessionPayload = Schema.NullOr(Schema.StructWithRest(Schema.Struct({ user: Fields }), [Fields]));
7
+ const SessionPayload = Schema.NullOr(Schema.StructWithRest(Schema.Struct({ user: Schema.StructWithRest(SessionUserSchema, [Fields]) }), [Fields]));
7
8
 
8
- export async function sessionPermissions(response: Response, roles: RoleSet): Promise<Response> {
9
- const payload = Schema.decodeUnknownSync(SessionPayload)(await response.json());
9
+ export const sessionPermissions = Effect.fn("Platform.sessionPermissions")(function* (
10
+ response: Response,
11
+ roles: RoleSet,
12
+ ): Effect.fn.Return<Response, Cause.UnknownError | Schema.SchemaError> {
13
+ const payload = yield* Schema.decodeUnknownEffect(SessionPayload)(yield* Effect.tryPromise(() => response.json()));
10
14
  if (payload === null) {
11
15
  return Response.json(null, response);
12
16
  }
13
- const access = await Effect.runPromise(resolveRole(roles, payload.user.role));
17
+ const access = yield* resolveRole(roles, payload.user.role);
14
18
  const headers = new Headers(response.headers);
15
19
  headers.delete("content-length");
16
20
  headers.set("cache-control", "private, no-store");
17
21
  return Response.json({ ...payload, user: { ...payload.user, ...access } }, { headers, status: response.status });
18
- }
22
+ });
@@ -1,7 +1,7 @@
1
1
  import { Cache, type Config, Duration, Effect, Exit } from "effect";
2
- import { redact } from "@shivaedev/errors/redact.ts";
3
- import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
2
+ import type { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
4
3
  import type { ProviderAccountValue } from "#identity.ts";
4
+ import { providerFailure } from "#server/providerFailure.ts";
5
5
 
6
6
  export interface SignInPolicy<E = never, R = never> {
7
7
  readonly accounts?: Config.Config<readonly ProviderAccountValue[]> | undefined;
@@ -33,14 +33,7 @@ export interface SignInGate<E> {
33
33
  const RULE_CACHE_CAPACITY = 10_000;
34
34
 
35
35
  export function fromStorage<A>(read: () => Promise<A>) {
36
- return Effect.tryPromise(read).pipe(
37
- Effect.catch((error) =>
38
- Effect.andThen(
39
- Effect.logError("Sign-in policy storage failed", redact(error.cause)),
40
- Effect.fail(new AuthUnavailable({ message: "Authentication is temporarily unavailable" })),
41
- ),
42
- ),
43
- );
36
+ return Effect.tryPromise(read).pipe(Effect.catch((error) => providerFailure(error.cause)));
44
37
  }
45
38
 
46
39
  function sameAccount(left: ProviderAccountValue, right: ProviderAccountValue) {
@@ -1,7 +1,7 @@
1
1
  import type { Auth } from "better-auth";
2
2
  import { Effect } from "effect";
3
- import { redact } from "@shivaedev/errors/redact.ts";
4
- import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
3
+ import type { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
4
+ import { providerFailure } from "#server/providerFailure.ts";
5
5
 
6
6
  export interface UserProfile {
7
7
  readonly id: string;
@@ -25,13 +25,6 @@ export const userProfiles = Effect.fn("Platform.userProfiles")(function* (
25
25
  select: ["id", "name", "image"],
26
26
  where: [{ field: "id", operator: "in", value: ids }],
27
27
  });
28
- }).pipe(
29
- Effect.catch((error) =>
30
- Effect.andThen(
31
- Effect.logError("Authentication provider failed", redact(error.cause)),
32
- Effect.fail(new AuthUnavailable({ message: "Authentication is temporarily unavailable" })),
33
- ),
34
- ),
35
- );
28
+ }).pipe(Effect.catch((error) => providerFailure(error.cause)));
36
29
  return users.map(({ id, name, image }) => ({ id, image: image ?? null, name }));
37
30
  });
@@ -1,10 +1,11 @@
1
- import { Context, Effect, Option } from "effect";
1
+ import { Context, Effect, Option, Schedule } from "effect";
2
2
  import * as Reactivity from "effect/reactivity/Reactivity";
3
3
  import type { Rpc } from "effect/rpc";
4
4
  import { SqlClient } from "effect/sql";
5
5
  import { invalidationKeys } from "@shivaedev/changes/keys.ts";
6
6
  import { CurrentViewer } from "@shivaedev/contract/readPolicy.ts";
7
7
  import { CommandInvalidation } from "@shivaedev/contract/serverMetadata.ts";
8
+ import { CommandRecovery } from "@shivaedev/sql/internal/CommandRecovery.ts";
8
9
  import { ChangeObserver, invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
9
10
  import { sessionKeyContext } from "#server/sessionKeys.ts";
10
11
 
@@ -14,37 +15,49 @@ export function commandChanges<A, E, R>(effect: Effect.Effect<A, E, R>, rpc: Rpc
14
15
  return effect;
15
16
  }
16
17
  const declared = invalidates.value.invalidates;
17
- return Effect.gen(function* () {
18
- const context = yield* sessionKeyContext(rpc);
19
- const sql = yield* Effect.serviceOption(SqlClient.SqlClient);
20
- const reactivity = yield* Effect.serviceOption(Reactivity.Reactivity);
21
- if (Option.isNone(reactivity)) {
22
- return yield* effect;
23
- }
24
- const published = new Set<unknown>();
25
- const observer = yield* ChangeObserver;
26
- const result = yield* effect.pipe(
27
- Effect.provideService(ChangeObserver, (event) => {
28
- if (event._tag === "Published") {
29
- for (const key of event.changes) {
30
- published.add(key);
18
+ return Effect.uninterruptibleMask((restore) =>
19
+ Effect.gen(function* () {
20
+ const context = yield* sessionKeyContext(rpc);
21
+ const sql = yield* Effect.serviceOption(SqlClient.SqlClient);
22
+ const reactivity = yield* Effect.serviceOption(Reactivity.Reactivity);
23
+ if (Option.isNone(reactivity)) {
24
+ return yield* restore(effect);
25
+ }
26
+ const published = new Set<unknown>();
27
+ const observer = yield* ChangeObserver;
28
+ const result = yield* restore(effect).pipe(
29
+ Effect.provideService(ChangeObserver, (event) => {
30
+ if (event._tag === "Published") {
31
+ for (const key of event.changes) {
32
+ published.add(key);
33
+ }
31
34
  }
32
- }
33
- return observer(event);
34
- }),
35
- );
36
- const viewer = yield* CurrentViewer;
37
- const keys = invalidationKeys(declared(payload, result, viewer), context).filter((key) => !published.has(key));
38
- if (keys.length > 0) {
39
- const announce = Option.isNone(sql)
40
- ? reactivity.value.invalidate(keys)
41
- : invalidateOnCommit(keys).pipe(
42
- transact({ onSqlError: (error) => error }),
43
- Effect.provideService(SqlClient.SqlClient, sql.value),
44
- Effect.provideService(Reactivity.Reactivity, reactivity.value),
45
- );
46
- yield* announce.pipe(Effect.catchCause((cause) => Effect.logError("Committed command invalidation failed", cause)));
47
- }
48
- return result;
49
- });
35
+ return observer(event);
36
+ }),
37
+ );
38
+ const viewer = yield* CurrentViewer;
39
+ const keys = invalidationKeys(declared(payload, result, viewer), context).filter((key) => !published.has(key));
40
+ if (keys.length > 0) {
41
+ const announce = Option.isNone(sql)
42
+ ? reactivity.value.invalidate(keys)
43
+ : invalidateOnCommit(keys).pipe(
44
+ transact({ onSqlError: (error) => error }),
45
+ Effect.provideService(SqlClient.SqlClient, sql.value),
46
+ Effect.provideService(Reactivity.Reactivity, reactivity.value),
47
+ );
48
+ yield* announce.pipe(
49
+ Effect.catchCause(Effect.fail),
50
+ Effect.retry({ schedule: Schedule.exponential("50 millis"), times: 2 }),
51
+ Effect.catch((cause) =>
52
+ Effect.gen(function* () {
53
+ yield* Effect.logError("Committed command invalidation failed; resynchronizing live streams", cause);
54
+ const recover = yield* CommandRecovery;
55
+ yield* recover;
56
+ }),
57
+ ),
58
+ );
59
+ }
60
+ return result;
61
+ }),
62
+ );
50
63
  }
@@ -3,7 +3,8 @@ import { HttpServerRequest, HttpServerResponse, HttpTraceContext } from "effect/
3
3
  import * as HttpStatus from "effect/http/HttpStatus";
4
4
  import { RpcSerialization } from "effect/rpc";
5
5
  import { proxyAddresses, proxyMatches } from "./trustedProxy.ts";
6
- import { trustedProxyRanges as normalizedRanges } from "./trustedProxyRanges.ts";
6
+
7
+ type TransportRequest = Pick<HttpServerRequest.HttpServerRequest, "headers" | "remoteAddress">;
7
8
 
8
9
  function loopbackAddress(address: string): boolean {
9
10
  const unmapped = unmapAddress(address);
@@ -23,7 +24,7 @@ function loopbackHost(host: string | undefined): boolean {
23
24
  const hostname = authority.hostname?.toLowerCase();
24
25
  return hostname !== undefined && (hostname === "localhost" || hostname === "[::1]" || loopbackAddress(hostname));
25
26
  }
26
- export function sameOrigin(request: HttpServerRequest.HttpServerRequest): boolean {
27
+ export function sameOrigin(request: Pick<TransportRequest, "headers">): boolean {
27
28
  const origin = request.headers.origin;
28
29
  if (origin === undefined) {
29
30
  return true;
@@ -47,11 +48,8 @@ export function trustedProxyPeer(trustedProxy?: string): (address: string) => bo
47
48
  const addresses = trustedProxy === undefined ? undefined : proxyAddresses(trustedProxy);
48
49
  return (address) => addresses !== undefined && proxyMatches(addresses, address);
49
50
  }
50
- export function trustedProxyRanges(trustedProxy?: string): string[] {
51
- return normalizedRanges(trustedProxy);
52
- }
53
51
 
54
- function proxyOrigin(request: HttpServerRequest.HttpServerRequest, isTrustedProxy: (address: string) => boolean, native: boolean): boolean {
52
+ function proxyOrigin(request: TransportRequest, isTrustedProxy: (address: string) => boolean, native: boolean): boolean {
55
53
  if (!Option.exists(request.remoteAddress, isTrustedProxy)) {
56
54
  return false;
57
55
  }
@@ -69,7 +67,7 @@ function proxyOrigin(request: HttpServerRequest.HttpServerRequest, isTrustedProx
69
67
  }
70
68
  export function localTransport(trustedProxy?: string, nativeOrigins: readonly string[] = []) {
71
69
  const isTrustedProxy = trustedProxyPeer(trustedProxy);
72
- return (request: HttpServerRequest.HttpServerRequest): boolean => {
70
+ return (request: TransportRequest): boolean => {
73
71
  const native = nativeOrigins.includes(request.headers.origin ?? "");
74
72
  const local = loopbackHost(request.headers.host) && Option.exists(request.remoteAddress, loopbackAddress);
75
73
  return (local && (native || sameOrigin(request))) || proxyOrigin(request, isTrustedProxy, native);
@@ -1,26 +1,43 @@
1
- import { Option } from "effect";
2
- import { Headers } from "effect/http";
1
+ import { Effect, Option } from "effect";
2
+ import { Headers, HttpServerRequest } from "effect/http";
3
+ import { localTransport } from "#server/local.ts";
4
+ import { transportHeaders } from "#server/transportHeaders.ts";
3
5
  export interface OriginRequest {
4
6
  readonly headers: Headers.Headers;
5
7
  readonly origin: Option.Option<string>;
8
+ readonly remoteAddress?: Option.Option<string>;
6
9
  readonly rpc: string;
7
10
  }
8
11
  export type OriginPolicy = (request: OriginRequest) => boolean;
9
12
  export interface TrustedOriginsOptions {
10
13
  readonly allow: readonly string[];
11
14
  readonly missing: "allow" | "reject";
15
+ readonly sameOrigin?: { readonly trustedProxy?: string | undefined };
12
16
  }
13
17
  export function trustedOrigins(options: TrustedOriginsOptions): OriginPolicy {
14
- return ({ origin }) =>
15
- Option.match(origin, {
18
+ const sameOrigin = options.sameOrigin === undefined ? undefined : localTransport(options.sameOrigin.trustedProxy);
19
+ return (request) =>
20
+ Option.match(request.origin, {
16
21
  onNone: () => options.missing === "allow",
17
- onSome: (value) => options.allow.includes(value),
22
+ onSome: (value) =>
23
+ options.allow.includes(value) || sameOrigin?.({ headers: request.headers, remoteAddress: request.remoteAddress ?? Option.none() }) === true,
18
24
  });
19
25
  }
20
- export function originRequest(headers: Headers.Headers, rpc: string): OriginRequest {
26
+ export function originRequest(headers: Headers.Headers, rpc: string, remoteAddress: Option.Option<string> = Option.none()): OriginRequest {
21
27
  return {
22
28
  headers,
23
29
  origin: Headers.get(headers, "origin"),
30
+ remoteAddress,
24
31
  rpc,
25
32
  };
26
33
  }
34
+
35
+ export const transportOriginRequest = Effect.fn("Identity.transportOriginRequest")(function* (headers: Headers.Headers, rpc: string) {
36
+ const transport = yield* transportHeaders(headers);
37
+ const request = yield* Effect.serviceOption(HttpServerRequest.HttpServerRequest);
38
+ return originRequest(
39
+ transport,
40
+ rpc,
41
+ Option.flatMap(request, (value) => value.remoteAddress),
42
+ );
43
+ });
@@ -3,11 +3,13 @@ import { type HttpServerRequest, HttpServerResponse } from "effect/http";
3
3
  import * as HttpStatus from "effect/http/HttpStatus";
4
4
  import type { RpcMiddleware } from "effect/rpc";
5
5
  import type { Permission } from "@shivaedev/access/permission.ts";
6
+ import { forbidden } from "@shivaedev/access/refusal.ts";
7
+ import { requirePermission } from "@shivaedev/access/requirePermission.ts";
6
8
  import { authorizeReads } from "@shivaedev/contract/readPolicy.ts";
7
- import type { MissingReadPolicy, QueryReadDenied } from "@shivaedev/contract/readPolicyErrors.ts";
8
- import { type AuthUnavailable, Forbidden, type Unauthorized } from "@shivaedev/errors/taxonomy.ts";
9
- import { Identity, type SessionUser } from "#identity.ts";
10
- import { hasPermission, type permissionMiddleware, requirePermission } from "#permission.ts";
9
+ import type { AuthUnavailable, Forbidden, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
10
+ import { Identity, SessionUser } from "#identity.ts";
11
+ import type { IdentityFailures } from "#middleware.ts";
12
+ import { hasPermission, type permissionMiddleware } from "#permission.ts";
11
13
  import { commandChanges } from "#server/commandChanges.ts";
12
14
  import { revalidateStream } from "./revalidateStream.ts";
13
15
  import { resolveSession, type SessionPolicy, type UserSessionShape, withSessionUser } from "./session.ts";
@@ -17,19 +19,17 @@ export function permissionLayer<TMiddleware, TSession extends UserSessionShape>(
17
19
  policy: SessionPolicy<TSession>,
18
20
  ) {
19
21
  const permission = middleware.permission;
20
- const guard: RpcMiddleware.RpcMiddleware<
21
- Identity | SessionUser,
22
- Unauthorized | AuthUnavailable | Forbidden | MissingReadPolicy | QueryReadDenied,
23
- never
24
- > = (effect, { headers, rpc, payload }) => {
22
+ const guard: RpcMiddleware.RpcMiddleware<Identity | SessionUser, IdentityFailures, never> = (effect, { headers, rpc, payload }) => {
25
23
  const lookup = Effect.tap(resolveSession(policy, headers, rpc._tag), (session) =>
26
- Option.isSome(session) && !hasPermission(session.value.user, permission)
27
- ? Effect.fail(new Forbidden({ message: `Permission required: ${permission.name} (${permission.strength})` }))
28
- : Effect.void,
24
+ Option.isSome(session) && !hasPermission(session.value.user, permission) ? Effect.fail(forbidden(permission)) : Effect.void,
29
25
  );
30
26
  return Effect.flatMap(Identity, (viewer) => authorizeReads(commandChanges(effect, rpc, payload), { payload, rpc }, Option.some(viewer))).pipe(
31
27
  (invocation) => Effect.flatMap(Identity, ({ id }) => invocation.pipe(revalidateStream(policy, rpc, id, lookup))),
32
- (invocation) => Effect.andThen(requirePermission(permission), invocation),
28
+ (invocation) =>
29
+ Effect.andThen(
30
+ Effect.flatMap(SessionUser, (user) => requirePermission(user, permission)),
31
+ invocation,
32
+ ),
33
33
  withSessionUser(policy, headers, rpc._tag),
34
34
  );
35
35
  };
@@ -49,7 +49,10 @@ function rejection(error: Unauthorized | Forbidden | AuthUnavailable) {
49
49
  export function permissionRoute<TSession extends UserSessionShape>(policy: SessionPolicy<TSession>, permission: Permission) {
50
50
  return <E, R>(handler: (request: HttpServerRequest.HttpServerRequest) => Effect.Effect<HttpServerResponse.HttpServerResponse, E, R>) =>
51
51
  (request: HttpServerRequest.HttpServerRequest): Effect.Effect<HttpServerResponse.HttpServerResponse, E, Exclude<R, Identity | SessionUser>> =>
52
- Effect.andThen(requirePermission(permission), Effect.context<Identity | SessionUser>()).pipe(
52
+ Effect.andThen(
53
+ Effect.flatMap(SessionUser, (user) => requirePermission(user, permission)),
54
+ Effect.context<Identity | SessionUser>(),
55
+ ).pipe(
53
56
  withSessionUser(policy, request.headers, request.url),
54
57
  Effect.matchEffect({
55
58
  onFailure: (error) => Effect.succeed(rejection(error)),
@@ -0,0 +1,13 @@
1
+ import { Cause, Effect, Schema } from "effect";
2
+ import { redact } from "@shivaedev/errors/redact.ts";
3
+ import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
4
+
5
+ export function providerFailure(cause: unknown) {
6
+ if (Schema.is(AuthUnavailable)(cause)) {
7
+ return Effect.fail(cause);
8
+ }
9
+ return Effect.andThen(
10
+ Effect.logError("Authentication provider failed", redact(Cause.isUnknownError(cause) ? cause.cause : cause)),
11
+ Effect.fail(new AuthUnavailable({ message: "Authentication is temporarily unavailable" })),
12
+ );
13
+ }
@@ -1,7 +1,9 @@
1
1
  import { Effect } from "effect";
2
2
  import type { RoleSet } from "@shivaedev/access/roleSet.ts";
3
- import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
4
3
 
5
4
  export function resolveRole(roles: RoleSet, stored: unknown) {
6
- return roles.resolve(stored).pipe(Effect.mapError(() => new AuthUnavailable({ message: "Stored user role is not declared by the application" })));
5
+ return roles.resolve(stored).pipe(
6
+ Effect.mapError((cause) => new Error(`Stored user role is not declared by the application: ${String(stored)}`, { cause })),
7
+ Effect.orDie,
8
+ );
7
9
  }
@@ -1,4 +1,4 @@
1
- import { Duration, Effect, Exit, Layer, Option } from "effect";
1
+ import { Duration, Effect, Exit, Layer, Option, Schema } from "effect";
2
2
  import type { Headers } from "effect/http";
3
3
  import type { Permission } from "@shivaedev/access/permission.ts";
4
4
  import type { RoleSet } from "@shivaedev/access/roleSet.ts";
@@ -8,17 +8,16 @@ import {
8
8
  Identity,
9
9
  OptionalIdentity,
10
10
  SessionUser,
11
+ SessionUserSchema,
11
12
  type SessionUserValue,
12
13
  SessionUserWithProviderAccounts,
13
14
  type SessionUserWithProviderAccountsValue,
14
15
  } from "#identity.ts";
15
16
  import { Authenticated, AuthenticatedUser, AuthenticatedUserWithProviderAccounts, MaybeAuthenticated } from "#middleware.ts";
16
17
  import { commandChanges } from "#server/commandChanges.ts";
17
- import { type OriginPolicy, originRequest } from "./origin.ts";
18
+ import { type OriginPolicy, transportOriginRequest } from "#server/origin.ts";
18
19
  import { resolveRole } from "./resolveRole.ts";
19
20
  import { revalidateStream } from "./revalidateStream.ts";
20
- import { sessionProfile } from "./sessionProfile.ts";
21
- import { transportHeaders } from "./transportHeaders.ts";
22
21
  export interface SessionShape {
23
22
  readonly user: {
24
23
  readonly id: string;
@@ -43,15 +42,16 @@ export const resolveSession: <TSession extends SessionShape>(
43
42
  headers: Headers.Headers,
44
43
  rpc: string,
45
44
  ) {
46
- const transport = yield* transportHeaders(headers);
47
- if (!policy.origin(originRequest(transport, rpc))) {
45
+ const request = yield* transportOriginRequest(headers, rpc);
46
+ if (!policy.origin(request)) {
48
47
  return yield* new Forbidden({ message: "Origin not allowed" });
49
48
  }
50
- const session = yield* policy.provider.get(transport);
49
+ const session = yield* policy.provider.get(request.headers);
51
50
  if (Option.isNone(session) || policy.roles === undefined) {
52
51
  return session;
53
52
  }
54
- const access = yield* resolveRole(policy.roles, Reflect.get(session.value.user, "role"));
53
+ const role: unknown = Reflect.get(session.value.user, "role");
54
+ const access = yield* resolveRole(policy.roles, role);
55
55
  return Option.some({ ...session.value, user: { ...session.value.user, ...access } });
56
56
  });
57
57
  function identified(id: string) {
@@ -99,7 +99,7 @@ export function withSessionUser<TSession extends UserSessionShape>(policy: Sessi
99
99
  if (Option.isNone(session)) {
100
100
  return yield* new Unauthorized({ message: "Authentication required" });
101
101
  }
102
- const user = sessionProfile(session.value.user);
102
+ const user = Schema.decodeSync(SessionUserSchema)(session.value.user);
103
103
  const id = yield* identified(session.value.user.id);
104
104
  return yield* effect.pipe(
105
105
  Effect.provideService(Identity, { id }),
@@ -135,7 +135,7 @@ export function authenticatedUserWithProviderAccountsLayer<TSession extends Prov
135
135
  Effect.map(providerAccounts, (values) => values.map(({ accountId, providerId }) => ({ accountId, providerId }))),
136
136
  (exit) => (Exit.isSuccess(exit) ? Duration.infinity : Duration.zero),
137
137
  );
138
- const user = sessionProfile(session.value.user);
138
+ const user = Schema.decodeSync(SessionUserSchema)(session.value.user);
139
139
  yield* identified(id);
140
140
  return yield* authorizeReads(commandChanges(effect, rpc, payload), { payload, rpc }, Option.some({ id })).pipe(
141
141
  revalidateStream(policy, rpc, id, resolveSession(policy, headers, rpc._tag)),
@@ -1,8 +1,8 @@
1
- import { Cause, Context, Effect, Exit, Layer, Option, Predicate, Random } from "effect";
1
+ import { Cause, Context, Effect, ErrorReporter, Exit, Layer, Option, Predicate, Random } from "effect";
2
2
  import { Headers } from "effect/http";
3
3
  import { KeyScope } from "@shivaedev/contract/serverMetadata.ts";
4
4
  import { redact } from "@shivaedev/errors/redact.ts";
5
- import { redactCause } from "@shivaedev/errors/redactCause.ts";
5
+ import { redactCause, redactDiagnosticCause } from "@shivaedev/errors/redactCause.ts";
6
6
  import { isSensitiveKey, REDACTED, redactText, type SensitiveKey } from "@shivaedev/errors/sensitive.ts";
7
7
  import { RequestId } from "#identity.ts";
8
8
  import { RequestTracing } from "#middleware.ts";
@@ -44,6 +44,12 @@ function logFailure(cause: Cause.Cause<unknown>, payload: unknown, sensitive: Se
44
44
  );
45
45
  }
46
46
  const annotations = { "rpc.payload": redact(payload, sensitive) };
47
+ const mapped = Option.flatMap(Cause.findErrorOption(cause), (error) =>
48
+ ErrorReporter.isIgnored(error) && Predicate.hasProperty(error, "cause") && Cause.isCause(error.cause) ? Option.some(error.cause) : Option.none(),
49
+ );
50
+ if (Option.isSome(mapped)) {
51
+ return Effect.annotateLogs(Effect.logError("RPC defect", redactDiagnosticCause(mapped.value, sensitive)), annotations);
52
+ }
47
53
  if (!Cause.hasDies(cause)) {
48
54
  return Effect.annotateLogs(Effect.logInfo("RPC failure"), { ...annotations, "rpc.failure": failureTag(cause, sensitive) });
49
55
  }
@@ -1,10 +1,6 @@
1
1
  import { BlockList, isIP } from "node:net";
2
2
  import { Schema } from "effect";
3
- import { addProxyAddress, proxyRanges as normalizedRanges } from "./proxyRanges.ts";
4
-
5
- export function proxyRanges(value: string): string[] | undefined {
6
- return normalizedRanges(value);
7
- }
3
+ import { addProxyAddress, proxyRanges } from "./proxyRanges.ts";
8
4
 
9
5
  export function proxyAddresses(value: string): BlockList | undefined {
10
6
  const addresses = new BlockList();
@@ -1,3 +0,0 @@
1
- import type { SessionUserValue } from "#identity.ts";
2
- export declare function sessionProfile({ id, name, email, role, permissions }: SessionUserValue): SessionUserValue;
3
- //# sourceMappingURL=sessionProfile.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"sessionProfile.d.ts","sourceRoot":"","sources":["../../src/server/sessionProfile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD,wBAAgB,cAAc,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,gBAAgB,GAAG,gBAAgB,CAEzG"}
@@ -1,4 +0,0 @@
1
- export function sessionProfile({ id, name, email, role, permissions }) {
2
- return { email, id, name, ...(role === undefined ? {} : { role }), ...(permissions === undefined ? {} : { permissions }) };
3
- }
4
- //# sourceMappingURL=sessionProfile.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"sessionProfile.js","sourceRoot":"","sources":["../../src/server/sessionProfile.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,cAAc,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAoB;IACtF,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;AAC5H,CAAC"}
@@ -1,5 +0,0 @@
1
- import type { SessionUserValue } from "#identity.ts";
2
-
3
- export function sessionProfile({ id, name, email, role, permissions }: SessionUserValue): SessionUserValue {
4
- return { email, id, name, ...(role === undefined ? {} : { role }), ...(permissions === undefined ? {} : { permissions }) };
5
- }