Commit Graph

5364 Commits

Author SHA1 Message Date
Haelwenn (lanodan) Monnier 5d3ece2861
Remove now useless flavours switching 2019-06-01 01:44:10 +02:00
Haelwenn (lanodan) Monnier aa9f52edd2
mastodon_api_controller.ex: Remove vanilla from supported_flavours 2019-06-01 01:44:10 +02:00
Haelwenn f1890d2cac Merge branch 'dokku' into 'develop'
Dokku CI support - On-Demand review instances

See merge request pleroma/pleroma!1216
2019-05-31 23:09:06 +00:00
feld f8d4c02431 Merge branch 'doc/mongoose-im-config' into 'develop'
Sample Mongoose IM config

See merge request pleroma/pleroma!1226
2019-05-31 20:36:33 +00:00
feld abedcca349 Sample Mongoose IM config.
Change domain, ensure paths to PEM files are correct, and this is good to go.
2019-05-31 20:36:33 +00:00
lambda 3415962d60 Merge branch 'fix/mastodon-user-search' into 'develop'
Fix/mastodon user search

See merge request pleroma/pleroma!1224
2019-05-31 18:46:57 +00:00
feld 6872c5f88f Mastodon API search default value for "resolve" is false
https://docs.joinmastodon.org/api/rest/accounts/
https://docs.joinmastodon.org/api/rest/search/
2019-05-31 18:46:57 +00:00
lain 7591a8928d Setting Store: Document in changelog. 2019-05-31 19:15:44 +02:00
lambda 2993361075 Merge branch 'hotfix/leaking-lists' into 'develop'
Mastodon API: Fix lists leaking private posts

See merge request pleroma/pleroma!1222
2019-05-31 13:26:48 +00:00
lain 10fe02acef Documentation: Document Settings store mechanism. 2019-05-31 14:59:24 +02:00
lain 7861974ab2 MastodonAPI: Add extension to set and get pleroma_settings_store. 2019-05-31 14:50:18 +02:00
lain aaad85c4d9 AccountView: settings -> settings_store 2019-05-31 14:49:46 +02:00
lain eb2963bc43 User: Add settings store to Info, AccountView
This is to provide a generic frontend settings storage mechanism for all kinds
of frontends.
2019-05-31 14:27:15 +02:00
rinpatch d9c0650ff9 Mastodon API: Fix lists leaking private posts
Our previous list visibility resolver grabbed posts if either follower
collection of the user in a list who is followed is in `to` or if
follower collection of the user in a list was in `cc`. This not only
missed unlisted posts but also lead to leaking private posts when
`fix_explicit_addressing` mistakingly started putting follower collections
to `cc` (also fixed in this MR).

Reported by @kurisu@iscute.moe via a DM
2019-05-31 15:25:17 +03:00
rinpatch a9eaa55885 Fix fix_explicit_addressing moving follower collection to cc and add tests for it 2019-05-31 14:17:05 +03:00
lain 97fb50d9fa Mastodon Conversation API: Don't return own account in 'accounts'. 2019-05-31 11:27:14 +02:00
lain 4e45f7bc87 CI: Add auto-deployment via dokku. 2019-05-31 10:55:35 +02:00
feld 3cc00fd2e9 Merge branch 'fix/install-guide' into 'develop'
Formatting

See merge request pleroma/pleroma!1219
2019-05-30 21:35:31 +00:00
feld 88414151b4 Formatting 2019-05-30 21:35:31 +00:00
feld 3c1c478125 Merge branch 'fix/install-guide' into 'develop'
Install docs should clone from master branch

See merge request pleroma/pleroma!1218
2019-05-30 21:30:42 +00:00
feld 75a37a68d4 Install docs should clone from master branch 2019-05-30 21:30:42 +00:00
feld 73a7420c23 Merge branch 'fix/ogp-missing-data' into 'develop'
Replace missing non-nullable Card attributes with empty strings

See merge request pleroma/pleroma!1217
2019-05-30 21:03:31 +00:00
Sergey Suprunenko 1690be991e Replace missing non-nullable Card attributes with empty strings 2019-05-30 21:03:31 +00:00
lambda 91ac8b075b Merge branch 'use-pleroma-config' into 'develop'
Use Pleroma.Config everywhere

