@shivaedev/identity 0.38.3 → 0.39.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.
- package/CHANGELOG.md +14 -0
- package/README.md +62 -43
- package/dist/generated/AccountPreferences.d.ts.map +1 -1
- package/dist/generated/AccountPreferences.js +3 -8
- package/dist/generated/AccountPreferences.js.map +1 -1
- package/dist/generated/Sessions.d.ts.map +1 -1
- package/dist/generated/Sessions.js +3 -7
- package/dist/generated/Sessions.js.map +1 -1
- package/dist/server/NativeOrigins.d.ts +5 -0
- package/dist/server/NativeOrigins.d.ts.map +1 -0
- package/dist/server/NativeOrigins.js +16 -0
- package/dist/server/NativeOrigins.js.map +1 -0
- package/dist/server/SessionPolicy.d.ts +2 -0
- package/dist/server/SessionPolicy.d.ts.map +1 -1
- package/dist/server/SessionPolicy.js.map +1 -1
- package/dist/server/adapters/local.d.ts +1 -1
- package/dist/server/adapters/local.d.ts.map +1 -1
- package/dist/server/adapters/local.js +3 -4
- package/dist/server/adapters/local.js.map +1 -1
- package/dist/server/better-auth/adapters/admittedSessions.d.ts +1 -2
- package/dist/server/better-auth/adapters/admittedSessions.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/admittedSessions.js +3 -3
- package/dist/server/better-auth/adapters/admittedSessions.js.map +1 -1
- package/dist/server/better-auth/adapters/bearerSessions.d.ts +1 -3
- package/dist/server/better-auth/adapters/bearerSessions.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/bearerSessions.js +6 -0
- package/dist/server/better-auth/adapters/bearerSessions.js.map +1 -1
- package/dist/server/better-auth/adapters/response.d.ts +1 -2
- package/dist/server/better-auth/adapters/response.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/response.js +2 -2
- package/dist/server/better-auth/adapters/response.js.map +1 -1
- package/dist/server/better-auth/define.d.ts +4 -0
- package/dist/server/better-auth/define.d.ts.map +1 -1
- package/dist/server/better-auth/define.js.map +1 -1
- package/dist/server/better-auth/mount.d.ts +4 -5
- package/dist/server/better-auth/mount.d.ts.map +1 -1
- package/dist/server/better-auth/mount.js +8 -5
- package/dist/server/better-auth/mount.js.map +1 -1
- package/dist/server/localOwner.d.ts +3 -1
- package/dist/server/localOwner.d.ts.map +1 -1
- package/dist/server/localOwner.js +3 -0
- package/dist/server/localOwner.js.map +1 -1
- package/dist/server/lookupSession.d.ts.map +1 -1
- package/dist/server/lookupSession.js +2 -1
- package/dist/server/lookupSession.js.map +1 -1
- package/package.json +8 -8
- package/src/generated/AccountPreferences.ts +3 -8
- package/src/generated/Sessions.ts +3 -7
- package/src/server/NativeOrigins.ts +23 -0
- package/src/server/SessionPolicy.ts +2 -0
- package/src/server/adapters/local.ts +2 -4
- package/src/server/better-auth/adapters/admittedSessions.ts +4 -4
- package/src/server/better-auth/adapters/bearerSessions.ts +10 -4
- package/src/server/better-auth/adapters/response.ts +4 -4
- package/src/server/better-auth/define.ts +10 -5
- package/src/server/better-auth/mount.ts +8 -6
- package/src/server/localOwner.ts +4 -0
- package/src/server/lookupSession.ts +2 -1
|
@@ -7,7 +7,7 @@ import { accountPreferenceOptions } from "#server/better-auth/adapters/accountPr
|
|
|
7
7
|
import type { AccountRoleSeed } from "#server/better-auth/adapters/accountRoleSeed.ts";
|
|
8
8
|
import { acquireAuth } from "#server/better-auth/adapters/acquire.ts";
|
|
9
9
|
import { admittedSessions } from "#server/better-auth/adapters/admittedSessions.ts";
|
|
10
|
-
import {
|
|
10
|
+
import { nativeTrustedOrigins, withBearerSessions } from "#server/better-auth/adapters/bearerSessions.ts";
|
|
11
11
|
import { betterAuthDatabase } from "#server/better-auth/adapters/database.ts";
|
|
12
12
|
import { effectHookOptions } from "#server/better-auth/adapters/effectHookOptions.ts";
|
|
13
13
|
import { emailOptions } from "#server/better-auth/adapters/emailOptions.ts";
|
|
@@ -32,11 +32,11 @@ import type { BetterAuthPasswordReset } from "#server/better-auth/PasswordReset.
|
|
|
32
32
|
import { authRouteHandler } from "#server/better-auth/routeHandler.ts";
|
|
33
33
|
import { storedRoleOptions } from "#server/better-auth/storedRoleOptions.ts";
|
|
34
34
|
import { UndeclaredDefaultRole } from "#server/better-auth/UndeclaredDefaultRole.ts";
|
|
35
|
+
import { declaredNativeOrigins } from "#server/NativeOrigins.ts";
|
|
35
36
|
import { providerFailure } from "#server/providerFailure.ts";
|
|
36
37
|
|
|
37
38
|
export interface BetterAuthMountOptions<E = never, R = never> {
|
|
38
39
|
readonly accountPreferences?: boolean;
|
|
39
|
-
readonly bearerSessions?: BearerSessionsOptions | undefined;
|
|
40
40
|
readonly clientIp?: "railway";
|
|
41
41
|
readonly databaseHooks?: BetterAuthDatabaseHooks<R> | undefined;
|
|
42
42
|
readonly emails?: BetterAuthEmails<R> | undefined;
|
|
@@ -58,6 +58,7 @@ const mountAuth = Effect.fn("Identity.mountAuth")(function* <const TOptions exte
|
|
|
58
58
|
const { defaultRole } = declaration;
|
|
59
59
|
yield* declaration.roles.resolve(defaultRole).pipe(Effect.mapError(() => new UndeclaredDefaultRole({ role: defaultRole })));
|
|
60
60
|
}
|
|
61
|
+
const nativeOrigins = yield* declaredNativeOrigins(declaration.nativeOrigins);
|
|
61
62
|
const options =
|
|
62
63
|
declaration.options.database === undefined ? { ...declaration.options, database: yield* betterAuthDatabase() } : declaration.options;
|
|
63
64
|
const { authOptions, clientIpHeader, rateLimitEnabled, trustedProxy } = yield* mountSettings(options, mount.clientIp);
|
|
@@ -83,13 +84,14 @@ const mountAuth = Effect.fn("Identity.mountAuth")(function* <const TOptions exte
|
|
|
83
84
|
const basePath = prefix === "/" ? "" : prefix;
|
|
84
85
|
const customStorage = yield* rateLimitStorage;
|
|
85
86
|
const { auth, profiles } = yield* acquireAuth({
|
|
86
|
-
...withHardening(withBearerSessions(preset,
|
|
87
|
+
...withHardening(withBearerSessions(preset, nativeOrigins !== undefined), mount.hardening),
|
|
87
88
|
...authOptions,
|
|
88
89
|
rateLimit: {
|
|
89
90
|
...rateLimit,
|
|
90
91
|
customStorage,
|
|
91
92
|
enabled: rateLimitEnabled,
|
|
92
93
|
},
|
|
94
|
+
trustedOrigins: nativeTrustedOrigins(authOptions.trustedOrigins, nativeOrigins),
|
|
93
95
|
user: gate.active ? gated.user : configured.user,
|
|
94
96
|
});
|
|
95
97
|
const authRoutes = mountRoutes.pipe(
|
|
@@ -98,9 +100,9 @@ const mountAuth = Effect.fn("Identity.mountAuth")(function* <const TOptions exte
|
|
|
98
100
|
basePath,
|
|
99
101
|
handle: authRouteHandler(auth, {
|
|
100
102
|
basePath,
|
|
101
|
-
bearerSessions: mount.bearerSessions,
|
|
102
103
|
clientIpHeader,
|
|
103
104
|
ipv6Subnet: options.advanced?.ipAddress?.ipv6Subnet,
|
|
105
|
+
nativeOrigins,
|
|
104
106
|
roles: declaration.roles,
|
|
105
107
|
runRequest: runtime.runRequest,
|
|
106
108
|
trustedProxy,
|
|
@@ -108,7 +110,7 @@ const mountAuth = Effect.fn("Identity.mountAuth")(function* <const TOptions exte
|
|
|
108
110
|
}),
|
|
109
111
|
),
|
|
110
112
|
);
|
|
111
|
-
const admit = admittedSessions(gate, () => auth.$context,
|
|
113
|
+
const admit = admittedSessions(gate, () => auth.$context, nativeOrigins !== undefined);
|
|
112
114
|
const admission = yield* signInGate({ ...policy, recheckInterval: 0 });
|
|
113
115
|
const admitsUser = Effect.fn("Identity.admitsUser")(function* (userId: string) {
|
|
114
116
|
if (!admission.active) {
|
|
@@ -119,7 +121,7 @@ const mountAuth = Effect.fn("Identity.mountAuth")(function* <const TOptions exte
|
|
|
119
121
|
});
|
|
120
122
|
const revoke = revokeUnadmitted(gate, () => auth.$context);
|
|
121
123
|
const lookupSession: unknown = Reflect.get(auth.api, "getSession");
|
|
122
|
-
const sessions = mountedSessions(lookupSession, admit, declaration.roles);
|
|
124
|
+
const sessions = { ...mountedSessions(lookupSession, admit, declaration.roles), nativeOrigins };
|
|
123
125
|
return { admitsUser, admittedSessions: admit, auth, profiles, revokeUnadmitted: revoke, routes: authRoutes, sessions };
|
|
124
126
|
});
|
|
125
127
|
|
package/src/server/localOwner.ts
CHANGED
|
@@ -5,20 +5,24 @@ import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
|
5
5
|
import type { SessionUserValue } from "#identity.ts";
|
|
6
6
|
import { localTransport } from "#server/adapters/local.ts";
|
|
7
7
|
import { machineTokens } from "#server/machineTokens.ts";
|
|
8
|
+
import { declaredNativeOrigins } from "#server/NativeOrigins.ts";
|
|
8
9
|
import type { SessionPolicy } from "#server/SessionPolicy.ts";
|
|
9
10
|
|
|
10
11
|
export const localOwner = Effect.fn("Identity.localOwner")(function* (options: {
|
|
12
|
+
readonly nativeOrigins?: readonly string[] | undefined;
|
|
11
13
|
readonly owner: Pick<SessionUserValue, "id" | "name" | "email"> & { readonly role: string };
|
|
12
14
|
readonly roles: RoleSet;
|
|
13
15
|
readonly streamRevalidationInterval?: Duration.Input;
|
|
14
16
|
}) {
|
|
15
17
|
const { owner, roles } = options;
|
|
18
|
+
const nativeOrigins = yield* declaredNativeOrigins(options.nativeOrigins);
|
|
16
19
|
const access = yield* roles.resolve(owner.role);
|
|
17
20
|
const random = yield* SecureRandom.SecureRandom;
|
|
18
21
|
const token = Redacted.make(Hex.encode(yield* random.randomBytes(32)));
|
|
19
22
|
const machines = yield* machineTokens({ owner, roles });
|
|
20
23
|
const allowed = localTransport();
|
|
21
24
|
const sessions: SessionPolicy["Service"] = {
|
|
25
|
+
nativeOrigins,
|
|
22
26
|
origin: (request) => allowed({ headers: request.headers, remoteAddress: request.remoteAddress ?? Option.none() }),
|
|
23
27
|
provider: {
|
|
24
28
|
get: (headers) => {
|
|
@@ -9,7 +9,8 @@ import type { SessionShape } from "#server/session.ts";
|
|
|
9
9
|
export const sessionRequest = Effect.fnUntraced(function* (headers: Headers.Headers, rpc: string) {
|
|
10
10
|
const policy = yield* SessionPolicy;
|
|
11
11
|
const request = yield* transportOriginRequest(headers, rpc);
|
|
12
|
-
|
|
12
|
+
const native = Option.exists(request.origin, (origin) => policy.nativeOrigins?.includes(origin) === true);
|
|
13
|
+
if (!(native || policy.origin(request))) {
|
|
13
14
|
const refused = Option.match(request.origin, { onNone: () => "a request without an Origin header", onSome: (origin) => `origin ${origin}` });
|
|
14
15
|
yield* Effect.logWarning(
|
|
15
16
|
`The session policy refused ${refused} calling ${rpc}. Add the origin to the policy's trusted origins if the application is served from it.`,
|