@atproto/bsky 0.0.245 → 0.0.247

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atproto/bsky
 
+## 0.0.247
+
+### Patch Changes
+
+- [#5131](https://github.com/bluesky-social/atproto/pull/5131) [`84dd93c`](https://github.com/bluesky-social/atproto/commit/84dd93c14b14390bd3838954f8a0bfe231aab3c1) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Type handle as `HandleString` and did as `DidString` in seed user data
+
+- [#5131](https://github.com/bluesky-social/atproto/pull/5131) [`84dd93c`](https://github.com/bluesky-social/atproto/commit/84dd93c14b14390bd3838954f8a0bfe231aab3c1) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Validate `aud` of service auth tokens to be valid DIDs
+
+## 0.0.246
+
+### Patch Changes
+
+- [#5127](https://github.com/bluesky-social/atproto/pull/5127) [`a67858d`](https://github.com/bluesky-social/atproto/commit/a67858df5e4c0ca213e345c14b0283b2e930c68c) Thanks [@estrattonbailey](https://github.com/estrattonbailey)! - Update required query params for searchPostsV2
+
+- Updated dependencies [[`a67858d`](https://github.com/bluesky-social/atproto/commit/a67858df5e4c0ca213e345c14b0283b2e930c68c)]:
+  - @atproto/api@0.20.19
+
 ## 0.0.245
 
 ### Patch Changes

package/dist/api/app/bsky/feed/searchPostsV2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"searchPostsV2.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/searchPostsV2.ts"],"names":[],"mappings":"AAGA,OAAO,EAAuB,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAwBnD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAgDvD"}
+{"version":3,"file":"searchPostsV2.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/searchPostsV2.ts"],"names":[],"mappings":"AAGA,OAAO,EAAuB,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAwBnD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAmDvD"}

package/dist/api/app/bsky/feed/searchPostsV2.js

@@ -30,6 +30,9 @@ export default function (server, ctx) {
             }
             const results = await searchPostsV2({
                 ...params,
+                // Default to curated 'top' ranking when unset; the backend rejects an
+                // unspecified sort order.
+                sort: params.sort ?? 'top',
                 hydrateCtx,
                 isModService,
             }, ctx);

package/dist/api/app/bsky/feed/searchPostsV2.js.map

@@ -1 +1 @@
-{"version":3,"file":"searchPostsV2.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/searchPostsV2.ts"],"names":[],"mappings":"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","sourcesContent":["import { Timestamp } from '@bufbuild/protobuf'\nimport { mapDefined } from '@atproto/common'\nimport { AtUriString } from '@atproto/lex'\nimport { InvalidRequestError, Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context.js'\nimport { DataPlaneClient } from '../../../../data-plane/index.js'\nimport {\n  PostSearchQuery,\n  parsePostSearchQuery,\n} from '../../../../data-plane/server/util.js'\nimport { HydrateCtx, Hydrator } from '../../../../hydration/hydrator.js'\nimport { parseString } from '../../../../hydration/util.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n  HydrationFnInput,\n  PresentationFnInput,\n  RulesFnInput,\n  SkeletonFnInput,\n  createPipeline,\n} from '../../../../pipeline.js'\nimport {\n  SearchQueryLanguage,\n  SearchSortOrder,\n} from '../../../../proto/bsky_pb.js'\nimport { uriToDid as creatorFromUri } from '../../../../util/uris.js'\nimport { Views } from '../../../../views/index.js'\nimport { resHeaders, resolveSearchV2Override } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const searchPostsV2 = createPipeline(\n    skeleton,\n    hydration,\n    noBlocksOrTagged,\n    presentation,\n  )\n  server.add(app.bsky.feed.searchPostsV2, {\n    auth: ctx.authVerifier.standard,\n    handler: async ({ auth, params, req }) => {\n      const { viewer, isModService, skipViewerBlocks } =\n        ctx.authVerifier.parseCreds(auth)\n\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({\n        labelers,\n        viewer,\n        skipViewerBlocks,\n        features: ctx.featureGatesClient.scope(\n          ctx.featureGatesClient.parseUserContextFromHandler({\n            viewer,\n            req,\n          }),\n        ),\n      })\n      const isV2Enabled =\n        hydrateCtx.features.checkGate(\n          hydrateCtx.features.Gate.SearchV2Enable,\n        ) || resolveSearchV2Override(req, ctx.cfg)\n      if (!isV2Enabled) {\n        throw new InvalidRequestError('Search v2 is not enabled')\n      }\n\n      const results = await searchPostsV2(\n        {\n          ...params,\n          hydrateCtx,\n          isModService,\n        },\n        ctx,\n      )\n      return {\n        encoding: 'application/json',\n        body: results,\n        headers: resHeaders({ labelers: hydrateCtx.labelers }),\n      }\n    },\n  })\n}\n\nconst skeleton = async (\n  inputs: SkeletonFnInput<Context, Params>,\n): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  const query = params.query ?? ''\n  const parsedQuery = parsePostSearchQuery(query, {\n    author: params.authors?.[0],\n  })\n\n  const res = await ctx.dataplane.searchPostsV2({\n    params: {\n      query,\n      viewer: params.hydrateCtx.viewer ?? undefined,\n      limit: params.limit,\n      cursor: params.cursor,\n    },\n    sort: postSortToV2(params.sort),\n    filters: {\n      authors: params.authors ?? [],\n      mentions: params.mentions ?? [],\n      domains: params.domains ?? [],\n      urls: params.urls ?? [],\n      embeddedAtUris: params.embeddedAtUris ?? [],\n      hashtags: params.hashtags ?? [],\n    },\n    exclude: {\n      authors: params.excludeAuthors ?? [],\n      mentions: params.excludeMentions ?? [],\n      domains: params.excludeDomains ?? [],\n      urls: params.excludeUrls ?? [],\n      embeddedAtUris: params.excludeEmbeddedAtUris ?? [],\n      hashtags: params.excludeHashtags ?? [],\n    },\n    since: parseTimestamp(params.since),\n    until: parseTimestamp(params.until),\n    allTime: params.allTime,\n    language: params.language,\n    hasMedia: params.hasMedia,\n    hasVideo: params.hasVideo,\n    replyParentUri: params.replyParentUri,\n    threadRootUri: params.threadRootUri,\n    excludeReplies: params.excludeReplies,\n    repliesOnly: params.repliesOnly,\n    following: params.following,\n    queryLanguage: queryLanguageToV2(params.queryLanguage),\n  })\n  return {\n    posts: res.posts.map(({ uri }) => uri as AtUriString),\n    cursor: parseString(res.pageInfo?.cursor),\n    hitsTotal: res.pageInfo?.hitsTotal\n      ? Number(res.pageInfo.hitsTotal)\n      : undefined,\n    detectedQueryLanguages: res.detectedQueryLanguages,\n    parsedQuery,\n  }\n}\n\nconst hydration = async (\n  inputs: HydrationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, params, skeleton } = inputs\n  return ctx.hydrator.hydratePosts(\n    skeleton.posts.map((uri) => ({ uri })),\n    params.hydrateCtx,\n  )\n}\n\nconst noBlocksOrTagged = (inputs: RulesFnInput<Context, Params, Skeleton>) => {\n  const { ctx, params, skeleton, hydration } = inputs\n  const { parsedQuery } = skeleton\n\n  skeleton.posts = skeleton.posts.filter((uri) => {\n    const post = hydration.posts?.get(uri)\n    if (!post) return\n\n    const creator = creatorFromUri(uri)\n    const isCuratedSearch = params.sort === 'top'\n    const isPostByViewer = creator === params.hydrateCtx.viewer\n\n    if (isPostByViewer) return true\n    if (params.isModService) return true\n\n    if (ctx.views.viewerBlockExists(creator, hydration)) return false\n\n    const tagged = [...ctx.cfg.searchTagsHide].some((t) => post.tags.has(t))\n\n    if (isCuratedSearch && tagged) return false\n    if (!(parsedQuery.author || params.authors?.length) && tagged) return false\n    return true\n  })\n  return skeleton\n}\n\nconst presentation = (\n  inputs: PresentationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, skeleton, hydration } = inputs\n  const posts = mapDefined(skeleton.posts, (uri) => {\n    const post = hydration.posts?.get(uri)\n    if (!post) return\n\n    return ctx.views.post(uri, hydration)\n  })\n  return {\n    posts,\n    cursor: skeleton.cursor,\n    hitsTotal: skeleton.hitsTotal,\n    detectedQueryLanguages: skeleton.detectedQueryLanguages,\n  }\n}\n\ntype Context = {\n  cfg: AppContext['cfg']\n  dataplane: DataPlaneClient\n  hydrator: Hydrator\n  views: Views\n}\n\ntype Params = app.bsky.feed.searchPostsV2.$Params & {\n  hydrateCtx: HydrateCtx\n  isModService: boolean\n}\n\ntype Skeleton = {\n  posts: AtUriString[]\n  hitsTotal?: number\n  cursor?: string\n  detectedQueryLanguages?: string[]\n  parsedQuery: PostSearchQuery\n}\n\nconst postSortToV2 = (sort: string): SearchSortOrder => {\n  if (sort === 'top') return SearchSortOrder.TOP\n  if (sort === 'recent') return SearchSortOrder.RECENT\n  return SearchSortOrder.UNSPECIFIED\n}\n\nconst queryLanguageToV2 = (\n  lang: string | undefined,\n): SearchQueryLanguage | undefined => {\n  if (lang === 'ja') return SearchQueryLanguage.JA\n  if (lang === 'zh') return SearchQueryLanguage.ZH\n  if (lang === 'ko') return SearchQueryLanguage.KO\n  if (lang === 'th') return SearchQueryLanguage.TH\n  if (lang === 'ar') return SearchQueryLanguage.AR\n  return undefined\n}\n\nconst parseTimestamp = (value: string | undefined): Timestamp | undefined => {\n  if (!value) return undefined\n  const date = new Date(value)\n  if (isNaN(date.getTime())) return undefined\n  return Timestamp.fromDate(date)\n}\n"]}
+{"version":3,"file":"searchPostsV2.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/searchPostsV2.ts"],"names":[],"mappings":"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","sourcesContent":["import { Timestamp } from '@bufbuild/protobuf'\nimport { mapDefined } from '@atproto/common'\nimport { AtUriString } from '@atproto/lex'\nimport { InvalidRequestError, Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context.js'\nimport { DataPlaneClient } from '../../../../data-plane/index.js'\nimport {\n  PostSearchQuery,\n  parsePostSearchQuery,\n} from '../../../../data-plane/server/util.js'\nimport { HydrateCtx, Hydrator } from '../../../../hydration/hydrator.js'\nimport { parseString } from '../../../../hydration/util.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n  HydrationFnInput,\n  PresentationFnInput,\n  RulesFnInput,\n  SkeletonFnInput,\n  createPipeline,\n} from '../../../../pipeline.js'\nimport {\n  SearchQueryLanguage,\n  SearchSortOrder,\n} from '../../../../proto/bsky_pb.js'\nimport { uriToDid as creatorFromUri } from '../../../../util/uris.js'\nimport { Views } from '../../../../views/index.js'\nimport { resHeaders, resolveSearchV2Override } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const searchPostsV2 = createPipeline(\n    skeleton,\n    hydration,\n    noBlocksOrTagged,\n    presentation,\n  )\n  server.add(app.bsky.feed.searchPostsV2, {\n    auth: ctx.authVerifier.standard,\n    handler: async ({ auth, params, req }) => {\n      const { viewer, isModService, skipViewerBlocks } =\n        ctx.authVerifier.parseCreds(auth)\n\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({\n        labelers,\n        viewer,\n        skipViewerBlocks,\n        features: ctx.featureGatesClient.scope(\n          ctx.featureGatesClient.parseUserContextFromHandler({\n            viewer,\n            req,\n          }),\n        ),\n      })\n      const isV2Enabled =\n        hydrateCtx.features.checkGate(\n          hydrateCtx.features.Gate.SearchV2Enable,\n        ) || resolveSearchV2Override(req, ctx.cfg)\n      if (!isV2Enabled) {\n        throw new InvalidRequestError('Search v2 is not enabled')\n      }\n\n      const results = await searchPostsV2(\n        {\n          ...params,\n          // Default to curated 'top' ranking when unset; the backend rejects an\n          // unspecified sort order.\n          sort: params.sort ?? 'top',\n          hydrateCtx,\n          isModService,\n        },\n        ctx,\n      )\n      return {\n        encoding: 'application/json',\n        body: results,\n        headers: resHeaders({ labelers: hydrateCtx.labelers }),\n      }\n    },\n  })\n}\n\nconst skeleton = async (\n  inputs: SkeletonFnInput<Context, Params>,\n): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  const query = params.query ?? ''\n  const parsedQuery = parsePostSearchQuery(query, {\n    author: params.authors?.[0],\n  })\n\n  const res = await ctx.dataplane.searchPostsV2({\n    params: {\n      query,\n      viewer: params.hydrateCtx.viewer ?? undefined,\n      limit: params.limit,\n      cursor: params.cursor,\n    },\n    sort: postSortToV2(params.sort),\n    filters: {\n      authors: params.authors ?? [],\n      mentions: params.mentions ?? [],\n      domains: params.domains ?? [],\n      urls: params.urls ?? [],\n      embeddedAtUris: params.embeddedAtUris ?? [],\n      hashtags: params.hashtags ?? [],\n    },\n    exclude: {\n      authors: params.excludeAuthors ?? [],\n      mentions: params.excludeMentions ?? [],\n      domains: params.excludeDomains ?? [],\n      urls: params.excludeUrls ?? [],\n      embeddedAtUris: params.excludeEmbeddedAtUris ?? [],\n      hashtags: params.excludeHashtags ?? [],\n    },\n    since: parseTimestamp(params.since),\n    until: parseTimestamp(params.until),\n    allTime: params.allTime,\n    language: params.language,\n    hasMedia: params.hasMedia,\n    hasVideo: params.hasVideo,\n    replyParentUri: params.replyParentUri,\n    threadRootUri: params.threadRootUri,\n    excludeReplies: params.excludeReplies,\n    repliesOnly: params.repliesOnly,\n    following: params.following,\n    queryLanguage: queryLanguageToV2(params.queryLanguage),\n  })\n  return {\n    posts: res.posts.map(({ uri }) => uri as AtUriString),\n    cursor: parseString(res.pageInfo?.cursor),\n    hitsTotal: res.pageInfo?.hitsTotal\n      ? Number(res.pageInfo.hitsTotal)\n      : undefined,\n    detectedQueryLanguages: res.detectedQueryLanguages,\n    parsedQuery,\n  }\n}\n\nconst hydration = async (\n  inputs: HydrationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, params, skeleton } = inputs\n  return ctx.hydrator.hydratePosts(\n    skeleton.posts.map((uri) => ({ uri })),\n    params.hydrateCtx,\n  )\n}\n\nconst noBlocksOrTagged = (inputs: RulesFnInput<Context, Params, Skeleton>) => {\n  const { ctx, params, skeleton, hydration } = inputs\n  const { parsedQuery } = skeleton\n\n  skeleton.posts = skeleton.posts.filter((uri) => {\n    const post = hydration.posts?.get(uri)\n    if (!post) return\n\n    const creator = creatorFromUri(uri)\n    const isCuratedSearch = params.sort === 'top'\n    const isPostByViewer = creator === params.hydrateCtx.viewer\n\n    if (isPostByViewer) return true\n    if (params.isModService) return true\n\n    if (ctx.views.viewerBlockExists(creator, hydration)) return false\n\n    const tagged = [...ctx.cfg.searchTagsHide].some((t) => post.tags.has(t))\n\n    if (isCuratedSearch && tagged) return false\n    if (!(parsedQuery.author || params.authors?.length) && tagged) return false\n    return true\n  })\n  return skeleton\n}\n\nconst presentation = (\n  inputs: PresentationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, skeleton, hydration } = inputs\n  const posts = mapDefined(skeleton.posts, (uri) => {\n    const post = hydration.posts?.get(uri)\n    if (!post) return\n\n    return ctx.views.post(uri, hydration)\n  })\n  return {\n    posts,\n    cursor: skeleton.cursor,\n    hitsTotal: skeleton.hitsTotal,\n    detectedQueryLanguages: skeleton.detectedQueryLanguages,\n  }\n}\n\ntype Context = {\n  cfg: AppContext['cfg']\n  dataplane: DataPlaneClient\n  hydrator: Hydrator\n  views: Views\n}\n\ntype Params = app.bsky.feed.searchPostsV2.$Params & {\n  hydrateCtx: HydrateCtx\n  isModService: boolean\n}\n\ntype Skeleton = {\n  posts: AtUriString[]\n  hitsTotal?: number\n  cursor?: string\n  detectedQueryLanguages?: string[]\n  parsedQuery: PostSearchQuery\n}\n\nconst postSortToV2 = (sort?: string): SearchSortOrder => {\n  if (sort === 'top') return SearchSortOrder.TOP\n  if (sort === 'recent') return SearchSortOrder.RECENT\n  return SearchSortOrder.UNSPECIFIED\n}\n\nconst queryLanguageToV2 = (\n  lang: string | undefined,\n): SearchQueryLanguage | undefined => {\n  if (lang === 'ja') return SearchQueryLanguage.JA\n  if (lang === 'zh') return SearchQueryLanguage.ZH\n  if (lang === 'ko') return SearchQueryLanguage.KO\n  if (lang === 'th') return SearchQueryLanguage.TH\n  if (lang === 'ar') return SearchQueryLanguage.AR\n  return undefined\n}\n\nconst parseTimestamp = (value: string | undefined): Timestamp | undefined => {\n  if (!value) return undefined\n  const date = new Date(value)\n  if (isNaN(date.getTime())) return undefined\n  return Timestamp.fromDate(date)\n}\n"]}

