limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity
5207 commits 27 branches 107 tags 315 MiB
Commit graph

5207 commits

This branch
This branch
All branches
Author SHA1 Message Date
rinpatch
a9eaa55885 Fix fix_explicit_addressing moving follower collection to cc and add tests for it 2019-05-31 14:17:05 +03: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
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
William Pitcock
9bec891eb4 kill @httpoison 2019-05-25 04:24:21 +00:00
kaniini
9f44fa0686 Merge branch 'fix/nodeinfo-unavailable-when-not-federating' into 'develop' 
Keep nodeinfo available when not federating

Closes #923

See merge request pleroma/pleroma!1202
 2019-05-25 01:45:17 +00:00
Aaron Tinio
9415932af5 Keep nodeinfo available when not federating 2019-05-25 08:15:12 +08:00
kaniini
625fec58ff 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
 2019-05-24 20:34:23 +00:00
Sergey Suprunenko
bbea5691da Mention all people in the beginning of DM 2019-05-24 20:34:23 +00:00
kaniini
8a0ee011ac Merge branch 'feature/static-headers' into 'develop' 
Improve serving of static assets

See merge request pleroma/pleroma!1200
 2019-05-24 20:33:55 +00:00
feld
f916e4cdd9 Move the Cache Control header test to its own file 
We can consolidate our cache control header tests here
 2019-05-24 20:33:55 +00:00
lambda
6499adc6a8 Merge branch 'reverse_proxy_upstream_v4_fix' into 'develop' 
explicitly set reverse proxy upstream to IPv4

Closes #930

See merge request pleroma/pleroma!1197
 2019-05-24 09:54:45 +00:00
Alfie Pates
356c047759 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.
 2019-05-23 22:33:27 +01:00
kaniini
75e78d4e23 Merge branch 'feature/mrf-user-filter' into 'develop' 
mrf: add support for filtering users

See merge request pleroma/pleroma!1188
 2019-05-22 19:03:14 +00:00
kaniini
f0516d9114 Merge branch 'ssh-fixes' into 'develop' 
Ssh fixes

Closes #869 and #925

See merge request pleroma/pleroma!1191
 2019-05-22 18:57:34 +00:00
William Pitcock
7d9b33b3ce update documentation for the new MRF features [no-ci] 2019-05-22 18:53:30 +00:00
William Pitcock
8086c7aed6 tests: add tests for banner and avatar removal 2019-05-22 18:53:12 +00:00
William Pitcock
baf72d6c58 mrf: simple policy: add the ability to strip avatars and banners from user profiles 2019-05-22 18:53:12 +00:00
William Pitcock
60f882b09f activitypub: run user objects through MRF filters 2019-05-22 18:53:12 +00:00
William Pitcock
75b6c4b004 mrf: defang policy modules for filtering user profile objects 2019-05-22 18:53:12 +00:00
rinpatch
0b4f569c5b Merge branch 'fix/prune-objects-times-out' into 'develop' 
Disable timeouts for object pruning query

See merge request pleroma/pleroma!1193
 2019-05-22 17:19:51 +00:00
rinpatch
54e10a3e55 Disable timeouts for object pruning query 2019-05-22 20:10:52 +03:00
lambda
83ca12f45e Merge branch 'issue/699' into 'develop' 
[#699] add worker to clean expired oauth tokens

See merge request pleroma/pleroma!1184
 2019-05-22 15:44:50 +00:00
Maksim
620908a2db [#699] add worker to clean expired oauth tokens 2019-05-22 15:44:50 +00:00
lambda
78ac8ee561 Update CHANGELOG.md 2019-05-22 11:07:51 +00:00
lambda
714d8d4ef9 Merge branch 'feature/object-pruning' into 'develop' 
Object pruning

See merge request pleroma/pleroma!1181
 2019-05-22 11:04:30 +00:00
lain
f323031927 Mix: Only start sshd when needed, second try. 2019-05-22 12:57:20 +02:00
lambda
ad535ae55b Merge branch 'bring-ecto-back-to-mainline' into 'develop' 
Mix: Bring ecto-sql back to mainline.

See merge request pleroma/pleroma!1192
 2019-05-22 10:05:05 +00:00
lain
f4cfcead88 Mix: Bring ecto-sql back to mainline. 2019-05-22 11:44:17 +02:00
lain
3b12e1ba7c Changelog: Add tip for debian users. 2019-05-22 11:01:10 +02:00
lain
b22145cbc4 Documentation: Specify PEM format for SSH keys. 
Otherwise openssh-client 7.9 will generate a different format that can't be used
by esshd.
 2019-05-22 10:44:26 +02:00
lain
db9a82d168 Linting. 2019-05-22 10:40:15 +02:00
lain
b6cf62ddea Mix: Don't start esshd application if we don't need it. 2019-05-22 10:28:50 +02:00
lain
f9e0d09ec0 Changelog: Add SSH mode. 2019-05-22 10:17:32 +02:00
lambda
ff363f70b5 Merge branch 'refactor/keys' into 'develop' 
move key generation functions into Pleroma.Keys module

See merge request pleroma/pleroma!1186
 2019-05-22 06:28:16 +00:00
William Pitcock
1344c85e2f salmon: fix credo 2019-05-22 05:58:51 +00:00