@atproto/ozone 0.1.63 → 0.1.65

package/dist/util.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatLabelerHeader = exports.defaultLabelerHeader = exports.parseLabelerHeader = exports.LABELER_HEADER_NAME = exports.getSigningKeyId = void 0;
-exports.retryHttp = retryHttp;
-exports.retryableHttp = retryableHttp;
-const axios_1 = require("axios");
-const structured_headers_1 = require("structured-headers");
-const xrpc_1 = require("@atproto/xrpc");
+exports.formatLabelerHeader = exports.defaultLabelerHeader = exports.parseLabelerHeader = exports.LABELER_HEADER_NAME = exports.retryHttp = exports.RETRYABLE_HTTP_STATUS_CODES = exports.getSigningKeyId = void 0;
 const common_1 = require("@atproto/common");
+const xrpc_1 = require("@atproto/xrpc");
+const structured_headers_1 = require("structured-headers");
 const getSigningKeyId = async (db, signingKey) => {
     const selectRes = await db.db
         .selectFrom('signing_key')
@@ -24,25 +21,17 @@ const getSigningKeyId = async (db, signingKey) => {
     return insertRes.id;
 };
 exports.getSigningKeyId = getSigningKeyId;
-async function retryHttp(fn, opts = {}) {
-    return (0, common_1.retry)(fn, { retryable: retryableHttp, ...opts });
-}
-function retryableHttp(err) {
+exports.RETRYABLE_HTTP_STATUS_CODES = new Set([
+    408, 425, 429, 500, 502, 503, 504, 522, 524,
+]);
+exports.retryHttp = (0, common_1.createRetryable)((err) => {
     if (err instanceof xrpc_1.XRPCError) {
         if (err.status === xrpc_1.ResponseType.Unknown)
             return true;
-        return retryableHttpStatusCodes.has(err.status);
-    }
-    if (err instanceof axios_1.AxiosError) {
-        if (!err.response)
-            return true;
-        return retryableHttpStatusCodes.has(err.response.status);
+        return exports.RETRYABLE_HTTP_STATUS_CODES.has(err.status);
     }
     return false;
-}
-const retryableHttpStatusCodes = new Set([
-    408, 425, 429, 500, 502, 503, 504, 522, 524,
-]);
+});
 exports.LABELER_HEADER_NAME = 'atproto-accept-labelers';
 const parseLabelerHeader = (header, ignoreDid) => {
     if (!header)

package/dist/util.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.63",
+  "version": "0.1.65",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
@@ -18,7 +18,6 @@
   "bin": "dist/bin.js",
   "dependencies": {
     "@did-plc/lib": "^0.0.1",
-    "axios": "^1.6.7",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
     "express": "^4.17.2",
@@ -32,14 +31,15 @@
     "structured-headers": "^1.0.1",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
-    "@atproto/api": "^0.13.24",
-    "@atproto/common": "^0.4.5",
+    "undici": "^6.14.1",
+    "@atproto/api": "^0.13.26",
+    "@atproto/common": "^0.4.6",
     "@atproto/crypto": "^0.4.2",
-    "@atproto/identity": "^0.4.3",
-    "@atproto/lexicon": "^0.4.4",
+    "@atproto/identity": "^0.4.4",
+    "@atproto/lexicon": "^0.4.5",
     "@atproto/syntax": "^0.3.1",
-    "@atproto/xrpc": "^0.6.5",
-    "@atproto/xrpc-server": "^0.7.4"
+    "@atproto/xrpc": "^0.6.6",
+    "@atproto/xrpc-server": "^0.7.5"
   },
   "devDependencies": {
     "@did-plc/server": "^0.0.1",
@@ -48,12 +48,11 @@
     "@types/express-serve-static-core": "^4.17.36",
     "@types/pg": "^8.6.6",
     "@types/qs": "^6.9.7",
-    "axios": "^0.27.2",
     "jest": "^28.1.2",
     "ts-node": "^10.8.2",
     "typescript": "^5.6.3",
-    "@atproto/lex-cli": "^0.5.4",
-    "@atproto/pds": "^0.4.80"
+    "@atproto/lex-cli": "^0.5.5",
+    "@atproto/pds": "^0.4.82"
   },
   "scripts": {
     "codegen": "lex gen-server --yes ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/* ../../lexicons/tools/ozone/*/*",

package/src/api/moderation/queryEvents.ts

@@ -25,6 +25,7 @@ export default function (server: Server, ctx: AppContext) {
         reportTypes,
         collections = [],
         subjectType,
+        policies,
       } = params
       const db = ctx.db
       const modService = ctx.modService(db)
@@ -47,6 +48,7 @@ export default function (server: Server, ctx: AppContext) {
         reportTypes,
         collections,
         subjectType,
+        policies,
       })
       return {
         encoding: 'application/json',

package/src/daemon/blob-diverter.ts

@@ -1,16 +1,19 @@
 import {
-  VerifyCidTransform,
-  forwardStreamErrors,
+  createDecoders,
   getPdsEndpoint,
+  VerifyCidTransform,
+  allFulfilled,
 } from '@atproto/common'
 import { IdResolver } from '@atproto/identity'
-import axios from 'axios'
-import { Readable } from 'stream'
+import { ResponseType, XRPCError } from '@atproto/xrpc'
 import { CID } from 'multiformats/cid'
+import { Readable } from 'node:stream'
+import { finished, pipeline } from 'node:stream/promises'
+import * as undici from 'undici'
 
+import { BlobDivertConfig } from '../config'
 import Database from '../db'
 import { retryHttp } from '../util'
-import { BlobDivertConfig } from '../config'
 
 export class BlobDiverter {
   serviceConfig: BlobDivertConfig
@@ -27,126 +30,158 @@ export class BlobDiverter {
     this.idResolver = services.idResolver
   }
 
-  private async getBlob({
-    pds,
-    did,
-    cid,
-  }: {
-    pds: string
-    did: string
-    cid: string
-  }) {
-    const blobResponse = await axios.get(
-      `${pds}/xrpc/com.atproto.sync.getBlob`,
-      {
-        params: { did, cid },
-        decompress: true,
-        responseType: 'stream',
-        timeout: 5000, // 5sec of inactivity on the connection
-      },
-    )
-    const imageStream: Readable = blobResponse.data
-    const verifyCid = new VerifyCidTransform(CID.parse(cid))
-    forwardStreamErrors(imageStream, verifyCid)
-
-    return {
-      contentType:
-        blobResponse.headers['content-type'] || 'application/octet-stream',
-      imageStream: imageStream.pipe(verifyCid),
+  /**
+   * @throws {XRPCError} so that retryHttp can handle retries
+   */
+  async getBlob(options: GetBlobOptions): Promise<Blob> {
+    const blobUrl = getBlobUrl(options)
+
+    const blobResponse = await undici
+      .request(blobUrl, {
+        headersTimeout: 10e3,
+        bodyTimeout: 30e3,
+      })
+      .catch((err) => {
+        throw asXrpcClientError(err, `Error fetching blob ${options.cid}`)
+      })
+
+    if (blobResponse.statusCode !== 200) {
+      blobResponse.body.destroy()
+      throw new XRPCError(
+        blobResponse.statusCode,
+        undefined,
+        `Error downloading blob ${options.cid}`,
+      )
     }
-  }
-
-  async sendImage({
-    url,
-    imageStream,
-    contentType,
-  }: {
-    url: string
-    imageStream: Readable
-    contentType: string
-  }) {
-    const result = await axios(url, {
-      method: 'POST',
-      data: imageStream,
-      headers: {
-        Authorization: basicAuth('admin', this.serviceConfig.adminPassword),
-        'Content-Type': contentType,
-      },
-    })
 
-    return result.status === 200
+    try {
+      const type = blobResponse.headers['content-type']
+      const encoding = blobResponse.headers['content-encoding']
+
+      const verifier = new VerifyCidTransform(CID.parse(options.cid))
+
+      void pipeline([
+        blobResponse.body,
+        ...createDecoders(encoding),
+        verifier,
+      ]).catch((_err) => {})
+
+      return {
+        type: typeof type === 'string' ? type : 'application/octet-stream',
+        stream: verifier,
+      }
+    } catch (err) {
+      // Typically un-supported content encoding
+      blobResponse.body.destroy()
+      throw err
+    }
   }
 
-  private async uploadBlob(
-    {
-      imageStream,
-      contentType,
-    }: { imageStream: Readable; contentType: string },
-    {
-      subjectDid,
-      subjectUri,
-    }: { subjectDid: string; subjectUri: string | null },
-  ) {
-    const url = new URL(
-      `${this.serviceConfig.url}/xrpc/com.atproto.unspecced.reportBlob`,
-    )
-    url.searchParams.set('did', subjectDid)
-    if (subjectUri) url.searchParams.set('uri', subjectUri)
-    const result = await this.sendImage({
-      url: url.toString(),
-      imageStream,
-      contentType,
-    })
+  /**
+   * @throws {XRPCError} so that retryHttp can handle retries
+   */
+  async uploadBlob(blob: Blob, report: ReportBlobOptions) {
+    const uploadUrl = reportBlobUrl(this.serviceConfig.url, report)
+
+    const result = await undici
+      .request(uploadUrl, {
+        method: 'POST',
+        body: blob.stream,
+        headersTimeout: 30e3,
+        bodyTimeout: 10e3,
+        headers: {
+          Authorization: basicAuth('admin', this.serviceConfig.adminPassword),
+          'content-type': blob.type,
+        },
+      })
+      .catch((err) => {
+        throw asXrpcClientError(err, `Error uploading blob ${report.did}`)
+      })
+
+    if (result.statusCode !== 200) {
+      result.body.destroy()
+      throw new XRPCError(
+        result.statusCode,
+        undefined,
+        `Error uploading blob ${report.did}`,
+      )
+    }
 
-    return result
+    await finished(result.body.resume())
   }
 
   async uploadBlobOnService({
-    subjectDid,
-    subjectUri,
+    subjectDid: did,
+    subjectUri: uri,
     subjectBlobCids,
   }: {
     subjectDid: string
     subjectUri: string | null
     subjectBlobCids: string[]
-  }): Promise<boolean> {
-    const didDoc = await this.idResolver.did.resolve(subjectDid)
-
-    if (!didDoc) {
-      throw new Error('Error resolving DID')
-    }
+  }): Promise<void> {
+    const didDoc = await this.idResolver.did.resolve(did)
+    if (!didDoc) throw new Error('Error resolving DID')
 
     const pds = getPdsEndpoint(didDoc)
+    if (!pds) throw new Error('Error resolving PDS')
 
-    if (!pds) {
-      throw new Error('Error resolving PDS')
-    }
-
-    // attempt to download and upload within the same retry block since the imageStream is not reusable
-    const uploadResult = await Promise.all(
+    await allFulfilled(
       subjectBlobCids.map((cid) =>
         retryHttp(async () => {
-          const { imageStream, contentType } = await this.getBlob({
-            pds,
-            cid,
-            did: subjectDid,
-          })
-          return this.uploadBlob(
-            { imageStream, contentType },
-            { subjectDid, subjectUri },
-          )
+          // attempt to download and upload within the same retry block since
+          // the blob stream is not reusable
+          const blob = await this.getBlob({ pds, cid, did })
+          return this.uploadBlob(blob, { did, uri })
         }),
       ),
-    )
-
-    if (uploadResult.includes(false)) {
-      throw new Error(`Error uploading blob ${subjectUri}`)
-    }
-
-    return true
+    ).catch((err) => {
+      throw new XRPCError(
+        ResponseType.UpstreamFailure,
+        undefined,
+        'Failed to process blobs',
+        undefined,
+        { cause: err },
+      )
+    })
   }
 }
 
 const basicAuth = (username: string, password: string) => {
   return 'Basic ' + Buffer.from(`${username}:${password}`).toString('base64')
 }
+
+type Blob = {
+  type: string
+  stream: Readable
+}
+
+type GetBlobOptions = {
+  pds: string
+  did: string
+  cid: string
+}
+
+function getBlobUrl({ pds, did, cid }: GetBlobOptions): URL {
+  const url = new URL(`/xrpc/com.atproto.sync.getBlob`, pds)
+  url.searchParams.set('did', did)
+  url.searchParams.set('cid', cid)
+  return url
+}
+
+type ReportBlobOptions = {
+  did: string
+  uri: string | null
+}
+
+function reportBlobUrl(service: string, { did, uri }: ReportBlobOptions): URL {
+  const url = new URL(`/xrpc/com.atproto.unspecced.reportBlob`, service)
+  url.searchParams.set('did', did)
+  if (uri != null) url.searchParams.set('uri', uri)
+  return url
+}
+
+function asXrpcClientError(err: unknown, message: string) {
+  return new XRPCError(ResponseType.Unknown, undefined, message, undefined, {
+    cause: err,
+  })
+}

package/src/lexicon/lexicons.ts

@@ -11309,6 +11309,15 @@ export const schemaDict = {
             description:
               'If true, all other reports on content authored by this account will be resolved (acknowledged).',
           },
+          policies: {
+            type: 'array',
+            maxLength: 5,
+            items: {
+              type: 'string',
+            },
+            description:
+              'Names/Keywords of the policies that drove the decision.',
+          },
         },
       },
       modEventReverseTakedown: {
@@ -12345,6 +12354,14 @@ export const schemaDict = {
                 type: 'string',
               },
             },
+            policies: {
+              type: 'array',
+              items: {
+                type: 'string',
+                description:
+                  'If specified, only events where the policy matches the given policy are returned',
+              },
+            },
             cursor: {
               type: 'string',
             },

package/src/lexicon/types/tools/ozone/moderation/defs.ts

@@ -174,6 +174,8 @@ export interface ModEventTakedown {
   durationInHours?: number
   /** If true, all other reports on content authored by this account will be resolved (acknowledged). */
   acknowledgeAccountSubjects?: boolean
+  /** Names/Keywords of the policies that drove the decision. */
+  policies?: string[]
   [k: string]: unknown
 }
 

package/src/lexicon/types/tools/ozone/moderation/queryEvents.ts

@@ -40,6 +40,7 @@ export interface QueryParams {
   /** If specified, only events where all of these tags were removed are returned */
   removedTags?: string[]
   reportTypes?: string[]
+  policies?: string[]
   cursor?: string
 }
 

package/src/mod-service/index.ts

@@ -152,6 +152,7 @@ export class ModerationService {
     reportTypes?: string[]
     collections: string[]
     subjectType?: string
+    policies?: string[]
   }): Promise<{ cursor?: string; events: ModerationEventRow[] }> {
     const {
       subject,
@@ -172,6 +173,7 @@ export class ModerationService {
       reportTypes,
       collections,
       subjectType,
+      policies,
     } = opts
     const { ref } = this.db.db.dynamic
     let builder = this.db.db.selectFrom('moderation_event').selectAll()
@@ -264,6 +266,14 @@ export class ModerationService {
     if (reportTypes?.length) {
       builder = builder.where(sql`meta->>'reportType'`, 'in', reportTypes)
     }
+    if (policies?.length) {
+      builder = builder.where((qb) => {
+        policies.forEach((policy) => {
+          qb = qb.orWhere(sql`meta->>'policies'`, 'ilike', `%${policy}%`)
+        })
+        return qb
+      })
+    }
 
     const keyset = new TimeIdKeyset(
       ref(`moderation_event.createdAt`),
@@ -435,6 +445,10 @@ export class ModerationService {
       meta.acknowledgeAccountSubjects = true
     }
 
+    if (isModEventTakedown(event) && event.policies?.length) {
+      meta.policies = event.policies.join(',')
+    }
+
     // Keep trace of reports that came in while the reporter was in muted stated
     if (isModEventReport(event)) {
       const isReportingMuted = await this.isReportingMutedForSubject(createdBy)

package/src/mod-service/views.ts

@@ -137,6 +137,17 @@ export class ModerationViews {
       }
     }
 
+    if (
+      event.action === 'tools.ozone.moderation.defs#modEventTakedown' &&
+      typeof event.meta?.policies === 'string' &&
+      event.meta.policies.length > 0
+    ) {
+      eventView.event = {
+        ...eventView.event,
+        policies: event.meta.policies.split(','),
+      }
+    }
+
     if (event.action === 'tools.ozone.moderation.defs#modEventLabel') {
       eventView.event = {
         ...eventView.event,

package/src/setting/constants.ts

@@ -1 +1,2 @@
 export const ProtectedTagSettingKey = 'tools.ozone.setting.protectedTags'
+export const PolicyListSettingKey = 'tools.ozone.setting.policyList'

package/src/setting/validators.ts

@@ -1,6 +1,6 @@
 import { Selectable } from 'kysely'
 import { Setting } from '../db/schema/setting'
-import { ProtectedTagSettingKey } from './constants'
+import { PolicyListSettingKey, ProtectedTagSettingKey } from './constants'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 
 export const settingValidators = new Map<
@@ -58,4 +58,31 @@ export const settingValidators = new Map<
       }
     },
   ],
+  [
+    PolicyListSettingKey,
+    async (setting: Partial<Selectable<Setting>>) => {
+      if (setting.managerRole !== 'tools.ozone.team.defs#roleAdmin') {
+        throw new InvalidRequestError(
+          'Only admins should be able to manage policy list',
+        )
+      }
+
+      if (typeof setting.value !== 'object') {
+        throw new InvalidRequestError('Invalid value')
+      }
+      for (const [key, val] of Object.entries(setting.value)) {
+        if (!val || typeof val !== 'object') {
+          throw new InvalidRequestError(
+            `Invalid configuration for policy ${key}`,
+          )
+        }
+
+        if (!val['name'] || !val['description']) {
+          throw new InvalidRequestError(
+            `Must define a name and description for policy ${key}`,
+          )
+        }
+      }
+    },
+  ],
 ])

package/src/util.ts

@@ -1,7 +1,6 @@
-import { AxiosError } from 'axios'
+import { createRetryable } from '@atproto/common'
+import { ResponseType, XRPCError } from '@atproto/xrpc'
 import { parseList } from 'structured-headers'
-import { XRPCError, ResponseType } from '@atproto/xrpc'
-import { RetryOptions, retry } from '@atproto/common'
 import Database from './db'
 
 export const getSigningKeyId = async (
@@ -24,28 +23,17 @@ export const getSigningKeyId = async (
   return insertRes.id
 }
 
-export async function retryHttp<T>(
-  fn: () => Promise<T>,
-  opts: RetryOptions = {},
-): Promise<T> {
-  return retry(fn, { retryable: retryableHttp, ...opts })
-}
+export const RETRYABLE_HTTP_STATUS_CODES = new Set([
+  408, 425, 429, 500, 502, 503, 504, 522, 524,
+])
 
-export function retryableHttp(err: unknown) {
+export const retryHttp = createRetryable((err: unknown) => {
   if (err instanceof XRPCError) {
     if (err.status === ResponseType.Unknown) return true
-    return retryableHttpStatusCodes.has(err.status)
-  }
-  if (err instanceof AxiosError) {
-    if (!err.response) return true
-    return retryableHttpStatusCodes.has(err.response.status)
+    return RETRYABLE_HTTP_STATUS_CODES.has(err.status)
   }
   return false
-}
-
-const retryableHttpStatusCodes = new Set([
-  408, 425, 429, 500, 502, 503, 504, 522, 524,
-])
+})
 
 export type ParsedLabelers = {
   dids: string[]

package/tests/_util.ts

@@ -1,3 +1,6 @@
+import { type Express } from 'express'
+import { Server } from 'node:http'
+import { AddressInfo } from 'node:net'
 import { AtUri } from '@atproto/syntax'
 import { lexToJson } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
@@ -195,3 +198,46 @@ export const stripViewerFromThread = <T>(thread: T): T => {
   }
   return thread
 }
+
+export async function startServer(app: Express) {
+  return new Promise<{
+    origin: string
+    server: Server
+    stop: () => Promise<void>
+  }>((resolve, reject) => {
+    const onListen = () => {
+      const port = (server.address() as AddressInfo).port
+      resolve({
+        server,
+        origin: `http://localhost:${port}`,
+        stop: () => stopServer(server),
+      })
+      cleanup()
+    }
+    const onError = (err: Error) => {
+      reject(err)
+      cleanup()
+    }
+    const cleanup = () => {
+      server.removeListener('listening', onListen)
+      server.removeListener('error', onError)
+    }
+
+    const server = app
+      .listen(0)
+      .once('listening', onListen)
+      .once('error', onError)
+  })
+}
+
+export async function stopServer(server: Server) {
+  return new Promise<void>((resolve, reject) => {
+    server.close((err) => {
+      if (err) {
+        reject(err)
+      } else {
+        resolve()
+      }
+    })
+  })
+}