package/dist/auth-verifier.d.ts

@@ -24,6 +24,7 @@ type NullOutput = {
 type StandardOutput = {
     credentials: {
         type: 'standard';
+        /** @note we don't validate this to be a {@link DidString} (we might want to in the future) */
         aud: string;
         iss: DidString | `${DidString}#${string}`;
     };
@@ -37,22 +38,22 @@ type RoleOutput = {
 type ModServiceOutput = {
     credentials: {
         type: 'mod_service';
-        aud: string;
-        iss: string;
+        aud: DidString;
+        iss: DidString | `${DidString}#${string}`;
     };
 };
 export type AuthVerifierOpts = {
-    ownDid: string;
-    alternateAudienceDids: string[];
-    modServiceDid: string;
+    ownDid: DidString;
+    alternateAudienceDids: DidString[];
+    modServiceDid: DidString;
     adminPasses: string[];
     entrywayJwtPublicKey?: KeyObject;
 };
 export declare class AuthVerifier {
     dataplane: DataPlaneClient;
-    ownDid: string;
-    standardAudienceDids: Set<string>;
-    modServiceDid: string;
+    ownDid: DidString;
+    standardAudienceDids: Set<DidString>;
+    modServiceDid: DidString;
     private adminPasses;
     private entrywayJwtPublicKey?;
     constructor(dataplane: DataPlaneClient, opts: AuthVerifierOpts);
@@ -76,15 +77,19 @@ export declare class AuthVerifier {
         status: RoleStatus;
         admin: boolean;
     };
-    verifyServiceJwt(reqCtx: ReqCtx, opts: {
+    verifyServiceJwt<TOptions extends {
         iss: string[] | null;
         aud: string | null;
         lxmCheck?: (method?: string) => boolean;
-    }): Promise<{
-        iss: DidString | `${DidString}#${string}`;
-        aud: string;
+    }>(reqCtx: ReqCtx, opts: TOptions): Promise<{
+        iss: (DidString | `${DidString}#${string}`) & (TOptions extends {
+            iss: ReadonlyArray<infer I>;
+        } ? I : unknown);
+        aud: string & (TOptions extends {
+            aud: infer A extends string;
+        } ? A : unknown);
     }>;
-    isModService(iss: string): boolean;
+    isModService(iss: string): iss is DidString | `${DidString}#atproto_labeler`;
     nullCreds(): NullOutput;
     parseCreds(creds: StandardOutput | RoleOutput | ModServiceOutput | NullOutput): {
         viewer: `did:${string}:${string}` | null;

package/dist/auth-verifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth-verifier.d.ts","sourceRoot":"","sources":["../src/auth-verifier.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth-verifier.d.ts","sourceRoot":"","sources":["../src/auth-verifier.ts"],"names":[],"mappings":"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"}

package/dist/auth-verifier.js

@@ -54,7 +54,8 @@ export class AuthVerifier {
                     iss: null,
                     aud: null,
                 });
-                if (!opts.skipAudCheck && !this.standardAudienceDids.has(aud)) {
+                if (!opts.skipAudCheck &&
+                    !this.standardAudienceDids.has(aud)) {
                     throw new AuthRequiredError('jwt audience does not match service did', 'BadJwtAudience');
                 }
                 return {
@@ -206,6 +207,9 @@ export class AuthVerifier {
                 throw new AuthRequiredError('Untrusted issuer', 'UntrustedIss');
             }
             const [did, serviceId] = iss.split('#');
+            if (!isDidString(did)) {
+                throw new AuthRequiredError('identity unknown');
+            }
             const keyId = serviceId === 'atproto_labeler' ? 'atproto_label' : 'atproto';
             let identity;
             try {
@@ -245,7 +249,10 @@ export class AuthVerifier {
             // we'll allow ozone self-hosters to upgrade before removing this condition.
             assertLxmCheck();
         }
-        return { iss: payload.iss, aud: payload.aud };
+        return {
+            iss: payload.iss,
+            aud: payload.aud,
+        };
     }
     isModService(iss) {
         return [

package/dist/auth-verifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth-verifier.js","sourceRoot":"","sources":["../src/auth-verifier.ts"],"names":[],"mappings":"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","sourcesContent":["import crypto, { KeyObject } from 'node:crypto'\nimport express from 'express'\nimport * as jose from 'jose'\nimport KeyEncoderModule from 'key-encoder'\nimport * as ui8 from 'uint8arrays'\nimport { SECP256K1_JWT_ALG, parseDidKey } from '@atproto/crypto'\nimport { DidString, isDidString } from '@atproto/lex'\nimport {\n  AuthRequiredError,\n  VerifySignatureWithKeyFn,\n  cryptoVerifySignatureWithKey,\n  parseReqNsid,\n  verifyJwt as verifyServiceJwt,\n} from '@atproto/xrpc-server'\nimport {\n  Code,\n  DataPlaneClient,\n  getKeyAsDidKey,\n  isDataplaneError,\n  unpackIdentityKeys,\n} from './data-plane/index.js'\nimport { GetIdentityByDidResponse } from './proto/bsky_pb.js'\n\n// key-encoder is CJS with exports.default; Node ESM interop wraps it as { default: Class }\nconst KeyEncoder = ((m) => m.default ?? m)(KeyEncoderModule)\n\ntype ReqCtx = {\n  req: express.Request\n}\n\ntype StandardAuthOpts = {\n  skipAudCheck?: boolean\n  lxmCheck?: (method?: string) => boolean\n}\n\nexport enum RoleStatus {\n  Valid,\n  Invalid,\n  Missing,\n}\n\ntype NullOutput = {\n  credentials: {\n    type: 'none'\n    iss: null\n  }\n}\n\ntype StandardOutput = {\n  credentials: {\n    type: 'standard'\n    aud: string\n    iss: DidString | `${DidString}#${string}`\n  }\n}\n\ntype RoleOutput = {\n  credentials: {\n    type: 'role'\n    admin: boolean\n  }\n}\n\ntype ModServiceOutput = {\n  credentials: {\n    type: 'mod_service'\n    aud: string\n    iss: string\n  }\n}\n\nconst ALLOWED_AUTH_SCOPES = new Set([\n  'com.atproto.access',\n  'com.atproto.appPass',\n  'com.atproto.appPassPrivileged',\n])\n\nexport type AuthVerifierOpts = {\n  ownDid: string\n  alternateAudienceDids: string[]\n  modServiceDid: string\n  adminPasses: string[]\n  entrywayJwtPublicKey?: KeyObject\n}\n\nexport class AuthVerifier {\n  public ownDid: string\n  public standardAudienceDids: Set<string>\n  public modServiceDid: string\n  private adminPasses: Set<string>\n  private entrywayJwtPublicKey?: KeyObject\n\n  constructor(\n    public dataplane: DataPlaneClient,\n    opts: AuthVerifierOpts,\n  ) {\n    this.ownDid = opts.ownDid\n    this.standardAudienceDids = new Set([\n      opts.ownDid,\n      ...opts.alternateAudienceDids,\n    ])\n    this.modServiceDid = opts.modServiceDid\n    this.adminPasses = new Set(opts.adminPasses)\n    this.entrywayJwtPublicKey = opts.entrywayJwtPublicKey\n  }\n\n  // verifiers (arrow fns to preserve scope)\n  standardOptionalParameterized =\n    (opts: StandardAuthOpts) =>\n    async (ctx: ReqCtx): Promise<StandardOutput | NullOutput> => {\n      // @TODO remove! basic auth + did supported just for testing.\n      if (isBasicToken(ctx.req)) {\n        const aud = this.ownDid\n        const iss = ctx.req.headers['appview-as-did']\n        if (typeof iss !== 'string' || !isDidString(iss)) {\n          throw new AuthRequiredError('bad issuer')\n        }\n        if (!this.parseRoleCreds(ctx.req).admin) {\n          throw new AuthRequiredError('bad credentials')\n        }\n        return {\n          credentials: { type: 'standard', iss, aud },\n        }\n      } else if (isBearerToken(ctx.req)) {\n        // @NOTE temporarily accept entryway session tokens to shed load from PDS instances\n        const token = bearerTokenFromReq(ctx.req)\n        const header = token ? jose.decodeProtectedHeader(token) : undefined\n        if (header?.typ === 'at+jwt') {\n          // we should never use entryway session tokens in the case of flexible auth audiences (namely in the case of getFeed)\n          if (opts.skipAudCheck) {\n            throw new AuthRequiredError('Malformed token', 'InvalidToken')\n          }\n          return this.entrywaySession(ctx)\n        }\n\n        const { iss, aud } = await this.verifyServiceJwt(ctx, {\n          lxmCheck: opts.lxmCheck,\n          iss: null,\n          aud: null,\n        })\n        if (!opts.skipAudCheck && !this.standardAudienceDids.has(aud)) {\n          throw new AuthRequiredError(\n            'jwt audience does not match service did',\n            'BadJwtAudience',\n          )\n        }\n        return {\n          credentials: {\n            type: 'standard',\n            iss,\n            aud,\n          },\n        }\n      } else {\n        return this.nullCreds()\n      }\n    }\n\n  standardOptional: (ctx: ReqCtx) => Promise<StandardOutput | NullOutput> =\n    this.standardOptionalParameterized({})\n\n  standard = async (ctx: ReqCtx): Promise<StandardOutput> => {\n    const output = await this.standardOptional(ctx)\n    if (output.credentials.type === 'none') {\n      throw new AuthRequiredError(undefined, 'AuthMissing')\n    }\n    return output as StandardOutput\n  }\n\n  role = (ctx: ReqCtx): RoleOutput => {\n    const creds = this.parseRoleCreds(ctx.req)\n    if (creds.status !== RoleStatus.Valid) {\n      throw new AuthRequiredError()\n    }\n    return {\n      credentials: {\n        ...creds,\n        type: 'role',\n      },\n    }\n  }\n\n  standardOrRole = async (\n    ctx: ReqCtx,\n  ): Promise<StandardOutput | RoleOutput> => {\n    if (isBearerToken(ctx.req)) {\n      return this.standard(ctx)\n    } else {\n      return this.role(ctx)\n    }\n  }\n\n  optionalStandardOrRole = async (\n    ctx: ReqCtx,\n  ): Promise<StandardOutput | RoleOutput | NullOutput> => {\n    if (isBearerToken(ctx.req)) {\n      return await this.standard(ctx)\n    } else {\n      const creds = this.parseRoleCreds(ctx.req)\n      if (creds.status === RoleStatus.Valid) {\n        return {\n          credentials: {\n            ...creds,\n            type: 'role',\n          },\n        }\n      } else if (creds.status === RoleStatus.Missing) {\n        return this.nullCreds()\n      } else {\n        throw new AuthRequiredError()\n      }\n    }\n  }\n\n  // @NOTE this auth verifier method is not recommended to be implemented by most appviews\n  // this is a short term fix to remove proxy load from Bluesky's PDS and in line with possible\n  // future plans to have the client talk directly with the appview\n  entrywaySession = async (reqCtx: ReqCtx): Promise<StandardOutput> => {\n    const token = bearerTokenFromReq(reqCtx.req)\n    if (!token) {\n      throw new AuthRequiredError(undefined, 'AuthMissing')\n    }\n\n    // if entryway jwt key not configured then do not parsed these tokens\n    if (!this.entrywayJwtPublicKey) {\n      throw new AuthRequiredError('Malformed token', 'InvalidToken')\n    }\n\n    const res = await jose\n      .jwtVerify(token, this.entrywayJwtPublicKey)\n      .catch((err) => {\n        if (err?.['code'] === 'ERR_JWT_EXPIRED') {\n          throw new AuthRequiredError('Token has expired', 'ExpiredToken')\n        }\n        throw new AuthRequiredError(\n          'Token could not be verified',\n          'InvalidToken',\n        )\n      })\n\n    const { sub, aud, scope, cnf } = res.payload\n    if (typeof cnf !== 'undefined') {\n      // Proof-of-Possession (PoP) tokens are not allowed here\n      // https://www.rfc-editor.org/rfc/rfc7800.html\n      throw new AuthRequiredError(\n        'Malformed token: DPoP not supported',\n        'InvalidToken',\n      )\n    }\n    if (typeof sub !== 'string' || !sub.startsWith('did:')) {\n      throw new AuthRequiredError('Malformed token', 'InvalidToken')\n    } else if (\n      typeof aud !== 'string' ||\n      !aud.startsWith('did:web:') ||\n      !aud.endsWith('.bsky.network')\n    ) {\n      throw new AuthRequiredError('Bad token aud', 'InvalidToken')\n    } else if (typeof scope !== 'string' || !ALLOWED_AUTH_SCOPES.has(scope)) {\n      throw new AuthRequiredError('Bad token scope', 'InvalidToken')\n    }\n\n    return {\n      credentials: {\n        type: 'standard',\n        aud: this.ownDid,\n        iss: sub as DidString | `${DidString}#${string}`,\n      },\n    }\n  }\n\n  modService = async (reqCtx: ReqCtx): Promise<ModServiceOutput> => {\n    const { iss, aud } = await this.verifyServiceJwt(reqCtx, {\n      aud: this.ownDid,\n      iss: [this.modServiceDid, `${this.modServiceDid}#atproto_labeler`],\n    })\n    return { credentials: { type: 'mod_service', aud, iss } }\n  }\n\n  roleOrModService = async (\n    reqCtx: ReqCtx,\n  ): Promise<RoleOutput | ModServiceOutput> => {\n    if (isBearerToken(reqCtx.req)) {\n      return this.modService(reqCtx)\n    } else {\n      return this.role(reqCtx)\n    }\n  }\n\n  parseRoleCreds(req: express.Request) {\n    const parsed = parseBasicAuth(req.headers.authorization || '')\n    const { Missing, Valid, Invalid } = RoleStatus\n    if (!parsed) {\n      return { status: Missing, admin: false, moderator: false, triage: false }\n    }\n    const { username, password } = parsed\n    if (username === 'admin' && this.adminPasses.has(password)) {\n      return { status: Valid, admin: true }\n    }\n    return { status: Invalid, admin: false }\n  }\n\n  async verifyServiceJwt(\n    reqCtx: ReqCtx,\n    opts: {\n      iss: string[] | null\n      aud: string | null\n      lxmCheck?: (method?: string) => boolean\n    },\n  ): Promise<{\n    iss: DidString | `${DidString}#${string}`\n    aud: string\n  }> {\n    const getSigningKey = async (\n      iss: string,\n      _forceRefresh: boolean, // @TODO consider propagating to dataplane\n    ): Promise<string> => {\n      if (opts.iss !== null && !opts.iss.includes(iss)) {\n        throw new AuthRequiredError('Untrusted issuer', 'UntrustedIss')\n      }\n      const [did, serviceId] = iss.split('#')\n      const keyId =\n        serviceId === 'atproto_labeler' ? 'atproto_label' : 'atproto'\n      let identity: GetIdentityByDidResponse\n      try {\n        identity = await this.dataplane.getIdentityByDid({ did })\n      } catch (err) {\n        if (isDataplaneError(err, Code.NotFound)) {\n          throw new AuthRequiredError('identity unknown')\n        }\n        throw err\n      }\n      const keys = unpackIdentityKeys(identity.keys)\n      const didKey = getKeyAsDidKey(keys, { id: keyId })\n      if (!didKey) {\n        throw new AuthRequiredError('missing or bad key')\n      }\n      return didKey\n    }\n    const assertLxmCheck = () => {\n      const lxm = parseReqNsid(reqCtx.req)\n      if (\n        (opts.lxmCheck && !opts.lxmCheck(payload.lxm)) ||\n        (!opts.lxmCheck && payload.lxm !== lxm)\n      ) {\n        throw new AuthRequiredError(\n          payload.lxm !== undefined\n            ? `bad jwt lexicon method (\"lxm\"). must match: ${lxm}`\n            : `missing jwt lexicon method (\"lxm\"). must match: ${lxm}`,\n          'BadJwtLexiconMethod',\n        )\n      }\n    }\n\n    const jwtStr = bearerTokenFromReq(reqCtx.req)\n    if (!jwtStr) {\n      throw new AuthRequiredError('missing jwt', 'MissingJwt')\n    }\n    // if validating additional scopes, skip scope check in initial validation & follow up afterwards\n    const payload = await verifyServiceJwt(\n      jwtStr,\n      opts.aud,\n      null,\n      getSigningKey,\n      verifySignatureWithKey,\n    )\n    if (\n      !payload.iss.endsWith('#atproto_labeler') ||\n      payload.lxm !== undefined\n    ) {\n      // @TODO currently permissive of labelers who dont set lxm yet.\n      // we'll allow ozone self-hosters to upgrade before removing this condition.\n      assertLxmCheck()\n    }\n    return { iss: payload.iss, aud: payload.aud }\n  }\n\n  isModService(iss: string): boolean {\n    return [\n      this.modServiceDid,\n      `${this.modServiceDid}#atproto_labeler`,\n    ].includes(iss)\n  }\n\n  nullCreds(): NullOutput {\n    return {\n      credentials: {\n        type: 'none',\n        iss: null,\n      },\n    }\n  }\n\n  parseCreds(\n    creds: StandardOutput | RoleOutput | ModServiceOutput | NullOutput,\n  ) {\n    const viewer =\n      creds.credentials.type === 'standard' ? creds.credentials.iss : null\n    const includeTakedownsAnd3pBlocks =\n      (creds.credentials.type === 'role' && creds.credentials.admin) ||\n      creds.credentials.type === 'mod_service' ||\n      (creds.credentials.type === 'standard' &&\n        this.isModService(creds.credentials.iss))\n    const canPerformTakedown =\n      (creds.credentials.type === 'role' && creds.credentials.admin) ||\n      creds.credentials.type === 'mod_service'\n    const isModService =\n      creds.credentials.type === 'mod_service' ||\n      (creds.credentials.type === 'standard' &&\n        this.isModService(creds.credentials.iss))\n\n    return {\n      viewer,\n      includeTakedowns: includeTakedownsAnd3pBlocks,\n      include3pBlocks: includeTakedownsAnd3pBlocks,\n      canPerformTakedown,\n      isModService,\n      skipViewerBlocks: isModService && viewer !== null,\n    }\n  }\n}\n\n// HELPERS\n// ---------\n\nconst BEARER = 'Bearer '\nconst BASIC = 'Basic '\n\nconst isBearerToken = (req: express.Request): boolean => {\n  return req.headers.authorization?.startsWith(BEARER) ?? false\n}\n\nconst isBasicToken = (req: express.Request): boolean => {\n  return req.headers.authorization?.startsWith(BASIC) ?? false\n}\n\nconst bearerTokenFromReq = (req: express.Request) => {\n  const header = req.headers.authorization || ''\n  if (!header.startsWith(BEARER)) return null\n  return header.slice(BEARER.length).trim()\n}\n\nexport const parseBasicAuth = (\n  token: string,\n): { username: string; password: string } | null => {\n  if (!token.startsWith(BASIC)) return null\n  const b64 = token.slice(BASIC.length)\n  let parsed: string[]\n  try {\n    parsed = ui8.toString(ui8.fromString(b64, 'base64pad'), 'utf8').split(':')\n  } catch (err) {\n    return null\n  }\n  const [username, password] = parsed\n  if (!username || !password) return null\n  return { username, password }\n}\n\nexport const buildBasicAuth = (username: string, password: string): string => {\n  return (\n    BASIC +\n    ui8.toString(ui8.fromString(`${username}:${password}`, 'utf8'), 'base64pad')\n  )\n}\n\nconst keyEncoder = new KeyEncoder('secp256k1')\nexport const createPublicKeyObject = (publicKeyHex: string): KeyObject => {\n  const key = keyEncoder.encodePublic(publicKeyHex, 'raw', 'pem')\n  return crypto.createPublicKey({ format: 'pem', key })\n}\n\nconst verifySig = (\n  publicKey: Uint8Array,\n  data: Uint8Array,\n  sig: Uint8Array,\n) => {\n  const keyEncoder = new KeyEncoder('secp256k1')\n\n  const pemKey = keyEncoder.encodePublic(\n    ui8.toString(publicKey, 'hex'),\n    'raw',\n    'pem',\n  )\n  const key = crypto.createPublicKey({ format: 'pem', key: pemKey })\n\n  return crypto.verify(\n    'sha256',\n    data,\n    {\n      key,\n      dsaEncoding: 'ieee-p1363',\n    },\n    sig,\n  )\n}\n\nexport const verifySignatureWithKey: VerifySignatureWithKeyFn = async (\n  didKey: string,\n  msgBytes: Uint8Array,\n  sigBytes: Uint8Array,\n  alg: string,\n) => {\n  if (alg === SECP256K1_JWT_ALG) {\n    const parsed = parseDidKey(didKey)\n    if (alg !== parsed.jwtAlg) {\n      throw new Error(`Expected key alg ${alg}, got ${parsed.jwtAlg}`)\n    }\n\n    return verifySig(parsed.keyBytes, msgBytes, sigBytes)\n  }\n\n  return cryptoVerifySignatureWithKey(didKey, msgBytes, sigBytes, alg)\n}\n"]}
+{"version":3,"file":"auth-verifier.js","sourceRoot":"","sources":["../src/auth-verifier.ts"],"names":[],"mappings":"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","sourcesContent":["import crypto, { KeyObject } from 'node:crypto'\nimport express from 'express'\nimport * as jose from 'jose'\nimport KeyEncoderModule from 'key-encoder'\nimport * as ui8 from 'uint8arrays'\nimport { SECP256K1_JWT_ALG, parseDidKey } from '@atproto/crypto'\nimport { DidString, isDidString } from '@atproto/lex'\nimport {\n  AuthRequiredError,\n  VerifySignatureWithKeyFn,\n  cryptoVerifySignatureWithKey,\n  parseReqNsid,\n  verifyJwt as verifyServiceJwt,\n} from '@atproto/xrpc-server'\nimport {\n  Code,\n  DataPlaneClient,\n  getKeyAsDidKey,\n  isDataplaneError,\n  unpackIdentityKeys,\n} from './data-plane/index.js'\nimport { GetIdentityByDidResponse } from './proto/bsky_pb.js'\n\n// key-encoder is CJS with exports.default; Node ESM interop wraps it as { default: Class }\nconst KeyEncoder = ((m) => m.default ?? m)(KeyEncoderModule)\n\ntype ReqCtx = {\n  req: express.Request\n}\n\ntype StandardAuthOpts = {\n  skipAudCheck?: boolean\n  lxmCheck?: (method?: string) => boolean\n}\n\nexport enum RoleStatus {\n  Valid,\n  Invalid,\n  Missing,\n}\n\ntype NullOutput = {\n  credentials: {\n    type: 'none'\n    iss: null\n  }\n}\n\ntype StandardOutput = {\n  credentials: {\n    type: 'standard'\n    /** @note we don't validate this to be a {@link DidString} (we might want to in the future) */\n    aud: string\n    iss: DidString | `${DidString}#${string}`\n  }\n}\n\ntype RoleOutput = {\n  credentials: {\n    type: 'role'\n    admin: boolean\n  }\n}\n\ntype ModServiceOutput = {\n  credentials: {\n    type: 'mod_service'\n    aud: DidString\n    iss: DidString | `${DidString}#${string}`\n  }\n}\n\nconst ALLOWED_AUTH_SCOPES = new Set([\n  'com.atproto.access',\n  'com.atproto.appPass',\n  'com.atproto.appPassPrivileged',\n])\n\nexport type AuthVerifierOpts = {\n  ownDid: DidString\n  alternateAudienceDids: DidString[]\n  modServiceDid: DidString\n  adminPasses: string[]\n  entrywayJwtPublicKey?: KeyObject\n}\n\nexport class AuthVerifier {\n  public ownDid: DidString\n  public standardAudienceDids: Set<DidString>\n  public modServiceDid: DidString\n  private adminPasses: Set<string>\n  private entrywayJwtPublicKey?: KeyObject\n\n  constructor(\n    public dataplane: DataPlaneClient,\n    opts: AuthVerifierOpts,\n  ) {\n    this.ownDid = opts.ownDid\n    this.standardAudienceDids = new Set([\n      opts.ownDid,\n      ...opts.alternateAudienceDids,\n    ])\n    this.modServiceDid = opts.modServiceDid\n    this.adminPasses = new Set(opts.adminPasses)\n    this.entrywayJwtPublicKey = opts.entrywayJwtPublicKey\n  }\n\n  // verifiers (arrow fns to preserve scope)\n  standardOptionalParameterized =\n    (opts: StandardAuthOpts) =>\n    async (ctx: ReqCtx): Promise<StandardOutput | NullOutput> => {\n      // @TODO remove! basic auth + did supported just for testing.\n      if (isBasicToken(ctx.req)) {\n        const aud = this.ownDid\n        const iss = ctx.req.headers['appview-as-did']\n        if (typeof iss !== 'string' || !isDidString(iss)) {\n          throw new AuthRequiredError('bad issuer')\n        }\n        if (!this.parseRoleCreds(ctx.req).admin) {\n          throw new AuthRequiredError('bad credentials')\n        }\n        return {\n          credentials: { type: 'standard', iss, aud },\n        }\n      } else if (isBearerToken(ctx.req)) {\n        // @NOTE temporarily accept entryway session tokens to shed load from PDS instances\n        const token = bearerTokenFromReq(ctx.req)\n        const header = token ? jose.decodeProtectedHeader(token) : undefined\n        if (header?.typ === 'at+jwt') {\n          // we should never use entryway session tokens in the case of flexible auth audiences (namely in the case of getFeed)\n          if (opts.skipAudCheck) {\n            throw new AuthRequiredError('Malformed token', 'InvalidToken')\n          }\n          return this.entrywaySession(ctx)\n        }\n\n        const { iss, aud } = await this.verifyServiceJwt(ctx, {\n          lxmCheck: opts.lxmCheck,\n          iss: null,\n          aud: null,\n        })\n        if (\n          !opts.skipAudCheck &&\n          !(this.standardAudienceDids as Set<string>).has(aud)\n        ) {\n          throw new AuthRequiredError(\n            'jwt audience does not match service did',\n            'BadJwtAudience',\n          )\n        }\n        return {\n          credentials: {\n            type: 'standard',\n            iss,\n            aud,\n          },\n        }\n      } else {\n        return this.nullCreds()\n      }\n    }\n\n  standardOptional: (ctx: ReqCtx) => Promise<StandardOutput | NullOutput> =\n    this.standardOptionalParameterized({})\n\n  standard = async (ctx: ReqCtx): Promise<StandardOutput> => {\n    const output = await this.standardOptional(ctx)\n    if (output.credentials.type === 'none') {\n      throw new AuthRequiredError(undefined, 'AuthMissing')\n    }\n    return output as StandardOutput\n  }\n\n  role = (ctx: ReqCtx): RoleOutput => {\n    const creds = this.parseRoleCreds(ctx.req)\n    if (creds.status !== RoleStatus.Valid) {\n      throw new AuthRequiredError()\n    }\n    return {\n      credentials: {\n        ...creds,\n        type: 'role',\n      },\n    }\n  }\n\n  standardOrRole = async (\n    ctx: ReqCtx,\n  ): Promise<StandardOutput | RoleOutput> => {\n    if (isBearerToken(ctx.req)) {\n      return this.standard(ctx)\n    } else {\n      return this.role(ctx)\n    }\n  }\n\n  optionalStandardOrRole = async (\n    ctx: ReqCtx,\n  ): Promise<StandardOutput | RoleOutput | NullOutput> => {\n    if (isBearerToken(ctx.req)) {\n      return await this.standard(ctx)\n    } else {\n      const creds = this.parseRoleCreds(ctx.req)\n      if (creds.status === RoleStatus.Valid) {\n        return {\n          credentials: {\n            ...creds,\n            type: 'role',\n          },\n        }\n      } else if (creds.status === RoleStatus.Missing) {\n        return this.nullCreds()\n      } else {\n        throw new AuthRequiredError()\n      }\n    }\n  }\n\n  // @NOTE this auth verifier method is not recommended to be implemented by most appviews\n  // this is a short term fix to remove proxy load from Bluesky's PDS and in line with possible\n  // future plans to have the client talk directly with the appview\n  entrywaySession = async (reqCtx: ReqCtx): Promise<StandardOutput> => {\n    const token = bearerTokenFromReq(reqCtx.req)\n    if (!token) {\n      throw new AuthRequiredError(undefined, 'AuthMissing')\n    }\n\n    // if entryway jwt key not configured then do not parsed these tokens\n    if (!this.entrywayJwtPublicKey) {\n      throw new AuthRequiredError('Malformed token', 'InvalidToken')\n    }\n\n    const res = await jose\n      .jwtVerify(token, this.entrywayJwtPublicKey)\n      .catch((err) => {\n        if (err?.['code'] === 'ERR_JWT_EXPIRED') {\n          throw new AuthRequiredError('Token has expired', 'ExpiredToken')\n        }\n        throw new AuthRequiredError(\n          'Token could not be verified',\n          'InvalidToken',\n        )\n      })\n\n    const { sub, aud, scope, cnf } = res.payload\n    if (typeof cnf !== 'undefined') {\n      // Proof-of-Possession (PoP) tokens are not allowed here\n      // https://www.rfc-editor.org/rfc/rfc7800.html\n      throw new AuthRequiredError(\n        'Malformed token: DPoP not supported',\n        'InvalidToken',\n      )\n    }\n    if (typeof sub !== 'string' || !sub.startsWith('did:')) {\n      throw new AuthRequiredError('Malformed token', 'InvalidToken')\n    } else if (\n      typeof aud !== 'string' ||\n      !aud.startsWith('did:web:') ||\n      !aud.endsWith('.bsky.network')\n    ) {\n      throw new AuthRequiredError('Bad token aud', 'InvalidToken')\n    } else if (typeof scope !== 'string' || !ALLOWED_AUTH_SCOPES.has(scope)) {\n      throw new AuthRequiredError('Bad token scope', 'InvalidToken')\n    }\n\n    return {\n      credentials: {\n        type: 'standard',\n        aud: this.ownDid,\n        iss: sub as DidString | `${DidString}#${string}`,\n      },\n    }\n  }\n\n  modService = async (reqCtx: ReqCtx): Promise<ModServiceOutput> => {\n    const { iss, aud } = await this.verifyServiceJwt(reqCtx, {\n      aud: this.ownDid,\n      iss: [this.modServiceDid, `${this.modServiceDid}#atproto_labeler`],\n    })\n    return { credentials: { type: 'mod_service', aud, iss } }\n  }\n\n  roleOrModService = async (\n    reqCtx: ReqCtx,\n  ): Promise<RoleOutput | ModServiceOutput> => {\n    if (isBearerToken(reqCtx.req)) {\n      return this.modService(reqCtx)\n    } else {\n      return this.role(reqCtx)\n    }\n  }\n\n  parseRoleCreds(req: express.Request) {\n    const parsed = parseBasicAuth(req.headers.authorization || '')\n    const { Missing, Valid, Invalid } = RoleStatus\n    if (!parsed) {\n      return { status: Missing, admin: false, moderator: false, triage: false }\n    }\n    const { username, password } = parsed\n    if (username === 'admin' && this.adminPasses.has(password)) {\n      return { status: Valid, admin: true }\n    }\n    return { status: Invalid, admin: false }\n  }\n\n  async verifyServiceJwt<\n    TOptions extends {\n      iss: string[] | null\n      aud: string | null\n      lxmCheck?: (method?: string) => boolean\n    },\n  >(reqCtx: ReqCtx, opts: TOptions) {\n    const getSigningKey = async (\n      iss: string,\n      _forceRefresh: boolean, // @TODO consider propagating to dataplane\n    ): Promise<string> => {\n      if (opts.iss !== null && !opts.iss.includes(iss)) {\n        throw new AuthRequiredError('Untrusted issuer', 'UntrustedIss')\n      }\n      const [did, serviceId] = iss.split('#')\n      if (!isDidString(did)) {\n        throw new AuthRequiredError('identity unknown')\n      }\n\n      const keyId =\n        serviceId === 'atproto_labeler' ? 'atproto_label' : 'atproto'\n      let identity: GetIdentityByDidResponse\n      try {\n        identity = await this.dataplane.getIdentityByDid({ did })\n      } catch (err) {\n        if (isDataplaneError(err, Code.NotFound)) {\n          throw new AuthRequiredError('identity unknown')\n        }\n        throw err\n      }\n      const keys = unpackIdentityKeys(identity.keys)\n      const didKey = getKeyAsDidKey(keys, { id: keyId })\n      if (!didKey) {\n        throw new AuthRequiredError('missing or bad key')\n      }\n      return didKey\n    }\n    const assertLxmCheck = () => {\n      const lxm = parseReqNsid(reqCtx.req)\n      if (\n        (opts.lxmCheck && !opts.lxmCheck(payload.lxm)) ||\n        (!opts.lxmCheck && payload.lxm !== lxm)\n      ) {\n        throw new AuthRequiredError(\n          payload.lxm !== undefined\n            ? `bad jwt lexicon method (\"lxm\"). must match: ${lxm}`\n            : `missing jwt lexicon method (\"lxm\"). must match: ${lxm}`,\n          'BadJwtLexiconMethod',\n        )\n      }\n    }\n\n    const jwtStr = bearerTokenFromReq(reqCtx.req)\n    if (!jwtStr) {\n      throw new AuthRequiredError('missing jwt', 'MissingJwt')\n    }\n    // if validating additional scopes, skip scope check in initial validation & follow up afterwards\n    const payload = await verifyServiceJwt(\n      jwtStr,\n      opts.aud,\n      null,\n      getSigningKey,\n      verifySignatureWithKey,\n    )\n    if (\n      !payload.iss.endsWith('#atproto_labeler') ||\n      payload.lxm !== undefined\n    ) {\n      // @TODO currently permissive of labelers who dont set lxm yet.\n      // we'll allow ozone self-hosters to upgrade before removing this condition.\n      assertLxmCheck()\n    }\n\n    return {\n      iss: payload.iss as (DidString | `${DidString}#${string}`) &\n        (TOptions extends { iss: ReadonlyArray<infer I> } ? I : unknown),\n      aud: payload.aud as string &\n        (TOptions extends { aud: infer A extends string } ? A : unknown),\n    }\n  }\n\n  isModService(iss: string): iss is DidString | `${DidString}#atproto_labeler` {\n    return [\n      this.modServiceDid,\n      `${this.modServiceDid}#atproto_labeler`,\n    ].includes(iss)\n  }\n\n  nullCreds(): NullOutput {\n    return {\n      credentials: {\n        type: 'none',\n        iss: null,\n      },\n    }\n  }\n\n  parseCreds(\n    creds: StandardOutput | RoleOutput | ModServiceOutput | NullOutput,\n  ) {\n    const viewer =\n      creds.credentials.type === 'standard' ? creds.credentials.iss : null\n    const includeTakedownsAnd3pBlocks =\n      (creds.credentials.type === 'role' && creds.credentials.admin) ||\n      creds.credentials.type === 'mod_service' ||\n      (creds.credentials.type === 'standard' &&\n        this.isModService(creds.credentials.iss))\n    const canPerformTakedown =\n      (creds.credentials.type === 'role' && creds.credentials.admin) ||\n      creds.credentials.type === 'mod_service'\n    const isModService =\n      creds.credentials.type === 'mod_service' ||\n      (creds.credentials.type === 'standard' &&\n        this.isModService(creds.credentials.iss))\n\n    return {\n      viewer,\n      includeTakedowns: includeTakedownsAnd3pBlocks,\n      include3pBlocks: includeTakedownsAnd3pBlocks,\n      canPerformTakedown,\n      isModService,\n      skipViewerBlocks: isModService && viewer !== null,\n    }\n  }\n}\n\n// HELPERS\n// ---------\n\nconst BEARER = 'Bearer '\nconst BASIC = 'Basic '\n\nconst isBearerToken = (req: express.Request): boolean => {\n  return req.headers.authorization?.startsWith(BEARER) ?? false\n}\n\nconst isBasicToken = (req: express.Request): boolean => {\n  return req.headers.authorization?.startsWith(BASIC) ?? false\n}\n\nconst bearerTokenFromReq = (req: express.Request) => {\n  const header = req.headers.authorization || ''\n  if (!header.startsWith(BEARER)) return null\n  return header.slice(BEARER.length).trim()\n}\n\nexport const parseBasicAuth = (\n  token: string,\n): { username: string; password: string } | null => {\n  if (!token.startsWith(BASIC)) return null\n  const b64 = token.slice(BASIC.length)\n  let parsed: string[]\n  try {\n    parsed = ui8.toString(ui8.fromString(b64, 'base64pad'), 'utf8').split(':')\n  } catch (err) {\n    return null\n  }\n  const [username, password] = parsed\n  if (!username || !password) return null\n  return { username, password }\n}\n\nexport const buildBasicAuth = (username: string, password: string): string => {\n  return (\n    BASIC +\n    ui8.toString(ui8.fromString(`${username}:${password}`, 'utf8'), 'base64pad')\n  )\n}\n\nconst keyEncoder = new KeyEncoder('secp256k1')\nexport const createPublicKeyObject = (publicKeyHex: string): KeyObject => {\n  const key = keyEncoder.encodePublic(publicKeyHex, 'raw', 'pem')\n  return crypto.createPublicKey({ format: 'pem', key })\n}\n\nconst verifySig = (\n  publicKey: Uint8Array,\n  data: Uint8Array,\n  sig: Uint8Array,\n) => {\n  const keyEncoder = new KeyEncoder('secp256k1')\n\n  const pemKey = keyEncoder.encodePublic(\n    ui8.toString(publicKey, 'hex'),\n    'raw',\n    'pem',\n  )\n  const key = crypto.createPublicKey({ format: 'pem', key: pemKey })\n\n  return crypto.verify(\n    'sha256',\n    data,\n    {\n      key,\n      dsaEncoding: 'ieee-p1363',\n    },\n    sig,\n  )\n}\n\nexport const verifySignatureWithKey: VerifySignatureWithKeyFn = async (\n  didKey: string,\n  msgBytes: Uint8Array,\n  sigBytes: Uint8Array,\n  alg: string,\n) => {\n  if (alg === SECP256K1_JWT_ALG) {\n    const parsed = parseDidKey(didKey)\n    if (alg !== parsed.jwtAlg) {\n      throw new Error(`Expected key alg ${alg}, got ${parsed.jwtAlg}`)\n    }\n\n    return verifySig(parsed.keyBytes, msgBytes, sigBytes)\n  }\n\n  return cryptoVerifySignatureWithKey(didKey, msgBytes, sigBytes, alg)\n}\n"]}

package/dist/config.d.ts

@@ -32,8 +32,8 @@ export interface ServerConfigValues {
     debugMode?: boolean;
     port?: number;
     publicUrl?: string;
-    serverDid: string;
-    alternateAudienceDids: string[];
+    serverDid: DidString;
+    alternateAudienceDids: DidString[];
     entrywayJwtPublicKeyHex?: string;
     liveNowConfig?: LiveNowConfig;
     etcdHosts: string[];
@@ -66,9 +66,9 @@ export interface ServerConfigValues {
     blobRateLimitBypassHostname?: string;
     didPlcUrl: string;
     handleResolveNameservers?: string[];
-    modServiceDid: string;
+    modServiceDid: DidString;
     adminPasswords: string[];
-    labelsFromIssuerDids?: string[];
+    labelsFromIssuerDids?: DidString[];
     indexedAtEpoch?: Date;
     blobCacheLocation?: string;
     eventProxyTrackingEndpoint?: string;
@@ -107,8 +107,8 @@ export declare class ServerConfig {
     get debugMode(): boolean;
     get port(): number | undefined;
     get publicUrl(): string | undefined;
-    get serverDid(): string;
-    get alternateAudienceDids(): string[];
+    get serverDid(): `did:${string}:${string}`;
+    get alternateAudienceDids(): `did:${string}:${string}`[];
     get entrywayJwtPublicKeyHex(): string | undefined;
     get liveNowConfig(): LiveNowConfig | undefined;
     get etcdHosts(): string[];
@@ -142,7 +142,7 @@ export declare class ServerConfig {
     get didPlcUrl(): string;
     get handleResolveNameservers(): string[] | undefined;
     get adminPasswords(): string[];
-    get modServiceDid(): string;
+    get modServiceDid(): `did:${string}:${string}`;
     get labelsFromIssuerDids(): DidString[];
     get blobCacheLocation(): string | undefined;
     get eventProxyTrackingEndpoint(): string | undefined;

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}

package/dist/config.js

@@ -13,10 +13,12 @@ export class ServerConfig {
         process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test';
         const publicUrl = process.env.BSKY_PUBLIC_URL || undefined;
         const serverDid = process.env.BSKY_SERVER_DID || 'did:example:test';
+        assert(isDidString(serverDid));
         const envPort = parseInt(process.env.BSKY_PORT || '', 10);
         const port = isNaN(envPort) ? 2584 : envPort;
         const didPlcUrl = process.env.BSKY_DID_PLC_URL || 'http://localhost:2582';
         const alternateAudienceDids = envList(process.env.BSKY_ALT_AUDIENCE_DIDS);
+        assert(alternateAudienceDids.every(isDidString));
         const entrywayJwtPublicKeyHex = process.env.BSKY_ENTRYWAY_JWT_PUBLIC_KEY_HEX || undefined;
         let liveNowConfig;
         if (process.env.BSKY_LIVE_NOW_CONFIG) {
@@ -58,6 +60,7 @@ export class ServerConfig {
         assert(dataplaneUrls.length || dataplaneUrlsEtcdKeyPrefix, 'dataplane urls are not configured directly nor with etcd');
         assert(dataplaneHttpVersion === '1.1' || dataplaneHttpVersion === '2');
         const labelsFromIssuerDids = envList(process.env.BSKY_LABELS_FROM_ISSUER_DIDS);
+        assert(labelsFromIssuerDids.every(isDidString));
         const bsyncUrl = process.env.BSKY_BSYNC_URL || undefined;
         assert(bsyncUrl);
         const bsyncApiKey = process.env.BSKY_BSYNC_API_KEY || undefined;
@@ -80,7 +83,7 @@ export class ServerConfig {
         assert(!blobRateLimitBypassKey || blobRateLimitBypassHostname, 'must specify a hostname when using a blob rate limit bypass key');
         const adminPasswords = envList(process.env.BSKY_ADMIN_PASSWORDS || process.env.BSKY_ADMIN_PASSWORD);
         const modServiceDid = process.env.MOD_SERVICE_DID;
-        assert(modServiceDid);
+        assert(modServiceDid != null && isDidString(modServiceDid));
         const eventProxyTrackingEndpoint = process.env.BSKY_EVENT_PROXY_TRACKING_ENDPOINT || undefined;
         const growthBookApiHost = process.env.BSKY_GROWTHBOOK_API_HOST || undefined;
         const growthBookClientKey = process.env.NODE_ENV === 'test'