diff --git a/CHANGELOG.md b/CHANGELOG.md index 512547427..19b2596cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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`. -## 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 - **Breaking:** The metadata providers RelMe and Feed are no longer configurable. RelMe should always be activated and Feed only provides a header tag for the actual RSS/Atom feed when the instance is public. - -### Security -- Fix metadata leak for accounts and statuses on private instances +- Improved error message when cmake is not available at build stage. ### Added - -- Rich media failure tracking (along with `:failure_backoff` option) -- MRF policy to rewrite bot posts scope from public to unlisted +- Rich media failure tracking (along with `:failure_backoff` option). ### Fixed - -- Possible OOM errors with the default HTTP adapter +- Default HTTP adapter not respecting pool setting, leading to possible OOM. - 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: Timelines hanging for (`number of posts with links * rich media timeout`) in the worst case. Reduced to just rich media timeout. -- Mastodon API: Cards being wrong for preview statuses due to cache key collision -- Password resets no longer processed for deactivated accounts +- Mastodon API: Cards being wrong for preview statuses due to cache key collision. +- Password resets no longer processed for deactivated accounts. +- Favicon scraper raising exceptions on URLs longer than 255 characters. ## [2.1.0] - 2020-08-28 diff --git a/priv/static/index.html b/priv/static/index.html index c850e8756..6fa237768 100644 --- a/priv/static/index.html +++ b/priv/static/index.html @@ -1 +1 @@ -Pleroma
\ No newline at end of file +Pleroma
\ No newline at end of file diff --git a/priv/static/static/font/fontello.1598361006087.woff2 b/priv/static/static/font/fontello.1598361006087.woff2 deleted file mode 100644 index e9991e4f9..000000000 Binary files a/priv/static/static/font/fontello.1598361006087.woff2 and /dev/null differ diff --git a/priv/static/static/font/fontello.1598361006087.eot b/priv/static/static/font/fontello.1599568314856.eot similarity index 99% rename from priv/static/static/font/fontello.1598361006087.eot rename to priv/static/static/font/fontello.1599568314856.eot index f25e4b7e4..1a6931a0e 100644 Binary files a/priv/static/static/font/fontello.1598361006087.eot and b/priv/static/static/font/fontello.1599568314856.eot differ diff --git a/priv/static/static/font/fontello.1598361006087.svg b/priv/static/static/font/fontello.1599568314856.svg similarity index 100% rename from priv/static/static/font/fontello.1598361006087.svg rename to priv/static/static/font/fontello.1599568314856.svg diff --git a/priv/static/static/font/fontello.1598361006087.ttf b/priv/static/static/font/fontello.1599568314856.ttf similarity index 99% rename from priv/static/static/font/fontello.1598361006087.ttf rename to priv/static/static/font/fontello.1599568314856.ttf index ccedb3fa1..795464475 100644 Binary files a/priv/static/static/font/fontello.1598361006087.ttf and b/priv/static/static/font/fontello.1599568314856.ttf differ diff --git a/priv/static/static/font/fontello.1598361006087.woff b/priv/static/static/font/fontello.1599568314856.woff similarity index 98% rename from priv/static/static/font/fontello.1598361006087.woff rename to priv/static/static/font/fontello.1599568314856.woff index de9dbbc35..64f566383 100644 Binary files a/priv/static/static/font/fontello.1598361006087.woff and b/priv/static/static/font/fontello.1599568314856.woff differ diff --git a/priv/static/static/font/fontello.1599568314856.woff2 b/priv/static/static/font/fontello.1599568314856.woff2 new file mode 100644 index 000000000..972e70831 Binary files /dev/null and b/priv/static/static/font/fontello.1599568314856.woff2 differ diff --git a/priv/static/static/fontello.1598361006087.css b/priv/static/static/fontello.1599568314856.css similarity index 90% rename from priv/static/static/fontello.1598361006087.css rename to priv/static/static/fontello.1599568314856.css index d6ff3f718..e636286c0 100644 Binary files a/priv/static/static/fontello.1598361006087.css and b/priv/static/static/fontello.1599568314856.css differ diff --git a/priv/static/static/js/10.1c5cd5fbe554eca63dfe.js b/priv/static/static/js/10.1c5cd5fbe554eca63dfe.js deleted file mode 100644 index cdd1409d9..000000000 Binary files a/priv/static/static/js/10.1c5cd5fbe554eca63dfe.js and /dev/null differ diff --git a/priv/static/static/js/10.46fbbdfaf0d4800f349b.js b/priv/static/static/js/10.46fbbdfaf0d4800f349b.js new file mode 100644 index 000000000..0fd8463df Binary files /dev/null and b/priv/static/static/js/10.46fbbdfaf0d4800f349b.js differ diff --git a/priv/static/static/js/10.1c5cd5fbe554eca63dfe.js.map b/priv/static/static/js/10.46fbbdfaf0d4800f349b.js.map similarity index 56% rename from priv/static/static/js/10.1c5cd5fbe554eca63dfe.js.map rename to priv/static/static/js/10.46fbbdfaf0d4800f349b.js.map index 5cbfc317f..bee2feb10 100644 Binary files a/priv/static/static/js/10.1c5cd5fbe554eca63dfe.js.map and b/priv/static/static/js/10.46fbbdfaf0d4800f349b.js.map differ diff --git a/priv/static/static/js/12.6619e0b2f854637e76d4.js b/priv/static/static/js/12.6619e0b2f854637e76d4.js deleted file mode 100644 index fdacd8b84..000000000 Binary files a/priv/static/static/js/12.6619e0b2f854637e76d4.js and /dev/null differ diff --git a/priv/static/static/js/12.b3bf0bc313861d6ec36b.js b/priv/static/static/js/12.b3bf0bc313861d6ec36b.js new file mode 100644 index 000000000..4890ca10a Binary files /dev/null and b/priv/static/static/js/12.b3bf0bc313861d6ec36b.js differ diff --git a/priv/static/static/js/12.6619e0b2f854637e76d4.js.map b/priv/static/static/js/12.b3bf0bc313861d6ec36b.js.map similarity index 56% rename from priv/static/static/js/12.6619e0b2f854637e76d4.js.map rename to priv/static/static/js/12.b3bf0bc313861d6ec36b.js.map index 9180668b2..28545ac96 100644 Binary files a/priv/static/static/js/12.6619e0b2f854637e76d4.js.map and b/priv/static/static/js/12.b3bf0bc313861d6ec36b.js.map differ diff --git a/priv/static/static/js/13.c843797f3e374f0e3e1a.js b/priv/static/static/js/13.adb8a942514d735722c4.js similarity index 95% rename from priv/static/static/js/13.c843797f3e374f0e3e1a.js rename to priv/static/static/js/13.adb8a942514d735722c4.js index 6b28e9703..41abcb5a6 100644 Binary files a/priv/static/static/js/13.c843797f3e374f0e3e1a.js and b/priv/static/static/js/13.adb8a942514d735722c4.js differ diff --git a/priv/static/static/js/13.c843797f3e374f0e3e1a.js.map b/priv/static/static/js/13.adb8a942514d735722c4.js.map similarity index 56% rename from priv/static/static/js/13.c843797f3e374f0e3e1a.js.map rename to priv/static/static/js/13.adb8a942514d735722c4.js.map index a11c0ac7c..2b8ff6d6c 100644 Binary files a/priv/static/static/js/13.c843797f3e374f0e3e1a.js.map and b/priv/static/static/js/13.adb8a942514d735722c4.js.map differ diff --git a/priv/static/static/js/14.71f8caca49093a99e871.js b/priv/static/static/js/14.d015d9b2ea16407e389c.js similarity index 99% rename from priv/static/static/js/14.71f8caca49093a99e871.js rename to priv/static/static/js/14.d015d9b2ea16407e389c.js index 068f010d0..200a79625 100644 Binary files a/priv/static/static/js/14.71f8caca49093a99e871.js and b/priv/static/static/js/14.d015d9b2ea16407e389c.js differ diff --git a/priv/static/static/js/14.71f8caca49093a99e871.js.map b/priv/static/static/js/14.d015d9b2ea16407e389c.js.map similarity index 56% rename from priv/static/static/js/14.71f8caca49093a99e871.js.map rename to priv/static/static/js/14.d015d9b2ea16407e389c.js.map index b18479521..49dab13f7 100644 Binary files a/priv/static/static/js/14.71f8caca49093a99e871.js.map and b/priv/static/static/js/14.d015d9b2ea16407e389c.js.map differ diff --git a/priv/static/static/js/18.b29eedabe76445fe94b8.js b/priv/static/static/js/18.94946caca48930c224c7.js similarity index 93% rename from priv/static/static/js/18.b29eedabe76445fe94b8.js rename to priv/static/static/js/18.94946caca48930c224c7.js index f30ea09da..5a1f40c6d 100644 Binary files a/priv/static/static/js/18.b29eedabe76445fe94b8.js and b/priv/static/static/js/18.94946caca48930c224c7.js differ diff --git a/priv/static/static/js/18.94946caca48930c224c7.js.map b/priv/static/static/js/18.94946caca48930c224c7.js.map new file mode 100644 index 000000000..ad04b99ab Binary files /dev/null and b/priv/static/static/js/18.94946caca48930c224c7.js.map differ diff --git a/priv/static/static/js/18.b29eedabe76445fe94b8.js.map b/priv/static/static/js/18.b29eedabe76445fe94b8.js.map deleted file mode 100644 index cb2b72921..000000000 Binary files a/priv/static/static/js/18.b29eedabe76445fe94b8.js.map and /dev/null differ diff --git a/priv/static/static/js/19.ed1cd5db596618779f03.js b/priv/static/static/js/19.233c81ac2c28d55e9f13.js similarity index 96% rename from priv/static/static/js/19.ed1cd5db596618779f03.js rename to priv/static/static/js/19.233c81ac2c28d55e9f13.js index ca9952213..ace0a1d41 100644 Binary files a/priv/static/static/js/19.ed1cd5db596618779f03.js and b/priv/static/static/js/19.233c81ac2c28d55e9f13.js differ diff --git a/priv/static/static/js/19.233c81ac2c28d55e9f13.js.map b/priv/static/static/js/19.233c81ac2c28d55e9f13.js.map new file mode 100644 index 000000000..cd3f7354d Binary files /dev/null and b/priv/static/static/js/19.233c81ac2c28d55e9f13.js.map differ diff --git a/priv/static/static/js/19.ed1cd5db596618779f03.js.map b/priv/static/static/js/19.ed1cd5db596618779f03.js.map deleted file mode 100644 index 8e7846eb3..000000000 Binary files a/priv/static/static/js/19.ed1cd5db596618779f03.js.map and /dev/null differ diff --git a/priv/static/static/js/2.fb3f90b584362209a143.js b/priv/static/static/js/2.c92f4803ff24726cea58.js similarity index 97% rename from priv/static/static/js/2.fb3f90b584362209a143.js rename to priv/static/static/js/2.c92f4803ff24726cea58.js index 92093f8bc..55aa1f44e 100644 Binary files a/priv/static/static/js/2.fb3f90b584362209a143.js and b/priv/static/static/js/2.c92f4803ff24726cea58.js differ diff --git a/priv/static/static/js/2.c92f4803ff24726cea58.js.map b/priv/static/static/js/2.c92f4803ff24726cea58.js.map new file mode 100644 index 000000000..e3cc6a3fb Binary files /dev/null and b/priv/static/static/js/2.c92f4803ff24726cea58.js.map differ diff --git a/priv/static/static/js/2.fb3f90b584362209a143.js.map b/priv/static/static/js/2.fb3f90b584362209a143.js.map deleted file mode 100644 index 8ea26cf44..000000000 Binary files a/priv/static/static/js/2.fb3f90b584362209a143.js.map and /dev/null differ diff --git a/priv/static/static/js/20.6d311b830d8ac672729f.js.map b/priv/static/static/js/20.6d311b830d8ac672729f.js.map deleted file mode 100644 index 728e16474..000000000 Binary files a/priv/static/static/js/20.6d311b830d8ac672729f.js.map and /dev/null differ diff --git a/priv/static/static/js/20.6d311b830d8ac672729f.js b/priv/static/static/js/20.818c38d27369c3a4d677.js similarity index 98% rename from priv/static/static/js/20.6d311b830d8ac672729f.js rename to priv/static/static/js/20.818c38d27369c3a4d677.js index 16762eee3..133eac52d 100644 Binary files a/priv/static/static/js/20.6d311b830d8ac672729f.js and b/priv/static/static/js/20.818c38d27369c3a4d677.js differ diff --git a/priv/static/static/js/20.818c38d27369c3a4d677.js.map b/priv/static/static/js/20.818c38d27369c3a4d677.js.map new file mode 100644 index 000000000..696eab20f Binary files /dev/null and b/priv/static/static/js/20.818c38d27369c3a4d677.js.map differ diff --git a/priv/static/static/js/23.2c5f0fd2f2acd04592e8.js.map b/priv/static/static/js/23.2c5f0fd2f2acd04592e8.js.map deleted file mode 100644 index 2f75cc5a0..000000000 Binary files a/priv/static/static/js/23.2c5f0fd2f2acd04592e8.js.map and /dev/null differ diff --git a/priv/static/static/js/23.2c5f0fd2f2acd04592e8.js b/priv/static/static/js/23.a57a7845cc20fafd06d1.js similarity index 91% rename from priv/static/static/js/23.2c5f0fd2f2acd04592e8.js rename to priv/static/static/js/23.a57a7845cc20fafd06d1.js index 5ed52a202..b15a888df 100644 Binary files a/priv/static/static/js/23.2c5f0fd2f2acd04592e8.js and b/priv/static/static/js/23.a57a7845cc20fafd06d1.js differ diff --git a/priv/static/static/js/23.a57a7845cc20fafd06d1.js.map b/priv/static/static/js/23.a57a7845cc20fafd06d1.js.map new file mode 100644 index 000000000..0e5b421e6 Binary files /dev/null and b/priv/static/static/js/23.a57a7845cc20fafd06d1.js.map differ diff --git a/priv/static/static/js/25.365514e44606a895ab50.js.map b/priv/static/static/js/25.365514e44606a895ab50.js.map deleted file mode 100644 index 0973086f2..000000000 Binary files a/priv/static/static/js/25.365514e44606a895ab50.js.map and /dev/null differ diff --git a/priv/static/static/js/25.365514e44606a895ab50.js b/priv/static/static/js/25.5a9efe20e3ae1352e6d2.js similarity index 96% rename from priv/static/static/js/25.365514e44606a895ab50.js rename to priv/static/static/js/25.5a9efe20e3ae1352e6d2.js index c5cccd1ba..e96c5e6ec 100644 Binary files a/priv/static/static/js/25.365514e44606a895ab50.js and b/priv/static/static/js/25.5a9efe20e3ae1352e6d2.js differ diff --git a/priv/static/static/js/25.5a9efe20e3ae1352e6d2.js.map b/priv/static/static/js/25.5a9efe20e3ae1352e6d2.js.map new file mode 100644 index 000000000..a506e6fa8 Binary files /dev/null and b/priv/static/static/js/25.5a9efe20e3ae1352e6d2.js.map differ diff --git a/priv/static/static/js/28.9eb3e783aeba24c84f0a.js.map b/priv/static/static/js/28.9eb3e783aeba24c84f0a.js.map deleted file mode 100644 index 5d106cfb7..000000000 Binary files a/priv/static/static/js/28.9eb3e783aeba24c84f0a.js.map and /dev/null differ diff --git a/priv/static/static/js/28.9eb3e783aeba24c84f0a.js b/priv/static/static/js/28.e0f9f164e0bfd890dc61.js similarity index 87% rename from priv/static/static/js/28.9eb3e783aeba24c84f0a.js rename to priv/static/static/js/28.e0f9f164e0bfd890dc61.js index 3766823cb..75ba6d69d 100644 Binary files a/priv/static/static/js/28.9eb3e783aeba24c84f0a.js and b/priv/static/static/js/28.e0f9f164e0bfd890dc61.js differ diff --git a/priv/static/static/js/28.e0f9f164e0bfd890dc61.js.map b/priv/static/static/js/28.e0f9f164e0bfd890dc61.js.map new file mode 100644 index 000000000..536ae2d7a Binary files /dev/null and b/priv/static/static/js/28.e0f9f164e0bfd890dc61.js.map differ diff --git a/priv/static/static/js/3.7d21accf4e5bd07e3ebf.js b/priv/static/static/js/3.7d21accf4e5bd07e3ebf.js index 8a1ed4198..d98aadec2 100644 Binary files a/priv/static/static/js/3.7d21accf4e5bd07e3ebf.js and b/priv/static/static/js/3.7d21accf4e5bd07e3ebf.js differ diff --git a/priv/static/static/js/3.7d21accf4e5bd07e3ebf.js.map b/priv/static/static/js/3.7d21accf4e5bd07e3ebf.js.map index 041ba44ef..37826baac 100644 Binary files a/priv/static/static/js/3.7d21accf4e5bd07e3ebf.js.map and b/priv/static/static/js/3.7d21accf4e5bd07e3ebf.js.map differ diff --git a/priv/static/static/js/30.a9377272337674f2dd05.js.map b/priv/static/static/js/30.a9377272337674f2dd05.js.map deleted file mode 100644 index fb35db3d0..000000000 Binary files a/priv/static/static/js/30.a9377272337674f2dd05.js.map and /dev/null differ diff --git a/priv/static/static/js/30.a9377272337674f2dd05.js b/priv/static/static/js/30.fce58be0b52ca3e32fa4.js similarity index 93% rename from priv/static/static/js/30.a9377272337674f2dd05.js rename to priv/static/static/js/30.fce58be0b52ca3e32fa4.js index bd6accce8..03a5d65f6 100644 Binary files a/priv/static/static/js/30.a9377272337674f2dd05.js and b/priv/static/static/js/30.fce58be0b52ca3e32fa4.js differ diff --git a/priv/static/static/js/30.fce58be0b52ca3e32fa4.js.map b/priv/static/static/js/30.fce58be0b52ca3e32fa4.js.map new file mode 100644 index 000000000..f7dc83701 Binary files /dev/null and b/priv/static/static/js/30.fce58be0b52ca3e32fa4.js.map differ diff --git a/priv/static/static/js/8.5f48d6f0cbed548baf0f.js b/priv/static/static/js/8.636322a87bb10a1754f8.js similarity index 84% rename from priv/static/static/js/8.5f48d6f0cbed548baf0f.js rename to priv/static/static/js/8.636322a87bb10a1754f8.js index 2b8d4f509..6e635fb6a 100644 Binary files a/priv/static/static/js/8.5f48d6f0cbed548baf0f.js and b/priv/static/static/js/8.636322a87bb10a1754f8.js differ diff --git a/priv/static/static/js/8.5f48d6f0cbed548baf0f.js.map b/priv/static/static/js/8.636322a87bb10a1754f8.js.map similarity index 57% rename from priv/static/static/js/8.5f48d6f0cbed548baf0f.js.map rename to priv/static/static/js/8.636322a87bb10a1754f8.js.map index b1730e83c..f074928a5 100644 Binary files a/priv/static/static/js/8.5f48d6f0cbed548baf0f.js.map and b/priv/static/static/js/8.636322a87bb10a1754f8.js.map differ diff --git a/priv/static/static/js/9.a95fcd286ba2c9050c4d.js b/priv/static/static/js/9.6010dbcce7b4d7c05a18.js similarity index 96% rename from priv/static/static/js/9.a95fcd286ba2c9050c4d.js rename to priv/static/static/js/9.6010dbcce7b4d7c05a18.js index 773c638fd..fcad39a7e 100644 Binary files a/priv/static/static/js/9.a95fcd286ba2c9050c4d.js and b/priv/static/static/js/9.6010dbcce7b4d7c05a18.js differ diff --git a/priv/static/static/js/9.a95fcd286ba2c9050c4d.js.map b/priv/static/static/js/9.6010dbcce7b4d7c05a18.js.map similarity index 57% rename from priv/static/static/js/9.a95fcd286ba2c9050c4d.js.map rename to priv/static/static/js/9.6010dbcce7b4d7c05a18.js.map index 721bcb907..e5e1cd823 100644 Binary files a/priv/static/static/js/9.a95fcd286ba2c9050c4d.js.map and b/priv/static/static/js/9.6010dbcce7b4d7c05a18.js.map differ diff --git a/priv/static/static/js/app.154c25316542278028a6.js b/priv/static/static/js/app.154c25316542278028a6.js deleted file mode 100644 index b52be573a..000000000 Binary files a/priv/static/static/js/app.154c25316542278028a6.js and /dev/null differ diff --git a/priv/static/static/js/app.154c25316542278028a6.js.map b/priv/static/static/js/app.154c25316542278028a6.js.map deleted file mode 100644 index 1bdb6dd70..000000000 Binary files a/priv/static/static/js/app.154c25316542278028a6.js.map and /dev/null differ diff --git a/priv/static/static/js/app.55d173dc5e39519aa518.js b/priv/static/static/js/app.55d173dc5e39519aa518.js new file mode 100644 index 000000000..d04ae3499 Binary files /dev/null and b/priv/static/static/js/app.55d173dc5e39519aa518.js differ diff --git a/priv/static/static/js/app.55d173dc5e39519aa518.js.map b/priv/static/static/js/app.55d173dc5e39519aa518.js.map new file mode 100644 index 000000000..600e97afa Binary files /dev/null and b/priv/static/static/js/app.55d173dc5e39519aa518.js.map differ diff --git a/priv/static/static/js/vendors~app.bc5812c087f5dbcb914d.js b/priv/static/static/js/vendors~app.90c4af83c1ae68f4cd95.js similarity index 99% rename from priv/static/static/js/vendors~app.bc5812c087f5dbcb914d.js rename to priv/static/static/js/vendors~app.90c4af83c1ae68f4cd95.js index d2f2c34da..879a3b312 100644 Binary files a/priv/static/static/js/vendors~app.bc5812c087f5dbcb914d.js and b/priv/static/static/js/vendors~app.90c4af83c1ae68f4cd95.js differ diff --git a/priv/static/static/js/vendors~app.bc5812c087f5dbcb914d.js.map b/priv/static/static/js/vendors~app.90c4af83c1ae68f4cd95.js.map similarity index 99% rename from priv/static/static/js/vendors~app.bc5812c087f5dbcb914d.js.map rename to priv/static/static/js/vendors~app.90c4af83c1ae68f4cd95.js.map index b4efa6807..395f83b6b 100644 Binary files a/priv/static/static/js/vendors~app.bc5812c087f5dbcb914d.js.map and b/priv/static/static/js/vendors~app.90c4af83c1ae68f4cd95.js.map differ diff --git a/priv/static/sw-pleroma.js b/priv/static/sw-pleroma.js index ee1b38e86..54c6ed8f0 100644 Binary files a/priv/static/sw-pleroma.js and b/priv/static/sw-pleroma.js differ diff --git a/priv/static/sw-pleroma.js.map b/priv/static/sw-pleroma.js.map index 114741e96..cd5ea0ae6 100644 Binary files a/priv/static/sw-pleroma.js.map and b/priv/static/sw-pleroma.js.map differ