@atproto/ozone 0.0.17-next.0 → 0.0.17-next.1

package/tests/moderation-statuses.test.ts

@@ -6,8 +6,8 @@ import {
   ModeratorClient,
 } from '@atproto/dev-env'
 import {
-  ComAtprotoAdminDefs,
-  ComAtprotoAdminQueryModerationStatuses,
+  ToolsOzoneModerationDefs,
+  ToolsOzoneModerationQueryStatuses,
 } from '@atproto/api'
 import { forSnapshot } from './_util'
 import {
@@ -17,7 +17,7 @@ import {
 import {
   REVIEWOPEN,
   REVIEWNONE,
-} from '../src/lexicon/types/com/atproto/admin/defs'
+} from '../src/lexicon/types/tools/ozone/moderation/defs'
 
 describe('moderation-statuses', () => {
   let network: TestNetwork
@@ -79,19 +79,19 @@ describe('moderation-statuses', () => {
 
   describe('query statuses', () => {
     it('returns statuses for subjects that received moderation events', async () => {
-      const response = await modClient.queryModerationStatuses({})
+      const response = await modClient.queryStatuses({})
 
       expect(forSnapshot(response.subjectStatuses)).toMatchSnapshot()
     })
 
     it('returns statuses filtered by subject language', async () => {
-      const klingonQueue = await modClient.queryModerationStatuses({
+      const klingonQueue = await modClient.queryStatuses({
         tags: ['lang:i'],
       })
 
       expect(forSnapshot(klingonQueue.subjectStatuses)).toMatchSnapshot()
 
-      const nonKlingonQueue = await modClient.queryModerationStatuses({
+      const nonKlingonQueue = await modClient.queryStatuses({
         excludeTags: ['lang:i'],
       })
 
@@ -104,13 +104,13 @@ describe('moderation-statuses', () => {
     it('returns paginated statuses', async () => {
       // We know there will be exactly 4 statuses in db
       const getPaginatedStatuses = async (
-        params: ComAtprotoAdminQueryModerationStatuses.QueryParams,
+        params: ToolsOzoneModerationQueryStatuses.QueryParams,
       ) => {
         let cursor: string | undefined = ''
-        const statuses: ComAtprotoAdminDefs.SubjectStatusView[] = []
+        const statuses: ToolsOzoneModerationDefs.SubjectStatusView[] = []
         let count = 0
         do {
-          const results = await modClient.queryModerationStatuses({
+          const results = await modClient.queryStatuses({
             limit: 1,
             cursor,
             ...params,
@@ -128,10 +128,10 @@ describe('moderation-statuses', () => {
       expect(list[0].id).toEqual(7)
       expect(list[list.length - 1].id).toEqual(1)
 
-      await modClient.emitModerationEvent({
+      await modClient.emitEvent({
         subject: list[1].subject,
         event: {
-          $type: 'com.atproto.admin.defs#modEventAcknowledge',
+          $type: 'tools.ozone.moderation.defs#modEventAcknowledge',
           comment: 'X',
         },
       })
@@ -160,7 +160,7 @@ describe('moderation-statuses', () => {
         cid: sc.posts[sc.dids.alice][0].ref.cidStr,
       }
       const getBobsAccountStatus = async () => {
-        const data = await modClient.queryModerationStatuses({
+        const data = await modClient.queryStatuses({
           subject: bobsAccount.did,
         })
 
@@ -170,20 +170,20 @@ describe('moderation-statuses', () => {
       const bobsAccountStatusBeforeTag = await getBobsAccountStatus()
 
       await Promise.all([
-        modClient.emitModerationEvent({
+        modClient.emitEvent({
           subject: bobsAccount,
           event: {
-            $type: 'com.atproto.admin.defs#modEventTag',
+            $type: 'tools.ozone.moderation.defs#modEventTag',
             add: ['newTag'],
             remove: [],
             comment: 'X',
           },
           createdBy: sc.dids.alice,
         }),
-        modClient.emitModerationEvent({
+        modClient.emitEvent({
           subject: bobsAccount,
           event: {
-            $type: 'com.atproto.admin.defs#modEventComment',
+            $type: 'tools.ozone.moderation.defs#modEventComment',
             comment: 'X',
           },
           createdBy: sc.dids.alice,
@@ -197,7 +197,7 @@ describe('moderation-statuses', () => {
 
       // Since alice's post didn't have a reviewState it is set to reviewNone on first non-impactful event
       const getAlicesPostStatus = async () => {
-        const data = await modClient.queryModerationStatuses({
+        const data = await modClient.queryStatuses({
           subject: alicesPost.uri,
         })
 
@@ -207,10 +207,10 @@ describe('moderation-statuses', () => {
       const alicesPostStatusBeforeTag = await getAlicesPostStatus()
       expect(alicesPostStatusBeforeTag).toBeUndefined()
 
-      await modClient.emitModerationEvent({
+      await modClient.emitEvent({
         subject: alicesPost,
         event: {
-          $type: 'com.atproto.admin.defs#modEventComment',
+          $type: 'tools.ozone.moderation.defs#modEventComment',
           comment: 'X',
         },
         createdBy: sc.dids.alice,
@@ -218,10 +218,10 @@ describe('moderation-statuses', () => {
       const alicesPostStatusAfterTag = await getAlicesPostStatus()
       expect(alicesPostStatusAfterTag.reviewState).toEqual(REVIEWNONE)
 
-      await modClient.emitModerationEvent({
+      await modClient.emitEvent({
         subject: alicesPost,
         event: {
-          $type: 'com.atproto.admin.defs#modEventReport',
+          $type: 'tools.ozone.moderation.defs#modEventReport',
           reportType: REASONMISLEADING,
           comment: 'X',
         },
@@ -236,9 +236,9 @@ describe('moderation-statuses', () => {
     it('are tracked on takendown subject', async () => {
       const post = sc.posts[sc.dids.carol][0]
       assert(post.images.length > 1)
-      await modClient.emitModerationEvent({
+      await modClient.emitEvent({
         event: {
-          $type: 'com.atproto.admin.defs#modEventTakedown',
+          $type: 'tools.ozone.moderation.defs#modEventTakedown',
         },
         subject: {
           $type: 'com.atproto.repo.strongRef',
@@ -248,7 +248,7 @@ describe('moderation-statuses', () => {
         subjectBlobCids: [post.images[0].image.ref.toString()],
         createdBy: sc.dids.alice,
       })
-      const result = await modClient.queryModerationStatuses({
+      const result = await modClient.queryStatuses({
         subject: post.ref.uriStr,
       })
       expect(result.subjectStatuses.length).toBe(1)
@@ -260,9 +260,9 @@ describe('moderation-statuses', () => {
 
     it('are tracked on reverse-takendown subject based on previous status', async () => {
       const post = sc.posts[sc.dids.carol][0]
-      await modClient.emitModerationEvent({
+      await modClient.emitEvent({
         event: {
-          $type: 'com.atproto.admin.defs#modEventReverseTakedown',
+          $type: 'tools.ozone.moderation.defs#modEventReverseTakedown',
         },
         subject: {
           $type: 'com.atproto.repo.strongRef',
@@ -270,7 +270,7 @@ describe('moderation-statuses', () => {
           cid: post.ref.cidStr,
         },
       })
-      const result = await modClient.queryModerationStatuses({
+      const result = await modClient.queryStatuses({
         subject: post.ref.uriStr,
       })
       expect(result.subjectStatuses.length).toBe(1)

package/tests/moderation.test.ts

@@ -6,7 +6,7 @@ import {
   basicSeed,
   ModeratorClient,
 } from '@atproto/dev-env'
-import AtpAgent, { ComAtprotoAdminEmitModerationEvent } from '@atproto/api'
+import AtpAgent, { ToolsOzoneModerationEmitEvent } from '@atproto/api'
 import { AtUri } from '@atproto/syntax'
 import { forSnapshot } from './_util'
 import {
@@ -18,7 +18,7 @@ import {
   ModEventLabel,
   REVIEWCLOSED,
   REVIEWESCALATED,
-} from '../src/lexicon/types/com/atproto/admin/defs'
+} from '../src/lexicon/types/tools/ozone/moderation/defs'
 import { EventReverser } from '../src'
 import { TestOzone } from '@atproto/dev-env/src/ozone'
 import { ImageInvalidator } from '../src/image-invalidator'
@@ -176,10 +176,9 @@ describe('moderation', () => {
         subject: repoSubject(sc.dids.bob),
       })
 
-      const moderationStatusOnBobsAccount =
-        await modClient.queryModerationStatuses({
-          subject: sc.dids.bob,
-        })
+      const moderationStatusOnBobsAccount = await modClient.queryStatuses({
+        subject: sc.dids.bob,
+      })
 
       // Validate that subject status is set to review closed and takendown flag is on
       expect(moderationStatusOnBobsAccount.subjectStatuses[0]).toMatchObject({
@@ -204,10 +203,10 @@ describe('moderation', () => {
         uri: alicesPostRef.uri.toString(),
         cid: alicesPostRef.cid.toString(),
       }
-      await modClient.emitModerationEvent(
+      await modClient.emitEvent(
         {
           event: {
-            $type: 'com.atproto.admin.defs#modEventEscalate',
+            $type: 'tools.ozone.moderation.defs#modEventEscalate',
             comment: 'Y',
           },
           subject: alicesPostSubject,
@@ -216,7 +215,7 @@ describe('moderation', () => {
         'triage',
       )
 
-      const alicesPostStatus = await modClient.queryModerationStatuses({
+      const alicesPostStatus = await modClient.queryStatuses({
         subject: alicesPostRef.uri.toString(),
       })
 
@@ -234,10 +233,10 @@ describe('moderation', () => {
         uri: alicesPostRef.uri.toString(),
         cid: alicesPostRef.cid.toString(),
       }
-      await modClient.emitModerationEvent(
+      await modClient.emitEvent(
         {
           event: {
-            $type: 'com.atproto.admin.defs#modEventComment',
+            $type: 'tools.ozone.moderation.defs#modEventComment',
             sticky: true,
             comment: 'This is a persistent note',
           },
@@ -247,7 +246,7 @@ describe('moderation', () => {
         'triage',
       )
 
-      const alicesPostStatus = await modClient.queryModerationStatuses({
+      const alicesPostStatus = await modClient.queryStatuses({
         subject: alicesPostRef.uri.toString(),
       })
 
@@ -259,8 +258,8 @@ describe('moderation', () => {
     it('reverses status when revert event is triggered.', async () => {
       const alicesPostRef = sc.posts[sc.dids.alice][0].ref
       const emitModEvent = async (
-        event: ComAtprotoAdminEmitModerationEvent.InputSchema['event'],
-        overwrites: Partial<ComAtprotoAdminEmitModerationEvent.InputSchema> = {},
+        event: ToolsOzoneModerationEmitEvent.InputSchema['event'],
+        overwrites: Partial<ToolsOzoneModerationEmitEvent.InputSchema> = {},
       ) => {
         const baseAction = {
           subject: {
@@ -270,7 +269,7 @@ describe('moderation', () => {
           },
           createdBy: 'did:example:admin',
         }
-        return modClient.emitModerationEvent({
+        return modClient.emitEvent({
           event,
           ...baseAction,
           ...overwrites,
@@ -278,20 +277,19 @@ describe('moderation', () => {
       }
       // Validate that subject status is marked as escalated
       await emitModEvent({
-        $type: 'com.atproto.admin.defs#modEventReport',
+        $type: 'tools.ozone.moderation.defs#modEventReport',
         reportType: REASONSPAM,
       })
       await emitModEvent({
-        $type: 'com.atproto.admin.defs#modEventReport',
+        $type: 'tools.ozone.moderation.defs#modEventReport',
         reportType: REASONMISLEADING,
       })
       await emitModEvent({
-        $type: 'com.atproto.admin.defs#modEventEscalate',
+        $type: 'tools.ozone.moderation.defs#modEventEscalate',
+      })
+      const alicesPostStatusAfterEscalation = await modClient.queryStatuses({
+        subject: alicesPostRef.uriStr,
       })
-      const alicesPostStatusAfterEscalation =
-        await modClient.queryModerationStatuses({
-          subject: alicesPostRef.uriStr,
-        })
       expect(
         alicesPostStatusAfterEscalation.subjectStatuses[0].reviewState,
       ).toEqual(REVIEWESCALATED)
@@ -299,30 +297,28 @@ describe('moderation', () => {
       // Validate that subject status is marked as takendown
 
       await emitModEvent({
-        $type: 'com.atproto.admin.defs#modEventLabel',
+        $type: 'tools.ozone.moderation.defs#modEventLabel',
         createLabelVals: ['nsfw'],
         negateLabelVals: [],
       })
       await emitModEvent({
-        $type: 'com.atproto.admin.defs#modEventTakedown',
+        $type: 'tools.ozone.moderation.defs#modEventTakedown',
       })
 
-      const alicesPostStatusAfterTakedown =
-        await modClient.queryModerationStatuses({
-          subject: alicesPostRef.uriStr,
-        })
+      const alicesPostStatusAfterTakedown = await modClient.queryStatuses({
+        subject: alicesPostRef.uriStr,
+      })
       expect(alicesPostStatusAfterTakedown.subjectStatuses[0]).toMatchObject({
         reviewState: REVIEWCLOSED,
         takendown: true,
       })
 
       await emitModEvent({
-        $type: 'com.atproto.admin.defs#modEventReverseTakedown',
+        $type: 'tools.ozone.moderation.defs#modEventReverseTakedown',
+      })
+      const alicesPostStatusAfterRevert = await modClient.queryStatuses({
+        subject: alicesPostRef.uriStr,
       })
-      const alicesPostStatusAfterRevert =
-        await modClient.queryModerationStatuses({
-          subject: alicesPostRef.uriStr,
-        })
       // Validate that after reverting, the status of the subject is reverted to the last status changing event
       expect(alicesPostStatusAfterRevert.subjectStatuses[0]).toMatchObject({
         reviewState: REVIEWCLOSED,
@@ -482,10 +478,10 @@ describe('moderation', () => {
     })
 
     it('does not allow triage moderators to label.', async () => {
-      const attemptLabel = modClient.emitModerationEvent(
+      const attemptLabel = modClient.emitEvent(
         {
           event: {
-            $type: 'com.atproto.admin.defs#modEventLabel',
+            $type: 'tools.ozone.moderation.defs#modEventLabel',
             negateLabelVals: ['a'],
             createLabelVals: ['b', 'c'],
           },
@@ -624,10 +620,10 @@ describe('moderation', () => {
     })
 
     it('allows full moderators to takedown.', async () => {
-      await modClient.emitModerationEvent(
+      await modClient.emitEvent(
         {
           event: {
-            $type: 'com.atproto.admin.defs#modEventTakedown',
+            $type: 'tools.ozone.moderation.defs#modEventTakedown',
           },
           createdBy: 'did:example:moderator',
           subject: {
@@ -647,10 +643,10 @@ describe('moderation', () => {
     })
 
     it('does not allow non-full moderators to takedown.', async () => {
-      const attemptTakedownTriage = modClient.emitModerationEvent(
+      const attemptTakedownTriage = modClient.emitEvent(
         {
           event: {
-            $type: 'com.atproto.admin.defs#modEventTakedown',
+            $type: 'tools.ozone.moderation.defs#modEventTakedown',
           },
           createdBy: 'did:example:moderator',
           subject: {
@@ -679,7 +675,7 @@ describe('moderation', () => {
       })
       await ozone.processAll()
 
-      const statusesAfterTakedown = await modClient.queryModerationStatuses(
+      const statusesAfterTakedown = await modClient.queryStatuses(
         { subject: sc.dids.bob },
         'moderator',
       )
@@ -697,11 +693,8 @@ describe('moderation', () => {
       await ozone.processAll()
 
       const [eventList, statuses] = await Promise.all([
-        modClient.queryModerationEvents({ subject: sc.dids.bob }, 'moderator'),
-        modClient.queryModerationStatuses(
-          { subject: sc.dids.bob },
-          'moderator',
-        ),
+        modClient.queryEvents({ subject: sc.dids.bob }, 'moderator'),
+        modClient.queryStatuses({ subject: sc.dids.bob }, 'moderator'),
       ])
 
       expect(statuses.subjectStatuses[0]).toMatchObject({
@@ -713,7 +706,7 @@ describe('moderation', () => {
       expect(eventList.events[0]).toMatchObject({
         createdBy: action.createdBy,
         event: {
-          $type: 'com.atproto.admin.defs#modEventReverseTakedown',
+          $type: 'tools.ozone.moderation.defs#modEventReverseTakedown',
           comment:
             '[SCHEDULED_REVERSAL] Reverting action as originally scheduled',
         },
@@ -737,16 +730,16 @@ describe('moderation', () => {
     })
 
     async function emitLabelEvent(
-      opts: Partial<ComAtprotoAdminEmitModerationEvent.InputSchema> & {
-        subject: ComAtprotoAdminEmitModerationEvent.InputSchema['subject']
+      opts: Partial<ToolsOzoneModerationEmitEvent.InputSchema> & {
+        subject: ToolsOzoneModerationEmitEvent.InputSchema['subject']
         createLabelVals: ModEventLabel['createLabelVals']
         negateLabelVals: ModEventLabel['negateLabelVals']
       },
     ) {
       const { createLabelVals, negateLabelVals } = opts
-      const result = await modClient.emitModerationEvent({
+      const result = await modClient.emitEvent({
         event: {
-          $type: 'com.atproto.admin.defs#modEventLabel',
+          $type: 'tools.ozone.moderation.defs#modEventLabel',
           createLabelVals,
           negateLabelVals,
         },
@@ -758,13 +751,13 @@ describe('moderation', () => {
     }
 
     async function reverse(
-      opts: Partial<ComAtprotoAdminEmitModerationEvent.InputSchema> & {
-        subject: ComAtprotoAdminEmitModerationEvent.InputSchema['subject']
+      opts: Partial<ToolsOzoneModerationEmitEvent.InputSchema> & {
+        subject: ToolsOzoneModerationEmitEvent.InputSchema['subject']
       },
     ) {
-      await modClient.emitModerationEvent({
+      await modClient.emitEvent({
         event: {
-          $type: 'com.atproto.admin.defs#modEventReverseTakedown',
+          $type: 'tools.ozone.moderation.defs#modEventReverseTakedown',
         },
         createdBy: 'did:example:admin',
         reason: 'Y',
@@ -773,7 +766,7 @@ describe('moderation', () => {
     }
 
     async function getRecordLabels(uri: string) {
-      const result = await agent.api.com.atproto.admin.getRecord(
+      const result = await agent.api.tools.ozone.moderation.getRecord(
         { uri },
         { headers: await network.ozone.modHeaders() },
       )
@@ -782,7 +775,7 @@ describe('moderation', () => {
     }
 
     async function getRepoLabels(did: string) {
-      const result = await agent.api.com.atproto.admin.getRepo(
+      const result = await agent.api.tools.ozone.moderation.getRepo(
         { did },
         { headers: await network.ozone.modHeaders() },
       )
@@ -818,7 +811,7 @@ describe('moderation', () => {
     })
 
     it('sets blobCids in moderation status', async () => {
-      const { subjectStatuses } = await modClient.queryModerationStatuses({
+      const { subjectStatuses } = await modClient.queryStatuses({
         subject: post.ref.uriStr,
       })
 

package/tests/query-labels.test.ts

@@ -1,12 +1,16 @@
 import AtpAgent from '@atproto/api'
-import { TestNetwork } from '@atproto/dev-env'
+import { EXAMPLE_LABELER, TestNetwork } from '@atproto/dev-env'
 import { DisconnectError, Subscription } from '@atproto/xrpc-server'
 import { ids, lexicons } from '../src/lexicon/lexicons'
 import { Label } from '../src/lexicon/types/com/atproto/label/defs'
+import { Secp256k1Keypair, verifySignature } from '@atproto/crypto'
+import { cborEncode } from '@atproto/common'
+import { ModerationService } from '../src/mod-service'
 import {
   OutputSchema as LabelMessage,
   isLabels,
 } from '../src/lexicon/types/com/atproto/label/subscribeLabels'
+import { getSigningKeyId } from '../src/util'
 
 describe('ozone query labels', () => {
   let network: TestNetwork
@@ -21,44 +25,44 @@ describe('ozone query labels', () => {
 
     agent = network.ozone.getClient()
 
-    labels = [
+    const toCreate = [
       {
-        src: 'did:example:labeler',
+        src: EXAMPLE_LABELER,
         uri: 'did:example:blah',
         val: 'spam',
         neg: false,
         cts: new Date().toISOString(),
       },
       {
-        src: 'did:example:labeler',
+        src: EXAMPLE_LABELER,
         uri: 'did:example:blah',
         val: 'impersonation',
         neg: false,
         cts: new Date().toISOString(),
       },
       {
-        src: 'did:example:labeler',
+        src: EXAMPLE_LABELER,
         uri: 'at://did:example:blah/app.bsky.feed.post/1234abcde',
         val: 'spam',
         neg: false,
         cts: new Date().toISOString(),
       },
       {
-        src: 'did:example:labeler',
+        src: EXAMPLE_LABELER,
         uri: 'at://did:example:blah/app.bsky.feed.post/1234abcfg',
         val: 'spam',
         neg: false,
         cts: new Date().toISOString(),
       },
       {
-        src: 'did:example:labeler',
+        src: EXAMPLE_LABELER,
         uri: 'at://did:example:blah/app.bsky.actor.profile/self',
         val: 'spam',
         neg: false,
         cts: new Date().toISOString(),
       },
       {
-        src: 'did:example:labeler',
+        src: EXAMPLE_LABELER,
         uri: 'did:example:thing',
         val: 'spam',
         neg: false,
@@ -67,7 +71,7 @@ describe('ozone query labels', () => {
     ]
 
     const modService = network.ozone.ctx.modService(network.ozone.ctx.db)
-    await modService.createLabels(labels)
+    labels = await modService.createLabels(toCreate)
   })
 
   afterAll(async () => {
@@ -128,6 +132,72 @@ describe('ozone query labels', () => {
     )
   })
 
+  it('returns validly signed labels', async () => {
+    const res = await agent.api.com.atproto.label.queryLabels({
+      uriPatterns: ['*'],
+    })
+    const signingKey = network.ozone.ctx.signingKey.did()
+    for (const label of res.data.labels) {
+      const { sig, ...rest } = label
+      if (!sig) {
+        throw new Error('Missing signature')
+      }
+      const encodedLabel = cborEncode(rest)
+      const isValid = await verifySignature(signingKey, encodedLabel, sig)
+      expect(isValid).toBe(true)
+    }
+  })
+
+  it('resigns labels if the signingKey changes', async () => {
+    // mock changing the signing key for the service
+    const ctx = network.ozone.ctx
+    const origModServiceFn = ctx.modService
+
+    const modSrvc = ctx.modService(ctx.db)
+    const newSigningKey = await Secp256k1Keypair.create()
+    const newSigningKeyId = await getSigningKeyId(ctx.db, newSigningKey.did())
+    ctx.devOverride({
+      modService: ModerationService.creator(
+        newSigningKey,
+        newSigningKeyId,
+        ctx.cfg,
+        modSrvc.backgroundQueue,
+        ctx.idResolver,
+        modSrvc.eventPusher,
+        modSrvc.appviewAgent,
+        ctx.serviceAuthHeaders,
+      ),
+    })
+
+    const res = await agent.api.com.atproto.label.queryLabels({
+      uriPatterns: ['*'],
+    })
+    for (const label of res.data.labels) {
+      const { sig, ...rest } = label
+      if (!sig) {
+        throw new Error('Missing signature')
+      }
+      const encodedLabel = cborEncode(rest)
+      const isValid = await verifySignature(
+        newSigningKey.did(),
+        encodedLabel,
+        sig,
+      )
+      expect(isValid).toBe(true)
+    }
+
+    await network.ozone.processAll()
+
+    const fromDb = await ctx.db.db.selectFrom('label').selectAll().execute()
+    expect(fromDb.every((row) => row.signingKeyId === newSigningKeyId)).toBe(
+      true,
+    )
+
+    ctx.devOverride({
+      modService: origModServiceFn,
+    })
+  })
+
   describe('subscribeLabels', () => {
     it('streams all labels from initial cursor.', async () => {
       const ac = new AbortController()
@@ -154,7 +224,13 @@ describe('ozone query labels', () => {
       for await (const message of sub) {
         resetDoneTimer()
         if (isLabels(message)) {
-          streamedLabels.push(...message.labels)
+          for (const label of message.labels) {
+            // sigs are currently parsed as a Buffer which is a Uint8Array under the hood, but fails our equality test so we cast to Uint8Array
+            streamedLabels.push({
+              ...label,
+              sig: label.sig ? new Uint8Array(label.sig) : undefined,
+            })
+          }
         }
       }
       expect(streamedLabels).toEqual(labels)