akkoma
5 years agoMerge branch 'dokku' into 'develop'
Haelwenn [Fri, 31 May 2019 23:09:06 +0000 (23:09 +0000)]
Merge branch 'dokku' into 'develop'

Dokku CI support - On-Demand review instances

See merge request pleroma/pleroma!1216

5 years agoMerge branch 'doc/mongoose-im-config' into 'develop'
feld [Fri, 31 May 2019 20:36:33 +0000 (20:36 +0000)]
Merge branch 'doc/mongoose-im-config' into 'develop'

Sample Mongoose IM config

See merge request pleroma/pleroma!1226

5 years agoSample Mongoose IM config.
feld [Fri, 31 May 2019 20:36:33 +0000 (20:36 +0000)]
Sample Mongoose IM config.

Change domain, ensure paths to PEM files are correct, and this is good to go.

5 years agoMerge branch 'fix/mastodon-user-search' into 'develop'
lambda [Fri, 31 May 2019 18:46:57 +0000 (18:46 +0000)]
Merge branch 'fix/mastodon-user-search' into 'develop'

Fix/mastodon user search

See merge request pleroma/pleroma!1224

5 years agoMastodon API search default value for "resolve" is false
feld [Fri, 31 May 2019 18:46:57 +0000 (18:46 +0000)]
Mastodon API search default value for "resolve" is false

https://docs.joinmastodon.org/api/rest/accounts/
https://docs.joinmastodon.org/api/rest/search/

5 years agoMerge branch 'hotfix/leaking-lists' into 'develop'
lambda [Fri, 31 May 2019 13:26:48 +0000 (13:26 +0000)]
Merge branch 'hotfix/leaking-lists' into 'develop'

Mastodon API: Fix lists leaking private posts

See merge request pleroma/pleroma!1222

5 years agoMastodon API: Fix lists leaking private posts
rinpatch [Fri, 31 May 2019 12:25:17 +0000 (15:25 +0300)]
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

5 years agoFix fix_explicit_addressing moving follower collection to cc and add tests for it
rinpatch [Fri, 31 May 2019 11:17:05 +0000 (14:17 +0300)]
Fix fix_explicit_addressing moving follower collection to cc and add tests for it

5 years agoCI: Add auto-deployment via dokku.
lain [Fri, 31 May 2019 08:55:35 +0000 (10:55 +0200)]
CI: Add auto-deployment via dokku.

5 years agoMerge branch 'fix/install-guide' into 'develop'
feld [Thu, 30 May 2019 21:35:31 +0000 (21:35 +0000)]
Merge branch 'fix/install-guide' into 'develop'

Formatting

See merge request pleroma/pleroma!1219

5 years agoFormatting
feld [Thu, 30 May 2019 21:35:31 +0000 (21:35 +0000)]
Formatting

5 years agoMerge branch 'fix/install-guide' into 'develop'
feld [Thu, 30 May 2019 21:30:42 +0000 (21:30 +0000)]
Merge branch 'fix/install-guide' into 'develop'

Install docs should clone from master branch

See merge request pleroma/pleroma!1218

5 years agoInstall docs should clone from master branch
feld [Thu, 30 May 2019 21:30:42 +0000 (21:30 +0000)]
Install docs should clone from master branch

5 years agoMerge branch 'fix/ogp-missing-data' into 'develop'
feld [Thu, 30 May 2019 21:03:31 +0000 (21:03 +0000)]
Merge branch 'fix/ogp-missing-data' into 'develop'

Replace missing non-nullable Card attributes with empty strings

See merge request pleroma/pleroma!1217

5 years agoReplace missing non-nullable Card attributes with empty strings
Sergey Suprunenko [Thu, 30 May 2019 21:03:31 +0000 (21:03 +0000)]
Replace missing non-nullable Card attributes with empty strings

5 years agoMerge branch 'use-pleroma-config' into 'develop'
lambda [Thu, 30 May 2019 13:16:08 +0000 (13:16 +0000)]
Merge branch 'use-pleroma-config' into 'develop'

Use Pleroma.Config everywhere

See merge request pleroma/pleroma!1214

