Federation fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2021-11-19 17:40:42 +01:00
parent fbf2d480a3
commit d7fd30f8e6
10 changed files with 53 additions and 250 deletions
--- a/test/fixtures/signature/framapiaf_admin.json
+++ b/test/fixtures/signature/framapiaf_admin.json
@@ -1,112 +0,0 @@
-{
-  "@context": [
-    "https://www.w3.org/ns/activitystreams",
-    "https://w3id.org/security/v1",
-    {
-      "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
-      "toot": "http://joinmastodon.org/ns#",
-      "featured": {
-        "@id": "toot:featured",
-        "@type": "@id"
-      },
-      "alsoKnownAs": {
-        "@id": "as:alsoKnownAs",
-        "@type": "@id"
-      },
-      "movedTo": {
-        "@id": "as:movedTo",
-        "@type": "@id"
-      },
-      "schema": "http://schema.org#",
-      "PropertyValue": "schema:PropertyValue",
-      "value": "schema:value",
-      "IdentityProof": "toot:IdentityProof",
-      "discoverable": "toot:discoverable",
-      "Device": "toot:Device",
-      "Ed25519Signature": "toot:Ed25519Signature",
-      "Ed25519Key": "toot:Ed25519Key",
-      "Curve25519Key": "toot:Curve25519Key",
-      "EncryptedMessage": "toot:EncryptedMessage",
-      "publicKeyBase64": "toot:publicKeyBase64",
-      "deviceId": "toot:deviceId",
-      "claim": {
-        "@type": "@id",
-        "@id": "toot:claim"
-      },
-      "fingerprintKey": {
-        "@type": "@id",
-        "@id": "toot:fingerprintKey"
-      },
-      "identityKey": {
-        "@type": "@id",
-        "@id": "toot:identityKey"
-      },
-      "devices": {
-        "@type": "@id",
-        "@id": "toot:devices"
-      },
-      "messageFranking": "toot:messageFranking",
-      "messageType": "toot:messageType",
-      "cipherText": "toot:cipherText",
-      "focalPoint": {
-        "@container": "@list",
-        "@id": "toot:focalPoint"
-      }
-    }
-  ],
-  "id": "https://framapiaf.org/users/admin",
-  "type": "Service",
-  "following": "https://framapiaf.org/users/admin/following",
-  "followers": "https://framapiaf.org/users/admin/followers",
-  "inbox": "https://framapiaf.org/users/admin/inbox",
-  "outbox": "https://framapiaf.org/users/admin/outbox",
-  "featured": "https://framapiaf.org/users/admin/collections/featured",
-  "preferredUsername": "admin",
-  "name": "Administrateur",
-  "summary": "<p>Je ne suis qu&apos;un compte inutile. Merci nous de contacter via <a href=\"https://contact.framasoft.org/\" rel=\"nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">contact.framasoft.org/</span><span class=\"invisible\"></span></a></p>",
-  "url": "https://framapiaf.org/@admin",
-  "manuallyApprovesFollowers": false,
-  "discoverable": null,
-  "devices": "https://framapiaf.org/users/admin/collections/devices",
-  "publicKey": {
-    "id": "https://framapiaf.org/users/admin#main-key",
-    "owner": "https://framapiaf.org/users/admin",
-    "publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyHaU/AZ5dWtSxZXkPa89\nDUQ4z+JQHGGUG/xkGuq0v8P6qJfQqtHPBO5vH0IQJqluXWQS96gqTwjZnYevcpNA\nveYv0K25DWszx5Ehz6JX2/sSvu2rNUcQ3YZvSjdo/Yy1u5Fuc5lLmvw8uFzXYekD\nWovTMOnp4mIKpVEm/G/v4w8jvFEKw88h743vwaEIim88GEQItMxzGAV6zSqV1DWO\nLxtoRsinslJYfAG46ex4YUATFveWvOUeWk5W1sEa5f3c0moaTmBM/PAAo8vLxhlw\nJhsHihsCH+BcXKVMjW8OCqYYqISMxEifUBX63HcJt78ELHpOuc1c2eG59PomtTjQ\nywIDAQAB\n-----END PUBLIC KEY-----\n"
-  },
-  "tag": [],
-  "attachment": [
-    {
-      "type": "PropertyValue",
-      "name": "News",
-      "value": "<span class=\"h-card\"><a href=\"https://framapiaf.org/@Framasoft\" class=\"u-url mention\">@<span>Framasoft</span></a></span>"
-    },
-    {
-      "type": "PropertyValue",
-      "name": "Support",
-      "value": "<a href=\"https://contact.framasoft.org/\" rel=\"me nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">contact.framasoft.org/</span><span class=\"invisible\"></span></a>"
-    },
-    {
-      "type": "PropertyValue",
-      "name": "Soutenir",
-      "value": "<a href=\"https://soutenir.framasoft.org/\" rel=\"me nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">soutenir.framasoft.org/</span><span class=\"invisible\"></span></a>"
-    },
-    {
-      "type": "PropertyValue",
-      "name": "Site",
-      "value": "<a href=\"https://framasoft.org/\" rel=\"me nofollow noopener noreferrer\" target=\"_blank\"><span class=\"invisible\">https://</span><span class=\"\">framasoft.org/</span><span class=\"invisible\"></span></a>"
-    }
-  ],
-  "endpoints": {
-    "sharedInbox": "https://framapiaf.org/inbox"
-  },
-  "icon": {
-    "type": "Image",
-    "mediaType": "image/jpeg",
-    "url": "https://framapiaf.s3.framasoft.org/framapiaf/accounts/avatars/000/000/002/original/85fbb27ad5e3cf71.jpg"
-  },
-  "image": {
-    "type": "Image",
-    "mediaType": "image/jpeg",
-    "url": "https://framapiaf.s3.framasoft.org/framapiaf/accounts/headers/000/000/002/original/6aba75f1ab1ab6de.jpg"
-  }
-}
--- a/test/fixtures/signature/nyu_rye.json
+++ b/test/fixtures/signature/nyu_rye.json
@@ -1,55 +0,0 @@
-{
-  "@context": [
-    "https://www.w3.org/ns/activitystreams",
-    "https://w3id.org/security/v1",
-    {
-      "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
-      "toot": "http://joinmastodon.org/ns#",
-      "featured": { "@id": "toot:featured", "@type": "@id" },
-      "alsoKnownAs": { "@id": "as:alsoKnownAs", "@type": "@id" },
-      "movedTo": { "@id": "as:movedTo", "@type": "@id" },
-      "schema": "http://schema.org#",
-      "PropertyValue": "schema:PropertyValue",
-      "value": "schema:value",
-      "IdentityProof": "toot:IdentityProof",
-      "discoverable": "toot:discoverable",
-      "Device": "toot:Device",
-      "Ed25519Signature": "toot:Ed25519Signature",
-      "Ed25519Key": "toot:Ed25519Key",
-      "Curve25519Key": "toot:Curve25519Key",
-      "EncryptedMessage": "toot:EncryptedMessage",
-      "publicKeyBase64": "toot:publicKeyBase64",
-      "deviceId": "toot:deviceId",
-      "claim": { "@type": "@id", "@id": "toot:claim" },
-      "fingerprintKey": { "@type": "@id", "@id": "toot:fingerprintKey" },
-      "identityKey": { "@type": "@id", "@id": "toot:identityKey" },
-      "devices": { "@type": "@id", "@id": "toot:devices" },
-      "messageFranking": "toot:messageFranking",
-      "messageType": "toot:messageType",
-      "cipherText": "toot:cipherText",
-      "focalPoint": { "@container": "@list", "@id": "toot:focalPoint" }
-    }
-  ],
-  "id": "https://niu.moe/users/rye",
-  "type": "Person",
-  "following": "https://niu.moe/users/rye/following",
-  "followers": "https://niu.moe/users/rye/followers",
-  "inbox": "https://niu.moe/users/rye/inbox",
-  "outbox": "https://niu.moe/users/rye/outbox",
-  "featured": "https://niu.moe/users/rye/collections/featured",
-  "preferredUsername": "rye",
-  "name": "♡ rye ♡",
-  "summary": "\\u003cp\\u003ecome back with a warrant\\u003c/p\\u003e",
-  "url": "https://niu.moe/@rye",
-  "manuallyApprovesFollowers": false,
-  "discoverable": false,
-  "devices": "https://niu.moe/users/rye/collections/devices",
-  "publicKey": {
-    "id": "https://niu.moe/users/rye#main-key",
-    "owner": "https://niu.moe/users/rye",
-    "publicKeyPem": "-----BEGIN PUBLIC KEY-----\\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA83uRWjCFO35FwfA38mzv\\nEL0TUaXB7+2hYvPwNrn1WY6me5DRbqB5zzMrzWMGr0HSooqNqEYBafGsmVTWUqIk\\nKM9ehtIBraJI+mT5X7DPR3LrXOJF4a9EEslg8XvAk8MN9IrAhm6UljnvB67RtDcA\\nTNB01VWy9yWnxFRtz9o/EMoBPyw5giOaXE2ibVNP8lQIqGKuuBKPzPjSJygdvQ5q\\nxfow2z1TpKRqdsNDqn4n6U6zCXYTzkr0J71/tGw7fsgfv78l0Wjrc7EcuBk74OaG\\nC65UDiu3X4Q6kxCfCEhPSfuwLN+UZkzxcn6goWR0iYpWs57+4tFKu9nJYP4QJ0K9\\nTwIDAQAB\\n-----END PUBLIC KEY-----\\n"
-  },
-  "tag": [],
-  "attachment": [],
-  "endpoints": { "sharedInbox": "https://niu.moe/inbox" }
-}