See merge request pleroma/pleroma!1214
2019-05-30 13:16:08 +00:00
Egor Kislitsyn 99f70c7e20 Use Pleroma.Config everywhere 2019-05-30 15:33:58 +07:00
kaniini ab3f3af7cf Merge branch 'revert-57e58d26' into 'develop'
Revert "Merge branch 'feature/search-authenticated-only' into 'develop'"

See merge request pleroma/pleroma!1212
2019-05-29 22:19:13 +00:00
kaniini 6aec0d1b58 Revert "Merge branch 'feature/search-authenticated-only' into 'develop'"
This reverts merge request !1209
2019-05-29 22:10:16 +00:00
lambda 7e889786b8 Merge branch 'fix/mastodon-search-limit' into 'develop'
Default search limit should be 40

See merge request pleroma/pleroma!1210
2019-05-29 14:25:53 +00:00
lambda 6fb67b74da Merge branch 'issue/936' into 'develop'
[#936] fix tests

See merge request pleroma/pleroma!1208
2019-05-29 14:04:58 +00:00
Maksim db94294dfb [#936] fix tests 2019-05-29 14:04:58 +00:00
Mark Felder 672fddb721 Default search limit should be 40
https://docs.joinmastodon.org/api/rest/search/
2019-05-29 08:06:26 -05:00
kaniini 57e58d2602 Merge branch 'feature/search-authenticated-only' into 'develop'
router: require oauth_read for searching

Closes #935

See merge request pleroma/pleroma!1209
2019-05-29 11:33:37 +00:00
William Pitcock 0159a6dbe9 router: require oauth_read for searching
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-29 10:58:45 +00:00
feld 26e7613824 Merge branch 'varnish-improvements' into 'develop'
More Varnish improvements

See merge request pleroma/pleroma!667
2019-05-28 21:20:24 +00:00
feld abc15b6dcc Improve Varnish config. We set sane headers from the backend now. 2019-05-28 21:20:24 +00:00
kaniini b949a37ef5 Merge branch 'respect-proxy-settings-federation' into 'develop'
Respect proxy settings federation

See merge request pleroma/pleroma!1206
2019-05-28 06:49:54 +00:00
jeff 9f3bcf0efe Respect proxy settings federation 2019-05-28 06:49:53 +00:00
lambda 5bb843ceec Merge branch 'refactor/die-httpoison-die' into 'develop'
remove @httpoison, @ostatus and @websub compile-time constants

See merge request pleroma/pleroma!1203
2019-05-26 13:33:11 +00:00
kaniini d66cf4b2c4 Merge branch 'fix/mrf-simple' into 'develop'
mrf: simple policy: fix matching imported activitypub and ostatus statuses

Closes #915

See merge request pleroma/pleroma!1205
2019-05-26 02:10:31 +00:00
William Pitcock 79503ce90f mrf: simple policy: fix matching imported activitypub and ostatus statuses 2019-05-26 02:01:24 +00:00
William Pitcock 45e4642a58 tests: chase remote/local removal 2019-05-26 00:20:54 +00:00
William Pitcock 750ede5764 notification: remove local/remote match rules (too complicated) 2019-05-26 00:05:47 +00:00
William Pitcock 5fbbc57c1b add migration to add notification settings to user accounts 2019-05-25 07:25:13 +00:00
William Pitcock e7e2e7a1a6 user info: allow formdata for notification settings like every other API 2019-05-25 05:54:02 +00:00
William Pitcock 59a703fcbe twitter api: user view: expose user notification settings under pleroma object 2019-05-25 05:31:13 +00:00
William Pitcock 0f7eeb0943 tests: add tests for non-follows/non-followers settings 2019-05-25 05:25:40 +00:00
William Pitcock 1542cccbbc tests: chase notification setting changes 2019-05-25 05:22:13 +00:00
William Pitcock 4030837d91 notification: add non_follows/non_followers notification control settings 2019-05-25 05:19:47 +00:00
William Pitcock 56fd7dbdd7 remove @websub and @ostatus module-level constants 2019-05-25 04:43:11 +00:00
William Pitcock 80d55d428f tests: websub: check only that signature validation succeeds or fails 2019-05-25 04:34:16 +00:00