@shivaedev/identity 0.4.0 → 0.5.1
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.
- package/README.md +19 -13
- package/dist/identity.d.ts +19 -6
- package/dist/identity.d.ts.map +1 -1
- package/dist/identity.js +9 -1
- package/dist/identity.js.map +1 -1
- package/dist/middleware.d.ts +2 -0
- package/dist/middleware.d.ts.map +1 -1
- package/dist/middleware.js +5 -4
- package/dist/middleware.js.map +1 -1
- package/dist/permission.d.ts +7 -8
- package/dist/permission.d.ts.map +1 -1
- package/dist/permission.js +4 -12
- package/dist/permission.js.map +1 -1
- package/dist/server/adapters/betterAuthSessions.d.ts +1 -1
- package/dist/server/adapters/betterAuthSessions.d.ts.map +1 -1
- package/dist/server/adapters/betterAuthSessions.js +4 -7
- package/dist/server/adapters/betterAuthSessions.js.map +1 -1
- package/dist/server/better-auth/admittedSessions.d.ts +14 -0
- package/dist/server/better-auth/admittedSessions.d.ts.map +1 -0
- package/dist/server/better-auth/admittedSessions.js +32 -0
- package/dist/server/better-auth/admittedSessions.js.map +1 -0
- package/dist/server/better-auth/clientIp.d.ts.map +1 -1
- package/dist/server/better-auth/clientIp.js +2 -1
- package/dist/server/better-auth/clientIp.js.map +1 -1
- package/dist/server/better-auth/mount.d.ts +8 -7
- package/dist/server/better-auth/mount.d.ts.map +1 -1
- package/dist/server/better-auth/mount.js +6 -24
- package/dist/server/better-auth/mount.js.map +1 -1
- package/dist/server/better-auth/mountRoutes.d.ts.map +1 -1
- package/dist/server/better-auth/mountRoutes.js +6 -6
- package/dist/server/better-auth/mountRoutes.js.map +1 -1
- package/dist/server/better-auth/mountedSessions.d.ts +9 -5
- package/dist/server/better-auth/mountedSessions.d.ts.map +1 -1
- package/dist/server/better-auth/mountedSessions.js +5 -5
- package/dist/server/better-auth/mountedSessions.js.map +1 -1
- package/dist/server/better-auth/sessionPermissions.d.ts +2 -1
- package/dist/server/better-auth/sessionPermissions.d.ts.map +1 -1
- package/dist/server/better-auth/sessionPermissions.js +6 -5
- package/dist/server/better-auth/sessionPermissions.js.map +1 -1
- package/dist/server/better-auth/signInGate.d.ts +1 -1
- package/dist/server/better-auth/signInGate.d.ts.map +1 -1
- package/dist/server/better-auth/signInGate.js +2 -3
- package/dist/server/better-auth/signInGate.js.map +1 -1
- package/dist/server/better-auth/userProfiles.d.ts +1 -1
- package/dist/server/better-auth/userProfiles.d.ts.map +1 -1
- package/dist/server/better-auth/userProfiles.js +2 -3
- package/dist/server/better-auth/userProfiles.js.map +1 -1
- package/dist/server/commandChanges.d.ts.map +1 -1
- package/dist/server/commandChanges.js +11 -6
- package/dist/server/commandChanges.js.map +1 -1
- package/dist/server/local.d.ts +4 -3
- package/dist/server/local.d.ts.map +1 -1
- package/dist/server/local.js +0 -4
- package/dist/server/local.js.map +1 -1
- package/dist/server/lookupSession.d.ts +8 -0
- package/dist/server/lookupSession.d.ts.map +1 -0
- package/dist/server/lookupSession.js +23 -0
- package/dist/server/lookupSession.js.map +1 -0
- package/dist/server/origin.d.ts +7 -2
- package/dist/server/origin.d.ts.map +1 -1
- package/dist/server/origin.js +14 -5
- package/dist/server/origin.js.map +1 -1
- package/dist/server/permissions.d.ts +1 -1
- package/dist/server/permissions.d.ts.map +1 -1
- package/dist/server/permissions.js +9 -9
- package/dist/server/permissions.js.map +1 -1
- package/dist/server/providerFailure.d.ts +4 -0
- package/dist/server/providerFailure.d.ts.map +1 -0
- package/dist/server/providerFailure.js +10 -0
- package/dist/server/providerFailure.js.map +1 -0
- package/dist/server/recheckSession.d.ts +5 -0
- package/dist/server/recheckSession.d.ts.map +1 -0
- package/dist/server/recheckSession.js +11 -0
- package/dist/server/recheckSession.js.map +1 -0
- package/dist/server/resolveRole.d.ts +4 -5
- package/dist/server/resolveRole.d.ts.map +1 -1
- package/dist/server/resolveRole.js +1 -2
- package/dist/server/resolveRole.js.map +1 -1
- package/dist/server/revalidateStream.d.ts.map +1 -1
- package/dist/server/revalidateStream.js +2 -2
- package/dist/server/revalidateStream.js.map +1 -1
- package/dist/server/session.d.ts +2 -2
- package/dist/server/session.d.ts.map +1 -1
- package/dist/server/session.js +13 -23
- package/dist/server/session.js.map +1 -1
- package/dist/server/socketSession.d.ts +23 -0
- package/dist/server/socketSession.d.ts.map +1 -0
- package/dist/server/socketSession.js +32 -0
- package/dist/server/socketSession.js.map +1 -0
- package/dist/server/tracing.d.ts.map +1 -1
- package/dist/server/tracing.js +6 -2
- package/dist/server/tracing.js.map +1 -1
- package/dist/server/trustedProxy.d.ts +0 -1
- package/dist/server/trustedProxy.d.ts.map +1 -1
- package/dist/server/trustedProxy.js +1 -4
- package/dist/server/trustedProxy.js.map +1 -1
- package/package.json +8 -8
- package/src/identity.ts +10 -8
- package/src/middleware.ts +7 -4
- package/src/permission.ts +5 -17
- package/src/server/adapters/betterAuthSessions.ts +4 -10
- package/src/server/better-auth/admittedSessions.ts +38 -0
- package/src/server/better-auth/clientIp.ts +2 -1
- package/src/server/better-auth/mount.ts +8 -38
- package/src/server/better-auth/mountRoutes.ts +6 -10
- package/src/server/better-auth/mountedSessions.ts +19 -10
- package/src/server/better-auth/sessionPermissions.ts +10 -6
- package/src/server/better-auth/signInGate.ts +3 -10
- package/src/server/better-auth/userProfiles.ts +3 -10
- package/src/server/commandChanges.ts +46 -33
- package/src/server/local.ts +5 -7
- package/src/server/lookupSession.ts +30 -0
- package/src/server/origin.ts +23 -6
- package/src/server/permissions.ts +20 -16
- package/src/server/providerFailure.ts +13 -0
- package/src/server/recheckSession.ts +13 -0
- package/src/server/resolveRole.ts +4 -2
- package/src/server/revalidateStream.ts +2 -2
- package/src/server/session.ts +14 -22
- package/src/server/socketSession.ts +61 -0
- package/src/server/tracing.ts +8 -2
- package/src/server/trustedProxy.ts +1 -5
- package/dist/server/sessionProfile.d.ts +0 -3
- package/dist/server/sessionProfile.d.ts.map +0 -1
- package/dist/server/sessionProfile.js +0 -4
- package/dist/server/sessionProfile.js.map +0 -1
- package/src/server/sessionProfile.ts +0 -5
|
@@ -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
|
+
}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { Effect, Option } from "effect";
|
|
2
|
+
import type { Headers } from "effect/http";
|
|
3
|
+
import { sessionAccess, sessionRequest } from "./lookupSession.ts";
|
|
4
|
+
import type { SessionPolicy, SessionShape } from "./session.ts";
|
|
5
|
+
import { SocketSession } from "./socketSession.ts";
|
|
6
|
+
|
|
7
|
+
export const recheckSession = Effect.fnUntraced(function* (policy: SessionPolicy<SessionShape>, headers: Headers.Headers, rpc: string) {
|
|
8
|
+
const request = yield* sessionRequest(policy, headers, rpc);
|
|
9
|
+
const socket = yield* Effect.serviceOption(SocketSession);
|
|
10
|
+
const lookup = Effect.suspend(() => policy.provider.get(request.headers));
|
|
11
|
+
const session = yield* Option.match(socket, { onNone: () => lookup, onSome: (shared) => shared.lookup(policy.provider, lookup) });
|
|
12
|
+
return yield* sessionAccess(policy, session);
|
|
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(
|
|
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
|
}
|
|
@@ -2,6 +2,7 @@ import { Effect, Option } from "effect";
|
|
|
2
2
|
import { type Rpc, RpcSchema } from "effect/rpc";
|
|
3
3
|
import { type AuthUnavailable, type Forbidden, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
4
4
|
import type { SessionPolicy, SessionShape } from "./session.ts";
|
|
5
|
+
import { revalidateSession } from "./socketSession.ts";
|
|
5
6
|
|
|
6
7
|
export function revalidateStream<TSession extends SessionShape>(
|
|
7
8
|
policy: SessionPolicy<TSession>,
|
|
@@ -14,12 +15,11 @@ export function revalidateStream<TSession extends SessionShape>(
|
|
|
14
15
|
return effect;
|
|
15
16
|
}
|
|
16
17
|
const check = Effect.gen(function* () {
|
|
17
|
-
yield* Effect.sleep(policy.streamRevalidationInterval ?? "30 seconds");
|
|
18
18
|
const session = yield* lookup.pipe(Effect.catchTag("AuthUnavailable", () => Effect.succeed(undefined)));
|
|
19
19
|
if (session !== undefined && (Option.isNone(session) || session.value.user.id !== id)) {
|
|
20
20
|
return yield* new Unauthorized({ message: "Authentication required" });
|
|
21
21
|
}
|
|
22
22
|
});
|
|
23
|
-
return Effect.raceFirst(effect,
|
|
23
|
+
return Effect.raceFirst(effect, revalidateSession(check, policy.streamRevalidationInterval ?? "30 seconds"));
|
|
24
24
|
};
|
|
25
25
|
}
|
package/src/server/session.ts
CHANGED
|
@@ -1,24 +1,24 @@
|
|
|
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";
|
|
5
5
|
import { authorizeReads } from "@shivaedev/contract/readPolicy.ts";
|
|
6
|
-
import { type AuthUnavailable, Forbidden, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
6
|
+
import { type AuthUnavailable, type Forbidden, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
7
7
|
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 {
|
|
18
|
-
import {
|
|
18
|
+
import type { OriginPolicy } from "#server/origin.ts";
|
|
19
|
+
import { lookupSession, sessionRequest } from "./lookupSession.ts";
|
|
20
|
+
import { recheckSession } from "./recheckSession.ts";
|
|
19
21
|
import { revalidateStream } from "./revalidateStream.ts";
|
|
20
|
-
import { sessionProfile } from "./sessionProfile.ts";
|
|
21
|
-
import { transportHeaders } from "./transportHeaders.ts";
|
|
22
22
|
export interface SessionShape {
|
|
23
23
|
readonly user: {
|
|
24
24
|
readonly id: string;
|
|
@@ -43,16 +43,8 @@ export const resolveSession: <TSession extends SessionShape>(
|
|
|
43
43
|
headers: Headers.Headers,
|
|
44
44
|
rpc: string,
|
|
45
45
|
) {
|
|
46
|
-
const
|
|
47
|
-
|
|
48
|
-
return yield* new Forbidden({ message: "Origin not allowed" });
|
|
49
|
-
}
|
|
50
|
-
const session = yield* policy.provider.get(transport);
|
|
51
|
-
if (Option.isNone(session) || policy.roles === undefined) {
|
|
52
|
-
return session;
|
|
53
|
-
}
|
|
54
|
-
const access = yield* resolveRole(policy.roles, Reflect.get(session.value.user, "role"));
|
|
55
|
-
return Option.some({ ...session.value, user: { ...session.value.user, ...access } });
|
|
46
|
+
const request = yield* sessionRequest(policy, headers, rpc);
|
|
47
|
+
return yield* lookupSession(policy, request.headers);
|
|
56
48
|
});
|
|
57
49
|
function identified(id: string) {
|
|
58
50
|
return Effect.andThen(Effect.annotateCurrentSpan("user.id", id), Effect.succeed(id));
|
|
@@ -66,7 +58,7 @@ export function authenticatedLayer<TSession extends SessionShape>(policy: Sessio
|
|
|
66
58
|
}
|
|
67
59
|
const id = yield* identified(session.value.user.id);
|
|
68
60
|
return yield* authorizeReads(commandChanges(effect, rpc, payload), { payload, rpc }, Option.some({ id })).pipe(
|
|
69
|
-
revalidateStream(policy, rpc, id,
|
|
61
|
+
revalidateStream(policy, rpc, id, recheckSession(policy, headers, rpc._tag)),
|
|
70
62
|
Effect.provideService(Identity, { id }),
|
|
71
63
|
Effect.annotateLogs({ userId: id }),
|
|
72
64
|
);
|
|
@@ -82,7 +74,7 @@ export function maybeAuthenticatedLayer<TSession extends SessionShape>(policy: S
|
|
|
82
74
|
}
|
|
83
75
|
const id = yield* identified(session.value.user.id);
|
|
84
76
|
return yield* authorizeReads(effect, { payload, rpc }, Option.some({ id })).pipe(
|
|
85
|
-
revalidateStream(policy, rpc, id,
|
|
77
|
+
revalidateStream(policy, rpc, id, recheckSession(policy, headers, rpc._tag)),
|
|
86
78
|
Effect.provideService(OptionalIdentity, Option.some({ id })),
|
|
87
79
|
Effect.annotateLogs({ userId: id }),
|
|
88
80
|
);
|
|
@@ -99,7 +91,7 @@ export function withSessionUser<TSession extends UserSessionShape>(policy: Sessi
|
|
|
99
91
|
if (Option.isNone(session)) {
|
|
100
92
|
return yield* new Unauthorized({ message: "Authentication required" });
|
|
101
93
|
}
|
|
102
|
-
const user =
|
|
94
|
+
const user = Schema.decodeSync(SessionUserSchema)(session.value.user);
|
|
103
95
|
const id = yield* identified(session.value.user.id);
|
|
104
96
|
return yield* effect.pipe(
|
|
105
97
|
Effect.provideService(Identity, { id }),
|
|
@@ -112,7 +104,7 @@ export function authenticatedUserLayer<TSession extends UserSessionShape>(policy
|
|
|
112
104
|
return Layer.succeed(AuthenticatedUser, (effect, { headers, rpc, payload }) =>
|
|
113
105
|
Effect.flatMap(Identity, (viewer) => authorizeReads(commandChanges(effect, rpc, payload), { payload, rpc }, Option.some(viewer))).pipe(
|
|
114
106
|
(invocation) =>
|
|
115
|
-
Effect.flatMap(Identity, ({ id }) => invocation.pipe(revalidateStream(policy, rpc, id,
|
|
107
|
+
Effect.flatMap(Identity, ({ id }) => invocation.pipe(revalidateStream(policy, rpc, id, recheckSession(policy, headers, rpc._tag)))),
|
|
116
108
|
withSessionUser(policy, headers, rpc._tag),
|
|
117
109
|
),
|
|
118
110
|
);
|
|
@@ -135,10 +127,10 @@ export function authenticatedUserWithProviderAccountsLayer<TSession extends Prov
|
|
|
135
127
|
Effect.map(providerAccounts, (values) => values.map(({ accountId, providerId }) => ({ accountId, providerId }))),
|
|
136
128
|
(exit) => (Exit.isSuccess(exit) ? Duration.infinity : Duration.zero),
|
|
137
129
|
);
|
|
138
|
-
const user =
|
|
130
|
+
const user = Schema.decodeSync(SessionUserSchema)(session.value.user);
|
|
139
131
|
yield* identified(id);
|
|
140
132
|
return yield* authorizeReads(commandChanges(effect, rpc, payload), { payload, rpc }, Option.some({ id })).pipe(
|
|
141
|
-
revalidateStream(policy, rpc, id,
|
|
133
|
+
revalidateStream(policy, rpc, id, recheckSession(policy, headers, rpc._tag)),
|
|
142
134
|
Effect.provideService(Identity, { id }),
|
|
143
135
|
Effect.provideService(SessionUser, user),
|
|
144
136
|
Effect.provideService(SessionUserWithProviderAccounts, { ...user, providerAccounts: accounts }),
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { Context, Deferred, type Duration, Effect, Option, type Scope } from "effect";
|
|
2
|
+
import type { Permission } from "@shivaedev/access/permission.ts";
|
|
3
|
+
import type { AuthUnavailable, Forbidden } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
+
import type { SessionShape } from "./session.ts";
|
|
5
|
+
|
|
6
|
+
export type SessionSnapshot = SessionShape & { readonly user: { readonly permissions?: readonly Permission[] } };
|
|
7
|
+
type Lookup = Effect.Effect<Option.Option<SessionSnapshot>, AuthUnavailable | Forbidden>;
|
|
8
|
+
|
|
9
|
+
export class SocketSession extends Context.Service<
|
|
10
|
+
SocketSession,
|
|
11
|
+
{
|
|
12
|
+
readonly lookup: (key: object, lookup: Lookup) => Lookup;
|
|
13
|
+
readonly monitor: <E, R>(check: Effect.Effect<void, E, R>) => Effect.Effect<never, E, R | Scope.Scope>;
|
|
14
|
+
}
|
|
15
|
+
>()("@shivaedev/identity/SocketSession") {}
|
|
16
|
+
|
|
17
|
+
export const makeSocketSession = Effect.fnUntraced(function* (interval: Duration.Input) {
|
|
18
|
+
const pending = new Map<object, Lookup>();
|
|
19
|
+
const checks = new Set<Effect.Effect<void>>();
|
|
20
|
+
yield* Effect.forever(
|
|
21
|
+
Effect.sleep(interval).pipe(
|
|
22
|
+
Effect.andThen(Effect.suspend(() => Effect.forEach([...checks], (check) => check, { concurrency: "unbounded", discard: true }))),
|
|
23
|
+
),
|
|
24
|
+
).pipe(Effect.forkScoped);
|
|
25
|
+
return SocketSession.of({
|
|
26
|
+
lookup: (key, lookup) =>
|
|
27
|
+
Effect.gen(function* () {
|
|
28
|
+
let batch = pending.get(key);
|
|
29
|
+
if (batch === undefined) {
|
|
30
|
+
batch = yield* Effect.cached(Effect.sleep(0).pipe(Effect.andThen(lookup), Effect.ensuring(Effect.sync(() => pending.delete(key)))));
|
|
31
|
+
pending.set(key, batch);
|
|
32
|
+
}
|
|
33
|
+
return yield* batch;
|
|
34
|
+
}),
|
|
35
|
+
monitor: <E, R>(check: Effect.Effect<void, E, R>) =>
|
|
36
|
+
Effect.gen(function* () {
|
|
37
|
+
const context = yield* Effect.context<R>();
|
|
38
|
+
const ended = yield* Deferred.make<never, E>();
|
|
39
|
+
const run = check.pipe(
|
|
40
|
+
Effect.provideContext(context),
|
|
41
|
+
Effect.catchCause((cause) => Deferred.failCause(ended, cause)),
|
|
42
|
+
Effect.asVoid,
|
|
43
|
+
);
|
|
44
|
+
yield* Effect.acquireRelease(
|
|
45
|
+
Effect.sync(() => checks.add(run)),
|
|
46
|
+
() => Effect.sync(() => checks.delete(run)),
|
|
47
|
+
);
|
|
48
|
+
return yield* Deferred.await(ended);
|
|
49
|
+
}),
|
|
50
|
+
});
|
|
51
|
+
});
|
|
52
|
+
|
|
53
|
+
export function revalidateSession<E, R>(check: Effect.Effect<void, E, R>, interval: Duration.Input) {
|
|
54
|
+
return Effect.flatMap(
|
|
55
|
+
Effect.serviceOption(SocketSession),
|
|
56
|
+
Option.match({
|
|
57
|
+
onNone: () => Effect.forever(Effect.sleep(interval).pipe(Effect.andThen(check))),
|
|
58
|
+
onSome: (socket) => Effect.scoped(socket.monitor(check)),
|
|
59
|
+
}),
|
|
60
|
+
);
|
|
61
|
+
}
|
package/src/server/tracing.ts
CHANGED
|
@@ -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
|
|
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 +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 +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
|
-
}
|