Commit graph

2499 commits

Author SHA1 Message Date
William Pitcock
2c29329d39 user: local users are always AP-enabled (closes #316) 2018-10-11 10:35:11 +00:00
kaniini
3a77336d89 Merge branch 'bugfix/length-enforce-subjects' into 'develop'
common api: take the combination of the subject and content for length limit enforcement

Closes #315

See merge request pleroma/pleroma!371
2018-10-10 08:00:23 +00:00
William Pitcock
111841ad34 common api: take the combination of the subject and content for length limit enforcement
closes #315
2018-10-10 07:53:44 +00:00
Haelwenn
5294b11ef0 Merge branch 'feature/mrf-transparency-opt-out' into 'develop'
nodeinfo: allow opting out of MRF transparency

See merge request pleroma/pleroma!370
2018-10-07 01:34:16 +00:00
William Pitcock
08d5ad71b6 nodeinfo: allow opting out of MRF transparency 2018-10-07 01:23:38 +00:00
kaniini
4a3a46074d Merge branch 'security/follow-always-async' into 'develop'
AP follows must be always async (closes #306)

Closes #306

See merge request pleroma/pleroma!368
2018-10-07 01:16:05 +00:00
kaniini
b638cc50b6 Merge branch 'patch-2' into 'develop'
Relax form-action content security policy in sample nginx config

See merge request pleroma/pleroma!364
2018-10-07 01:10:12 +00:00
kaniini
a15eac05a6 Merge branch 'update-pleroma-frontend' into 'develop'
update-pleroma-frontend

See merge request pleroma/pleroma!369
2018-10-07 01:09:33 +00:00
William Pitcock
7b3fff9af8 {mastodon api, twitter api}: make the follow handshake timeout configurable 2018-10-07 01:05:59 +00:00
hakabahitoyo
be7bb90bef update-pleroma-frontend 2018-10-07 09:58:08 +09:00
William Pitcock
7f530f6f80 mastodon api: relationship view: better handle no pre-existing follow activity 2018-10-05 23:50:13 +00:00
William Pitcock
e69faf550c user: add wait_and_refresh() for async three-way handshake case 2018-10-05 23:40:49 +00:00
William Pitcock
3e751496e3 mastodon api: account view: fetch follow state and use it to populate requested field 2018-10-05 23:31:49 +00:00
William Pitcock
a71b822013 activitypub: always track following state for async reasons 2018-10-05 23:31:00 +00:00
William Pitcock
8ce217776d activitypub transmogrifier: better manage follow state 2018-10-05 23:30:34 +00:00
William Pitcock
4f7a468659 user: only pre-create follow relationships on OStatus
closes #306
2018-10-05 22:58:03 +00:00
kaniini
614e47aa7c Merge branch 'revert-d31bbb1c' into 'develop'
Rich Text Redo Branch

See merge request pleroma/pleroma!314
2018-10-05 21:17:46 +00:00
William Pitcock
497814cbbb test: update test for new html scrub policy 2018-10-05 21:11:22 +00:00
William Pitcock
bd76d9cee6 nodeinfo: add accepted post formats to metadata 2018-10-05 21:05:37 +00:00
William Pitcock
285ac80c36 config: allow for accepted post formats to be configured 2018-10-05 21:02:17 +00:00
William Pitcock
52b05137c5 formatter: use Pleroma.HTML module instead of HtmlSanitizeEx directly 2018-10-05 20:49:34 +00:00
William Pitcock
16307da311 twitterapi: frontend config: add formattingOptionsEnabled 2018-10-05 20:49:34 +00:00
William Pitcock
b1be9415ef Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
This reverts commit d31bbb1cfe, reversing
changes made to 340ab3cb90.
2018-10-05 20:49:34 +00:00
kaniini
f7ba393bb9 Merge branch 'feature/nodeinfo_federation_info' into 'develop'
Nodeinfo federation info

See merge request pleroma/pleroma!367
2018-10-05 20:41:16 +00:00
Haelwenn (lanodan) Monnier
f2efc8dcfb
nodeinfo_controller: Fix JSON rendering
This is the last noedinfo difference from my own branch
2018-10-05 22:32:53 +02:00
Haelwenn (lanodan) Monnier
28651df478
MRF Transparency 2018-10-05 20:09:08 +02:00
Haelwenn (lanodan) Monnier
56d31db130
Pleroma.Web.Nodeinfo.NodeinfoController: Further transparency, breaks API of previous one 2018-10-05 20:08:55 +02:00
Haelwenn (lanodan) Monnier
8226953f1d
[Pleroma.Web.Nodeinfo.NodeinfoController]: Transparency on MRF Simple 2018-10-05 20:02:13 +02:00
kaniini
4f03bb2299 Merge branch 'bugfix/fix-mrf-reject-match' into 'develop'
activitypub: fix error condition match

See merge request pleroma/pleroma!365
2018-09-30 05:32:56 +00:00
William Pitcock
4db1bc2c0e activitypub: fix error condition match 2018-09-30 05:26:13 +00:00
barrucadu
a32e013909 Relax form-action content security policy
'self' only allows forms submitted to the same origin, which
breaks the "remote follow" form.  To allow remote following,
we want to allow forms to be submitted to any host.
2018-09-28 22:17:19 +00:00
Haelwenn
ab2e5ba989 Merge branch 'bugfix/magnet-links' into 'develop'
formatter: Stop using phoenix HTML and format it ourselves

Closes #307

See merge request pleroma/pleroma!363
2018-09-28 19:20:54 +00:00
Haelwenn (lanodan) Monnier
a3cffd3566
formatter: Stop using phoenix HTML and format it ourselves
* Pheonix has an extra scheme whitelist conflicting with ours
* Pheonix doesn’t seems to do URL encoding, just HTML encoding

Closes: https://git.pleroma.social/pleroma/pleroma/issues/307
2018-09-28 17:32:27 +02:00
Haelwenn
34b6d444d6 Merge branch 'feature/twitter_api/fields' into 'develop'
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"

See merge request pleroma/pleroma!360
2018-09-28 09:25:27 +00:00
Haelwenn (lanodan) Monnier
a74daabfae
[Pleroma.Web.TwitterAPI.UserViewTest]: Add test for mastodon-fields 2018-09-28 11:17:33 +02:00
Haelwenn (lanodan) Monnier
82b57ebad1
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields" 2018-09-28 10:44:45 +02:00
kaniini
dbc9feecbf Merge branch 'bugfix/object-fetching-handle-mrf-reject' into 'develop'
activitypub: don't fall back to OStatus fetching when MRF rejects an object

See merge request pleroma/pleroma!362
2018-09-28 00:51:45 +00:00
William Pitcock
707077edde activitypub: don't fall back to OStatus fetching when MRF rejects an object 2018-09-28 00:45:10 +00:00
kaniini
db989d1fa4 Merge branch 'security/ap-unsigned-create' into 'develop'
activitypub inbox: only accept unsigned/invalid-signature relayed creates, nothing else

See merge request pleroma/pleroma!361
2018-09-28 00:14:53 +00:00
William Pitcock
5c312ad677 activitypub inbox: only accept unsigned/invalid-signature relayed creates, nothing else
although the previous handling assumed any unsigned/invalid signature message was a Create,
lets make it more explicit
2018-09-28 00:03:59 +00:00
kaniini
6258ddaa60 Merge branch 'bugfix/kroeg' into 'develop'
More kroeg bugfixes

See merge request pleroma/pleroma!353
2018-09-27 20:25:35 +00:00
Haelwenn (lanodan) Monnier
c739737998
transmogrifier: get_actor called without casting attributedTo in actor and actor is nil 2018-09-27 20:00:48 +02:00
Haelwenn (lanodan) Monnier
9446b02bdf
transmogrifier: Just make attachement maps into a list and reroll 2018-09-27 20:00:48 +02:00
Haelwenn (lanodan) Monnier
e53da692fb
transmogrifier: Use the correct variable and prefer inspect in case of a bad type being passed on 2018-09-27 20:00:48 +02:00
William Pitcock
d830a243a3
transmogrifier: more robustly handle dereferencing pointer URIs 2018-09-27 20:00:48 +02:00
Haelwenn (lanodan) Monnier
4c3a80de96
transmogrifier: Use oneliners when applicable 2018-09-27 20:00:47 +02:00
William Pitcock
ed8dfa3029
transmogrifier: reformat cond block by hand 2018-09-27 20:00:47 +02:00
Haelwenn (lanodan) Monnier
eebe33e86a
transmogrifier: Add support for array-less hashtags, add broken announce, harden get_actor 2018-09-27 20:00:47 +02:00
Haelwenn (lanodan) Monnier
f3291acc91
transmogrifier: pro-actively add support for Hashtag without array in tag 2018-09-27 20:00:47 +02:00
Haelwenn (lanodan) Monnier
2c820e10b8
transmogrifier_test: incoming notices with tag not being an array (kroeg) 2018-09-27 20:00:47 +02:00