ihor/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'stable-sync/2.1.1' into 'develop'

Browse source 
Sync stable with develop after 2.1.1

Closes #2, #2047, #2095, #2116, #1987, and #2080

See merge request pleroma/pleroma!2974
This commit is contained in:
rinpatch 2020-09-08 17:57:02 +00:00
commit 7c055af567
57 changed files with 73 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
CHANGELOG.md
View file

@ -14,29 +14,30 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- **Breaking:** Removed `Pleroma.Workers.Cron.StatsWorker` setting from Oban `:crontab`. - **Breaking:** Removed `Pleroma.Workers.Cron.StatsWorker` setting from Oban `:crontab`.
## unreleased-patch - ??? ## [2.1.1] - 2020-09-08
### Security
- Fix possible DoS in Mastodon API user search due to an error in match clauses, leading to an infinite recursion and subsequent OOM with certain inputs.
- Fix metadata leak for accounts and statuses on private instances.
- Fix possible DoS in Admin API search using an atom leak vulnerability. Authentication with admin rights was required to exploit.
### Changed ### Changed
- **Breaking:** The metadata providers RelMe and Feed are no longer configurable. RelMe should always be activated and Feed only provides a <link> header tag for the actual RSS/Atom feed when the instance is public. - **Breaking:** The metadata providers RelMe and Feed are no longer configurable. RelMe should always be activated and Feed only provides a <link> header tag for the actual RSS/Atom feed when the instance is public.
- Improved error message when cmake is not available at build stage.
### Security
- Fix metadata leak for accounts and statuses on private instances
### Added ### Added
- Rich media failure tracking (along with `:failure_backoff` option).
- Rich media failure tracking (along with `:failure_backoff` option)
- MRF policy to rewrite bot posts scope from public to unlisted
### Fixed ### Fixed
- Default HTTP adapter not respecting pool setting, leading to possible OOM.
- Possible OOM errors with the default HTTP adapter
- Fixed uploading webp images when the Exiftool Upload Filter is enabled by skipping them - Fixed uploading webp images when the Exiftool Upload Filter is enabled by skipping them
- Mastodon API: Search parameter `following` now correctly returns the followings rather than the followers - Mastodon API: Search parameter `following` now correctly returns the followings rather than the followers
- Mastodon API: Timelines hanging for (`number of posts with links * rich media timeout`) in the worst case. - Mastodon API: Timelines hanging for (`number of posts with links * rich media timeout`) in the worst case.
Reduced to just rich media timeout. Reduced to just rich media timeout.
- Mastodon API: Cards being wrong for preview statuses due to cache key collision - Mastodon API: Cards being wrong for preview statuses due to cache key collision.
- Password resets no longer processed for deactivated accounts - Password resets no longer processed for deactivated accounts.
- Favicon scraper raising exceptions on URLs longer than 255 characters.
## [2.1.0] - 2020-08-28 ## [2.1.0] - 2020-08-28

2
priv/static/index.html
View file

@ -1 +1 @@
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><title>Pleroma</title><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link href=/static/css/app.77b1644622e3bae24b6b.css rel=stylesheet><link href=/static/fontello.1598361006087.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.bc5812c087f5dbcb914d.js></script><script type=text/javascript src=/static/js/app.154c25316542278028a6.js></script></body></html> <!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><title>Pleroma</title><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link href=/static/css/app.77b1644622e3bae24b6b.css rel=stylesheet><link href=/static/fontello.1599568314856.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.90c4af83c1ae68f4cd95.js></script><script type=text/javascript src=/static/js/app.55d173dc5e39519aa518.js></script></body></html>

BIN
priv/static/static/font/fontello.1598361006087.woff2
View file

Binary file not shown.

BIN
priv/static/static/font/fontello.1598361006087.eot → priv/static/static/font/fontello.1599568314856.eot
View file

Binary file not shown.

0
priv/static/static/font/fontello.1598361006087.svg → priv/static/static/font/fontello.1599568314856.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

BIN
priv/static/static/font/fontello.1598361006087.ttf → priv/static/static/font/fontello.1599568314856.ttf
View file

Binary file not shown.

BIN
priv/static/static/font/fontello.1598361006087.woff → priv/static/static/font/fontello.1599568314856.woff
View file

Binary file not shown.

BIN
priv/static/static/font/fontello.1599568314856.woff2 Normal file
View file

Binary file not shown.

12
priv/static/static/fontello.1598361006087.css → priv/static/static/fontello.1599568314856.css vendored
View file

