@atproto/pds 0.4.77 → 0.4.79

package/tests/proxied/__snapshots__/views.test.ts.snap

@@ -484,7 +484,7 @@ Object {
           "$type": "app.bsky.embed.images#view",
           "images": Array [
             Object {
-              "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+              "alt": "../dev-env/assets/key-landscape-small.jpg",
               "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(1)/cids(2)@jpeg",
               "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(1)/cids(2)@jpeg",
             },
@@ -501,7 +501,7 @@ Object {
             "$type": "app.bsky.embed.images",
             "images": Array [
               Object {
-                "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                "alt": "../dev-env/assets/key-landscape-small.jpg",
                 "image": Object {
                   "$type": "blob",
                   "mimeType": "image/jpeg",
@@ -972,7 +972,7 @@ Object {
             "$type": "app.bsky.embed.images#view",
             "images": Array [
               Object {
-                "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                "alt": "../dev-env/assets/key-landscape-small.jpg",
                 "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(3)/cids(5)@jpeg",
                 "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(3)/cids(5)@jpeg",
               },
@@ -989,7 +989,7 @@ Object {
               "$type": "app.bsky.embed.images",
               "images": Array [
                 Object {
-                  "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                  "alt": "../dev-env/assets/key-landscape-small.jpg",
                   "image": Object {
                     "$type": "blob",
                     "mimeType": "image/jpeg",
@@ -1091,7 +1091,7 @@ Object {
           "$type": "app.bsky.embed.images#view",
           "images": Array [
             Object {
-              "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+              "alt": "../dev-env/assets/key-landscape-small.jpg",
               "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(3)/cids(5)@jpeg",
               "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(3)/cids(5)@jpeg",
             },
@@ -1108,7 +1108,7 @@ Object {
             "$type": "app.bsky.embed.images",
             "images": Array [
               Object {
-                "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                "alt": "../dev-env/assets/key-landscape-small.jpg",
                 "image": Object {
                   "$type": "blob",
                   "mimeType": "image/jpeg",
@@ -1322,7 +1322,7 @@ Object {
                         "$type": "app.bsky.embed.images",
                         "images": Array [
                           Object {
-                            "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                            "alt": "../dev-env/assets/key-landscape-small.jpg",
                             "image": Object {
                               "$type": "blob",
                               "mimeType": "image/jpeg",
@@ -1333,7 +1333,7 @@ Object {
                             },
                           },
                           Object {
-                            "alt": "../dev-env/src/seed/img/key-alt.jpg",
+                            "alt": "../dev-env/assets/key-alt.jpg",
                             "image": Object {
                               "$type": "blob",
                               "mimeType": "image/jpeg",
@@ -1666,12 +1666,12 @@ Object {
           "$type": "app.bsky.embed.images#view",
           "images": Array [
             Object {
-              "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+              "alt": "../dev-env/assets/key-landscape-small.jpg",
               "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(3)/cids(3)@jpeg",
               "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(3)/cids(3)@jpeg",
             },
             Object {
-              "alt": "../dev-env/src/seed/img/key-alt.jpg",
+              "alt": "../dev-env/assets/key-alt.jpg",
               "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(3)/cids(4)@jpeg",
               "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(3)/cids(4)@jpeg",
             },
@@ -1728,7 +1728,7 @@ Object {
             "$type": "app.bsky.embed.images",
             "images": Array [
               Object {
-                "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                "alt": "../dev-env/assets/key-landscape-small.jpg",
                 "image": Object {
                   "$type": "blob",
                   "mimeType": "image/jpeg",
@@ -1739,7 +1739,7 @@ Object {
                 },
               },
               Object {
-                "alt": "../dev-env/src/seed/img/key-alt.jpg",
+                "alt": "../dev-env/assets/key-alt.jpg",
                 "image": Object {
                   "$type": "blob",
                   "mimeType": "image/jpeg",
@@ -1924,7 +1924,7 @@ Object {
             "$type": "app.bsky.embed.images#view",
             "images": Array [
               Object {
-                "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                "alt": "../dev-env/assets/key-landscape-small.jpg",
                 "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(4)/cids(5)@jpeg",
                 "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(4)/cids(5)@jpeg",
               },
@@ -1941,7 +1941,7 @@ Object {
               "$type": "app.bsky.embed.images",
               "images": Array [
                 Object {
-                  "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                  "alt": "../dev-env/assets/key-landscape-small.jpg",
                   "image": Object {
                     "$type": "blob",
                     "mimeType": "image/jpeg",
@@ -2134,12 +2134,12 @@ Object {
                   "$type": "app.bsky.embed.images#view",
                   "images": Array [
                     Object {
-                      "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                      "alt": "../dev-env/assets/key-landscape-small.jpg",
                       "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(6)/cids(5)@jpeg",
                       "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(6)/cids(5)@jpeg",
                     },
                     Object {
-                      "alt": "../dev-env/src/seed/img/key-alt.jpg",
+                      "alt": "../dev-env/assets/key-alt.jpg",
                       "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(6)/cids(8)@jpeg",
                       "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(6)/cids(8)@jpeg",
                     },
@@ -2199,7 +2199,7 @@ Object {
                   "$type": "app.bsky.embed.images",
                   "images": Array [
                     Object {
-                      "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                      "alt": "../dev-env/assets/key-landscape-small.jpg",
                       "image": Object {
                         "$type": "blob",
                         "mimeType": "image/jpeg",
@@ -2210,7 +2210,7 @@ Object {
                       },
                     },
                     Object {
-                      "alt": "../dev-env/src/seed/img/key-alt.jpg",
+                      "alt": "../dev-env/assets/key-alt.jpg",
                       "image": Object {
                         "$type": "blob",
                         "mimeType": "image/jpeg",
@@ -2393,7 +2393,7 @@ Object {
             "$type": "app.bsky.embed.images#view",
             "images": Array [
               Object {
-                "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                "alt": "../dev-env/assets/key-landscape-small.jpg",
                 "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(4)/cids(5)@jpeg",
                 "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(4)/cids(5)@jpeg",
               },
@@ -2410,7 +2410,7 @@ Object {
               "$type": "app.bsky.embed.images",
               "images": Array [
                 Object {
-                  "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                  "alt": "../dev-env/assets/key-landscape-small.jpg",
                   "image": Object {
                     "$type": "blob",
                     "mimeType": "image/jpeg",
@@ -2650,7 +2650,7 @@ Object {
           "$type": "app.bsky.embed.images#view",
           "images": Array [
             Object {
-              "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+              "alt": "../dev-env/assets/key-landscape-small.jpg",
               "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(4)/cids(5)@jpeg",
               "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(4)/cids(5)@jpeg",
             },
@@ -2667,7 +2667,7 @@ Object {
             "$type": "app.bsky.embed.images",
             "images": Array [
               Object {
-                "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                "alt": "../dev-env/assets/key-landscape-small.jpg",
                 "image": Object {
                   "$type": "blob",
                   "mimeType": "image/jpeg",
@@ -2881,7 +2881,7 @@ Object {
                         "$type": "app.bsky.embed.images",
                         "images": Array [
                           Object {
-                            "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                            "alt": "../dev-env/assets/key-landscape-small.jpg",
                             "image": Object {
                               "$type": "blob",
                               "mimeType": "image/jpeg",
@@ -2892,7 +2892,7 @@ Object {
                             },
                           },
                           Object {
-                            "alt": "../dev-env/src/seed/img/key-alt.jpg",
+                            "alt": "../dev-env/assets/key-alt.jpg",
                             "image": Object {
                               "$type": "blob",
                               "mimeType": "image/jpeg",
@@ -3102,12 +3102,12 @@ Object {
                   "$type": "app.bsky.embed.images#view",
                   "images": Array [
                     Object {
-                      "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                      "alt": "../dev-env/assets/key-landscape-small.jpg",
                       "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(6)/cids(5)@jpeg",
                       "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(6)/cids(5)@jpeg",
                     },
                     Object {
-                      "alt": "../dev-env/src/seed/img/key-alt.jpg",
+                      "alt": "../dev-env/assets/key-alt.jpg",
                       "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(6)/cids(8)@jpeg",
                       "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(6)/cids(8)@jpeg",
                     },
@@ -3167,7 +3167,7 @@ Object {
                   "$type": "app.bsky.embed.images",
                   "images": Array [
                     Object {
-                      "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                      "alt": "../dev-env/assets/key-landscape-small.jpg",
                       "image": Object {
                         "$type": "blob",
                         "mimeType": "image/jpeg",
@@ -3178,7 +3178,7 @@ Object {
                       },
                     },
                     Object {
-                      "alt": "../dev-env/src/seed/img/key-alt.jpg",
+                      "alt": "../dev-env/assets/key-alt.jpg",
                       "image": Object {
                         "$type": "blob",
                         "mimeType": "image/jpeg",
@@ -3298,12 +3298,12 @@ Object {
             "$type": "app.bsky.embed.images#view",
             "images": Array [
               Object {
-                "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                "alt": "../dev-env/assets/key-landscape-small.jpg",
                 "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(6)/cids(5)@jpeg",
                 "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(6)/cids(5)@jpeg",
               },
               Object {
-                "alt": "../dev-env/src/seed/img/key-alt.jpg",
+                "alt": "../dev-env/assets/key-alt.jpg",
                 "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(6)/cids(8)@jpeg",
                 "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(6)/cids(8)@jpeg",
               },
@@ -3360,7 +3360,7 @@ Object {
               "$type": "app.bsky.embed.images",
               "images": Array [
                 Object {
-                  "alt": "../dev-env/src/seed/img/key-landscape-small.jpg",
+                  "alt": "../dev-env/assets/key-landscape-small.jpg",
                   "image": Object {
                     "$type": "blob",
                     "mimeType": "image/jpeg",
@@ -3371,7 +3371,7 @@ Object {
                   },
                 },
                 Object {
-                  "alt": "../dev-env/src/seed/img/key-alt.jpg",
+                  "alt": "../dev-env/assets/key-alt.jpg",
                   "image": Object {
                     "$type": "blob",
                     "mimeType": "image/jpeg",

package/tests/proxied/read-after-write.test.ts

@@ -48,7 +48,7 @@ describe('proxy read after write', () => {
     assert(network.pds.ctx.cfg.bskyAppView)
     const blob = await sc.uploadFile(
       alice,
-      '../dev-env/src/seed/img/key-landscape-small.jpg',
+      '../dev-env/assets/key-landscape-small.jpg',
       'image/jpeg',
     )
     await sc.updateProfile(alice, { displayName: 'blah', avatar: blob.image })
@@ -148,7 +148,7 @@ describe('proxy read after write', () => {
     assert(network.pds.ctx.cfg.bskyAppView)
     const img = await sc.uploadFile(
       alice,
-      '../dev-env/src/seed/img/key-landscape-small.jpg',
+      '../dev-env/assets/key-landscape-small.jpg',
       'image/jpeg',
     )
     const replyRes1 = await agent.api.app.bsky.feed.post.create(

package/tests/seeds/basic.ts

@@ -37,12 +37,12 @@ export default async (
   })
   const img1 = await sc.uploadFile(
     carol,
-    '../dev-env/src/seed/img/key-landscape-small.jpg',
+    '../dev-env/assets/key-landscape-small.jpg',
     'image/jpeg',
   )
   const img2 = await sc.uploadFile(
     carol,
-    '../dev-env/src/seed/img/key-alt.jpg',
+    '../dev-env/assets/key-alt.jpg',
     'image/jpeg',
   )
   await sc.post(
@@ -103,7 +103,7 @@ export default async (
 
   const replyImg = await sc.uploadFile(
     bob,
-    '../dev-env/src/seed/img/key-landscape-small.jpg',
+    '../dev-env/assets/key-landscape-small.jpg',
     'image/jpeg',
   )
   // must ensure ordering of replies in indexing

package/tests/takedown-appeal.test.ts

@@ -0,0 +1,157 @@
+import { AtpAgent, ComAtprotoModerationDefs } from '@atproto/api'
+import { SeedClient, TestNetwork } from '@atproto/dev-env'
+import { forSnapshot } from './_util'
+import { ids } from '../src/lexicon/lexicons'
+
+describe('appeal account takedown', () => {
+  let network: TestNetwork
+  let agent: AtpAgent
+  let sc: SeedClient
+  let moderator: string
+
+  beforeAll(async () => {
+    network = await TestNetwork.create({
+      dbPostgresSchema: 'takedown_appeal',
+    })
+    sc = network.getSeedClient()
+    const modAccount = await sc.createAccount('moderator', {
+      handle: 'testmod.test',
+      email: 'testmod@test.com',
+      password: 'testmod-pass',
+    })
+    moderator = modAccount.did
+    await network.ozone.addModeratorDid(moderator)
+
+    agent = network.pds.getClient()
+  })
+
+  afterAll(async () => {
+    await network.close()
+  })
+
+  it('actor takedown allows appeal request.', async () => {
+    const { data: account } = await agent.com.atproto.server.createAccount({
+      handle: 'jeff.test',
+      email: 'jeff@test.com',
+      password: 'password',
+    })
+
+    // Emit a takedown event
+    await network.ozone.getModClient().performTakedown({
+      subject: {
+        $type: 'com.atproto.admin.defs#repoRef',
+        did: account.did,
+      },
+    })
+
+    // Manually set the account as takendown at the PDS level
+    // since the takedown event only propagates when the daemon is running
+    await agent.com.atproto.admin.updateSubjectStatus(
+      {
+        subject: {
+          $type: 'com.atproto.admin.defs#repoRef',
+          did: account.did,
+        },
+        takedown: { applied: true },
+      },
+      {
+        encoding: 'application/json',
+        headers: { authorization: network.pds.adminAuth() },
+      },
+    )
+
+    // Verify user can not get session token without setting the optional param
+    await expect(
+      agent.com.atproto.server.createSession({
+        identifier: 'jeff.test',
+        password: 'password',
+      }),
+    ).rejects.toThrow('Account has been taken down')
+
+    const { data: auth } = await agent.com.atproto.server.createSession({
+      identifier: 'jeff.test',
+      password: 'password',
+      allowTakendown: true,
+    })
+
+    // send appeal event as the takendown account
+    await agent.com.atproto.moderation.createReport(
+      {
+        reasonType: ComAtprotoModerationDefs.REASONAPPEAL,
+        reason: 'I want my account back',
+        subject: { $type: 'com.atproto.admin.defs#repoRef', did: account.did },
+      },
+      {
+        headers: {
+          authorization: `Bearer ${auth.accessJwt}`,
+        },
+      },
+    )
+
+    // Verify that the appeal was created
+    const { data: result } = await agent.tools.ozone.moderation.queryStatuses(
+      {
+        subject: account.did,
+      },
+      { headers: sc.getHeaders(moderator) },
+    )
+
+    expect(result.subjectStatuses[0].appealed).toBe(true)
+    expect(forSnapshot(result.subjectStatuses[0])).toMatchSnapshot()
+  })
+
+  it('takendown actor is not allowed to create reports.', async () => {
+    const { data: auth } = await agent.com.atproto.server.createSession({
+      identifier: 'jeff.test',
+      password: 'password',
+      allowTakendown: true,
+    })
+
+    // send appeal event as the takendown account
+    await expect(
+      agent.com.atproto.moderation.createReport(
+        {
+          reasonType: ComAtprotoModerationDefs.REASONRUDE,
+          reason: 'reporting others',
+          subject: {
+            $type: 'com.atproto.admin.defs#repoRef',
+            did: 'did:plc:test',
+          },
+        },
+        {
+          headers: {
+            authorization: `Bearer ${auth.accessJwt}`,
+          },
+        },
+      ),
+    ).rejects.toThrow('Report not accepted from takendown account')
+  })
+  it('takendown actor is not allowed to create records.', async () => {
+    const { data: auth } = await agent.com.atproto.server.createSession({
+      identifier: 'jeff.test',
+      password: 'password',
+      allowTakendown: true,
+    })
+
+    // send appeal event as the takendown account
+    await expect(
+      agent.com.atproto.repo.createRecord(
+        {
+          repo: auth.did,
+          collection: ids.AppBskyFeedPost,
+          // rkey: 'self',
+          record: {
+            text: 'test',
+            createdAt: new Date().toISOString(),
+          },
+        },
+        {
+          headers: {
+            authorization: `Bearer ${auth.accessJwt}`,
+          },
+          encoding: 'application/json',
+        },
+      ),
+    ).rejects.toThrow('Bad token scope')
+  })
+})