@crombolo/auth 0.66.0 → 0.67.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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@crombolo/auth",
3
- "version": "0.66.0",
3
+ "version": "0.67.0",
4
4
  "description": "Internal to crombolo, with no compatibility promise: use @crombolo/crombolo. OAuth2 authorization server, password hashing, cookies and member tickets for crombolo.",
5
5
  "license": "MIT",
6
6
  "author": "Crombolo",
@@ -28,8 +28,8 @@
28
28
  "access": "public"
29
29
  },
30
30
  "dependencies": {
31
- "@crombolo/core": "0.66.0",
32
- "@crombolo/data": "0.66.0",
31
+ "@crombolo/core": "0.67.0",
32
+ "@crombolo/data": "0.67.0",
33
33
  "jose": "^6.2.12",
34
34
  "uqr": "^0.1.3"
35
35
  }
package/src/device.ts CHANGED
@@ -15,6 +15,18 @@ import { generateToken, hashToken } from './pkce.ts'
15
15
 
16
16
  /** The client id the CLI signs in as. */
17
17
  export const REMOTE_CLIENT_ID = 'crombolo-cli'
18
+
19
+ /**
20
+ * The client a token exchanged through a provider is issued to (story 364),
21
+ * with the provider's id after the colon: what marks its sessions as a machine's.
22
+ */
23
+ export const EXCHANGE_CLIENT_PREFIX = 'crombolo-exchange:'
24
+
25
+ /** The provider an exchanged token came through, when the client is one. */
26
+ export const exchangeProviderOf = (clientId: string): string | undefined =>
27
+ clientId.startsWith(EXCHANGE_CLIENT_PREFIX)
28
+ ? clientId.slice(EXCHANGE_CLIENT_PREFIX.length)
29
+ : undefined
18
30
  export const DEVICE_CODE_SECONDS = 10 * 60
19
31
  export const DEVICE_POLL_SECONDS = 5
20
32
 
@@ -116,6 +128,44 @@ export class DeviceStore {
116
128
  }
117
129
  }
118
130
 
131
+ /**
132
+ * A device signed in already, with no code to approve: a token exchanged
133
+ * through a provider (story 364), listed and signed out like any other.
134
+ */
135
+ async signedInByExchange(init: {
136
+ clientId: string
137
+ clientName: string
138
+ userId: number
139
+ sessionId: string
140
+ expiresAt: Date
141
+ }): Promise<void> {
142
+ const now = new Date()
143
+ for (let attempt = 0; ; attempt++) {
144
+ try {
145
+ await this.#db.q
146
+ .insertInto('device_authorization')
147
+ .values({
148
+ device_code_hash: hashToken(generateToken()),
149
+ user_code: userCode(),
150
+ client_id: init.clientId,
151
+ client_name: init.clientName,
152
+ scope: '',
153
+ status: 'issued',
154
+ user_id: init.userId,
155
+ session_id: init.sessionId,
156
+ interval_seconds: DEVICE_POLL_SECONDS,
157
+ expires_at: DbDate.toDb(init.expiresAt),
158
+ decided_at: DbDate.toDb(now),
159
+ create_date: DbDate.toDb(now),
160
+ })
161
+ .execute()
162
+ return
163
+ } catch (error) {
164
+ if (attempt >= 4) throw error
165
+ }
166
+ }
167
+ }
168
+
119
169
  async byDeviceCode(deviceCode: string): Promise<DeviceAuthorizationRow | undefined> {
120
170
  const row = await this.#db.q
121
171
  .selectFrom('device_authorization')
package/src/oidc.ts CHANGED
@@ -17,6 +17,8 @@ export interface OidcClaims {
17
17
  name: string
18
18
  /** Where group or role values come from, for mapping onto groups. */
19
19
  groups?: string
20
+ /** What names the person across tokens for other apps of the provider; `sub` when unset. */
21
+ identity?: string
20
22
  }
21
23
 
22
24
  /** One provider, as a preset describes it. */
@@ -41,6 +43,8 @@ export interface OidcIdentity {
41
43
  name: string | undefined
42
44
  /** The values of the provider's groups claim, when it names one. */
43
45
  groups: string[]
46
+ /** The value of the claim that names the person (story 364): `sub` unless the provider says. */
47
+ identity: string | undefined
44
48
  claims: JWTPayload
45
49
  }
46
50
 
@@ -189,6 +193,7 @@ export class OidcClient {
189
193
  emailVerified: verified === true || verified === 'true',
190
194
  name: stringClaim(claims, this.options.claims.name),
191
195
  groups: listClaim(claims, this.options.claims.groups),
196
+ identity: stringClaim(claims, this.options.claims.identity ?? 'sub'),
192
197
  claims,
193
198
  }
194
199
  }