5 years agoUse Pleroma.Config everywhere
Egor Kislitsyn [Thu, 30 May 2019 08:33:58 +0000 (15:33 +0700)]
Use Pleroma.Config everywhere

5 years agoMerge branch 'revert-57e58d26' into 'develop'
kaniini [Wed, 29 May 2019 22:19:13 +0000 (22:19 +0000)]
Merge branch 'revert-57e58d26' into 'develop'

Revert "Merge branch 'feature/search-authenticated-only' into 'develop'"

See merge request pleroma/pleroma!1212

5 years agoRevert "Merge branch 'feature/search-authenticated-only' into 'develop'"
kaniini [Wed, 29 May 2019 22:10:16 +0000 (22:10 +0000)]
Revert "Merge branch 'feature/search-authenticated-only' into 'develop'"

This reverts merge request !1209

5 years agoMerge branch 'fix/mastodon-search-limit' into 'develop'
lambda [Wed, 29 May 2019 14:25:53 +0000 (14:25 +0000)]
Merge branch 'fix/mastodon-search-limit' into 'develop'

Default search limit should be 40

See merge request pleroma/pleroma!1210

5 years agoMerge branch 'issue/936' into 'develop'
lambda [Wed, 29 May 2019 14:04:58 +0000 (14:04 +0000)]
Merge branch 'issue/936' into 'develop'

