summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-31Fix fix_explicit_addressing moving follower collection to cc and add tests ↵rinpatch
for it
2019-05-29Merge branch 'revert-57e58d26' into 'develop'kaniini
Revert "Merge branch 'feature/search-authenticated-only' into 'develop'" See merge request pleroma/pleroma!1212
2019-05-29Revert "Merge branch 'feature/search-authenticated-only' into 'develop'"kaniini
This reverts merge request !1209
2019-05-29Merge branch 'fix/mastodon-search-limit' into 'develop'lambda
Default search limit should be 40 See merge request pleroma/pleroma!1210
2019-05-29Merge branch 'issue/936' into 'develop'lambda
[#936] fix tests See merge request pleroma/pleroma!1208
2019-05-29[#936] fix testsMaksim
2019-05-29Default search limit should be 40Mark Felder
https://docs.joinmastodon.org/api/rest/search/
2019-05-29Merge branch 'feature/search-authenticated-only' into 'develop'kaniini
router: require oauth_read for searching Closes #935 See merge request pleroma/pleroma!1209
2019-05-29router: require oauth_read for searchingWilliam Pitcock
Search calls are generally expensive and allow unauthenticated users to crawl the instance for user profiles or posts which contain specified keywords. An adversary can build a distributed search engine which not only will consume significant instance resources, but also can be used for undesirable purposes such as datamining. Accordingly, require authenticated access to use the search API endpoints. This acts as a nice balance as it allows guest users to make use of most functionality available in Pleroma FE while ensuring that Pleroma instances are reasonably protected from resource exhaustion. It also removes Pleroma as a potential vector in distributed search engines.
2019-05-28Merge branch 'varnish-improvements' into 'develop'feld
More Varnish improvements See merge request pleroma/pleroma!667
2019-05-28Improve Varnish config. We set sane headers from the backend now.feld
2019-05-28Merge branch 'respect-proxy-settings-federation' into 'develop'kaniini
Respect proxy settings federation See merge request pleroma/pleroma!1206
2019-05-28Respect proxy settings federationjeff
2019-05-26Merge branch 'refactor/die-httpoison-die' into 'develop'lambda
remove @httpoison, @ostatus and @websub compile-time constants See merge request pleroma/pleroma!1203
2019-05-26Merge branch 'fix/mrf-simple' into 'develop'kaniini
mrf: simple policy: fix matching imported activitypub and ostatus statuses Closes #915 See merge request pleroma/pleroma!1205
2019-05-26mrf: simple policy: fix matching imported activitypub and ostatus statusesWilliam Pitcock
2019-05-25remove @websub and @ostatus module-level constantsWilliam Pitcock
2019-05-25tests: websub: check only that signature validation succeeds or failsWilliam Pitcock
2019-05-25kill @httpoisonWilliam Pitcock
2019-05-25Merge branch 'fix/nodeinfo-unavailable-when-not-federating' into 'develop'kaniini
Keep nodeinfo available when not federating Closes #923 See merge request pleroma/pleroma!1202
2019-05-25Keep nodeinfo available when not federatingAaron Tinio
2019-05-24Merge branch 'bugfix/mention-all-people-in-beginning-dm' into 'develop'kaniini
Mention all people in the beginning of DM Closes #924 See merge request pleroma/pleroma!1194
2019-05-24Mention all people in the beginning of DMSergey Suprunenko
2019-05-24Merge branch 'feature/static-headers' into 'develop'kaniini
Improve serving of static assets See merge request pleroma/pleroma!1200
2019-05-24Move the Cache Control header test to its own filefeld
We can consolidate our cache control header tests here
2019-05-24Merge branch 'reverse_proxy_upstream_v4_fix' into 'develop'lambda
explicitly set reverse proxy upstream to IPv4 Closes #930 See merge request pleroma/pleroma!1197
2019-05-23explicitly set reverse proxy upstream to IPv4Alfie Pates
since Pleroma.Web.Endpoint binds on IPv4 only and `localhost.` resolves to [::0] on some systems fixes #930.
2019-05-22Merge branch 'feature/mrf-user-filter' into 'develop'kaniini
mrf: add support for filtering users See merge request pleroma/pleroma!1188
2019-05-22Merge branch 'ssh-fixes' into 'develop'kaniini
Ssh fixes Closes #869 and #925 See merge request pleroma/pleroma!1191
2019-05-22update documentation for the new MRF features [no-ci]William Pitcock
2019-05-22tests: add tests for banner and avatar removalWilliam Pitcock
2019-05-22mrf: simple policy: add the ability to strip avatars and banners from user ↵William Pitcock
profiles
2019-05-22activitypub: run user objects through MRF filtersWilliam Pitcock
2019-05-22mrf: defang policy modules for filtering user profile objectsWilliam Pitcock
2019-05-22Merge branch 'fix/prune-objects-times-out' into 'develop'rinpatch
Disable timeouts for object pruning query See merge request pleroma/pleroma!1193
2019-05-22Disable timeouts for object pruning queryrinpatch
2019-05-22Merge branch 'issue/699' into 'develop'lambda
[#699] add worker to clean expired oauth tokens See merge request pleroma/pleroma!1184
2019-05-22[#699] add worker to clean expired oauth tokensMaksim
2019-05-22Update CHANGELOG.mdlambda
2019-05-22Merge branch 'feature/object-pruning' into 'develop'lambda
Object pruning See merge request pleroma/pleroma!1181
2019-05-22Mix: Only start sshd when needed, second try.lain
2019-05-22Merge branch 'bring-ecto-back-to-mainline' into 'develop'lambda
Mix: Bring ecto-sql back to mainline. See merge request pleroma/pleroma!1192
2019-05-22Mix: Bring ecto-sql back to mainline.lain
2019-05-22Changelog: Add tip for debian users.lain
2019-05-22Documentation: Specify PEM format for SSH keys.lain
Otherwise openssh-client 7.9 will generate a different format that can't be used by esshd.
2019-05-22Linting.lain
2019-05-22Mix: Don't start esshd application if we don't need it.lain
2019-05-22Changelog: Add SSH mode.lain
2019-05-22Merge branch 'refactor/keys' into 'develop'lambda
move key generation functions into Pleroma.Keys module See merge request pleroma/pleroma!1186
2019-05-22salmon: fix credoWilliam Pitcock