summaryrefslogtreecommitdiff
path: root/test/fixtures
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-11-17 21:52:51 +0000
committerlambda <pleromagit@rogerbraun.net>2018-11-17 21:52:51 +0000
commitd73c7cc0caf322316541fe8daf72ec34d95e1520 (patch)
tree1da0f6d758e4f9e8202fd336875b5eeb442fe9e8 /test/fixtures
parenta960983815b8798632fc489b762f760738cf798b (diff)
parente10f839e9b413a58dfa2c55f136862ec0f56e314 (diff)
downloadpleroma-d73c7cc0caf322316541fe8daf72ec34d95e1520.tar.gz
pleroma-d73c7cc0caf322316541fe8daf72ec34d95e1520.zip
Merge branch 'security/spoofing-hardening' into 'develop'
security: spoofing hardening Closes #380, #381, and #382 See merge request pleroma/pleroma!461
Diffstat (limited to 'test/fixtures')
-rw-r--r--test/fixtures/httpoison_mock/https__info.pleroma.site_activity4.json13
1 files changed, 13 insertions, 0 deletions
diff --git a/test/fixtures/httpoison_mock/https__info.pleroma.site_activity4.json b/test/fixtures/httpoison_mock/https__info.pleroma.site_activity4.json
new file mode 100644
index 000000000..57a73b12a
--- /dev/null
+++ b/test/fixtures/httpoison_mock/https__info.pleroma.site_activity4.json
@@ -0,0 +1,13 @@
+{
+ "@context": "https://www.w3.org/ns/activitystreams",
+ "attributedTo": "http://mastodon.example.org/users/admin",
+ "attachment": [],
+ "content": "<p>this post was not actually written by Haelwenn</p>",
+ "id": "http://mastodon.example.org/users/admin/activities/1234",
+ "published": "2018-09-01T22:15:00Z",
+ "tag": [],
+ "to": [
+ "https://www.w3.org/ns/activitystreams#Public"
+ ],
+ "type": "Note"
+}