@bbthorson/atproto-cf-auth 0.2.0 → 0.3.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/README.md +96 -4
- package/dist/server/auth.d.ts +62 -2
- package/dist/server/auth.js +166 -13
- package/dist/server/auth.js.map +1 -1
- package/dist/server/edge.d.ts +9 -0
- package/dist/server/edge.js +62 -0
- package/dist/server/edge.js.map +1 -0
- package/dist/server/handoff.d.ts +49 -0
- package/dist/server/handoff.js +97 -0
- package/dist/server/handoff.js.map +1 -0
- package/dist/server/index.d.ts +2 -0
- package/dist/server/index.js +2 -0
- package/dist/server/index.js.map +1 -1
- package/dist/server/scopes.d.ts +57 -0
- package/dist/server/scopes.js +84 -0
- package/dist/server/scopes.js.map +1 -0
- package/package.json +3 -1
package/README.md
CHANGED
|
@@ -39,16 +39,108 @@ With Astro: call `auth.handle(context.request)` from middleware or from an
|
|
|
39
39
|
`src/pages/auth/[...route].ts` endpoint.
|
|
40
40
|
|
|
41
41
|
**Options:** `basePath` (default `/auth`), `redirectTo` (default `/`), `scope`
|
|
42
|
-
(default `atproto`, which proves identity only;
|
|
43
|
-
|
|
44
|
-
`
|
|
45
|
-
|
|
42
|
+
(default `atproto`, which proves identity only; see [Scopes](#scopes)),
|
|
43
|
+
`conditionalScopes`, `privateKeys` (see [Confidential client](#confidential-client)),
|
|
44
|
+
`origin` (see [Outside a request](#outside-a-request)), `sessionTtlSeconds`
|
|
45
|
+
(default 30 days), `cookieName`, `metadata` (logo, terms and privacy URLs for the
|
|
46
|
+
consent screen), `onSignIn`, `handleResolver` and `requestLock` (see [Lock](#lock)).
|
|
47
|
+
|
|
48
|
+
**Identity lookups on Workers.** Workers refuse `redirect: "error"`, in `fetch()`
|
|
49
|
+
and in `new Request()`, and AT-Proto's stock resolvers ask for it when they load
|
|
50
|
+
a handle's `/.well-known/atproto-did` and a DID document. So the package ships
|
|
51
|
+
its own DID resolver and gives the default handle resolver a `fetch` that sends
|
|
52
|
+
`redirect: "manual"` and still refuses a redirect. If you pass your own
|
|
53
|
+
`handleResolver`, give it the same treatment. Before 0.2.1, every handle
|
|
54
|
+
without an `_atproto` DNS record, which is every `*.bsky.social` handle, failed
|
|
55
|
+
with `handle_not_found`.
|
|
46
56
|
|
|
47
57
|
**To call the user's PDS:** `const session = await auth.getOAuthSession(request)`,
|
|
48
58
|
then `new Agent(session)` from `@atproto/api`. Tokens refresh on demand. Before
|
|
49
59
|
you do this from concurrent requests (two `fetch`es from one page is enough),
|
|
50
60
|
add the lock below.
|
|
51
61
|
|
|
62
|
+
### Scopes
|
|
63
|
+
|
|
64
|
+
`scope` is asked for at every sign-in. To act on someone's PDS, add granular
|
|
65
|
+
scopes: `repo:com.example.post` to write a collection, `rpc:com.example.method?aud=*`
|
|
66
|
+
to call another service with auth their PDS signs, `space:…` for permissioned
|
|
67
|
+
spaces. (`transition:generic` still works, and grants everything.)
|
|
68
|
+
|
|
69
|
+
Some scopes only work on some PDSes. Space scopes asked of a PDS without spaces
|
|
70
|
+
fail the whole sign-in with `invalid_scope`, not just the feature. List those as
|
|
71
|
+
`conditionalScopes`: each is asked for only when its test passes for the PDS
|
|
72
|
+
signing that person in.
|
|
73
|
+
|
|
74
|
+
```ts
|
|
75
|
+
import { pdsServesMethod } from "@bbthorson/atproto-cf-auth/server";
|
|
76
|
+
|
|
77
|
+
createBlueskyAuth({
|
|
78
|
+
// ...
|
|
79
|
+
scope: "atproto repo:com.example.post",
|
|
80
|
+
conditionalScopes: [
|
|
81
|
+
{
|
|
82
|
+
scope: "space:com.example.notes?authority=*&skey=*&action=read&action=create",
|
|
83
|
+
when: pdsServesMethod("com.atproto.space.getDelegationToken"),
|
|
84
|
+
},
|
|
85
|
+
],
|
|
86
|
+
});
|
|
87
|
+
```
|
|
88
|
+
|
|
89
|
+
`pdsServesMethod` asks the PDS's `community.lexicon.service.describe`, a
|
|
90
|
+
community convention for listing the methods a service serves, and fails the
|
|
91
|
+
test (leaving the scope off) when the PDS doesn't answer. `when` can be any
|
|
92
|
+
function of `{ did, pds, issuer }`.
|
|
93
|
+
|
|
94
|
+
The client metadata publishes `scope` and every conditional scope, whichever a
|
|
95
|
+
given sign-in asks for. That `scope` is the most the client may ever ask for, and
|
|
96
|
+
some authorization servers reject a request for anything beyond it.
|
|
97
|
+
|
|
98
|
+
### Confidential client
|
|
99
|
+
|
|
100
|
+
Pass `privateKeys` (ES256 private JWKs, each with a `kid`) to authenticate token
|
|
101
|
+
requests with `private_key_jwt`. Authorization servers give confidential clients
|
|
102
|
+
much longer sessions than public ones, which matters when an app acts for people
|
|
103
|
+
between their visits. The public halves are served at `{basePath}/jwks.json` and
|
|
104
|
+
named in the metadata. Loopback development stays a public client.
|
|
105
|
+
|
|
106
|
+
```ts
|
|
107
|
+
// once: node -e "import('@atproto/jwk-jose').then(async ({JoseKey}) => console.log(JSON.stringify((await JoseKey.generate(['ES256'], 'k1')).privateJwk)))"
|
|
108
|
+
createBlueskyAuth({ /* ... */ privateKeys: [env.OAUTH_PRIVATE_KEY] });
|
|
109
|
+
```
|
|
110
|
+
|
|
111
|
+
To rotate, put the new key first and keep the old one until its sessions have
|
|
112
|
+
refreshed.
|
|
113
|
+
|
|
114
|
+
### Outside a request
|
|
115
|
+
|
|
116
|
+
`getOAuthSession(request)` finds the signed-in person from their cookie. For
|
|
117
|
+
work with no request (a queue consumer, a scheduled job), use
|
|
118
|
+
`await auth.restore(did)`, which returns the stored session for that DID, or
|
|
119
|
+
`null`. The client identity is named for an origin, so set the `origin` option
|
|
120
|
+
(`https://app.example`) or pass `{ origin }`.
|
|
121
|
+
|
|
122
|
+
### Sessions handed over
|
|
123
|
+
|
|
124
|
+
Some authorization servers hand an app a session for another account outside
|
|
125
|
+
the redirect flow: a group host creating a group account for the app, say.
|
|
126
|
+
|
|
127
|
+
```ts
|
|
128
|
+
const { did, session, response } = await auth.obtainSession(
|
|
129
|
+
"https://groups.example/xrpc/fyi.opensocial.provisionGroup",
|
|
130
|
+
{ handle: "thornwood", displayName: "Thornwood" },
|
|
131
|
+
{ headers: { authorization: `Bearer ${serviceAuthFromTheFounder}` } },
|
|
132
|
+
);
|
|
133
|
+
```
|
|
134
|
+
|
|
135
|
+
It POSTs the body as JSON the way a token request is made: with the app's
|
|
136
|
+
`client_id` (and a client assertion when confidential) and a DPoP proof for a
|
|
137
|
+
fresh key, answering one nonce challenge. The response must hold an OAuth token
|
|
138
|
+
response at `session` or as its whole body. The session is kept only if the
|
|
139
|
+
endpoint belongs to the account's own authorization server, then stored like a
|
|
140
|
+
sign-in's, so `restore(did)` returns it from then on. Otherwise it throws
|
|
141
|
+
`ObtainSessionError`, whose `error` is the endpoint's code or `NoSession`,
|
|
142
|
+
`WrongAuthServer` or `UnresolvableAccount`.
|
|
143
|
+
|
|
52
144
|
### Lock
|
|
53
145
|
|
|
54
146
|
A refresh token can be used once. When two requests for the same user land on
|
package/dist/server/auth.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { type HandleResolver, type OAuthClientMetadataInput, type OAuthSession, type RuntimeLock } from "@atproto/oauth-client";
|
|
2
2
|
import { type User } from "../shared.js";
|
|
3
|
+
import { type ConditionalScope } from "./scopes.js";
|
|
3
4
|
import type { AuthStore } from "./stores/types.js";
|
|
4
5
|
export interface BlueskyAuthOptions {
|
|
5
6
|
/** Shown on the Bluesky consent screen. */
|
|
@@ -12,15 +13,43 @@ export interface BlueskyAuthOptions {
|
|
|
12
13
|
basePath?: string;
|
|
13
14
|
/** Where the browser lands after sign-in or sign-out, unless the sign-in named a `returnTo`. Default `/`. */
|
|
14
15
|
redirectTo?: string;
|
|
15
|
-
/**
|
|
16
|
+
/**
|
|
17
|
+
* The OAuth scope asked for at every sign-in. Default `atproto` (identity
|
|
18
|
+
* only). Add granular scopes (`repo:com.example.post`, `rpc:…?aud=…`,
|
|
19
|
+
* `space:…`) or `transition:generic` to act on the person's PDS.
|
|
20
|
+
*/
|
|
16
21
|
scope?: string;
|
|
22
|
+
/**
|
|
23
|
+
* Scopes asked for only when the PDS signing someone in can honour them, such
|
|
24
|
+
* as space scopes, which most PDSes don't support yet and which fail the whole
|
|
25
|
+
* sign-in where they aren't. Each is still published in the client metadata,
|
|
26
|
+
* which bounds what the client may ask for. See `pdsServesMethod`.
|
|
27
|
+
*/
|
|
28
|
+
conditionalScopes?: ConditionalScope[];
|
|
29
|
+
/**
|
|
30
|
+
* Private signing keys (ES256 JWKs with a `kid`, as objects or JSON strings)
|
|
31
|
+
* that make this a confidential client: token requests are authenticated with
|
|
32
|
+
* `private_key_jwt`, and the public halves are served at
|
|
33
|
+
* `{basePath}/jwks.json`. Authorization servers give confidential clients far
|
|
34
|
+
* longer sessions. Loopback development stays a public client. Rotating keys:
|
|
35
|
+
* list the new one first and keep the old one until its sessions have
|
|
36
|
+
* refreshed.
|
|
37
|
+
*/
|
|
38
|
+
privateKeys?: Array<string | Record<string, unknown>>;
|
|
39
|
+
/**
|
|
40
|
+
* The app's public origin (`https://app.example`), for work outside a request:
|
|
41
|
+
* `restore` and `obtainSession` without an `origin` of their own. The client
|
|
42
|
+
* identity is named for an origin, so these need one.
|
|
43
|
+
*/
|
|
44
|
+
origin?: string;
|
|
17
45
|
/** How long a sign-in lasts, in seconds. Default 30 days. */
|
|
18
46
|
sessionTtlSeconds?: number;
|
|
19
47
|
/** Name of the session cookie. Default `bsky_sid`. */
|
|
20
48
|
cookieName?: string;
|
|
21
49
|
/**
|
|
22
50
|
* Handle → DID resolution. Default: DNS-over-HTTPS through Cloudflare's
|
|
23
|
-
* resolver plus the `/.well-known/atproto-did` check,
|
|
51
|
+
* resolver plus the `/.well-known/atproto-did` check, with a `fetch` that
|
|
52
|
+
* Workers accept for both.
|
|
24
53
|
*/
|
|
25
54
|
handleResolver?: HandleResolver | string | URL;
|
|
26
55
|
/**
|
|
@@ -51,6 +80,37 @@ export interface BlueskyAuth {
|
|
|
51
80
|
* (`new Agent(session)` from `@atproto/api`). Refreshes tokens as needed.
|
|
52
81
|
*/
|
|
53
82
|
getOAuthSession(request: Request): Promise<OAuthSession | null>;
|
|
83
|
+
/**
|
|
84
|
+
* The OAuth session stored for `did`, outside any request: background work,
|
|
85
|
+
* or acting as an account whose session was handed over (`obtainSession`).
|
|
86
|
+
* `null` when none is stored or it can no longer be refreshed. Uses `origin`,
|
|
87
|
+
* or the `origin` option.
|
|
88
|
+
*/
|
|
89
|
+
restore(did: string, opts?: {
|
|
90
|
+
origin?: string;
|
|
91
|
+
}): Promise<OAuthSession | null>;
|
|
92
|
+
/**
|
|
93
|
+
* Accept a session for another account, handed over by that account's own
|
|
94
|
+
* authorization server outside the redirect flow: a group host creating a
|
|
95
|
+
* group account for this app, for instance.
|
|
96
|
+
*
|
|
97
|
+
* POSTs `body` as JSON to `url` the way a token request is made: with this
|
|
98
|
+
* app's `client_id` (and a client assertion when confidential), a DPoP proof
|
|
99
|
+
* for a fresh key, and `headers` (service auth from the person asking,
|
|
100
|
+
* typically). The response must hold an OAuth token response, at `session` or
|
|
101
|
+
* as the whole body. The session is kept only if `url` belongs to the
|
|
102
|
+
* account's own authorization server, so no endpoint can hand over an account
|
|
103
|
+
* it doesn't serve; it is then stored like a sign-in's, and `restore(did)`
|
|
104
|
+
* returns it. Throws `ObtainSessionError` otherwise.
|
|
105
|
+
*/
|
|
106
|
+
obtainSession(url: string, body: Record<string, unknown>, opts?: {
|
|
107
|
+
headers?: Record<string, string>;
|
|
108
|
+
origin?: string;
|
|
109
|
+
}): Promise<{
|
|
110
|
+
did: string;
|
|
111
|
+
session: OAuthSession;
|
|
112
|
+
response: Record<string, unknown>;
|
|
113
|
+
}>;
|
|
54
114
|
/** The client metadata document served for an origin. */
|
|
55
115
|
clientMetadata(origin: string): OAuthClientMetadataInput;
|
|
56
116
|
}
|
package/dist/server/auth.js
CHANGED
|
@@ -1,8 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { isAtprotoDid } from "@atproto/did";
|
|
2
|
+
import { JoseKey } from "@atproto/jwk-jose";
|
|
3
|
+
import { AtprotoDohHandleResolver, Keyset, OAuthCallbackError, OAuthClient, } from "@atproto/oauth-client";
|
|
2
4
|
import { AUTH_ERROR_MESSAGES, AUTH_ERROR_PARAM, isValidHandle, normalizeHandle, safeReturnTo, } from "../shared.js";
|
|
5
|
+
import { edgeDidResolver, edgeFetch } from "./edge.js";
|
|
3
6
|
import { appendSetCookie, clearCookie, readCookie, serializeCookie } from "./cookies.js";
|
|
4
7
|
import { webRuntime, sessionStore, stateStore } from "./runtime.js";
|
|
5
8
|
import { Sealer, toB64url } from "./seal.js";
|
|
9
|
+
import { CLIENT_ASSERTION_TYPE, clientAssertion, ObtainSessionError, requestHandoff } from "./handoff.js";
|
|
10
|
+
import { joinScopes, negotiateScope } from "./scopes.js";
|
|
6
11
|
const NONCE_COOKIE = "bsky_auth_nonce";
|
|
7
12
|
const NONCE_TTL_SECONDS = 15 * 60;
|
|
8
13
|
const DEFAULT_SESSION_TTL_SECONDS = 30 * 24 * 60 * 60;
|
|
@@ -23,18 +28,33 @@ export function createBlueskyAuth(options) {
|
|
|
23
28
|
const basePath = (options.basePath ?? "/auth").replace(/\/+$/, "");
|
|
24
29
|
const redirectTo = safeReturnTo(options.redirectTo ?? "/") ?? "/";
|
|
25
30
|
const scope = options.scope ?? "atproto";
|
|
31
|
+
const conditionalScopes = options.conditionalScopes ?? [];
|
|
32
|
+
// What the client may ask for: everything it ever asks for.
|
|
33
|
+
const publishedScope = joinScopes(scope, ...conditionalScopes.map((c) => c.scope));
|
|
26
34
|
const sessionTtl = options.sessionTtlSeconds ?? DEFAULT_SESSION_TTL_SECONDS;
|
|
27
35
|
const cookieName = options.cookieName ?? "bsky_sid";
|
|
28
36
|
const sealer = new Sealer(options.secret);
|
|
29
37
|
const store = options.store;
|
|
30
|
-
const handleResolver = options.handleResolver ??
|
|
38
|
+
const handleResolver = options.handleResolver ??
|
|
39
|
+
new AtprotoDohHandleResolver({ dohEndpoint: "https://cloudflare-dns.com/dns-query", fetch: edgeFetch });
|
|
31
40
|
const runtimeImplementation = webRuntime(options.requestLock);
|
|
32
41
|
const clients = new Map();
|
|
42
|
+
const sessions = sessionStore(store, sealer);
|
|
43
|
+
const states = stateStore(store, sealer);
|
|
44
|
+
// Private keys are imported once, on first use: importing is async, and a
|
|
45
|
+
// malformed key should fail the first request loudly rather than the module.
|
|
46
|
+
let keysetPromise;
|
|
47
|
+
function keyset() {
|
|
48
|
+
keysetPromise ??= loadKeyset(options.privateKeys);
|
|
49
|
+
return keysetPromise;
|
|
50
|
+
}
|
|
51
|
+
/** Confidential when it has keys and isn't the loopback development client. */
|
|
52
|
+
const confidential = (url) => (options.privateKeys?.length ?? 0) > 0 && !isLoopback(url);
|
|
33
53
|
function clientMetadata(origin) {
|
|
34
54
|
const url = new URL(origin);
|
|
35
55
|
const common = {
|
|
36
56
|
client_name: options.appName,
|
|
37
|
-
scope,
|
|
57
|
+
scope: publishedScope,
|
|
38
58
|
grant_types: ["authorization_code", "refresh_token"],
|
|
39
59
|
response_types: ["code"],
|
|
40
60
|
token_endpoint_auth_method: "none",
|
|
@@ -48,32 +68,117 @@ export function createBlueskyAuth(options) {
|
|
|
48
68
|
const redirectUri = `http://127.0.0.1${url.port ? `:${url.port}` : ""}${basePath}/callback`;
|
|
49
69
|
return {
|
|
50
70
|
...common,
|
|
51
|
-
client_id: `http://localhost?redirect_uri=${encodeURIComponent(redirectUri)}&scope=${encodeURIComponent(
|
|
71
|
+
client_id: `http://localhost?redirect_uri=${encodeURIComponent(redirectUri)}&scope=${encodeURIComponent(publishedScope)}`,
|
|
52
72
|
redirect_uris: [redirectUri],
|
|
53
73
|
};
|
|
54
74
|
}
|
|
55
75
|
return {
|
|
56
76
|
...common,
|
|
77
|
+
...(confidential(url)
|
|
78
|
+
? {
|
|
79
|
+
token_endpoint_auth_method: "private_key_jwt",
|
|
80
|
+
token_endpoint_auth_signing_alg: "ES256",
|
|
81
|
+
jwks_uri: `${url.origin}${basePath}/jwks.json`,
|
|
82
|
+
}
|
|
83
|
+
: {}),
|
|
57
84
|
client_id: `${url.origin}${basePath}/client-metadata.json`,
|
|
58
85
|
client_uri: url.origin,
|
|
59
86
|
redirect_uris: [`${url.origin}${basePath}/callback`],
|
|
60
87
|
};
|
|
61
88
|
}
|
|
62
|
-
function clientFor(origin) {
|
|
89
|
+
async function clientFor(origin) {
|
|
63
90
|
let client = clients.get(origin);
|
|
64
91
|
if (!client) {
|
|
92
|
+
const keys = confidential(new URL(origin)) ? await keyset() : undefined;
|
|
65
93
|
client = new OAuthClient({
|
|
66
94
|
responseMode: "query",
|
|
67
95
|
clientMetadata: clientMetadata(origin),
|
|
68
|
-
|
|
69
|
-
|
|
96
|
+
...(keys ? { keyset: keys } : {}),
|
|
97
|
+
stateStore: states,
|
|
98
|
+
sessionStore: sessions,
|
|
70
99
|
runtimeImplementation,
|
|
71
100
|
handleResolver,
|
|
101
|
+
didResolver: edgeDidResolver,
|
|
72
102
|
});
|
|
73
103
|
clients.set(origin, client);
|
|
74
104
|
}
|
|
75
105
|
return client;
|
|
76
106
|
}
|
|
107
|
+
function originFor(explicit) {
|
|
108
|
+
const origin = explicit ?? options.origin;
|
|
109
|
+
if (!origin)
|
|
110
|
+
throw new Error("atproto-cf-auth: pass `origin`, or set the `origin` option, to act outside a request");
|
|
111
|
+
return new URL(origin).origin;
|
|
112
|
+
}
|
|
113
|
+
async function restore(did, opts = {}) {
|
|
114
|
+
const client = await clientFor(originFor(opts.origin));
|
|
115
|
+
try {
|
|
116
|
+
return await client.restore(did);
|
|
117
|
+
}
|
|
118
|
+
catch {
|
|
119
|
+
return null;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
async function obtainSession(url, body, opts = {}) {
|
|
123
|
+
const origin = originFor(opts.origin);
|
|
124
|
+
const client = await clientFor(origin);
|
|
125
|
+
const metadata = clientMetadata(origin);
|
|
126
|
+
const endpoint = new URL(url);
|
|
127
|
+
const keys = confidential(new URL(origin)) ? await keyset() : undefined;
|
|
128
|
+
const signingKey = keys ? [...keys][0] : undefined;
|
|
129
|
+
// The tokens are bound to a fresh key, as each sign-in's are.
|
|
130
|
+
const dpopKey = await JoseKey.generate(["ES256"]);
|
|
131
|
+
const payload = {
|
|
132
|
+
...body,
|
|
133
|
+
client_id: metadata.client_id,
|
|
134
|
+
...(signingKey
|
|
135
|
+
? {
|
|
136
|
+
client_assertion_type: CLIENT_ASSERTION_TYPE,
|
|
137
|
+
client_assertion: await clientAssertion(signingKey, metadata.client_id, endpoint.origin),
|
|
138
|
+
}
|
|
139
|
+
: {}),
|
|
140
|
+
};
|
|
141
|
+
const { tokens, response } = await requestHandoff({
|
|
142
|
+
url,
|
|
143
|
+
payload,
|
|
144
|
+
dpopKey,
|
|
145
|
+
...(opts.headers ? { headers: opts.headers } : {}),
|
|
146
|
+
});
|
|
147
|
+
// Only the account's own authorization server may hand it over. The same
|
|
148
|
+
// check the client makes on every token response (`verifyIssuer`).
|
|
149
|
+
const did = tokens.sub;
|
|
150
|
+
if (!isAtprotoDid(did))
|
|
151
|
+
throw new ObtainSessionError("NoSession", `${did} isn't an AT Protocol DID`, 502);
|
|
152
|
+
let resolved;
|
|
153
|
+
try {
|
|
154
|
+
resolved = await client.oauthResolver.resolveFromIdentity(did, { noCache: true, allowStale: false });
|
|
155
|
+
}
|
|
156
|
+
catch {
|
|
157
|
+
throw new ObtainSessionError("UnresolvableAccount", `Couldn't resolve ${did} to its authorization server`, 502);
|
|
158
|
+
}
|
|
159
|
+
if (new URL(resolved.metadata.issuer).origin !== endpoint.origin) {
|
|
160
|
+
throw new ObtainSessionError("WrongAuthServer", `${endpoint.origin} is not the authorization server for ${did}`, 502);
|
|
161
|
+
}
|
|
162
|
+
const stored = {
|
|
163
|
+
dpopKey,
|
|
164
|
+
authMethod: signingKey?.kid ? { method: "private_key_jwt", kid: signingKey.kid } : { method: "none" },
|
|
165
|
+
tokenSet: {
|
|
166
|
+
iss: resolved.metadata.issuer,
|
|
167
|
+
sub: did,
|
|
168
|
+
aud: resolved.pds.href,
|
|
169
|
+
scope: (tokens.scope ?? "atproto"),
|
|
170
|
+
access_token: tokens.access_token,
|
|
171
|
+
token_type: "DPoP",
|
|
172
|
+
...(tokens.refresh_token ? { refresh_token: tokens.refresh_token } : {}),
|
|
173
|
+
...(tokens.expires_in !== undefined
|
|
174
|
+
? { expires_at: new Date(Date.now() + tokens.expires_in * 1000).toISOString() }
|
|
175
|
+
: {}),
|
|
176
|
+
},
|
|
177
|
+
};
|
|
178
|
+
await sessions.set(did, stored);
|
|
179
|
+
const session = await client.restore(did, false);
|
|
180
|
+
return { did, session, response };
|
|
181
|
+
}
|
|
77
182
|
async function readSession(request) {
|
|
78
183
|
const sid = readCookie(request, cookieName);
|
|
79
184
|
if (!sid)
|
|
@@ -95,7 +200,7 @@ export function createBlueskyAuth(options) {
|
|
|
95
200
|
if (!user)
|
|
96
201
|
return null;
|
|
97
202
|
try {
|
|
98
|
-
return await clientFor(new URL(request.url).origin).restore(user.did);
|
|
203
|
+
return await (await clientFor(new URL(request.url).origin)).restore(user.did);
|
|
99
204
|
}
|
|
100
205
|
catch {
|
|
101
206
|
return null;
|
|
@@ -151,12 +256,18 @@ export function createBlueskyAuth(options) {
|
|
|
151
256
|
const state = { n: nonce, ...(returnTo ? { r: returnTo } : {}) };
|
|
152
257
|
let authorizeUrl;
|
|
153
258
|
try {
|
|
259
|
+
const client = await clientFor(url.origin);
|
|
154
260
|
// `state` is kept server-side by the client and handed back by callback();
|
|
155
261
|
// only a random key travels through the PDS.
|
|
156
|
-
authorizeUrl = await
|
|
262
|
+
authorizeUrl = await client.authorize(handle, {
|
|
263
|
+
state: JSON.stringify(state),
|
|
264
|
+
scope: await scopeFor(client, handle),
|
|
265
|
+
});
|
|
157
266
|
}
|
|
158
267
|
catch (err) {
|
|
159
|
-
|
|
268
|
+
// Only a failed handle → DID lookup is the person's typo; a PDS that
|
|
269
|
+
// won't serve its OAuth metadata is ours or theirs to fix.
|
|
270
|
+
const code = /resolve identity|unable to resolve handle/i.test(String(err))
|
|
160
271
|
? "handle_not_found"
|
|
161
272
|
: "authorize_failed";
|
|
162
273
|
return loginError(request, code, code === "handle_not_found" ? 400 : 502, returnTo);
|
|
@@ -169,13 +280,30 @@ export function createBlueskyAuth(options) {
|
|
|
169
280
|
}));
|
|
170
281
|
return response;
|
|
171
282
|
}
|
|
283
|
+
/**
|
|
284
|
+
* The scope to ask this person for: `scope`, plus each conditional scope
|
|
285
|
+
* whose test passes for their PDS. Without conditional scopes, no lookup. A
|
|
286
|
+
* failed lookup asks for `scope` alone; `authorize` then reports the failure.
|
|
287
|
+
*/
|
|
288
|
+
async function scopeFor(client, handle) {
|
|
289
|
+
if (conditionalScopes.length === 0)
|
|
290
|
+
return scope;
|
|
291
|
+
try {
|
|
292
|
+
const { identityInfo, metadata, pds } = await client.oauthResolver.resolveFromIdentity(handle);
|
|
293
|
+
return await negotiateScope(scope, conditionalScopes, { did: identityInfo.did, pds, issuer: metadata.issuer });
|
|
294
|
+
}
|
|
295
|
+
catch {
|
|
296
|
+
return scope;
|
|
297
|
+
}
|
|
298
|
+
}
|
|
172
299
|
async function callback(request) {
|
|
173
300
|
const url = new URL(request.url);
|
|
174
301
|
const nonce = readCookie(request, NONCE_COOKIE);
|
|
175
302
|
const clearNonce = clearCookie(NONCE_COOKIE, { path: basePath, secure: url.protocol === "https:" });
|
|
303
|
+
const client = await clientFor(url.origin);
|
|
176
304
|
let result;
|
|
177
305
|
try {
|
|
178
|
-
result = await
|
|
306
|
+
result = await client.callback(url.searchParams);
|
|
179
307
|
}
|
|
180
308
|
catch (err) {
|
|
181
309
|
let returnTo;
|
|
@@ -196,7 +324,7 @@ export function createBlueskyAuth(options) {
|
|
|
196
324
|
const did = result.session.did;
|
|
197
325
|
let handle;
|
|
198
326
|
try {
|
|
199
|
-
const identity = await
|
|
327
|
+
const identity = await client.identityResolver.resolve(did);
|
|
200
328
|
if (identity.handle && identity.handle !== "handle.invalid")
|
|
201
329
|
handle = identity.handle;
|
|
202
330
|
}
|
|
@@ -236,6 +364,14 @@ export function createBlueskyAuth(options) {
|
|
|
236
364
|
headers: { "content-type": "application/json", "cache-control": "public, max-age=600" },
|
|
237
365
|
});
|
|
238
366
|
}
|
|
367
|
+
if (route === "/jwks.json" && method === "GET") {
|
|
368
|
+
const keys = confidential(url) ? await keyset() : undefined;
|
|
369
|
+
if (!keys)
|
|
370
|
+
return null;
|
|
371
|
+
return new Response(JSON.stringify(keys.publicJwks), {
|
|
372
|
+
headers: { "content-type": "application/json", "cache-control": "public, max-age=600" },
|
|
373
|
+
});
|
|
374
|
+
}
|
|
239
375
|
if (route === "/session" && method === "GET") {
|
|
240
376
|
const user = await getUser(request);
|
|
241
377
|
return json(user ? { authenticated: true, user } : { authenticated: false });
|
|
@@ -254,7 +390,24 @@ export function createBlueskyAuth(options) {
|
|
|
254
390
|
}
|
|
255
391
|
return null;
|
|
256
392
|
}
|
|
257
|
-
return { handle, getUser, getOAuthSession, clientMetadata };
|
|
393
|
+
return { handle, getUser, getOAuthSession, restore, obtainSession, clientMetadata };
|
|
394
|
+
}
|
|
395
|
+
/** Import the configured private keys as a keyset. Every key needs a `kid`; only ES256 is supported. */
|
|
396
|
+
async function loadKeyset(privateKeys) {
|
|
397
|
+
if (!privateKeys?.length)
|
|
398
|
+
return undefined;
|
|
399
|
+
const keys = await Promise.all(privateKeys.map(async (raw, i) => {
|
|
400
|
+
const jwk = typeof raw === "string" ? JSON.parse(raw) : raw;
|
|
401
|
+
if (typeof jwk.kid !== "string" || !jwk.kid)
|
|
402
|
+
throw new Error(`atproto-cf-auth: privateKeys[${i}] has no kid`);
|
|
403
|
+
const key = await JoseKey.fromJWK(jwk);
|
|
404
|
+
if (!key.isPrivate)
|
|
405
|
+
throw new Error(`atproto-cf-auth: privateKeys[${i}] (${jwk.kid}) is a public key`);
|
|
406
|
+
if (!key.algorithms.includes("ES256"))
|
|
407
|
+
throw new Error(`atproto-cf-auth: privateKeys[${i}] (${jwk.kid}) isn't an ES256 key`);
|
|
408
|
+
return key;
|
|
409
|
+
}));
|
|
410
|
+
return new Keyset(keys);
|
|
258
411
|
}
|
|
259
412
|
/**
|
|
260
413
|
* State-changing routes refuse cross-site requests. Browsers send `Origin` on
|
package/dist/server/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/server/auth.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/server/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { DidResolver } from "@atproto-labs/did-resolver";
|
|
2
|
+
/** `fetch` for the handle resolver, which passes its options straight to `fetch()`. */
|
|
3
|
+
export declare const edgeFetch: typeof fetch;
|
|
4
|
+
/**
|
|
5
|
+
* DID documents for `did:plc` and `did:web`, the two methods AT-Proto allows.
|
|
6
|
+
* The stock resolver builds a `Request` with `redirect: "error"` before any
|
|
7
|
+
* `fetch` it is given sees it, so a `fetch` option can't fix it.
|
|
8
|
+
*/
|
|
9
|
+
export declare const edgeDidResolver: DidResolver<"plc" | "web">;
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import { DidError, didDocumentValidator, didWebToUrl } from "@atproto/did";
|
|
2
|
+
/*
|
|
3
|
+
* Workers refuse `redirect: "error"`, in `fetch()` and in `new Request()`
|
|
4
|
+
* alike ("won't be implemented since it does not make sense at the edge").
|
|
5
|
+
* AT-Proto's resolvers ask for it on every identity lookup, so on Workers the
|
|
6
|
+
* handle's well-known DID and the DID document both fail to load and no one
|
|
7
|
+
* can sign in. These stand-ins ask for `redirect: "manual"` and still refuse a
|
|
8
|
+
* redirect.
|
|
9
|
+
*/
|
|
10
|
+
/** `fetch` for the handle resolver, which passes its options straight to `fetch()`. */
|
|
11
|
+
export const edgeFetch = async (input, init) => {
|
|
12
|
+
if (init?.redirect !== "error")
|
|
13
|
+
return fetch(input, init);
|
|
14
|
+
const response = await fetch(input, { ...init, redirect: "manual" });
|
|
15
|
+
if (response.status >= 300 && response.status < 400) {
|
|
16
|
+
await response.body?.cancel();
|
|
17
|
+
throw new TypeError(`Refused redirect from ${String(input)}`);
|
|
18
|
+
}
|
|
19
|
+
return response;
|
|
20
|
+
};
|
|
21
|
+
/**
|
|
22
|
+
* DID documents for `did:plc` and `did:web`, the two methods AT-Proto allows.
|
|
23
|
+
* The stock resolver builds a `Request` with `redirect: "error"` before any
|
|
24
|
+
* `fetch` it is given sees it, so a `fetch` option can't fix it.
|
|
25
|
+
*/
|
|
26
|
+
export const edgeDidResolver = {
|
|
27
|
+
async resolve(did, options) {
|
|
28
|
+
let url;
|
|
29
|
+
if (did.startsWith("did:plc:")) {
|
|
30
|
+
url = new URL(`/${encodeURIComponent(did)}`, "https://plc.directory/");
|
|
31
|
+
}
|
|
32
|
+
else if (did.startsWith("did:web:")) {
|
|
33
|
+
const base = didWebToUrl(did);
|
|
34
|
+
url = new URL(base.pathname === "/" ? "/.well-known/did.json" : `${base.pathname}/did.json`, base);
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
throw new DidError(did, "Unsupported DID method", "did-method-invalid", 400);
|
|
38
|
+
}
|
|
39
|
+
let response;
|
|
40
|
+
try {
|
|
41
|
+
response = await edgeFetch(url, {
|
|
42
|
+
redirect: "error",
|
|
43
|
+
headers: { accept: "application/did+ld+json,application/json" },
|
|
44
|
+
...(options?.signal ? { signal: options.signal } : {}),
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
catch (err) {
|
|
48
|
+
throw new DidError(did, `Could not fetch the DID document: ${String(err)}`, "did-fetch-error", 400, err);
|
|
49
|
+
}
|
|
50
|
+
if (!response.ok) {
|
|
51
|
+
await response.body?.cancel();
|
|
52
|
+
const status = response.status >= 500 ? 502 : response.status;
|
|
53
|
+
throw new DidError(did, `DID document returned HTTP ${response.status}`, "did-fetch-error", status);
|
|
54
|
+
}
|
|
55
|
+
const document = didDocumentValidator.parse(await response.json());
|
|
56
|
+
if (document.id !== did) {
|
|
57
|
+
throw new DidError(did, `DID document id (${document.id}) does not match DID`, "did-document-id-mismatch", 400);
|
|
58
|
+
}
|
|
59
|
+
return document;
|
|
60
|
+
},
|
|
61
|
+
};
|
|
62
|
+
//# sourceMappingURL=edge.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"edge.js","sourceRoot":"","sources":["../../src/server/edge.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import type { Key } from "@atproto/oauth-client";
|
|
2
|
+
/**
|
|
3
|
+
* The wire half of accepting a session handed over outside the redirect flow
|
|
4
|
+
* (`BlueskyAuth.obtainSession`): a JSON POST to an authorization server's own
|
|
5
|
+
* endpoint, made the way a token request is made. The client authenticates as
|
|
6
|
+
* itself (its `client_id`, and a signed assertion when it is confidential) and
|
|
7
|
+
* proves possession of the key the tokens will be bound to (DPoP, answering
|
|
8
|
+
* one nonce challenge).
|
|
9
|
+
*
|
|
10
|
+
* The case this exists for: a group host creating a group account for an app,
|
|
11
|
+
* and giving the app a session on it in the same response.
|
|
12
|
+
*/
|
|
13
|
+
/** A refusal from the endpoint, or an answer that holds no usable session. */
|
|
14
|
+
export declare class ObtainSessionError extends Error {
|
|
15
|
+
/** The endpoint's error code (an XRPC error name or OAuth `error`), or one of ours. */
|
|
16
|
+
readonly error: string;
|
|
17
|
+
readonly status: number;
|
|
18
|
+
constructor(
|
|
19
|
+
/** The endpoint's error code (an XRPC error name or OAuth `error`), or one of ours. */
|
|
20
|
+
error: string, message: string, status: number);
|
|
21
|
+
}
|
|
22
|
+
/** The OAuth token response an endpoint hands back, at `session` or as its whole body. */
|
|
23
|
+
export interface HandedOverTokens {
|
|
24
|
+
sub: string;
|
|
25
|
+
access_token: string;
|
|
26
|
+
token_type: string;
|
|
27
|
+
refresh_token?: string;
|
|
28
|
+
scope?: string;
|
|
29
|
+
expires_in?: number;
|
|
30
|
+
}
|
|
31
|
+
/** A DPoP proof for one POST to `url`, signed with the key the tokens will be bound to. */
|
|
32
|
+
export declare function dpopProof(key: Key, url: string, nonce?: string): Promise<string>;
|
|
33
|
+
/** A `private_key_jwt` client assertion addressed to `audience` (RFC 7523). */
|
|
34
|
+
export declare function clientAssertion(key: Key, clientId: string, audience: string): Promise<string>;
|
|
35
|
+
export declare const CLIENT_ASSERTION_TYPE = "urn:ietf:params:oauth:client-assertion-type:jwt-bearer";
|
|
36
|
+
/**
|
|
37
|
+
* POST `payload` to `url` with a DPoP proof, retrying once with the nonce the
|
|
38
|
+
* server asks for, and return the session it hands back.
|
|
39
|
+
*/
|
|
40
|
+
export declare function requestHandoff(opts: {
|
|
41
|
+
url: string;
|
|
42
|
+
payload: Record<string, unknown>;
|
|
43
|
+
headers?: Record<string, string>;
|
|
44
|
+
dpopKey: Key;
|
|
45
|
+
fetch?: typeof fetch;
|
|
46
|
+
}): Promise<{
|
|
47
|
+
tokens: HandedOverTokens;
|
|
48
|
+
response: Record<string, unknown>;
|
|
49
|
+
}>;
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
import { toB64url } from "./seal.js";
|
|
2
|
+
/**
|
|
3
|
+
* The wire half of accepting a session handed over outside the redirect flow
|
|
4
|
+
* (`BlueskyAuth.obtainSession`): a JSON POST to an authorization server's own
|
|
5
|
+
* endpoint, made the way a token request is made. The client authenticates as
|
|
6
|
+
* itself (its `client_id`, and a signed assertion when it is confidential) and
|
|
7
|
+
* proves possession of the key the tokens will be bound to (DPoP, answering
|
|
8
|
+
* one nonce challenge).
|
|
9
|
+
*
|
|
10
|
+
* The case this exists for: a group host creating a group account for an app,
|
|
11
|
+
* and giving the app a session on it in the same response.
|
|
12
|
+
*/
|
|
13
|
+
/** A refusal from the endpoint, or an answer that holds no usable session. */
|
|
14
|
+
export class ObtainSessionError extends Error {
|
|
15
|
+
error;
|
|
16
|
+
status;
|
|
17
|
+
constructor(
|
|
18
|
+
/** The endpoint's error code (an XRPC error name or OAuth `error`), or one of ours. */
|
|
19
|
+
error, message, status) {
|
|
20
|
+
super(message);
|
|
21
|
+
this.error = error;
|
|
22
|
+
this.status = status;
|
|
23
|
+
this.name = "ObtainSessionError";
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
function randomJti() {
|
|
27
|
+
return toB64url(crypto.getRandomValues(new Uint8Array(16)));
|
|
28
|
+
}
|
|
29
|
+
/** `htu` is the request URL without its query or fragment (RFC 9449 §4.2). */
|
|
30
|
+
function htu(url) {
|
|
31
|
+
const u = new URL(url);
|
|
32
|
+
return `${u.origin}${u.pathname}`;
|
|
33
|
+
}
|
|
34
|
+
/** A DPoP proof for one POST to `url`, signed with the key the tokens will be bound to. */
|
|
35
|
+
export async function dpopProof(key, url, nonce) {
|
|
36
|
+
const jwk = key.bareJwk;
|
|
37
|
+
if (!jwk)
|
|
38
|
+
throw new Error("atproto-cf-auth: DPoP key has no public JWK");
|
|
39
|
+
return key.createJwt({ alg: "ES256", typ: "dpop+jwt", jwk }, {
|
|
40
|
+
iat: Math.floor(Date.now() / 1000),
|
|
41
|
+
jti: randomJti(),
|
|
42
|
+
htm: "POST",
|
|
43
|
+
htu: htu(url),
|
|
44
|
+
...(nonce ? { nonce } : {}),
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
/** A `private_key_jwt` client assertion addressed to `audience` (RFC 7523). */
|
|
48
|
+
export async function clientAssertion(key, clientId, audience) {
|
|
49
|
+
const iat = Math.floor(Date.now() / 1000);
|
|
50
|
+
return key.createJwt({ alg: "ES256", kid: key.kid }, { iss: clientId, sub: clientId, aud: audience, jti: randomJti(), iat, exp: iat + 60 });
|
|
51
|
+
}
|
|
52
|
+
export const CLIENT_ASSERTION_TYPE = "urn:ietf:params:oauth:client-assertion-type:jwt-bearer";
|
|
53
|
+
/**
|
|
54
|
+
* POST `payload` to `url` with a DPoP proof, retrying once with the nonce the
|
|
55
|
+
* server asks for, and return the session it hands back.
|
|
56
|
+
*/
|
|
57
|
+
export async function requestHandoff(opts) {
|
|
58
|
+
const doFetch = opts.fetch ?? fetch;
|
|
59
|
+
const send = async (nonce) => doFetch(opts.url, {
|
|
60
|
+
method: "POST",
|
|
61
|
+
headers: {
|
|
62
|
+
...opts.headers,
|
|
63
|
+
"content-type": "application/json",
|
|
64
|
+
dpop: await dpopProof(opts.dpopKey, opts.url, nonce),
|
|
65
|
+
},
|
|
66
|
+
body: JSON.stringify(opts.payload),
|
|
67
|
+
});
|
|
68
|
+
let res = await send();
|
|
69
|
+
let out = (await res.json().catch(() => ({})));
|
|
70
|
+
const nonce = res.headers.get("dpop-nonce");
|
|
71
|
+
if (!res.ok && out.error === "use_dpop_nonce" && nonce) {
|
|
72
|
+
res = await send(nonce);
|
|
73
|
+
out = (await res.json().catch(() => ({})));
|
|
74
|
+
}
|
|
75
|
+
if (!res.ok) {
|
|
76
|
+
throw new ObtainSessionError(typeof out.error === "string" ? out.error : "UpstreamFailure", String(out.message ?? out.error_description ?? `${opts.url} failed (${res.status})`), res.status);
|
|
77
|
+
}
|
|
78
|
+
const token = (typeof out.session === "object" && out.session ? out.session : out);
|
|
79
|
+
if (typeof token.sub !== "string" || !token.sub.startsWith("did:") || typeof token.access_token !== "string") {
|
|
80
|
+
throw new ObtainSessionError("NoSession", `${opts.url} returned no session`, 502);
|
|
81
|
+
}
|
|
82
|
+
if (typeof token.token_type !== "string" || token.token_type.toLowerCase() !== "dpop") {
|
|
83
|
+
throw new ObtainSessionError("NoSession", `${opts.url} returned a session that isn't DPoP-bound`, 502);
|
|
84
|
+
}
|
|
85
|
+
return {
|
|
86
|
+
tokens: {
|
|
87
|
+
sub: token.sub,
|
|
88
|
+
access_token: token.access_token,
|
|
89
|
+
token_type: token.token_type,
|
|
90
|
+
...(typeof token.refresh_token === "string" ? { refresh_token: token.refresh_token } : {}),
|
|
91
|
+
...(typeof token.scope === "string" ? { scope: token.scope } : {}),
|
|
92
|
+
...(typeof token.expires_in === "number" ? { expires_in: token.expires_in } : {}),
|
|
93
|
+
},
|
|
94
|
+
response: out,
|
|
95
|
+
};
|
|
96
|
+
}
|
|
97
|
+
//# sourceMappingURL=handoff.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"handoff.js","sourceRoot":"","sources":["../../src/server/handoff.ts"],"names":[],"mappings":"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"}
|
package/dist/server/index.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
export { createBlueskyAuth, type BlueskyAuth, type BlueskyAuthOptions } from "./auth.js";
|
|
2
|
+
export { joinScopes, pdsServesMethod, type ConditionalScope, type PdsInfo, type PdsServesMethodOptions, } from "./scopes.js";
|
|
3
|
+
export { ObtainSessionError } from "./handoff.js";
|
|
2
4
|
export type { AuthStore } from "./stores/types.js";
|
|
3
5
|
export { AuthLock, durableObjectLock, type DurableObjectLockOptions, type DurableObjectNamespaceLike, } from "./lock.js";
|
|
4
6
|
export { d1Store, type D1DatabaseLike, type D1PreparedStatementLike } from "./stores/d1.js";
|
package/dist/server/index.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
export { createBlueskyAuth } from "./auth.js";
|
|
2
|
+
export { joinScopes, pdsServesMethod, } from "./scopes.js";
|
|
3
|
+
export { ObtainSessionError } from "./handoff.js";
|
|
2
4
|
export { AuthLock, durableObjectLock, } from "./lock.js";
|
|
3
5
|
export { d1Store } from "./stores/d1.js";
|
|
4
6
|
export { kvStore } from "./stores/kv.js";
|
package/dist/server/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAA6C,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAA6C,MAAM,WAAW,CAAC;AACzF,OAAO,EACL,UAAU,EACV,eAAe,GAIhB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,EACL,QAAQ,EACR,iBAAiB,GAGlB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,OAAO,EAAqD,MAAM,gBAAgB,CAAC;AAC5F,OAAO,EAAE,OAAO,EAAwB,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,SAAS,EACT,eAAe,EACf,aAAa,EACb,eAAe,GAGhB,MAAM,cAAc,CAAC"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Scopes asked for only where they can be granted.
|
|
3
|
+
*
|
|
4
|
+
* A permission the user's PDS can't honour has no business on their consent
|
|
5
|
+
* screen, and a strict authorization server is within its rights to reject the
|
|
6
|
+
* whole sign-in over it (`invalid_scope`): space scopes asked of a PDS without
|
|
7
|
+
* spaces fail the login outright, not just the feature. So an app lists the
|
|
8
|
+
* scopes it always needs in `scope`, and the rest as conditional scopes, each
|
|
9
|
+
* asked for only when its test passes for the PDS signing this person in.
|
|
10
|
+
*
|
|
11
|
+
* Every scope either list names is published in the client metadata all the
|
|
12
|
+
* same: the metadata's `scope` bounds what the client may ask for, and some
|
|
13
|
+
* authorization servers reject a request that asks for more than it declares.
|
|
14
|
+
*/
|
|
15
|
+
/** What a conditional scope's test is told about the account signing in. */
|
|
16
|
+
export interface PdsInfo {
|
|
17
|
+
/** The account's DID. */
|
|
18
|
+
did: string;
|
|
19
|
+
/** The account's PDS. */
|
|
20
|
+
pds: URL;
|
|
21
|
+
/** The issuer of the PDS's authorization server. */
|
|
22
|
+
issuer: string;
|
|
23
|
+
}
|
|
24
|
+
export interface ConditionalScope {
|
|
25
|
+
/** One or more space-separated scopes. */
|
|
26
|
+
scope: string;
|
|
27
|
+
/** Whether to ask for `scope` when this account signs in. A test that throws counts as false. */
|
|
28
|
+
when: (pds: PdsInfo) => boolean | Promise<boolean>;
|
|
29
|
+
}
|
|
30
|
+
/** Space-separated scopes, each once, in first-seen order. */
|
|
31
|
+
export declare function joinScopes(...scopes: (string | undefined)[]): string;
|
|
32
|
+
/** The base scope plus every conditional scope whose test passes for this PDS. */
|
|
33
|
+
export declare function negotiateScope(base: string, conditional: readonly ConditionalScope[], pds: PdsInfo): Promise<string>;
|
|
34
|
+
export interface PdsServesMethodOptions {
|
|
35
|
+
/** Default: global `fetch`. */
|
|
36
|
+
fetch?: typeof fetch;
|
|
37
|
+
/** How long a PDS's answer is reused, in milliseconds. Default 10 minutes. */
|
|
38
|
+
cacheMs?: number;
|
|
39
|
+
/** Give up on a PDS that hasn't answered after this long, in milliseconds. Default 3 seconds. */
|
|
40
|
+
timeoutMs?: number;
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
* A `when` test: does the PDS say it serves method `nsid`?
|
|
44
|
+
*
|
|
45
|
+
* Asks the PDS's `community.lexicon.service.describe`, a community convention
|
|
46
|
+
* (the lexicon.community set) that a service uses to list the methods it
|
|
47
|
+
* serves. A PDS that doesn't answer, answers with an error, or doesn't list
|
|
48
|
+
* `nsid` fails the test: an optional scope is left off rather than risk the
|
|
49
|
+
* sign-in. Answers are cached per PDS.
|
|
50
|
+
*
|
|
51
|
+
* ```ts
|
|
52
|
+
* conditionalScopes: [
|
|
53
|
+
* { scope: "space:com.example.notes?manage=create", when: pdsServesMethod("com.atproto.space.createSpace") },
|
|
54
|
+
* ]
|
|
55
|
+
* ```
|
|
56
|
+
*/
|
|
57
|
+
export declare function pdsServesMethod(nsid: string, options?: PdsServesMethodOptions): (pds: PdsInfo) => Promise<boolean>;
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Scopes asked for only where they can be granted.
|
|
3
|
+
*
|
|
4
|
+
* A permission the user's PDS can't honour has no business on their consent
|
|
5
|
+
* screen, and a strict authorization server is within its rights to reject the
|
|
6
|
+
* whole sign-in over it (`invalid_scope`): space scopes asked of a PDS without
|
|
7
|
+
* spaces fail the login outright, not just the feature. So an app lists the
|
|
8
|
+
* scopes it always needs in `scope`, and the rest as conditional scopes, each
|
|
9
|
+
* asked for only when its test passes for the PDS signing this person in.
|
|
10
|
+
*
|
|
11
|
+
* Every scope either list names is published in the client metadata all the
|
|
12
|
+
* same: the metadata's `scope` bounds what the client may ask for, and some
|
|
13
|
+
* authorization servers reject a request that asks for more than it declares.
|
|
14
|
+
*/
|
|
15
|
+
/** Space-separated scopes, each once, in first-seen order. */
|
|
16
|
+
export function joinScopes(...scopes) {
|
|
17
|
+
const seen = new Set();
|
|
18
|
+
for (const scope of scopes) {
|
|
19
|
+
for (const token of (scope ?? "").split(/\s+/))
|
|
20
|
+
if (token)
|
|
21
|
+
seen.add(token);
|
|
22
|
+
}
|
|
23
|
+
return [...seen].join(" ");
|
|
24
|
+
}
|
|
25
|
+
/** The base scope plus every conditional scope whose test passes for this PDS. */
|
|
26
|
+
export async function negotiateScope(base, conditional, pds) {
|
|
27
|
+
const granted = await Promise.all(conditional.map(async (c) => {
|
|
28
|
+
try {
|
|
29
|
+
return (await c.when(pds)) ? c.scope : undefined;
|
|
30
|
+
}
|
|
31
|
+
catch {
|
|
32
|
+
return undefined;
|
|
33
|
+
}
|
|
34
|
+
}));
|
|
35
|
+
return joinScopes(base, ...granted);
|
|
36
|
+
}
|
|
37
|
+
const DESCRIBE = "community.lexicon.service.describe";
|
|
38
|
+
/**
|
|
39
|
+
* A `when` test: does the PDS say it serves method `nsid`?
|
|
40
|
+
*
|
|
41
|
+
* Asks the PDS's `community.lexicon.service.describe`, a community convention
|
|
42
|
+
* (the lexicon.community set) that a service uses to list the methods it
|
|
43
|
+
* serves. A PDS that doesn't answer, answers with an error, or doesn't list
|
|
44
|
+
* `nsid` fails the test: an optional scope is left off rather than risk the
|
|
45
|
+
* sign-in. Answers are cached per PDS.
|
|
46
|
+
*
|
|
47
|
+
* ```ts
|
|
48
|
+
* conditionalScopes: [
|
|
49
|
+
* { scope: "space:com.example.notes?manage=create", when: pdsServesMethod("com.atproto.space.createSpace") },
|
|
50
|
+
* ]
|
|
51
|
+
* ```
|
|
52
|
+
*/
|
|
53
|
+
export function pdsServesMethod(nsid, options = {}) {
|
|
54
|
+
const doFetch = options.fetch ?? fetch;
|
|
55
|
+
const cacheMs = options.cacheMs ?? 10 * 60 * 1000;
|
|
56
|
+
const timeoutMs = options.timeoutMs ?? 3000;
|
|
57
|
+
const cache = new Map();
|
|
58
|
+
return async ({ pds }) => {
|
|
59
|
+
const key = pds.origin;
|
|
60
|
+
const hit = cache.get(key);
|
|
61
|
+
if (hit && Date.now() - hit.at < cacheMs)
|
|
62
|
+
return hit.methods.has(nsid);
|
|
63
|
+
let methods = new Set();
|
|
64
|
+
try {
|
|
65
|
+
const res = await doFetch(`${key}/xrpc/${DESCRIBE}`, { signal: AbortSignal.timeout(timeoutMs) });
|
|
66
|
+
if (res.ok) {
|
|
67
|
+
const body = (await res.json());
|
|
68
|
+
if (Array.isArray(body.methods)) {
|
|
69
|
+
for (const m of body.methods) {
|
|
70
|
+
const value = typeof m === "string" ? m : m?.value;
|
|
71
|
+
if (typeof value === "string")
|
|
72
|
+
methods.add(value);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
catch {
|
|
78
|
+
methods = new Set();
|
|
79
|
+
}
|
|
80
|
+
cache.set(key, { methods, at: Date.now() });
|
|
81
|
+
return methods.has(nsid);
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
//# sourceMappingURL=scopes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scopes.js","sourceRoot":"","sources":["../../src/server/scopes.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bbthorson/atproto-cf-auth",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.3.0",
|
|
4
4
|
"description": "Bluesky (AT-Proto OAuth) sign-in for apps on Cloudflare Workers: server handlers, D1/KV session stores, and framework-free browser primitives.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -37,6 +37,8 @@
|
|
|
37
37
|
"prepublishOnly": "npm run typecheck && npm test && npm run build"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
+
"@atproto-labs/did-resolver": "^0.3.10",
|
|
41
|
+
"@atproto/did": "^0.5.6",
|
|
40
42
|
"@atproto/jwk-jose": "^0.2.4",
|
|
41
43
|
"@atproto/oauth-client": "^0.8.9"
|
|
42
44
|
},
|