specter/mastodon
1
0
Fork 0
forked from fedi/mastodon
Code Pull requests Activity
6182 commits 82 branches 202 tags 316 MiB
Commit graph

6182 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eugen Rochko 21ad21cb50
Improve signature verification safeguards (#8959) 
* Downcase signed_headers string before building the signed string

The HTTP Signatures draft does not mandate the “headers” field to be downcased,
but mandates the header field names to be downcased in the signed string, which
means that prior to this patch, Mastodon could fail to process signatures from
some compliant clients. It also means that it would not actually check the
Digest of non-compliant clients that wouldn't use a lowercased Digest field
name.

Thankfully, I don't know of any such client.

* Revert "Remove dead code (#8919)"

This reverts commit a00ce8c92c.

* Restore time window checking, change it to 12 hours

By checking the Date header, we can prevent replaying old vulnerable
signatures. The focus is to prevent replaying old vulnerable requests
from software that has been fixed in the meantime, so a somewhat long
window should be fine and accounts for timezone misconfiguration.

* Escape users' URLs when formatting them

Fixes possible HTML injection

* Escape all string interpolations in Formatter class

Slightly improve performance by reducing class allocations
from repeated Formatter#encode calls

* Fix code style issues
 2018-10-12 00:15:55 +02:00
ThibG 2d27c11061 Set Content-Security-Policy rules through RoR's config (#8957) 
* Set CSP rules in RoR's configuration

* Override CSP setting in the embed controller to allow frames
 2018-10-11 20:35:46 +02:00
dependabot[bot] 9ece873d62 Bump doorkeeper from 5.0.0 to 5.0.1 (#8954) 
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases)
- [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md)
- [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.0.0...v5.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-11 19:26:39 +02:00
Eugen Rochko 18e7ef6eda
Add check for missing tag param in streaming API (#8955) 
* Add check for missing tag param in streaming API

Fixes error:

```
TypeError: Cannot read property 'toLowerCase' of undefined
at app.get (.../streaming/index.js:493:50)
```

* Fix code style issues
 2018-10-11 19:24:43 +02:00
Eugen Rochko e6c01171de
Bump version to 2.5.1 (#8953) 2018-10-11 02:29:32 +02:00
Eugen Rochko 61d44dd11f
Fix typo in ActivityPub Create handler (#8952) 
Regression from #8951
 2018-10-11 02:10:15 +02:00
Eugen Rochko 87fdd139b8
Do not push DMs into the home feed (#8940) 
* Do not push DMs into the home feed

* Show DMs column after sending a DM, if DMs column is not already shown
 2018-10-11 01:31:03 +02:00
Eugen Rochko 790d3bc637
Move network calls out of transaction in ActivityPub handler (#8951) 
Mention and emoji code may perform network calls, but does not need
to do that inside the database transaction. This may improve availability
of database connections when using pgBouncer in transaction mode.
 2018-10-11 00:50:18 +02:00
dependabot[bot] ac7df62a04 Bump better_errors from 2.4.0 to 2.5.0 (#8946) 
Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Changelog](https://github.com/BetterErrors/better_errors/blob/master/CHANGELOG.md)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.4.0...v2.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-10 19:36:41 +02:00
dependabot[bot] 070f817177 Bump bullet from 5.7.5 to 5.7.6 (#8947) 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.7.5 to 5.7.6.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/5.7.5...5.7.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-10 22:09:53 +09:00
dependabot[bot] 47d7381d60 Bump scss_lint from 0.57.0 to 0.57.1 (#8948) 
Bumps [scss_lint](https://github.com/brigade/scss-lint) from 0.57.0 to 0.57.1.
- [Release notes](https://github.com/brigade/scss-lint/releases)
- [Changelog](https://github.com/brigade/scss-lint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/brigade/scss-lint/compare/v0.57.0...v0.57.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-10 22:09:23 +09:00
Eugen Rochko 2459da29c2
Add description meta tag additionally to og:description (#8941) 
Fix #8685
 2018-10-10 02:21:30 +02:00
Eugen Rochko da7705b274
Add dns-prefetch if using different host for assets or uploads (#8942) 2018-10-10 01:31:10 +02:00
dependabot[bot] 46e4a759bb Bump capistrano-rails from 1.3.1 to 1.4.0 (#8936) 
Bumps [capistrano-rails](https://github.com/capistrano/rails) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/capistrano/rails/releases)
- [Changelog](https://github.com/capistrano/rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/capistrano/rails/compare/v1.3.1...v1.4.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-09 19:43:26 +02:00
dependabot[bot] 076ceffa84 Bump dotenv-rails from 2.2.2 to 2.5.0 (#8934) 
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.2.2 to 2.5.0.
- [Release notes](https://github.com/bkeepers/dotenv/releases)
- [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md)
- [Commits](https://github.com/bkeepers/dotenv/compare/v2.2.2...v2.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-09 19:43:05 +02:00
mayaeh e50cb5f4bd Fix that the copy button of verify link did not work. (#8938) 2018-10-09 19:36:13 +02:00
Eugen Rochko 7f9dd92a27
Track historical space stats in PgHero to determine PostgreSQL growth (#8906) 2018-10-09 19:35:14 +02:00
dependabot[bot] d4b7d75968 Bump faker from 1.8.7 to 1.9.1 (#8935) 
Bumps [faker](https://github.com/stympy/faker) from 1.8.7 to 1.9.1.
- [Release notes](https://github.com/stympy/faker/releases)
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stympy/faker/compare/v1.8.7...v1.9.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-09 19:59:34 +09:00
dependabot[bot] a47c8545c7 Bump memory_profiler from 0.9.11 to 0.9.12 (#8937) 
Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler) from 0.9.11 to 0.9.12.
- [Release notes](https://github.com/SamSaffron/memory_profiler/releases)
- [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/SamSaffron/memory_profiler/compare/v0.9.11...v0.9.12)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-09 19:39:46 +09:00
Sascha b2a57a5d6f add ffmpeg initializer (#8855) 
* add ffmpeg initializer

* use different expression to check for environment var
 2018-10-09 03:02:52 +02:00
mayaeh 87abbb07f3 Add Japanese translations. (#8927) 2018-10-09 07:12:37 +09:00
mayaeh 770e337497 Fixed error occurrence when pinning the DM column. (#8922) 2018-10-08 14:43:38 +02:00
dependabot[bot] 4c4ff05a46 Bump capybara from 3.8.2 to 3.9.0 (#8924) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.8.2 to 3.9.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.8.2...3.9.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-08 07:45:31 +02:00
dependabot[bot] 8639f000ea Bump tty-prompt from 0.17.0 to 0.17.1 (#8925) 
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.17.0 to 0.17.1.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases)
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.17.0...v0.17.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-08 07:45:08 +02:00
dependabot[bot] 10e38b441f Bump aws-sdk-s3 from 1.20.0 to 1.21.0 (#8926) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.20.0 to 1.21.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-08 07:44:53 +02:00
dependabot[bot] 87ad9c408c Bump i18n-tasks from 0.9.21 to 0.9.25 (#8923) 
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.21 to 0.9.25.
- [Release notes](https://github.com/glebm/i18n-tasks/releases)
- [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md)
- [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.21...v0.9.25)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-08 14:24:07 +09:00
ashleyhull-versent f194857ac9 rubocop issues - Cleaning up (#8912) 
* cleanup pass

* undo mistakes

* fixed.

* revert
 2018-10-08 04:50:11 +02:00
Eugen Rochko a00ce8c92c
Remove dead code (#8919) 
SignatureVerification#matches_time_window? is not called anywhere.
 2018-10-08 04:48:54 +02:00
ashleyhull-versent 2dba313100 Replace SVG asset with Custom mascot (#8766) 2018-10-08 00:20:45 +02:00
Eugen Rochko 774ac47373
Add conversations API (#8832) 
* Add conversations API

* Add web UI for conversations

* Add test for conversations API

* Add tests for ConversationAccount

* Improve web UI

* Rename ConversationAccount to AccountConversation

* Remove conversations on block and mute

* Change last_status_id to be a denormalization of status_ids

* Add optimistic locking
 2018-10-07 23:44:58 +02:00
ThibG 25744d43b0 Ensure only toots from the reported users are reported (#8916) 2018-10-07 19:45:40 +02:00
Eugen Rochko 09d789e79b
Add POST /api/v1/notifications/:id/dismiss (#8905) 
POST /api/v1/notifications/dismiss was a mistake in #2251
 2018-10-07 18:26:26 +02:00
Eugen Rochko 886af5ce19
Add fallback for PostgreSQL without upsert in CopyStatusStats (#8903) 
Fix #8590
 2018-10-07 04:40:37 +02:00
Marcin Mikołajczak 2fb692ea45 i18n: Update Polish translation (#8901) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-10-06 20:42:36 +09:00
bsky 84f82ee2fe Improve production build config (#8899) 2018-10-06 15:12:05 +09:00
Eugen Rochko 28401962ca Change documentation URL (#8898) 
* Change documentation URL

* Fix hardcoded documentation URL in locales
 2018-10-06 14:33:36 +09:00
Eugen Rochko 30dd7f3d90 Remove unused ruby-progressbar dependency (#8896) 
* Remove unused ruby-progressbar dependency

* Remove unused colorize dependency
 2018-10-06 08:33:26 +09:00
Masoud Abkenar 185cb2dc3a RTL: fix margins of public-account-header__tabs (#8897) 
* RTL: fix margins of public-account-header__tabs

* fix style

* even more stylish code :)
 2018-10-06 00:05:11 +02:00
Jeong Arm 144d73730d Leave unknown language as nil if account is remote (#8861) 
* Force use language detector if account is remote

* Set unknown remote toot's language as nil
 2018-10-05 19:17:46 +02:00
dependabot[bot] 9a42b75f00 Bump omniauth-saml from 1.10.0 to 1.10.1 (#8885) 
Bumps [omniauth-saml](https://github.com/omniauth/omniauth-saml) from 1.10.0 to 1.10.1.
- [Release notes](https://github.com/omniauth/omniauth-saml/releases)
- [Changelog](https://github.com/omniauth/omniauth-saml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/omniauth/omniauth-saml/compare/v1.10.0...v1.10.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-05 19:01:00 +02:00
dependabot[bot] 6812f811b1 Bump parallel_tests from 2.21.3 to 2.23.0 (#8884) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.21.3 to 2.23.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.21.3...v2.23.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-05 18:59:35 +02:00
dependabot[bot] 7c154c6afd Bump puma from 3.11.4 to 3.12.0 (#8883) 
Bumps [puma](https://github.com/puma/puma) from 3.11.4 to 3.12.0.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v3.11.4...v3.12.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-05 18:58:13 +02:00
ThibG 42aecb4c13 Add a confirmation dialog when hitting reply and the compose box isn't empty (#8893) 
* Add a confirmation dialog when hitting reply and the compose box isn't empty

Fixes #878

* Performance improvement
 2018-10-05 18:44:44 +02:00
dependabot[bot] 028ad4124c [Security] Bump nokogiri from 1.8.4 to 1.8.5 (#8881) 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.4 to 1.8.5. **This update includes security fixes.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.8.4...v1.8.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-10-05 04:07:44 +02:00
aus-social 0a4739c732 lint pass 2 (#8878) 
* Code quality pass

* Typofix

* Update applications_controller_spec.rb

* Update applications_controller_spec.rb
 2018-10-04 17:38:04 +02:00
Eugen Rochko a46ab86adf
Limit the number of people that can be followed from one account (#8807) 
Configurable soft limit of 7,500, and above that, configurable
ratio of 1.1 * followers, controlled by:

- MAX_FOLLOWS_THRESHOLD
- MAX_FOLLOWS_RATIO

Fix #2311
 2018-10-04 17:36:11 +02:00
Eugen Rochko 186024a058
Add tootctl settings registrations open (#8829) 2018-10-04 16:05:54 +02:00
Eugen Rochko e645ae9561
Change admin accounts default sort to most recent (#8813) 2018-10-04 16:05:38 +02:00
Eugen Rochko 7fe137d2f7
Fix link verification for remote accounts (#8868) 2018-10-04 15:47:03 +02:00
Isatis 49b182cd51 Dockerfile: update Node to 8.12.0 and put Ruby on Alpine 3.7 for build system memory help (#8842) 2018-10-04 15:37:31 +02:00