package/src/service.ts CHANGED
@@ -7,6 +7,8 @@ import {
7
7
  DEVICE_CODE_SECONDS,
8
8
  DEVICE_POLL_SECONDS,
9
9
  type DeviceAuthorizationRow,
10
+ EXCHANGE_CLIENT_PREFIX,
11
+ exchangeProviderOf,
10
12
  type SignedInDevice,
11
13
  } from './device.ts'
12
14
  import { hashPassword, isNativeHash, passwordConfigJson, verifyPassword } from './password.ts'
@@ -99,6 +101,8 @@ export interface ViewingAs {
99
101
  export interface ResolvedIdentity {
100
102
  user: UserRow
101
103
  sessionId: string
104
+ /** The provider a token exchanged through it came by (story 364); never set for a browser's session. */
105
+ exchangedThrough?: string
102
106
  allowedSections: Array<SectionAlias | ExtensionSectionAlias>
103
107
  groupKeys: string[]
104
108
  isAdmin: boolean
@@ -394,15 +398,18 @@ export class AuthService {
394
398
  if (!user) return undefined
395
399
  const own = await this.#store.loadAuthorization(user.id)
396
400
  const view = session.view
401
+ const provider = exchangeProviderOf(token.clientId)
402
+ const through = provider ? { exchangedThrough: provider } : {}
397
403
  if (view && view.until.getTime() > now.getTime() && own.isAdmin) {
398
404
  const theirs = await this.#store.loadGroupAuthorization(view.groupKeys)
399
405
  return {
400
406
  ...identityFrom(user, theirs),
401
407
  sessionId: token.sessionId,
402
408
  viewingAs: { groups: groupsOf(theirs), until: view.until },
409
+ ...through,
403
410
  }
404
411
  }
405
- return { ...identityFrom(user, own), sessionId: token.sessionId }
412
+ return { ...identityFrom(user, own), sessionId: token.sessionId, ...through }
406
413
  }
407
414
 
408
415
  /**
@@ -532,6 +539,48 @@ export class AuthService {
532
539
  return { ok: true, grant: await this.#issue(user.id, sessionId, clientId, row.scope), user }
533
540
  }
534
541
 
542
+ /**
543
+ * Signs a user in for a token exchanged through a provider (story 364): the
544
+ * same refusals as any sign-in, then a signed-in device of its own with an
545
+ * access token and no refresh token, so it ends when the token does.
546
+ */
547
+ async signInByExchange(
548
+ login: string,
549
+ provider: { id: string; name: string },
550
+ seconds: number,
551
+ ipAddress?: string,
552
+ ): Promise<
553
+ | { status: 'success'; user: UserRow; accessToken: string; expiresIn: number }
554
+ | { status: 'notAllowed'; reason: 'lockedOut' | 'notApproved' | 'unknown' }
555
+ > {
556
+ const user = await this.#store.findUserByLogin(login)
557
+ if (!user) return { status: 'notAllowed', reason: 'unknown' }
558
+ if (user.isLockedOut) return { status: 'notAllowed', reason: 'lockedOut' }
559
+ if (!user.isApproved) return { status: 'notAllowed', reason: 'notApproved' }
560
+ const sessionId = crypto.randomUUID()
561
+ const clientId = `${EXCHANGE_CLIENT_PREFIX}${provider.id}`
562
+ const expiresAt = new Date(Date.now() + seconds * 1000)
563
+ await this.#store.recordLoginSuccess(user.id, sessionId, ipAddress)
564
+ await this.#store.devices.signedInByExchange({
565
+ clientId,
566
+ clientName: `Signed in through ${provider.name}`,
567
+ userId: user.id,
568
+ sessionId,
569
+ expiresAt,
570
+ })
571
+ const accessToken = generateToken()
572
+ await this.#store.createToken({
573
+ token: accessToken,
574
+ type: 'access',
575
+ userId: user.id,
576
+ sessionId,
577
+ clientId,
578
+ scope: '',
579
+ expiresAt,
580
+ })
581
+ return { status: 'success', user, accessToken, expiresIn: seconds }
582
+ }
583
+
535
584
  /** The devices signed in as this user. */
536
585
  signedInDevices(userId: number): Promise<SignedInDevice[]> {
537
586
  return this.#store.devices.signedIn(userId)