@atproto/ozone 0.0.16 → 0.0.17-next.1

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)

package/tests/repo-search.test.ts

@@ -1,4 +1,9 @@
-import { SeedClient, TestNetwork, usersBulkSeed } from '@atproto/dev-env'
+import {
+  ModeratorClient,
+  SeedClient,
+  TestNetwork,
+  usersBulkSeed,
+} from '@atproto/dev-env'
 import AtpAgent from '@atproto/api'
 import { paginateAll } from './_util'
 
@@ -6,16 +11,18 @@ describe('admin repo search view', () => {
   let network: TestNetwork
   let agent: AtpAgent
   let sc: SeedClient
+  let modClient: ModeratorClient
   let headers: { [s: string]: string }
 
   beforeAll(async () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'ozone_admin_repo_search',
     })
-    agent = network.pds.getClient()
+    agent = network.ozone.getClient()
     sc = network.getSeedClient()
+    modClient = network.ozone.getModClient()
     await usersBulkSeed(sc)
-    headers = network.pds.adminAuthHeaders()
+    headers = await network.ozone.modHeaders()
     await network.processAll()
   })
 
@@ -24,8 +31,8 @@ describe('admin repo search view', () => {
   })
 
   beforeAll(async () => {
-    await sc.emitModerationEvent({
-      event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
+    await modClient.emitEvent({
+      event: { $type: 'tools.ozone.moderation.defs#modEventTakedown' },
       subject: {
         $type: 'com.atproto.admin.defs#repoRef',
         did: sc.dids['cara-wiegand69.test'],
@@ -34,7 +41,7 @@ describe('admin repo search view', () => {
   })
 
   it('gives relevant results', async () => {
-    const result = await agent.api.com.atproto.admin.searchRepos(
+    const result = await agent.api.tools.ozone.moderation.searchRepos(
       { term: 'car' },
       { headers },
     )
@@ -64,7 +71,7 @@ describe('admin repo search view', () => {
 
   it('finds repo by did', async () => {
     const term = sc.dids['cara-wiegand69.test']
-    const res = await agent.api.com.atproto.admin.searchRepos(
+    const res = await agent.api.tools.ozone.moderation.searchRepos(
       { term },
       { headers },
     )
@@ -76,7 +83,7 @@ describe('admin repo search view', () => {
   it('paginates with term', async () => {
     const results = (results) => results.flatMap((res) => res.users)
     const paginator = async (cursor?: string) => {
-      const res = await agent.api.com.atproto.admin.searchRepos(
+      const res = await agent.api.tools.ozone.moderation.searchRepos(
         { term: 'p', cursor, limit: 3 },
         { headers },
       )
@@ -88,7 +95,7 @@ describe('admin repo search view', () => {
       expect(res.repos.length).toBeLessThanOrEqual(3),
     )
 
-    const full = await agent.api.com.atproto.admin.searchRepos(
+    const full = await agent.api.tools.ozone.moderation.searchRepos(
       { term: 'p' },
       { headers },
     )
@@ -100,7 +107,7 @@ describe('admin repo search view', () => {
   it('paginates without term', async () => {
     const results = (results) => results.flatMap((res) => res.repos)
     const paginator = async (cursor?: string) => {
-      const res = await agent.api.com.atproto.admin.searchRepos(
+      const res = await agent.api.tools.ozone.moderation.searchRepos(
         { cursor, limit: 3 },
         { headers },
       )
@@ -112,7 +119,7 @@ describe('admin repo search view', () => {
       expect(res.repos.length).toBeLessThanOrEqual(3),
     )
 
-    const full = await agent.api.com.atproto.admin.searchRepos(
+    const full = await agent.api.tools.ozone.moderation.searchRepos(
       { limit: 15 },
       { headers },
     )

package/tests/sequencer.test.ts

@@ -1,4 +1,4 @@
-import { TestNetwork } from '@atproto/dev-env'
+import { EXAMPLE_LABELER, TestNetwork } from '@atproto/dev-env'
 import { readFromGenerator, wait } from '@atproto/common'
 import { LabelsEvt, Sequencer } from '../src/sequencer'
 import Outbox from '../src/sequencer/outbox'
@@ -33,11 +33,14 @@ describe('sequencer', () => {
   }
 
   const evtToDbRow = (e: LabelsEvt) => {
-    const label = e.labels[0]
+    const { ver: _, ...label } = e.labels[0]
     return {
       id: e.seq,
       ...label,
       cid: label.cid ? label.cid : '',
+      exp: null,
+      sig: label.sig ? Buffer.from(label.sig) : null,
+      signingKeyId: network.ozone.ctx.signingKeyId,
     }
   }
 
@@ -54,7 +57,7 @@ describe('sequencer', () => {
     for (let i = 0; i < count; i++) {
       const did = `did:example:${randomStr(10, 'base32')}`
       const label = {
-        src: 'did:example:labeler',
+        src: EXAMPLE_LABELER,
         uri: did,
         val: 'spam',
         neg: false,

package/dist/api/admin/util.d.ts

@@ -1,5 +0,0 @@
-import AppContext from '../../context';
-import { RepoView, RepoViewDetail, AccountView } from '../../lexicon/types/com/atproto/admin/defs';
-export declare const getPdsAccountInfo: (ctx: AppContext, did: string) => Promise<AccountView | null>;
-export declare const addAccountInfoToRepoViewDetail: (repoView: RepoViewDetail, accountInfo: AccountView | null, includeEmail?: boolean) => RepoViewDetail;
-export declare const addAccountInfoToRepoView: (repoView: RepoView, accountInfo: AccountView | null, includeEmail?: boolean) => RepoView;

package/dist/api/moderation/util.d.ts

@@ -1,4 +0,0 @@
-import { InputSchema as ReportInput } from '../../lexicon/types/com/atproto/moderation/createReport';
-export declare const getReasonType: (reasonType: ReportInput['reasonType']) => string | boolean;
-export declare const getEventType: (type: string) => "com.atproto.admin.defs#modEventTakedown" | "com.atproto.admin.defs#modEventAcknowledge" | "com.atproto.admin.defs#modEventEscalate" | "com.atproto.admin.defs#modEventComment" | "com.atproto.admin.defs#modEventLabel" | "com.atproto.admin.defs#modEventReport" | "com.atproto.admin.defs#modEventMute" | "com.atproto.admin.defs#modEventReverseTakedown" | "com.atproto.admin.defs#modEventEmail" | "com.atproto.admin.defs#modEventResolveAppeal" | "com.atproto.admin.defs#modEventTag";
-export declare const getReviewState: (reviewState?: string) => "com.atproto.admin.defs#reviewOpen" | "com.atproto.admin.defs#reviewEscalated" | "com.atproto.admin.defs#reviewClosed" | undefined;

package/src/api/admin/emitModerationEvent.ts

@@ -1,170 +0,0 @@
-import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
-import { Server } from '../../lexicon'
-import AppContext from '../../context'
-import {
-  isModEventEmail,
-  isModEventLabel,
-  isModEventReverseTakedown,
-  isModEventTakedown,
-} from '../../lexicon/types/com/atproto/admin/defs'
-import { subjectFromInput } from '../../mod-service/subject'
-import { ModerationLangService } from '../../mod-service/lang'
-import { retryHttp } from '../../util'
-
-export default function (server: Server, ctx: AppContext) {
-  server.com.atproto.admin.emitModerationEvent({
-    auth: ctx.authVerifier.modOrRole,
-    handler: async ({ input, auth }) => {
-      const access = auth.credentials
-      const db = ctx.db
-      const moderationService = ctx.modService(db)
-      const { createdBy, event } = input.body
-      const isTakedownEvent = isModEventTakedown(event)
-      const isReverseTakedownEvent = isModEventReverseTakedown(event)
-      const isLabelEvent = isModEventLabel(event)
-      const subject = subjectFromInput(
-        input.body.subject,
-        input.body.subjectBlobCids,
-      )
-
-      // apply access rules
-
-      // if less than moderator access then can only take ack and escalation actions
-      if (isTakedownEvent || isReverseTakedownEvent) {
-        if (!access.isModerator) {
-          throw new AuthRequiredError(
-            'Must be a full moderator to take this type of action',
-          )
-        }
-
-        // Non admins should not be able to take down feed generators
-        if (
-          !access.isAdmin &&
-          subject.recordPath?.includes('app.bsky.feed.generator/')
-        ) {
-          throw new AuthRequiredError(
-            'Must be a full admin to take this type of action on feed generators',
-          )
-        }
-      }
-      // if less than moderator access then can not apply labels
-      if (!access.isModerator && isLabelEvent) {
-        throw new AuthRequiredError('Must be a full moderator to label content')
-      }
-
-      if (isLabelEvent) {
-        validateLabels([
-          ...(event.createLabelVals ?? []),
-          ...(event.negateLabelVals ?? []),
-        ])
-      }
-
-      if (isTakedownEvent || isReverseTakedownEvent) {
-        const status = await moderationService.getStatus(subject)
-
-        if (status?.takendown && isTakedownEvent) {
-          throw new InvalidRequestError(`Subject is already taken down`)
-        }
-
-        if (!status?.takendown && isReverseTakedownEvent) {
-          throw new InvalidRequestError(`Subject is not taken down`)
-        }
-
-        if (status?.takendown && isReverseTakedownEvent && subject.isRecord()) {
-          // due to the way blob status is modeled, we should reverse takedown on all
-          // blobs for the record being restored, which aren't taken down on another record.
-          subject.blobCids = status.blobCids ?? []
-        }
-      }
-
-      if (isModEventEmail(event) && event.content) {
-        // sending email prior to logging the event to avoid a long transaction below
-        if (!subject.isRepo()) {
-          throw new InvalidRequestError(
-            'Email can only be sent to a repo subject',
-          )
-        }
-        const { content, subjectLine } = event
-        await retryHttp(() =>
-          ctx.modService(db).sendEmail({
-            subject: subjectLine,
-            content,
-            recipientDid: subject.did,
-          }),
-        )
-      }
-
-      const moderationEvent = await db.transaction(async (dbTxn) => {
-        const moderationTxn = ctx.modService(dbTxn)
-
-        const result = await moderationTxn.logEvent({
-          event,
-          subject,
-          createdBy,
-        })
-
-        const moderationLangService = new ModerationLangService(moderationTxn)
-        await moderationLangService.tagSubjectWithLang({
-          subject,
-          createdBy: ctx.cfg.service.did,
-          subjectStatus: result.subjectStatus,
-        })
-
-        if (subject.isRepo()) {
-          if (isTakedownEvent) {
-            const isSuspend = !!result.event.durationInHours
-            await moderationTxn.takedownRepo(
-              subject,
-              result.event.id,
-              isSuspend,
-            )
-          } else if (isReverseTakedownEvent) {
-            await moderationTxn.reverseTakedownRepo(subject)
-          }
-        }
-
-        if (subject.isRecord()) {
-          if (isTakedownEvent) {
-            await moderationTxn.takedownRecord(subject, result.event.id)
-          } else if (isReverseTakedownEvent) {
-            await moderationTxn.reverseTakedownRecord(subject)
-          }
-        }
-
-        if (isLabelEvent) {
-          await moderationTxn.formatAndCreateLabels(
-            result.event.subjectUri ?? result.event.subjectDid,
-            result.event.subjectCid,
-            {
-              create: result.event.createLabelVals?.length
-                ? result.event.createLabelVals.split(' ')
-                : undefined,
-              negate: result.event.negateLabelVals?.length
-                ? result.event.negateLabelVals.split(' ')
-                : undefined,
-            },
-          )
-        }
-
-        return result.event
-      })
-
-      return {
-        encoding: 'application/json',
-        body: moderationService.views.formatEvent(moderationEvent),
-      }
-    },
-  })
-}
-
-const validateLabels = (labels: string[]) => {
-  for (const label of labels) {
-    for (const char of badChars) {
-      if (label.includes(char)) {
-        throw new InvalidRequestError(`Invalid label: ${label}`)
-      }
-    }
-  }
-}
-
-const badChars = [' ', ',', ';', `'`, `"`]

package/src/api/admin/util.ts

@@ -1,54 +0,0 @@
-import AppContext from '../../context'
-import {
-  RepoView,
-  RepoViewDetail,
-  AccountView,
-} from '../../lexicon/types/com/atproto/admin/defs'
-
-export const getPdsAccountInfo = async (
-  ctx: AppContext,
-  did: string,
-): Promise<AccountView | null> => {
-  const agent = ctx.pdsAgent
-  if (!agent) return null
-  const auth = await ctx.pdsAuth()
-  if (!auth) return null
-  try {
-    const res = await agent.api.com.atproto.admin.getAccountInfo({ did }, auth)
-    return res.data
-  } catch (err) {
-    return null
-  }
-}
-
-export const addAccountInfoToRepoViewDetail = (
-  repoView: RepoViewDetail,
-  accountInfo: AccountView | null,
-  includeEmail = false,
-): RepoViewDetail => {
-  if (!accountInfo) return repoView
-  return {
-    ...repoView,
-    email: includeEmail ? accountInfo.email : undefined,
-    invitedBy: accountInfo.invitedBy,
-    invitesDisabled: accountInfo.invitesDisabled,
-    inviteNote: accountInfo.inviteNote,
-    invites: accountInfo.invites,
-    emailConfirmedAt: accountInfo.emailConfirmedAt,
-  }
-}
-
-export const addAccountInfoToRepoView = (
-  repoView: RepoView,
-  accountInfo: AccountView | null,
-  includeEmail = false,
-): RepoView => {
-  if (!accountInfo) return repoView
-  return {
-    ...repoView,
-    email: includeEmail ? accountInfo.email : undefined,
-    invitedBy: accountInfo.invitedBy,
-    invitesDisabled: accountInfo.invitesDisabled,
-    inviteNote: accountInfo.inviteNote,
-  }
-}

package/src/api/moderation/util.ts

@@ -1,67 +0,0 @@
-import { InvalidRequestError } from '@atproto/xrpc-server'
-import { InputSchema as ReportInput } from '../../lexicon/types/com/atproto/moderation/createReport'
-import {
-  REASONOTHER,
-  REASONSPAM,
-  REASONMISLEADING,
-  REASONRUDE,
-  REASONSEXUAL,
-  REASONVIOLATION,
-  REASONAPPEAL,
-} from '../../lexicon/types/com/atproto/moderation/defs'
-import {
-  REVIEWCLOSED,
-  REVIEWESCALATED,
-  REVIEWOPEN,
-} from '../../lexicon/types/com/atproto/admin/defs'
-import { ModerationEvent } from '../../db/schema/moderation_event'
-import { ModerationSubjectStatusRow } from '../../mod-service/types'
-
-export const getReasonType = (reasonType: ReportInput['reasonType']) => {
-  if (reasonTypes.has(reasonType)) {
-    return reasonType as NonNullable<ModerationEvent['meta']>['reportType']
-  }
-  throw new InvalidRequestError('Invalid reason type')
-}
-
-export const getEventType = (type: string) => {
-  if (eventTypes.has(type)) {
-    return type as ModerationEvent['action']
-  }
-  throw new InvalidRequestError('Invalid event type')
-}
-
-export const getReviewState = (reviewState?: string) => {
-  if (!reviewState) return undefined
-  if (reviewStates.has(reviewState)) {
-    return reviewState as ModerationSubjectStatusRow['reviewState']
-  }
-  throw new InvalidRequestError('Invalid review state')
-}
-
-const reviewStates = new Set([REVIEWCLOSED, REVIEWESCALATED, REVIEWOPEN])
-
-const reasonTypes = new Set([
-  REASONOTHER,
-  REASONSPAM,
-  REASONMISLEADING,
-  REASONRUDE,
-  REASONSEXUAL,
-  REASONVIOLATION,
-  REASONAPPEAL,
-])
-
-const eventTypes = new Set([
-  'com.atproto.admin.defs#modEventTakedown',
-  'com.atproto.admin.defs#modEventAcknowledge',
-  'com.atproto.admin.defs#modEventEscalate',
-  'com.atproto.admin.defs#modEventComment',
-  'com.atproto.admin.defs#modEventLabel',
-  'com.atproto.admin.defs#modEventReport',
-  'com.atproto.admin.defs#modEventMute',
-  'com.atproto.admin.defs#modEventUnmute',
-  'com.atproto.admin.defs#modEventReverseTakedown',
-  'com.atproto.admin.defs#modEventEmail',
-  'com.atproto.admin.defs#modEventResolveAppeal',
-  'com.atproto.admin.defs#modEventTag',
-])