[#936] fix tests

See merge request pleroma/pleroma!1208

5 years ago[#936] fix tests
Maksim [Wed, 29 May 2019 14:04:58 +0000 (14:04 +0000)]
[#936] fix tests

5 years agoDefault search limit should be 40
Mark Felder [Wed, 29 May 2019 13:06:26 +0000 (08:06 -0500)]
Default search limit should be 40

https://docs.joinmastodon.org/api/rest/search/

5 years agoMerge branch 'feature/search-authenticated-only' into 'develop'
kaniini [Wed, 29 May 2019 11:33:37 +0000 (11:33 +0000)]
Merge branch 'feature/search-authenticated-only' into 'develop'

router: require oauth_read for searching

Closes #935

See merge request pleroma/pleroma!1209

5 years agorouter: require oauth_read for searching
William Pitcock [Wed, 29 May 2019 10:58:45 +0000 (10:58 +0000)]
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.

5 years agoMerge branch 'varnish-improvements' into 'develop'
feld [Tue, 28 May 2019 21:20:24 +0000 (21:20 +0000)]
Merge branch 'varnish-improvements' into 'develop'

More Varnish improvements

See merge request pleroma/pleroma!667

5 years agoImprove Varnish config. We set sane headers from the backend now.
feld [Tue, 28 May 2019 21:20:24 +0000 (21:20 +0000)]
Improve Varnish config. We set sane headers from the backend now.

5 years agoMerge branch 'respect-proxy-settings-federation' into 'develop'
kaniini [Tue, 28 May 2019 06:49:54 +0000 (06:49 +0000)]
Merge branch 'respect-proxy-settings-federation' into 'develop'

Respect proxy settings federation

See merge request pleroma/pleroma!1206

5 years agoRespect proxy settings federation
jeff [Tue, 28 May 2019 06:49:53 +0000 (06:49 +0000)]
Respect proxy settings federation

5 years agoMerge branch 'refactor/die-httpoison-die' into 'develop'
lambda [Sun, 26 May 2019 13:33:11 +0000 (13:33 +0000)]
Merge branch 'refactor/die-httpoison-die' into 'develop'

remove @httpoison, @ostatus and @websub compile-time constants

See merge request pleroma/pleroma!1203

5 years agoMerge branch 'fix/mrf-simple' into 'develop'
kaniini [Sun, 26 May 2019 02:10:31 +0000 (02:10 +0000)]
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

5 years agomrf: simple policy: fix matching imported activitypub and ostatus statuses
William Pitcock [Sun, 26 May 2019 01:57:22 +0000 (01:57 +0000)]
mrf: simple policy: fix matching imported activitypub and ostatus statuses

5 years agoremove @websub and @ostatus module-level constants
William Pitcock [Sat, 25 May 2019 04:39:32 +0000 (04:39 +0000)]
remove @websub and @ostatus module-level constants

5 years agotests: websub: check only that signature validation succeeds or fails
William Pitcock [Sat, 25 May 2019 04:34:16 +0000 (04:34 +0000)]
tests: websub: check only that signature validation succeeds or fails

5 years agokill @httpoison
William Pitcock [Sat, 25 May 2019 04:24:21 +0000 (04:24 +0000)]
kill @httpoison

5 years agoMerge branch 'fix/nodeinfo-unavailable-when-not-federating' into 'develop'
kaniini [Sat, 25 May 2019 01:45:17 +0000 (01:45 +0000)]
Merge branch 'fix/nodeinfo-unavailable-when-not-federating' into 'develop'

Keep nodeinfo available when not federating

Closes #923

See merge request pleroma/pleroma!1202

5 years agoKeep nodeinfo available when not federating
Aaron Tinio [Sat, 25 May 2019 00:15:12 +0000 (08:15 +0800)]
Keep nodeinfo available when not federating

5 years agoMerge branch 'bugfix/mention-all-people-in-beginning-dm' into 'develop'
kaniini [Fri, 24 May 2019 20:34:23 +0000 (20:34 +0000)]
Merge branch 'bugfix/mention-all-people-in-beginning-dm' into 'develop'

Mention all people in the beginning of DM

Closes #924

See merge request pleroma/pleroma!1194

5 years agoMention all people in the beginning of DM
Sergey Suprunenko [Fri, 24 May 2019 20:34:23 +0000 (20:34 +0000)]
Mention all people in the beginning of DM

5 years agoMerge branch 'feature/static-headers' into 'develop'
kaniini [Fri, 24 May 2019 20:33:55 +0000 (20:33 +0000)]
Merge branch 'feature/static-headers' into 'develop'

Improve serving of static assets

See merge request pleroma/pleroma!1200

5 years agoMove the Cache Control header test to its own file
feld [Fri, 24 May 2019 20:33:55 +0000 (20:33 +0000)]
Move the Cache Control header test to its own file

We can consolidate our cache control header tests here

5 years agoMerge branch 'reverse_proxy_upstream_v4_fix' into 'develop'
lambda [Fri, 24 May 2019 09:54:45 +0000 (09:54 +0000)]
Merge branch 'reverse_proxy_upstream_v4_fix' into 'develop'

explicitly set reverse proxy upstream to IPv4

Closes #930

See merge request pleroma/pleroma!1197

5 years agoexplicitly set reverse proxy upstream to IPv4
Alfie Pates [Thu, 23 May 2019 21:33:27 +0000 (22:33 +0100)]
explicitly set reverse proxy upstream to IPv4

  since Pleroma.Web.Endpoint binds on IPv4 only and `localhost.` resolves to
  [::0] on some systems

  fixes #930.

5 years agoMerge branch 'feature/mrf-user-filter' into 'develop'
kaniini [Wed, 22 May 2019 19:03:14 +0000 (19:03 +0000)]
Merge branch 'feature/mrf-user-filter' into 'develop'

mrf: add support for filtering users

See merge request pleroma/pleroma!1188

5 years agoMerge branch 'ssh-fixes' into 'develop'
kaniini [Wed, 22 May 2019 18:57:34 +0000 (18:57 +0000)]
Merge branch 'ssh-fixes' into 'develop'

Ssh fixes

Closes #869 and #925

See merge request pleroma/pleroma!1191

5 years agoupdate documentation for the new MRF features [no-ci]
William Pitcock [Wed, 22 May 2019 05:55:09 +0000 (05:55 +0000)]
update documentation for the new MRF features [no-ci]

5 years agotests: add tests for banner and avatar removal
William Pitcock [Wed, 22 May 2019 05:08:37 +0000 (05:08 +0000)]
tests: add tests for banner and avatar removal

5 years agomrf: simple policy: add the ability to strip avatars and banners from user profiles
William Pitcock [Wed, 22 May 2019 04:55:16 +0000 (04:55 +0000)]
mrf: simple policy: add the ability to strip avatars and banners from user profiles

5 years agoactivitypub: run user objects through MRF filters
William Pitcock [Wed, 22 May 2019 04:33:10 +0000 (04:33 +0000)]
activitypub: run user objects through MRF filters

5 years agomrf: defang policy modules for filtering user profile objects
William Pitcock [Wed, 22 May 2019 04:15:59 +0000 (04:15 +0000)]
mrf: defang policy modules for filtering user profile objects

5 years agoMerge branch 'fix/prune-objects-times-out' into 'develop'
rinpatch [Wed, 22 May 2019 17:19:51 +0000 (17:19 +0000)]
Merge branch 'fix/prune-objects-times-out' into 'develop'

Disable timeouts for object pruning query

See merge request pleroma/pleroma!1193

5 years agoDisable timeouts for object pruning query
rinpatch [Wed, 22 May 2019 17:10:52 +0000 (20:10 +0300)]
Disable timeouts for object pruning query

5 years agoMerge branch 'issue/699' into 'develop'
lambda [Wed, 22 May 2019 15:44:50 +0000 (15:44 +0000)]
Merge branch 'issue/699' into 'develop'

[#699] add worker to clean expired oauth tokens

See merge request pleroma/pleroma!1184

5 years ago[#699] add worker to clean expired oauth tokens
Maksim [Wed, 22 May 2019 15:44:50 +0000 (15:44 +0000)]
[#699] add worker to clean expired oauth tokens

5 years agoUpdate CHANGELOG.md
lambda [Wed, 22 May 2019 11:07:51 +0000 (11:07 +0000)]
Update CHANGELOG.md

5 years agoMerge branch 'feature/object-pruning' into 'develop'
lambda [Wed, 22 May 2019 11:04:30 +0000 (11:04 +0000)]
Merge branch 'feature/object-pruning' into 'develop'

Object pruning

See merge request pleroma/pleroma!1181

5 years agoMix: Only start sshd when needed, second try.
lain [Wed, 22 May 2019 10:57:20 +0000 (12:57 +0200)]
Mix: Only start sshd when needed, second try.

5 years agoMerge branch 'bring-ecto-back-to-mainline' into 'develop'
lambda [Wed, 22 May 2019 10:05:05 +0000 (10:05 +0000)]
Merge branch 'bring-ecto-back-to-mainline' into 'develop'

Mix: Bring ecto-sql back to mainline.

See merge request pleroma/pleroma!1192

5 years agoMix: Bring ecto-sql back to mainline.
lain [Wed, 22 May 2019 09:44:17 +0000 (11:44 +0200)]
Mix: Bring ecto-sql back to mainline.

5 years agoChangelog: Add tip for debian users.
lain [Wed, 22 May 2019 09:01:10 +0000 (11:01 +0200)]
Changelog: Add tip for debian users.

5 years agoDocumentation: Specify PEM format for SSH keys.
lain [Wed, 22 May 2019 08:44:26 +0000 (10:44 +0200)]
Documentation: Specify PEM format for SSH keys.

Otherwise openssh-client 7.9 will generate a different format that can't be used
by esshd.

5 years agoLinting.
lain [Wed, 22 May 2019 08:40:15 +0000 (10:40 +0200)]
Linting.

5 years agoMix: Don't start esshd application if we don't need it.
lain [Wed, 22 May 2019 08:28:50 +0000 (10:28 +0200)]
Mix: Don't start esshd application if we don't need it.

5 years agoChangelog: Add SSH mode.
lain [Wed, 22 May 2019 08:17:32 +0000 (10:17 +0200)]
Changelog: Add SSH mode.

5 years agoMerge branch 'refactor/keys' into 'develop'
lambda [Wed, 22 May 2019 06:28:16 +0000 (06:28 +0000)]
Merge branch 'refactor/keys' into 'develop'

move key generation functions into Pleroma.Keys module

See merge request pleroma/pleroma!1186

5 years agosalmon: fix credo
William Pitcock [Wed, 22 May 2019 05:58:51 +0000 (05:58 +0000)]
salmon: fix credo

5 years agoMerge branch 'bugfix/account_view_source.note' into 'develop'
rinpatch [Wed, 22 May 2019 05:39:01 +0000 (05:39 +0000)]
Merge branch 'bugfix/account_view_source.note' into 'develop'

MastoAPI AccountView: fill source.note with plaintext version of note

Closes #926

See merge request pleroma/pleroma!1189

5 years agoMastoAPI AccountView: fill source.note with plaintext version of note
Haelwenn (lanodan) Monnier [Wed, 22 May 2019 05:22:19 +0000 (07:22 +0200)]
MastoAPI AccountView: fill source.note with plaintext version of note

Closes: https://git.pleroma.social/pleroma/pleroma/issues/926
5 years agoMerge branch 'mongooseim-support' into 'develop'
kaniini [Wed, 22 May 2019 04:06:54 +0000 (04:06 +0000)]
Merge branch 'mongooseim-support' into 'develop'

MongooseIM: Add basic integration endpoints.

See merge request pleroma/pleroma!1172

5 years agoMerge branch 'fix/api-fallback' into 'develop'
kaniini [Wed, 22 May 2019 04:05:41 +0000 (04:05 +0000)]
Merge branch 'fix/api-fallback' into 'develop'

Do not fallback to index.html for /api/* routes

Closes #920

See merge request pleroma/pleroma!1182

5 years agoMerge branch 'bugfix/dm-being-truncated' into 'develop'
kaniini [Wed, 22 May 2019 04:04:20 +0000 (04:04 +0000)]
Merge branch 'bugfix/dm-being-truncated' into 'develop'

Do not truncate DM when it contains newlines and safe_dm_mentions is set to true

Closes #904

See merge request pleroma/pleroma!1185

5 years agoDo not truncate DM when it contains newlines and safe_dm_mentions is set to true
Sergey Suprunenko [Wed, 22 May 2019 04:04:20 +0000 (04:04 +0000)]
Do not truncate DM when it contains newlines and safe_dm_mentions is set to true

5 years agomove key generation functions into Pleroma.Keys module
William Pitcock [Wed, 22 May 2019 03:58:15 +0000 (03:58 +0000)]
move key generation functions into Pleroma.Keys module

5 years agoprune objects task: use Repo.delete_all()
William Pitcock [Wed, 22 May 2019 03:12:48 +0000 (03:12 +0000)]
prune objects task: use Repo.delete_all()

5 years agoFix failing test
Aaron Tinio [Tue, 21 May 2019 23:11:09 +0000 (07:11 +0800)]
Fix failing test

5 years agoRespond with a 404 Not implemented JSON error message
Aaron Tinio [Tue, 21 May 2019 01:40:29 +0000 (09:40 +0800)]
Respond with a 404 Not implemented JSON error message

when requested API is not implemented

5 years agoAdd tests for fallback routes
Aaron Tinio [Tue, 21 May 2019 01:39:32 +0000 (09:39 +0800)]
Add tests for fallback routes

5 years agoadd changelog entry for object pruning
William Pitcock [Tue, 21 May 2019 01:22:27 +0000 (01:22 +0000)]
add changelog entry for object pruning

5 years agoadd mix task to prune the object database using a configured retention period
William Pitcock [Tue, 21 May 2019 01:21:28 +0000 (01:21 +0000)]
add mix task to prune the object database using a configured retention period

5 years agoobject: fetcher: add support for reinjecting pruned objects
William Pitcock [Tue, 21 May 2019 00:41:58 +0000 (00:41 +0000)]
object: fetcher: add support for reinjecting pruned objects

5 years agoobject: add Object.prune()
William Pitcock [Tue, 21 May 2019 00:41:40 +0000 (00:41 +0000)]
object: add Object.prune()

5 years agoMongooseIM: Add documentation.
lain [Tue, 21 May 2019 16:57:36 +0000 (18:57 +0200)]
MongooseIM: Add documentation.

5 years agoMerge branch 'trivial/increase-hackney-timeouts' into 'develop'
kaniini [Tue, 21 May 2019 05:15:29 +0000 (05:15 +0000)]
Merge branch 'trivial/increase-hackney-timeouts' into 'develop'

http: bump connection timeout to 10 seconds

See merge request pleroma/pleroma!1183

5 years agohttp: bump connection timeout to 10 seconds
William Pitcock [Tue, 21 May 2019 04:58:26 +0000 (04:58 +0000)]
http: bump connection timeout to 10 seconds

5 years agoMerge branch 'fix/prometheus-ecto-error-when-not-configured' into 'develop'
kaniini [Tue, 21 May 2019 01:36:06 +0000 (01:36 +0000)]
Merge branch 'fix/prometheus-ecto-error-when-not-configured' into 'develop'

Fix prometheus-ecto error when not configured

Closes #917

See merge request pleroma/pleroma!1180

5 years agoMerge branch 'refactor/add-virtual-thread-muted-field' into 'develop'
kaniini [Mon, 20 May 2019 23:30:19 +0000 (23:30 +0000)]
Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop'

Add virtual :thread_muted? field

Closes #901

See merge request pleroma/pleroma!1178

5 years agoFix prometheus-ecto error when not configured
Aaron Tinio [Mon, 20 May 2019 23:30:18 +0000 (07:30 +0800)]
Fix prometheus-ecto error when not configured

5 years agoAdditional reserved usernames
Mark Felder [Mon, 20 May 2019 22:18:59 +0000 (17:18 -0500)]
Additional reserved usernames

5 years agoMerge branch 'feature/user-configurable-mascot' into 'develop'
kaniini [Mon, 20 May 2019 18:17:42 +0000 (18:17 +0000)]
Merge branch 'feature/user-configurable-mascot' into 'develop'

Feature: user configurable mascot

See merge request pleroma/pleroma!1177

5 years agoMerge branch 'doc/mrf-simple-report-removal' into 'develop'
kaniini [Mon, 20 May 2019 18:16:29 +0000 (18:16 +0000)]
Merge branch 'doc/mrf-simple-report-removal' into 'develop'

Document MRF.Simple :report_removal

See merge request pleroma/pleroma!1179

5 years agoDocument MRF.Simple :report_removal
Aaron Tinio [Mon, 20 May 2019 16:59:12 +0000 (00:59 +0800)]
Document MRF.Simple :report_removal

5 years agoAdd virtual :thread_muted? field
Aaron Tinio [Mon, 20 May 2019 16:35:46 +0000 (00:35 +0800)]
Add virtual :thread_muted? field

that may be set when fetching activities

5 years agoMove default mascot configuration to `config/`
Sadposter [Mon, 20 May 2019 15:12:55 +0000 (16:12 +0100)]
Move default mascot configuration to `config/`

5 years agoAdd changelog entry for mascot config
Sadposter [Mon, 20 May 2019 13:19:42 +0000 (14:19 +0100)]
Add changelog entry for mascot config

5 years agoUse string map for default mascot
Sadposter [Mon, 20 May 2019 12:10:04 +0000 (13:10 +0100)]
Use string map for default mascot

5 years agoFormat mascot tests
Sadposter [Mon, 20 May 2019 11:58:17 +0000 (12:58 +0100)]
Format mascot tests

5 years agoAdd mascot get/set tests
Sadposter [Mon, 20 May 2019 11:58:06 +0000 (12:58 +0100)]
Add mascot get/set tests

5 years agoAdd API endpoints for a custom user mascot
Sadposter [Mon, 20 May 2019 11:39:23 +0000 (12:39 +0100)]
Add API endpoints for a custom user mascot

5 years agoMerge branch 'feature/mrf-simple-report-filtering' into 'develop'
kaniini [Sun, 19 May 2019 22:30:10 +0000 (22:30 +0000)]
Merge branch 'feature/mrf-simple-report-filtering' into 'develop'

Add report filtering to MRF.SimplePolicy

Closes #610

See merge request pleroma/pleroma!1176

5 years agoAdd report filtering to MRF.SimplePolicy
Aaron Tinio [Sun, 19 May 2019 22:02:50 +0000 (06:02 +0800)]
Add report filtering to MRF.SimplePolicy