@atproto/ozone 0.1.63 → 0.1.65

package/tests/blob-divert.test.ts

@@ -1,10 +1,11 @@
-import assert from 'node:assert'
 import {
   ModeratorClient,
   SeedClient,
   TestNetwork,
   basicSeed,
 } from '@atproto/dev-env'
+import { ResponseType, XRPCError } from '@atproto/xrpc'
+import assert from 'node:assert'
 import { forSnapshot } from './_util'
 
 describe('blob divert', () => {
@@ -30,13 +31,16 @@ describe('blob divert', () => {
     await network.close()
   })
 
-  const mockReportServiceResponse = (result: boolean) => {
+  const mockReportServiceResponse = (succeeds: boolean) => {
     const blobDiverter = network.ozone.ctx.blobDiverter
     assert(blobDiverter)
     return jest
-      .spyOn(blobDiverter, 'sendImage')
+      .spyOn(blobDiverter, 'uploadBlob')
       .mockImplementation(async () => {
-        return result
+        if (!succeeds) {
+          // Using an XRPCError to trigger retries
+          throw new XRPCError(ResponseType.Unknown, undefined)
+        }
       })
   }
 
@@ -46,6 +50,8 @@ describe('blob divert', () => {
     cid: sc.posts[sc.dids.carol][0].ref.cidStr,
   })
 
+  const getImages = () => sc.posts[sc.dids.carol][0].images
+
   const emitDivertEvent = async () =>
     modClient.emitEvent(
       {
@@ -55,9 +61,7 @@ describe('blob divert', () => {
           comment: 'Diverting for test',
         },
         createdBy: sc.dids.alice,
-        subjectBlobCids: sc.posts[sc.dids.carol][0].images.map((img) =>
-          img.image.ref.toString(),
-        ),
+        subjectBlobCids: getImages().map((img) => img.image.ref.toString()),
       },
       'moderator',
     )
@@ -65,25 +69,32 @@ describe('blob divert', () => {
   it('fails and keeps attempt count when report service fails to accept upload.', async () => {
     // Simulate failure to fail upload
     const reportServiceRequest = mockReportServiceResponse(false)
+    try {
+      await expect(emitDivertEvent()).rejects.toThrow('Failed to process blobs')
 
-    await expect(emitDivertEvent()).rejects.toThrow()
-
-    expect(reportServiceRequest).toHaveBeenCalled()
+      // 1 initial attempt + 3 retries
+      expect(reportServiceRequest).toHaveBeenCalledTimes(getImages().length * 4)
+    } finally {
+      reportServiceRequest.mockRestore()
+    }
   })
 
   it('sends blobs to configured divert service and marks divert date', async () => {
-    // Simulate failure to accept upload
+    // Simulate success to accept upload
     const reportServiceRequest = mockReportServiceResponse(true)
+    try {
+      const divertEvent = await emitDivertEvent()
 
-    const divertEvent = await emitDivertEvent()
+      expect(reportServiceRequest).toHaveBeenCalledTimes(getImages().length)
+      expect(forSnapshot(divertEvent)).toMatchSnapshot()
 
-    expect(reportServiceRequest).toHaveBeenCalled()
-    expect(forSnapshot(divertEvent)).toMatchSnapshot()
-
-    const { subjectStatuses } = await modClient.queryStatuses({
-      subject: getSubject().uri,
-    })
+      const { subjectStatuses } = await modClient.queryStatuses({
+        subject: getSubject().uri,
+      })
 
-    expect(subjectStatuses[0].takendown).toBe(true)
+      expect(subjectStatuses[0].takendown).toBe(true)
+    } finally {
+      reportServiceRequest.mockRestore()
+    }
   })
 })

package/tests/moderation.test.ts

@@ -816,7 +816,9 @@ describe('moderation', () => {
     it.skip('prevents image blob from being served, even when cached.', async () => {
       const fetchImage = await fetch(imageUri)
       expect(fetchImage.status).toEqual(404)
-      expect(await fetchImage.json()).toEqual({ message: 'Image not found' })
+      expect(await fetchImage.json()).toMatchObject({
+        message: 'Blob not found',
+      })
     })
 
     it('invalidates the image in the cdn', async () => {

package/tests/server.test.ts

@@ -1,8 +1,7 @@
-import { AddressInfo } from 'net'
+import { TestNetwork, TestOzone } from '@atproto/dev-env'
 import express from 'express'
-import axios, { AxiosError } from 'axios'
-import { TestOzone, TestNetwork } from '@atproto/dev-env'
 import { handler as errorHandler } from '../src/error'
+import { startServer } from './_util'
 
 describe('server', () => {
   let network: TestNetwork
@@ -20,56 +19,45 @@ describe('server', () => {
   })
 
   it('preserves 404s.', async () => {
-    const promise = axios.get(`${ozone.url}/unknown`)
-    await expect(promise).rejects.toThrow('failed with status code 404')
+    const response = await fetch(`${ozone.url}/unknown`)
+    expect(response.status).toEqual(404)
   })
 
   it('error handler turns unknown errors into 500s.', async () => {
     const app = express()
-    app.get('/oops', () => {
-      throw new Error('Oops!')
-    })
-    app.use(errorHandler)
-    const srv = app.listen()
-    const port = (srv.address() as AddressInfo).port
-    const promise = axios.get(`http://localhost:${port}/oops`)
-    await expect(promise).rejects.toThrow('failed with status code 500')
-    srv.close()
+      .get('/oops', () => {
+        throw new Error('Oops!')
+      })
+      .use(errorHandler)
+
+    const { origin, stop } = await startServer(app)
     try {
-      await promise
-    } catch (err: unknown) {
-      const axiosError = err as AxiosError
-      expect(axiosError.response?.status).toEqual(500)
-      expect(axiosError.response?.data).toEqual({
+      const response = await fetch(new URL(`/oops`, origin))
+      expect(response.status).toEqual(500)
+      await expect(response.json()).resolves.toEqual({
         error: 'InternalServerError',
         message: 'Internal Server Error',
       })
+    } finally {
+      await stop()
     }
   })
 
   it('healthcheck succeeds when database is available.', async () => {
-    const { data, status } = await axios.get(`${ozone.url}/xrpc/_health`)
-    expect(status).toEqual(200)
-    expect(data).toEqual({ version: '0.0.0' })
+    const response = await fetch(`${network.bsky.url}/xrpc/_health`)
+    expect(response.status).toEqual(200)
+    await expect(response.json()).resolves.toEqual({ version: 'unknown' })
   })
 
   it('healthcheck fails when database is unavailable.', async () => {
     // destroy sequencer to release connection that would prevent the db from closing
     await ozone.ctx.sequencer.destroy()
     await ozone.ctx.db.close()
-    let error: AxiosError
-    try {
-      await axios.get(`${ozone.url}/xrpc/_health`)
-      throw new Error('Healthcheck should have failed')
-    } catch (err) {
-      if (axios.isAxiosError(err)) {
-        error = err
-      } else {
-        throw err
-      }
-    }
-    expect(error.response?.status).toEqual(503)
-    expect(error.response?.data).toEqual({
+
+    const res = await fetch(`${ozone.url}/xrpc/_health`)
+
+    expect(res.status).toEqual(503)
+    await expect(res.json()).resolves.toEqual({
       version: '0.0.0',
       error: 'Service Unavailable',
     })

package/tests/takedown.test.ts

@@ -0,0 +1,64 @@
+import {
+  TestNetwork,
+  TestOzone,
+  SeedClient,
+  basicSeed,
+  ModeratorClient,
+} from '@atproto/dev-env'
+import { AtpAgent } from '@atproto/api'
+
+describe('moderation', () => {
+  let network: TestNetwork
+  let ozone: TestOzone
+  let agent: AtpAgent
+  let bskyAgent: AtpAgent
+  let pdsAgent: AtpAgent
+  let sc: SeedClient
+  let modClient: ModeratorClient
+
+  const repoSubject = (did: string) => ({
+    $type: 'com.atproto.admin.defs#repoRef',
+    did,
+  })
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'ozone_takedown',
+    })
+    ozone = network.ozone
+    agent = network.ozone.getClient()
+    bskyAgent = network.bsky.getClient()
+    pdsAgent = network.pds.getClient()
+    sc = network.getSeedClient()
+    modClient = network.ozone.getModClient()
+    await basicSeed(sc)
+    await network.processAll()
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  it('allows specifying policy for takedown actions.', async () => {
+    await modClient.performTakedown({
+      subject: repoSubject(sc.dids.bob),
+      policies: ['trolling'],
+    })
+
+    // Verify that that the takedown even exposes the policy specified for it
+    const { events } = await modClient.queryEvents({
+      subject: sc.dids.bob,
+      types: ['tools.ozone.moderation.defs#modEventTakedown'],
+    })
+
+    expect(events[0].event.policies?.[0]).toEqual('trolling')
+
+    // Verify that event stream can be filtered by policy
+    const { events: filteredEvents } = await modClient.queryEvents({
+      subject: sc.dids.bob,
+      policies: ['trolling'],
+    })
+
+    expect(filteredEvents[0].subject.did).toEqual(sc.dids.bob)
+  })
+})

package/tsconfig.tests.tsbuildinfo

@@ -1 +1 @@
-{"root":["./tests/3p-labeler.test.ts","./tests/_util.ts","./tests/ack-all-subjects-of-account.test.ts","./tests/blob-divert.test.ts","./tests/communication-templates.test.ts","./tests/content-tagger.test.ts","./tests/db.test.ts","./tests/get-config.test.ts","./tests/get-lists.test.ts","./tests/get-profiles.test.ts","./tests/get-record.test.ts","./tests/get-records.test.ts","./tests/get-repo.test.ts","./tests/get-repos.test.ts","./tests/get-starter-pack.test.ts","./tests/moderation-appeals.test.ts","./tests/moderation-events.test.ts","./tests/moderation-status-tags.test.ts","./tests/moderation-statuses.test.ts","./tests/moderation.test.ts","./tests/protected-tags.test.ts","./tests/query-labels.test.ts","./tests/record-and-account-events.test.ts","./tests/repo-search.test.ts","./tests/report-muting.test.ts","./tests/sequencer.test.ts","./tests/server.test.ts","./tests/sets.test.ts","./tests/settings.test.ts","./tests/team.test.ts"],"version":"5.6.3"}
+{"root":["./tests/3p-labeler.test.ts","./tests/_util.ts","./tests/ack-all-subjects-of-account.test.ts","./tests/blob-divert.test.ts","./tests/communication-templates.test.ts","./tests/content-tagger.test.ts","./tests/db.test.ts","./tests/get-config.test.ts","./tests/get-lists.test.ts","./tests/get-profiles.test.ts","./tests/get-record.test.ts","./tests/get-records.test.ts","./tests/get-repo.test.ts","./tests/get-repos.test.ts","./tests/get-starter-pack.test.ts","./tests/moderation-appeals.test.ts","./tests/moderation-events.test.ts","./tests/moderation-status-tags.test.ts","./tests/moderation-statuses.test.ts","./tests/moderation.test.ts","./tests/protected-tags.test.ts","./tests/query-labels.test.ts","./tests/record-and-account-events.test.ts","./tests/repo-search.test.ts","./tests/report-muting.test.ts","./tests/sequencer.test.ts","./tests/server.test.ts","./tests/sets.test.ts","./tests/settings.test.ts","./tests/takedown.test.ts","./tests/team.test.ts"],"version":"5.6.3"}