|
|
|
|
# frozen_string_literal: true
|
|
|
|
|
|
|
|
|
|
source 'https://rubygems.org'
|
|
|
|
|
ruby '>= 2.5.0', '< 3.0.0'
|
|
|
|
|
|
|
|
|
|
gem 'pkg-config', '~> 1.4'
|
|
|
|
|
|
|
|
|
|
gem 'puma', '~> 5.0'
|
|
|
|
|
gem 'rails', '~> 5.2.4.4'
|
|
|
|
|
gem 'sprockets', '~> 3.7.2'
|
|
|
|
|
gem 'thor', '~> 1.0'
|
|
|
|
|
gem 'rack', '~> 2.2.3'
|
|
|
|
|
|
|
|
|
|
gem 'hamlit-rails', '~> 0.2'
|
|
|
|
|
gem 'pg', '~> 1.2'
|
|
|
|
|
gem 'makara', '~> 0.4'
|
|
|
|
|
gem 'pghero', '~> 2.7'
|
|
|
|
|
gem 'dotenv-rails', '~> 2.7'
|
|
|
|
|
|
|
|
|
|
gem 'aws-sdk-s3', '~> 1.84', require: false
|
|
|
|
|
gem 'fog-core', '<= 2.1.0'
|
|
|
|
|
gem 'fog-openstack', '~> 0.3', require: false
|
|
|
|
|
gem 'paperclip', '~> 6.0'
|
|
|
|
|
gem 'paperclip-av-transcoder', '~> 0.6'
|
|
|
|
|
gem 'streamio-ffmpeg', '~> 3.0'
|
|
|
|
|
gem 'blurhash', '~> 0.1'
|
|
|
|
|
|
|
|
|
|
gem 'active_model_serializers', '~> 0.10'
|
|
|
|
|
gem 'addressable', '~> 2.7'
|
|
|
|
|
gem 'bootsnap', '~> 1.5', require: false
|
|
|
|
|
gem 'browser'
|
|
|
|
|
gem 'charlock_holmes', '~> 0.7.7'
|
|
|
|
|
gem 'iso-639'
|
|
|
|
|
gem 'chewy', '~> 5.1'
|
|
|
|
|
gem 'cld3', '~> 3.3.0'
|
|
|
|
|
gem 'devise', '~> 4.7'
|
|
|
|
|
gem 'devise-two-factor', '~> 3.1'
|
|
|
|
|
|
|
|
|
|
group :pam_authentication, optional: true do
|
|
|
|
|
gem 'devise_pam_authenticatable2', '~> 9.2'
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
gem 'net-ldap', '~> 0.16'
|
|
|
|
|
gem 'omniauth-cas', '~> 2.0'
|
|
|
|
|
gem 'omniauth-saml', '~> 1.10'
|
|
|
|
|
gem 'omniauth', '~> 1.9'
|
|
|
|
|
|
|
|
|
|
gem 'color_diff', '~> 0.1'
|
|
|
|
|
gem 'discard', '~> 1.2'
|
|
|
|
|
gem 'doorkeeper', '~> 5.4'
|
|
|
|
|
gem 'ed25519', '~> 1.2'
|
|
|
|
|
gem 'fast_blank', '~> 1.0'
|
|
|
|
|
gem 'fastimage'
|
|
|
|
|
gem 'hiredis', '~> 0.6'
|
|
|
|
|
gem 'redis-namespace', '~> 1.8'
|
|
|
|
|
gem 'health_check', git: 'https://github.com/ianheggie/health_check', ref: '0b799ead604f900ed50685e9b2d469cd2befba5b'
|
|
|
|
|
gem 'htmlentities', '~> 4.3'
|
|
|
|
|
gem 'http', '~> 4.4'
|
|
|
|
|
gem 'http_accept_language', '~> 2.1'
|
|
|
|
|
gem 'httplog', '~> 1.4.3'
|
|
|
|
|
gem 'idn-ruby', require: 'idn'
|
|
|
|
|
gem 'kaminari', '~> 1.2'
|
|
|
|
|
gem 'link_header', '~> 0.0'
|
|
|
|
|
gem 'mime-types', '~> 3.3.1', require: 'mime/types/columnar'
|
|
|
|
|
gem 'nilsimsa', git: 'https://github.com/witgo/nilsimsa', ref: 'fd184883048b922b176939f851338d0a4971a532'
|
|
|
|
|
gem 'nokogiri', '~> 1.10'
|
|
|
|
|
gem 'nsa', '~> 0.2'
|
|
|
|
|
gem 'oj', '~> 3.10'
|
|
|
|
|
gem 'ox', '~> 2.13'
|
|
|
|
|
gem 'parslet'
|
|
|
|
|
gem 'parallel', '~> 1.20'
|
|
|
|
|
gem 'posix-spawn'
|
|
|
|
|
gem 'pundit', '~> 2.1'
|
|
|
|
|
gem 'premailer-rails'
|
|
|
|
|
gem 'rack-attack', '~> 6.3'
|
|
|
|
|
gem 'rack-cors', '~> 1.1', require: 'rack/cors'
|
|
|
|
|
gem 'rails-i18n', '~> 5.1'
|
|
|
|
|
gem 'rails-settings-cached', '~> 0.6'
|
|
|
|
|
gem 'redis', '~> 4.2', require: ['redis', 'redis/connection/hiredis']
|
|
|
|
|
gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
|
|
|
|
|
gem 'rqrcode', '~> 1.1'
|
|
|
|
|
gem 'ruby-progressbar', '~> 1.10'
|
|
|
|
|
gem 'sanitize', '~> 5.2'
|
|
|
|
|
gem 'sidekiq', '~> 6.1'
|
|
|
|
|
gem 'sidekiq-scheduler', '~> 3.0'
|
|
|
|
|
gem 'sidekiq-unique-jobs', '~> 6.0'
|
|
|
|
|
gem 'sidekiq-bulk', '~>0.2.0'
|
|
|
|
|
gem 'simple-navigation', '~> 4.1'
|
|
|
|
|
gem 'simple_form', '~> 5.0'
|
|
|
|
|
gem 'sprockets-rails', '~> 3.2', require: 'sprockets/railtie'
|
|
|
|
|
gem 'stoplight', '~> 2.2.1'
|
|
|
|
|
gem 'strong_migrations', '~> 0.7'
|
|
|
|
|
gem 'tty-prompt', '~> 0.22', require: false
|
|
|
|
|
gem 'twitter-text', '~> 1.14'
|
|
|
|
|
gem 'tzinfo-data', '~> 1.2020'
|
|
|
|
|
gem 'webpacker', '~> 5.2'
|
|
|
|
|
gem 'webpush'
|
Add WebAuthn as an alternative 2FA method (#14466)
* feat: add possibility of adding WebAuthn security keys to use as 2FA
This adds a basic UI for enabling WebAuthn 2FA. We did a little refactor
to the Settings page for editing the 2FA methods – now it will list the
methods that are available to the user (TOTP and WebAuthn) and from
there they'll be able to add or remove any of them.
Also, it's worth mentioning that for enabling WebAuthn it's required to
have TOTP enabled, so the first time that you go to the 2FA Settings
page, you'll be asked to set it up.
This work was inspired by the one donde by Github in their platform, and
despite it could be approached in different ways, we decided to go with
this one given that we feel that this gives a great UX.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: add request for WebAuthn as second factor at login if enabled
This commits adds the feature for using WebAuthn as a second factor for
login when enabled.
If users have WebAuthn enabled, now a page requesting for the use of a
WebAuthn credential for log in will appear, although a link redirecting
to the old page for logging in using a two-factor code will also be
present.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: add possibility of deleting WebAuthn Credentials
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: disable WebAuthn when an Admin disables 2FA for a user
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* feat: remove ability to disable TOTP leaving only WebAuthn as 2FA
Following examples form other platforms like Github, we decided to make
Webauthn 2FA secondary to 2FA with TOTP, so that we removed the
possibility of removing TOTP authentication only, leaving users with
just WEbAuthn as 2FA. Instead, users will have to click on 'Disable 2FA'
in order to remove second factor auth.
The reason for WebAuthn being secondary to TOPT is that in that way,
users will still be able to log in using their code from their phone's
application if they don't have their security keys with them – or maybe
even lost them.
* We had to change a little the flow for setting up TOTP, given that now
it's possible to setting up again if you already had TOTP, in order to
let users modify their authenticator app – given that now it's not
possible for them to disable TOTP and set it up again with another
authenticator app.
So, basically, now instead of storing the new `otp_secret` in the
user, we store it in the session until the process of set up is
finished.
This was because, as it was before, when users clicked on 'Edit' in
the new two-factor methods lists page, but then went back without
finishing the flow, their `otp_secret` had been changed therefore
invalidating their previous authenticator app, making them unable to
log in again using TOTP.
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
* refactor: fix eslint errors
The PR build was failing given that linting returning some errors.
This commit attempts to fix them.
* refactor: normalize i18n translations
The build was failing given that i18n translations files were not
normalized.
This commits fixes that.
* refactor: avoid having the webauthn gem locked to a specific version
* refactor: use symbols for routes without '/'
* refactor: avoid sending webauthn disabled email when 2FA is disabled
When an admins disable 2FA for users, we were sending two mails
to them, one notifying that 2FA was disabled and the other to notify
that WebAuthn was disabled.
As the second one is redundant since the first email includes it, we can
remove it and send just one email to users.
* refactor: avoid creating new env variable for webauthn_origin config
* refactor: improve flash error messages for webauthn pages
Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
4 years ago
|
|
|
gem 'webauthn', '~> 3.0.0.alpha1'
|
|
|
|
|
|
|
|
|
|
gem 'json-ld'
|
|
|
|
|
gem 'json-ld-preloaded', '~> 3.1'
|
|
|
|
|
gem 'rdf-normalize', '~> 0.4'
|
|
|
|
|
|
|
|
|
|
gem 'redcarpet', '~> 3.4'
|
|
|
|
|
|
|
|
|
|
group :development, :test do
|
|
|
|
|
gem 'fabrication', '~> 2.21'
|
|
|
|
|
gem 'fuubar', '~> 2.5'
|
|
|
|
|
gem 'i18n-tasks', '~> 0.9', require: false
|
|
|
|
|
gem 'pry-byebug', '~> 3.9'
|
|
|
|
|
gem 'pry-rails', '~> 0.3'
|
|
|
|
|
gem 'rspec-rails', '~> 4.0'
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
group :production, :test do
|
|
|
|
|
gem 'private_address_check', '~> 0.5'
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
group :test do
|
|
|
|
|
gem 'capybara', '~> 3.33'
|
|
|
|
|
gem 'climate_control', '~> 0.2'
|
|
|
|
|
gem 'faker', '~> 2.14'
|
|
|
|
|
gem 'microformats', '~> 4.2'
|
|
|
|
|
gem 'rails-controller-testing', '~> 1.0'
|
|
|
|
|
gem 'rspec-sidekiq', '~> 3.1'
|
|
|
|
|
gem 'simplecov', '~> 0.19', require: false
|
|
|
|
|
gem 'webmock', '~> 3.10'
|
|
|
|
|
gem 'parallel_tests', '~> 3.3'
|
|
|
|
|
gem 'rspec_junit_formatter', '~> 0.4'
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
group :development do
|
|
|
|
|
gem 'active_record_query_trace', '~> 1.8'
|
|
|
|
|
gem 'annotate', '~> 3.1'
|
|
|
|
|
gem 'better_errors', '~> 2.9'
|
|
|
|
|
gem 'binding_of_caller', '~> 0.7'
|
|
|
|
|
gem 'bullet', '~> 6.1'
|
|
|
|
|
gem 'letter_opener', '~> 1.7'
|
|
|
|
|
gem 'letter_opener_web', '~> 1.4'
|
|
|
|
|
gem 'memory_profiler'
|
|
|
|
|
gem 'rubocop', '~> 1.3', require: false
|
|
|
|
|
gem 'rubocop-rails', '~> 2.8', require: false
|
|
|
|
|
gem 'brakeman', '~> 4.10', require: false
|
|
|
|
|
gem 'bundler-audit', '~> 0.7', require: false
|
|
|
|
|
|
|
|
|
|
gem 'capistrano', '~> 3.14'
|
|
|
|
|
gem 'capistrano-rails', '~> 1.6'
|
|
|
|
|
gem 'capistrano-rbenv', '~> 2.2'
|
|
|
|
|
gem 'capistrano-yarn', '~> 2.0'
|
|
|
|
|
|
|
|
|
|
gem 'stackprof'
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
group :production do
|
|
|
|
|
gem 'lograge', '~> 0.11'
|
|
|
|
|
gem 'redis-rails', '~> 5.0'
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
gem 'concurrent-ruby', require: false
|
|
|
|
|
gem 'connection_pool', require: false
|
Add follower synchronization mechanism (#14510)
* Add support for followers synchronization on the receiving end
Check the `collectionSynchronization` attribute on `Create` and `Announce`
activities and synchronize followers from provided collection if possible.
* Add tests for followers synchronization on the receiving end
* Add support for follower synchronization on the sender's end
* Add tests for the sending end
* Switch from AS attributes to HTTP header
Replace the custom `collectionSynchronization` ActivityStreams attribute by
an HTTP header (`X-AS-Collection-Synchronization`) with the same syntax as
the `Signature` header and the following fields:
- `collectionId` to specify which collection to synchronize
- `digest` for the SHA256 hex-digest of the list of followers known on the
receiving instance (where “receiving instance” is determined by accounts
sharing the same host name for their ActivityPub actor `id`)
- `url` of a collection that should be fetched by the instance actor
Internally, move away from the webfinger-based `domain` attribute and use
account `uri` prefix to group accounts.
* Add environment variable to disable followers synchronization
Since the whole mechanism relies on some new preconditions that, in some
extremely rare cases, might not be met, add an environment variable
(DISABLE_FOLLOWERS_SYNCHRONIZATION) to disable the mechanism altogether and
avoid followers being incorrectly removed.
The current conditions are:
1. all managed accounts' actor `id` and inbox URL have the same URI scheme and
netloc.
2. all accounts whose actor `id` or inbox URL share the same URI scheme and
netloc as a managed account must be managed by the same Mastodon instance
as well.
As far as Mastodon is concerned, breaking those preconditions require extensive
configuration changes in the reverse proxy and might also cause other issues.
Therefore, this environment variable provides a way out for people with highly
unusual configurations, and can be safely ignored for the overwhelming majority
of Mastodon administrators.
* Only set follower synchronization header on non-public statuses
This is to avoid unnecessary computations and allow Follow-related
activities to be handled by the usual codepath instead of going through
the synchronization mechanism (otherwise, any Follow/Undo/Accept activity
would trigger the synchronization mechanism even if processing the activity
itself would be enough to re-introduce synchronization)
* Change how ActivityPub::SynchronizeFollowersService handles follow requests
If the remote lists a local follower which we only know has sent a follow
request, consider the follow request as accepted instead of sending an Undo.
* Integrate review feeback
- rename X-AS-Collection-Synchronization to Collection-Synchronization
- various minor refactoring and code style changes
* Only select required fields when computing followers_hash
* Use actor URI rather than webfinger domain in synchronization endpoint
* Change hash computation to be a XOR of individual hashes
Makes it much easier to be memory-efficient, and avoid sorting discrepancy issues.
* Marginally improve followers_hash computation speed
* Further improve hash computation performances by using pluck_each
4 years ago
|
|
|
|
|
|
|
|
gem 'xorcist', '~> 1.1'
|
|
|
|
|
gem 'pluck_each', '~> 0.1.3'
|