@ -1,11 +1,11 @@
@font-face { @font-face {
font-family: "Icons"; font-family: "Icons";
src: url("./font/fontello.1598361006087.eot"); src: url("./font/fontello.1599568314856.eot");
src: url("./font/fontello.1598361006087.eot") format("embedded-opentype"), src: url("./font/fontello.1599568314856.eot") format("embedded-opentype"),
url("./font/fontello.1598361006087.woff2") format("woff2"), url("./font/fontello.1599568314856.woff2") format("woff2"),
url("./font/fontello.1598361006087.woff") format("woff"), url("./font/fontello.1599568314856.woff") format("woff"),
url("./font/fontello.1598361006087.ttf") format("truetype"), url("./font/fontello.1599568314856.ttf") format("truetype"),
url("./font/fontello.1598361006087.svg") format("svg"); url("./font/fontello.1599568314856.svg") format("svg");
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }

2
priv/static/static/js/10.1c5cd5fbe554eca63dfe.js
View file

File diff suppressed because one or more lines are too long

2
priv/static/static/js/10.46fbbdfaf0d4800f349b.js Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/static/js/10.1c5cd5fbe554eca63dfe.js.map → priv/static/static/js/10.46fbbdfaf0d4800f349b.js.map
View file

@ -1 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/10.1c5cd5fbe554eca63dfe.js","sourceRoot":""} {"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/10.46fbbdfaf0d4800f349b.js","sourceRoot":""}

2
priv/static/static/js/12.6619e0b2f854637e76d4.js
View file

File diff suppressed because one or more lines are too long

2
priv/static/static/js/12.b3bf0bc313861d6ec36b.js Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/static/js/12.6619e0b2f854637e76d4.js.map → priv/static/static/js/12.b3bf0bc313861d6ec36b.js.map
View file

@ -1 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/12.6619e0b2f854637e76d4.js","sourceRoot":""} {"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/12.b3bf0bc313861d6ec36b.js","sourceRoot":""}

4
priv/static/static/js/13.c843797f3e374f0e3e1a.js → priv/static/static/js/13.adb8a942514d735722c4.js
View file

File diff suppressed because one or more lines are too long

2
priv/static/static/js/13.c843797f3e374f0e3e1a.js.map → priv/static/static/js/13.adb8a942514d735722c4.js.map
View file

@ -1 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/13.c843797f3e374f0e3e1a.js","sourceRoot":""} {"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/13.adb8a942514d735722c4.js","sourceRoot":""}

4
priv/static/static/js/14.71f8caca49093a99e871.js → priv/static/static/js/14.d015d9b2ea16407e389c.js
View file

File diff suppressed because one or more lines are too long

2
priv/static/static/js/14.71f8caca49093a99e871.js.map → priv/static/static/js/14.d015d9b2ea16407e389c.js.map
View file

@ -1 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/14.71f8caca49093a99e871.js","sourceRoot":""} {"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/14.d015d9b2ea16407e389c.js","sourceRoot":""}

4
priv/static/static/js/18.b29eedabe76445fe94b8.js → priv/static/static/js/18.94946caca48930c224c7.js
View file

File diff suppressed because one or more lines are too long

1
priv/static/static/js/18.94946caca48930c224c7.js.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/18.94946caca48930c224c7.js","sourceRoot":""}

1
priv/static/static/js/18.b29eedabe76445fe94b8.js.map
View file

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/18.b29eedabe76445fe94b8.js","sourceRoot":""}

4
priv/static/static/js/19.ed1cd5db596618779f03.js → priv/static/static/js/19.233c81ac2c28d55e9f13.js
View file

File diff suppressed because one or more lines are too long

1
priv/static/static/js/19.233c81ac2c28d55e9f13.js.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/19.233c81ac2c28d55e9f13.js","sourceRoot":""}

1
priv/static/static/js/19.ed1cd5db596618779f03.js.map
View file

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/19.ed1cd5db596618779f03.js","sourceRoot":""}

4
priv/static/static/js/2.fb3f90b584362209a143.js → priv/static/static/js/2.c92f4803ff24726cea58.js
View file

File diff suppressed because one or more lines are too long

1
priv/static/static/js/2.c92f4803ff24726cea58.js.map Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/static/js/2.fb3f90b584362209a143.js.map
View file

File diff suppressed because one or more lines are too long

1
priv/static/static/js/20.6d311b830d8ac672729f.js.map
View file

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/20.6d311b830d8ac672729f.js","sourceRoot":""}

4
priv/static/static/js/20.6d311b830d8ac672729f.js → priv/static/static/js/20.818c38d27369c3a4d677.js
View file

File diff suppressed because one or more lines are too long

1
priv/static/static/js/20.818c38d27369c3a4d677.js.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/20.818c38d27369c3a4d677.js","sourceRoot":""}

1
priv/static/static/js/23.2c5f0fd2f2acd04592e8.js.map
View file

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/23.2c5f0fd2f2acd04592e8.js","sourceRoot":""}

4
priv/static/static/js/23.2c5f0fd2f2acd04592e8.js → priv/static/static/js/23.a57a7845cc20fafd06d1.js
View file

File diff suppressed because one or more lines are too long

1
priv/static/static/js/23.a57a7845cc20fafd06d1.js.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/23.a57a7845cc20fafd06d1.js","sourceRoot":""}

1
priv/static/static/js/25.365514e44606a895ab50.js.map
View file

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/25.365514e44606a895ab50.js","sourceRoot":""}

4
priv/static/static/js/25.365514e44606a895ab50.js → priv/static/static/js/25.5a9efe20e3ae1352e6d2.js
View file

File diff suppressed because one or more lines are too long

1
priv/static/static/js/25.5a9efe20e3ae1352e6d2.js.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/25.5a9efe20e3ae1352e6d2.js","sourceRoot":""}

1
priv/static/static/js/28.9eb3e783aeba24c84f0a.js.map
View file

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/28.9eb3e783aeba24c84f0a.js","sourceRoot":""}

4
priv/static/static/js/28.9eb3e783aeba24c84f0a.js → priv/static/static/js/28.e0f9f164e0bfd890dc61.js
View file

File diff suppressed because one or more lines are too long

1
priv/static/static/js/28.e0f9f164e0bfd890dc61.js.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/28.e0f9f164e0bfd890dc61.js","sourceRoot":""}

2
priv/static/static/js/3.7d21accf4e5bd07e3ebf.js
View file

File diff suppressed because one or more lines are too long

2
priv/static/static/js/3.7d21accf4e5bd07e3ebf.js.map
View file

File diff suppressed because one or more lines are too long

1
priv/static/static/js/30.a9377272337674f2dd05.js.map
View file

@ -1 +0,0 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/30.a9377272337674f2dd05.js","sourceRoot":""}

4
priv/static/static/js/30.a9377272337674f2dd05.js → priv/static/static/js/30.fce58be0b52ca3e32fa4.js
View file

File diff suppressed because one or more lines are too long

1
priv/static/static/js/30.fce58be0b52ca3e32fa4.js.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/30.fce58be0b52ca3e32fa4.js","sourceRoot":""}

4
priv/static/static/js/8.5f48d6f0cbed548baf0f.js → priv/static/static/js/8.636322a87bb10a1754f8.js
View file

File diff suppressed because one or more lines are too long

2
priv/static/static/js/8.5f48d6f0cbed548baf0f.js.map → priv/static/static/js/8.636322a87bb10a1754f8.js.map
View file

@ -1 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/8.5f48d6f0cbed548baf0f.js","sourceRoot":""} {"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/8.636322a87bb10a1754f8.js","sourceRoot":""}

4
priv/static/static/js/9.a95fcd286ba2c9050c4d.js → priv/static/static/js/9.6010dbcce7b4d7c05a18.js
View file

File diff suppressed because one or more lines are too long

2
priv/static/static/js/9.a95fcd286ba2c9050c4d.js.map → priv/static/static/js/9.6010dbcce7b4d7c05a18.js.map
View file

@ -1 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/9.a95fcd286ba2c9050c4d.js","sourceRoot":""} {"version":3,"sources":[],"names":[],"mappings":"","file":"static/js/9.6010dbcce7b4d7c05a18.js","sourceRoot":""}

2
priv/static/static/js/app.154c25316542278028a6.js
View file

File diff suppressed because one or more lines are too long

1
priv/static/static/js/app.154c25316542278028a6.js.map
View file

File diff suppressed because one or more lines are too long

2
priv/static/static/js/app.55d173dc5e39519aa518.js Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/static/js/app.55d173dc5e39519aa518.js.map Normal file
View file

File diff suppressed because one or more lines are too long

6
priv/static/static/js/vendors~app.bc5812c087f5dbcb914d.js → priv/static/static/js/vendors~app.90c4af83c1ae68f4cd95.js
View file

File diff suppressed because one or more lines are too long

2
priv/static/static/js/vendors~app.bc5812c087f5dbcb914d.js.map → priv/static/static/js/vendors~app.90c4af83c1ae68f4cd95.js.map
View file

File diff suppressed because one or more lines are too long

4
priv/static/sw-pleroma.js
View file

File diff suppressed because one or more lines are too long

2
priv/static/sw-pleroma.js.map
View file

File diff suppressed because one or more lines are too long