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

package/src/lexicon/types/{com/atproto/admin → tools/ozone/moderation}/getRecord.ts

@@ -7,7 +7,7 @@ import { lexicons } from '../../../../lexicons'
 import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import * as ToolsOzoneModerationDefs from './defs'
 
 export interface QueryParams {
   uri: string
@@ -15,7 +15,7 @@ export interface QueryParams {
 }
 
 export type InputSchema = undefined
-export type OutputSchema = ComAtprotoAdminDefs.RecordViewDetail
+export type OutputSchema = ToolsOzoneModerationDefs.RecordViewDetail
 export type HandlerInput = undefined
 
 export interface HandlerSuccess {

package/src/lexicon/types/{com/atproto/admin → tools/ozone/moderation}/getRepo.ts

@@ -7,14 +7,14 @@ import { lexicons } from '../../../../lexicons'
 import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import * as ToolsOzoneModerationDefs from './defs'
 
 export interface QueryParams {
   did: string
 }
 
 export type InputSchema = undefined
-export type OutputSchema = ComAtprotoAdminDefs.RepoViewDetail
+export type OutputSchema = ToolsOzoneModerationDefs.RepoViewDetail
 export type HandlerInput = undefined
 
 export interface HandlerSuccess {

package/src/lexicon/types/{com/atproto/admin/queryModerationEvents.ts → tools/ozone/moderation/queryEvents.ts}

@@ -7,10 +7,10 @@ import { lexicons } from '../../../../lexicons'
 import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import * as ToolsOzoneModerationDefs from './defs'
 
 export interface QueryParams {
-  /** The types of events (fully qualified string in the format of com.atproto.admin#modEvent<name>) to filter by. If not specified, all events are returned. */
+  /** The types of events (fully qualified string in the format of tools.ozone.moderation.defs#modEvent<name>) to filter by. If not specified, all events are returned. */
   types?: string[]
   createdBy?: string
   /** Sort direction for the events. Defaults to descending order of created at timestamp. */
@@ -43,7 +43,7 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   cursor?: string
-  events: ComAtprotoAdminDefs.ModEventView[]
+  events: ToolsOzoneModerationDefs.ModEventView[]
   [k: string]: unknown
 }
 

package/src/lexicon/types/{com/atproto/admin/queryModerationStatuses.ts → tools/ozone/moderation/queryStatuses.ts}

@@ -7,7 +7,7 @@ import { lexicons } from '../../../../lexicons'
 import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import * as ToolsOzoneModerationDefs from './defs'
 
 export interface QueryParams {
   subject?: string
@@ -44,7 +44,7 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   cursor?: string
-  subjectStatuses: ComAtprotoAdminDefs.SubjectStatusView[]
+  subjectStatuses: ToolsOzoneModerationDefs.SubjectStatusView[]
   [k: string]: unknown
 }
 

package/src/lexicon/types/{com/atproto/admin → tools/ozone/moderation}/searchRepos.ts

@@ -7,7 +7,7 @@ import { lexicons } from '../../../../lexicons'
 import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
-import * as ComAtprotoAdminDefs from './defs'
+import * as ToolsOzoneModerationDefs from './defs'
 
 export interface QueryParams {
   /** DEPRECATED: use 'q' instead */
@@ -21,7 +21,7 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   cursor?: string
-  repos: ComAtprotoAdminDefs.RepoView[]
+  repos: ToolsOzoneModerationDefs.RepoView[]
   [k: string]: unknown
 }
 

package/src/mod-service/index.ts

@@ -4,6 +4,7 @@ import { CID } from 'multiformats/cid'
 import { AtUri, INVALID_HANDLE } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { addHoursToDate } from '@atproto/common'
+import { Keypair } from '@atproto/crypto'
 import { IdResolver } from '@atproto/identity'
 import AtpAgent from '@atproto/api'
 import { Database } from '../db'
@@ -17,9 +18,8 @@ import {
   isModEventTakedown,
   isModEventEmail,
   isModEventTag,
-  RepoRef,
-  RepoBlobRef,
-} from '../lexicon/types/com/atproto/admin/defs'
+} from '../lexicon/types/tools/ozone/moderation/defs'
+import { RepoRef, RepoBlobRef } from '../lexicon/types/com/atproto/admin/defs'
 import {
   adjustModerationSubjectStatus,
   getStatusIdentifierFromSubject,
@@ -46,6 +46,7 @@ import { LabelChannel } from '../db/schema/label'
 import { BlobPushEvent } from '../db/schema/blob_push_event'
 import { BackgroundQueue } from '../background'
 import { EventPusher } from '../daemon'
+import { formatLabel, formatLabelRow, signLabel } from './util'
 import { ImageInvalidator } from '../image-invalidator'
 import { httpLogger as log } from '../logger'
 import { OzoneConfig } from '../config'
@@ -55,45 +56,49 @@ export type ModerationServiceCreator = (db: Database) => ModerationService
 export class ModerationService {
   constructor(
     public db: Database,
+    public signingKey: Keypair,
+    public signingKeyId: number,
     public cfg: OzoneConfig,
     public backgroundQueue: BackgroundQueue,
     public idResolver: IdResolver,
     public eventPusher: EventPusher,
     public appviewAgent: AtpAgent,
     private createAuthHeaders: (aud: string) => Promise<AuthHeaders>,
-    public serverDid: string,
     public imgInvalidator?: ImageInvalidator,
-    public cdnPaths?: string[],
   ) {}
 
   static creator(
+    signingKey: Keypair,
+    signingKeyId: number,
     cfg: OzoneConfig,
     backgroundQueue: BackgroundQueue,
     idResolver: IdResolver,
     eventPusher: EventPusher,
     appviewAgent: AtpAgent,
     createAuthHeaders: (aud: string) => Promise<AuthHeaders>,
-    serverDid: string,
     imgInvalidator?: ImageInvalidator,
-    cdnPaths?: string[],
   ) {
     return (db: Database) =>
       new ModerationService(
         db,
+        signingKey,
+        signingKeyId,
         cfg,
         backgroundQueue,
         idResolver,
         eventPusher,
         appviewAgent,
         createAuthHeaders,
-        serverDid,
         imgInvalidator,
-        cdnPaths,
       )
   }
 
-  views = new ModerationViews(this.db, this.appviewAgent, () =>
-    this.createAuthHeaders(this.cfg.appview.did),
+  views = new ModerationViews(
+    this.db,
+    this.signingKey,
+    this.signingKeyId,
+    this.appviewAgent,
+    () => this.createAuthHeaders(this.cfg.appview.did),
   )
 
   async getEvent(id: number): Promise<ModerationEventRow | undefined> {
@@ -247,7 +252,7 @@ export class ModerationService {
   async getReport(id: number): Promise<ModerationEventRow | undefined> {
     return await this.db.db
       .selectFrom('moderation_event')
-      .where('action', '=', 'com.atproto.admin.defs#modEventReport')
+      .where('action', '=', 'tools.ozone.moderation.defs#modEventReport')
       .selectAll()
       .where('id', '=', id)
       .executeTakeFirst()
@@ -370,12 +375,12 @@ export class ModerationService {
     // Means the subject was suspended and needs to be unsuspended
     if (subject.reverseSuspend) {
       builder = builder
-        .where('action', '=', 'com.atproto.admin.defs#modEventTakedown')
+        .where('action', '=', 'tools.ozone.moderation.defs#modEventTakedown')
         .where('durationInHours', 'is not', null)
     }
     if (subject.reverseMute) {
       builder = builder
-        .where('action', '=', 'com.atproto.admin.defs#modEventMute')
+        .where('action', '=', 'tools.ozone.moderation.defs#modEventMute')
         .where('durationInHours', 'is not', null)
     }
 
@@ -422,13 +427,13 @@ export class ModerationService {
     subject,
   }: ReversibleModerationEvent): Promise<ModerationEventRow> {
     const isRevertingTakedown =
-      action === 'com.atproto.admin.defs#modEventTakedown'
+      action === 'tools.ozone.moderation.defs#modEventTakedown'
     this.db.assertTransaction()
     const { event } = await this.logEvent({
       event: {
         $type: isRevertingTakedown
-          ? 'com.atproto.admin.defs#modEventReverseTakedown'
-          : 'com.atproto.admin.defs#modEventUnmute',
+          ? 'tools.ozone.moderation.defs#modEventReverseTakedown'
+          : 'tools.ozone.moderation.defs#modEventUnmute',
         comment: comment ?? undefined,
       },
       createdAt,
@@ -560,27 +565,17 @@ export class ModerationService {
         for (const cid of blobCids) {
           blobValues.push({
             eventType,
+            takedownRef,
             subjectDid: subject.did,
+            subjectUri: subject.uri || null,
             subjectBlobCid: cid.toString(),
-            takedownRef,
           })
         }
       }
-      const blobEvts = await this.db.db
-        .insertInto('blob_push_event')
-        .values(blobValues)
-        .onConflict((oc) =>
-          oc
-            .columns(['subjectDid', 'subjectBlobCid', 'eventType'])
-            .doUpdateSet({
-              takedownRef,
-              confirmedAt: null,
-              attempts: 0,
-              lastAttempted: null,
-            }),
-        )
-        .returning(['id', 'subjectDid', 'subjectBlobCid', 'eventType'])
-        .execute()
+      const blobEvts = await this.eventPusher.logBlobPushEvent(
+        blobValues,
+        takedownRef,
+      )
 
       this.db.onCommit(() => {
         this.backgroundQueue.add(async () => {
@@ -597,7 +592,7 @@ export class ModerationService {
           if (this.imgInvalidator) {
             await Promise.allSettled(
               (subject.blobCids ?? []).map((cid) => {
-                const paths = (this.cdnPaths ?? []).map((path) =>
+                const paths = (this.cfg.cdn.paths ?? []).map((path) =>
                   path.replace('%s', subject.did).replace('%s', cid),
                 )
                 return this.imgInvalidator
@@ -698,7 +693,7 @@ export class ModerationService {
 
     const result = await this.logEvent({
       event: {
-        $type: 'com.atproto.admin.defs#modEventReport',
+        $type: 'tools.ozone.moderation.defs#modEventReport',
         reportType: reasonType,
         comment: reason,
       },
@@ -876,7 +871,7 @@ export class ModerationService {
   ): Promise<Label[]> {
     const { create = [], negate = [] } = labels
     const toCreate = create.map((val) => ({
-      src: this.serverDid,
+      src: this.cfg.service.did,
       uri,
       cid: cid ?? undefined,
       val,
@@ -884,7 +879,7 @@ export class ModerationService {
       cts: new Date().toISOString(),
     }))
     const toNegate = negate.map((val) => ({
-      src: this.serverDid,
+      src: this.cfg.service.did,
       uri,
       cid: cid ?? undefined,
       val,
@@ -892,21 +887,19 @@ export class ModerationService {
       cts: new Date().toISOString(),
     }))
     const formatted = [...toCreate, ...toNegate]
-    await this.createLabels(formatted)
-    return formatted
+    return this.createLabels(formatted)
   }
 
-  async createLabels(labels: Label[]) {
-    if (labels.length < 1) return
-    const dbVals = labels.map((l) => ({
-      ...l,
-      cid: l.cid ?? '',
-      neg: !!l.neg,
-    }))
+  async createLabels(labels: Label[]): Promise<Label[]> {
+    if (labels.length < 1) return []
+    const signedLabels = await Promise.all(
+      labels.map((l) => signLabel(l, this.signingKey)),
+    )
+    const dbVals = signedLabels.map((l) => formatLabelRow(l, this.signingKeyId))
     const { ref } = this.db.db.dynamic
     await sql`notify ${ref(LabelChannel)}`.execute(this.db.db)
     const excluded = (col: string) => ref(`excluded.${col}`)
-    await this.db.db
+    const res = await this.db.db
       .insertInto('label')
       .values(dbVals)
       .onConflict((oc) =>
@@ -916,7 +909,9 @@ export class ModerationService {
           cts: sql`${excluded('cts')}`,
         }),
       )
+      .returningAll()
       .execute()
+    return res.map((row) => formatLabel(row))
   }
 
   async sendEmail(opts: {

package/src/mod-service/lang.ts

@@ -25,7 +25,7 @@ export class ModerationLangService {
         })
         await this.moderationService.logEvent({
           event: {
-            $type: 'com.atproto.admin.defs#modEventTag',
+            $type: 'tools.ozone.moderation.defs#modEventTag',
             add: recordLangs
               ? recordLangs.map((lang) => `lang:${lang}`)
               : ['lang:und'],

package/src/mod-service/status.ts

@@ -8,7 +8,7 @@ import {
   REVIEWCLOSED,
   REVIEWESCALATED,
   REVIEWNONE,
-} from '../lexicon/types/com/atproto/admin/defs'
+} from '../lexicon/types/tools/ozone/moderation/defs'
 import { ModerationEventRow, ModerationSubjectStatusRow } from './types'
 import { HOUR } from '@atproto/common'
 import { REASONAPPEAL } from '../lexicon/types/com/atproto/moderation/defs'
@@ -32,24 +32,24 @@ const getSubjectStatusForModerationEvent = ({
     : REVIEWNONE
 
   switch (action) {
-    case 'com.atproto.admin.defs#modEventAcknowledge':
+    case 'tools.ozone.moderation.defs#modEventAcknowledge':
       return {
         lastReviewedBy: createdBy,
         reviewState: REVIEWCLOSED,
         lastReviewedAt: createdAt,
       }
-    case 'com.atproto.admin.defs#modEventReport':
+    case 'tools.ozone.moderation.defs#modEventReport':
       return {
         reviewState: REVIEWOPEN,
         lastReportedAt: createdAt,
       }
-    case 'com.atproto.admin.defs#modEventEscalate':
+    case 'tools.ozone.moderation.defs#modEventEscalate':
       return {
         lastReviewedBy: createdBy,
         reviewState: REVIEWESCALATED,
         lastReviewedAt: createdAt,
       }
-    case 'com.atproto.admin.defs#modEventReverseTakedown':
+    case 'tools.ozone.moderation.defs#modEventReverseTakedown':
       return {
         lastReviewedBy: createdBy,
         reviewState: REVIEWCLOSED,
@@ -57,7 +57,7 @@ const getSubjectStatusForModerationEvent = ({
         suspendUntil: null,
         lastReviewedAt: createdAt,
       }
-    case 'com.atproto.admin.defs#modEventUnmute':
+    case 'tools.ozone.moderation.defs#modEventUnmute':
       return {
         lastReviewedBy: createdBy,
         muteUntil: null,
@@ -66,7 +66,7 @@ const getSubjectStatusForModerationEvent = ({
         reviewState: defaultReviewState,
         lastReviewedAt: createdAt,
       }
-    case 'com.atproto.admin.defs#modEventTakedown':
+    case 'tools.ozone.moderation.defs#modEventTakedown':
       return {
         takendown: true,
         lastReviewedBy: createdBy,
@@ -76,7 +76,7 @@ const getSubjectStatusForModerationEvent = ({
           ? new Date(Date.now() + durationInHours * HOUR).toISOString()
           : null,
       }
-    case 'com.atproto.admin.defs#modEventMute':
+    case 'tools.ozone.moderation.defs#modEventMute':
       return {
         lastReviewedBy: createdBy,
         lastReviewedAt: createdAt,
@@ -88,15 +88,15 @@ const getSubjectStatusForModerationEvent = ({
         // but if it does happen, default to unnecessary
         reviewState: defaultReviewState,
       }
-    case 'com.atproto.admin.defs#modEventComment':
+    case 'tools.ozone.moderation.defs#modEventComment':
       return {
         lastReviewedBy: createdBy,
         lastReviewedAt: createdAt,
         reviewState: defaultReviewState,
       }
-    case 'com.atproto.admin.defs#modEventTag':
+    case 'tools.ozone.moderation.defs#modEventTag':
       return { tags: [], reviewState: defaultReviewState }
-    case 'com.atproto.admin.defs#modEventResolveAppeal':
+    case 'tools.ozone.moderation.defs#modEventResolveAppeal':
       return {
         appealed: false,
       }
@@ -141,7 +141,7 @@ export const adjustModerationSubjectStatus = async (
     .executeTakeFirst()
 
   const isAppealEvent =
-    action === 'com.atproto.admin.defs#modEventReport' &&
+    action === 'tools.ozone.moderation.defs#modEventReport' &&
     meta?.reportType === REASONAPPEAL
 
   const subjectStatus = getSubjectStatusForModerationEvent({
@@ -183,7 +183,7 @@ export const adjustModerationSubjectStatus = async (
   }
 
   if (
-    action === 'com.atproto.admin.defs#modEventReverseTakedown' &&
+    action === 'tools.ozone.moderation.defs#modEventReverseTakedown' &&
     !subjectStatus.takendown
   ) {
     newStatus.takendown = false
@@ -201,19 +201,22 @@ export const adjustModerationSubjectStatus = async (
   }
 
   if (
-    action === 'com.atproto.admin.defs#modEventResolveAppeal' &&
+    action === 'tools.ozone.moderation.defs#modEventResolveAppeal' &&
     subjectStatus.appealed
   ) {
     newStatus.appealed = false
     subjectStatus.appealed = false
   }
 
-  if (action === 'com.atproto.admin.defs#modEventComment' && meta?.sticky) {
+  if (
+    action === 'tools.ozone.moderation.defs#modEventComment' &&
+    meta?.sticky
+  ) {
     newStatus.comment = comment
     subjectStatus.comment = comment
   }
 
-  if (action === 'com.atproto.admin.defs#modEventTag') {
+  if (action === 'tools.ozone.moderation.defs#modEventTag') {
     let tags = currentStatus?.tags || []
     if (addedTags?.length) {
       tags = tags.concat(addedTags)

package/src/mod-service/subject.ts

@@ -1,6 +1,6 @@
 import { AtUri } from '@atproto/syntax'
 import { InputSchema as ReportInput } from '../lexicon/types/com/atproto/moderation/createReport'
-import { InputSchema as ActionInput } from '../lexicon/types/com/atproto/admin/emitModerationEvent'
+import { InputSchema as ActionInput } from '../lexicon/types/tools/ozone/moderation/emitEvent'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { ModerationEventRow, ModerationSubjectStatusRow } from './types'
 import { RepoRef } from '../lexicon/types/com/atproto/admin/defs'

package/src/mod-service/types.ts

@@ -1,7 +1,7 @@
 import { Selectable } from 'kysely'
 import { ModerationEvent } from '../db/schema/moderation_event'
 import { ModerationSubjectStatus } from '../db/schema/moderation_subject_status'
-import { ComAtprotoAdminDefs } from '@atproto/api'
+import { ToolsOzoneModerationDefs } from '@atproto/api'
 import { ModSubject } from './subject'
 
 export type ModerationEventRow = Selectable<ModerationEvent>
@@ -22,15 +22,15 @@ export type ModerationSubjectStatusRowWithHandle =
   ModerationSubjectStatusRow & { handle: string | null }
 
 export type ModEventType =
-  | ComAtprotoAdminDefs.ModEventTakedown
-  | ComAtprotoAdminDefs.ModEventAcknowledge
-  | ComAtprotoAdminDefs.ModEventEscalate
-  | ComAtprotoAdminDefs.ModEventComment
-  | ComAtprotoAdminDefs.ModEventLabel
-  | ComAtprotoAdminDefs.ModEventReport
-  | ComAtprotoAdminDefs.ModEventMute
-  | ComAtprotoAdminDefs.ModEventReverseTakedown
-  | ComAtprotoAdminDefs.ModEventTag
+  | ToolsOzoneModerationDefs.ModEventTakedown
+  | ToolsOzoneModerationDefs.ModEventAcknowledge
+  | ToolsOzoneModerationDefs.ModEventEscalate
+  | ToolsOzoneModerationDefs.ModEventComment
+  | ToolsOzoneModerationDefs.ModEventLabel
+  | ToolsOzoneModerationDefs.ModEventReport
+  | ToolsOzoneModerationDefs.ModEventMute
+  | ToolsOzoneModerationDefs.ModEventReverseTakedown
+  | ToolsOzoneModerationDefs.ModEventTag
 
 export const UNSPECCED_TAKEDOWN_LABEL = '!unspecced-takedown'
 

package/src/mod-service/util.ts

@@ -1,17 +1,61 @@
+import { cborEncode, noUndefinedVals } from '@atproto/common'
+import { Keypair } from '@atproto/crypto'
 import { LabelRow } from '../db/schema/label'
 import { Label } from '../lexicon/types/com/atproto/label/defs'
 
+export type SignedLabel = Label & { sig: Uint8Array }
+
 export const formatLabel = (row: LabelRow): Label => {
-  const label: Label = {
+  return noUndefinedVals({
+    ver: 1,
     src: row.src,
     uri: row.uri,
+    cid: row.cid === '' ? undefined : row.cid,
     val: row.val,
     neg: row.neg,
     cts: row.cts,
+    exp: row.exp ?? undefined,
+    sig: row.sig ? new Uint8Array(row.sig) : undefined,
+  }) as Label
+}
+
+export const formatLabelRow = (
+  label: Label,
+  signingKeyId?: number,
+): Omit<LabelRow, 'id'> => {
+  return {
+    src: label.src,
+    uri: label.uri,
+    cid: label.cid ?? '',
+    val: label.val,
+    neg: !!label.neg,
+    cts: label.cts,
+    exp: label.exp ?? null,
+    sig: label.sig ? Buffer.from(label.sig) : null,
+    signingKeyId: signingKeyId ?? null,
   }
-  if (row.cid !== '') {
-    // @NOTE avoiding undefined values on label, which dag-cbor chokes on when serializing.
-    label.cid = row.cid
+}
+
+export const signLabel = async (
+  label: Label,
+  signingKey: Keypair,
+): Promise<SignedLabel> => {
+  const { ver, src, uri, cid, val, neg, cts, exp } = label
+  const reformatted = noUndefinedVals({
+    ver: ver ?? 1,
+    src,
+    uri,
+    cid,
+    val,
+    neg,
+    cts,
+    exp,
+  }) as Label
+
+  const bytes = cborEncode(reformatted)
+  const sig = await signingKey.sign(bytes)
+  return {
+    ...reformatted,
+    sig,
   }
-  return label
 }