Squashed commit of the following:
commit 7b2ba61c4841e23081552fb79270e4e430dd1fe0
Author: noellabo <noel.yoshiba@gmail.com>
Date: Sat Sep 5 16:03:52 2020 +0900
Add the ability to change to a new circle by replying to a circle
commit 7013a228c65c7bd147885de458b50095f3c24334
Author: noellabo <noel.yoshiba@gmail.com>
Date: Sat Sep 5 16:10:57 2020 +0900
fixup! add-limited-visibility-icon-to-status
commit 679aa8a7f9bef42ee5d0b326d9ae4925a1999939
Author: noellabo <noel.yoshiba@gmail.com>
Date: Sat Sep 5 15:12:53 2020 +0900
Fix 14666
commit b3addd8220d8bb3512ff345b32ca83c714dadd2a
Author: noellabo <noel.yoshiba@gmail.com>
Date: Sat Sep 5 11:44:12 2020 +0900
Add Japanese translation for circle
commit b7f4b773a0cd554084d5ad6a5923adb06b3acfc4
Author: noellabo <noel.yoshiba@gmail.com>
Date: Sat Sep 5 11:40:12 2020 +0900
Squashed commit of the following:
commit b85a4685b27c49462288aba5f38723b91e936c4a
Author: noellabo <noel.yoshiba@gmail.com>
Date: Sat Sep 5 10:50:03 2020 +0900
Changed to remove restrictions on privacy options and allow users to switch circles when replying
commit 0a8c0140c73d7c5333e4f8017964adb5061a7cf1
Author: noellabo <noel.yoshiba@gmail.com>
Date: Sat Sep 5 09:33:07 2020 +0900
Change limited visibility icon
commit b64adf19788d828249408454ec6afa9beb3d4872
Author: noellabo <noel.yoshiba@gmail.com>
Date: Mon Aug 31 06:50:56 2020 +0900
Fix a change to limited-visibility-bearcaps replies
commit ed361405b5e38857a2f42b0515a599ddcdd412cf
Author: noellabo <noel.yoshiba@gmail.com>
Date: Thu Aug 27 15:53:18 2020 +0900
Fix composer text when change visibility
commit 4da3adddb6ffde43070d743e34c5b56e06579b30
Author: noellabo <noel.yoshiba@gmail.com>
Date: Sat Aug 22 22:34:23 2020 +0900
Fix wrong circle_id when changing visibility
commit 752d7fc2a3c9e34fab9993d767f83c6eae7ba55a
Author: noellabo <noel.yoshiba@gmail.com>
Date: Sun Aug 9 13:12:51 2020 +0900
Add circle reply and redraft
commit 5978bc04a24695edce6717bda89dcf6f861ef2c4
Author: noellabo <noel.yoshiba@gmail.com>
Date: Mon Jul 27 01:07:52 2020 +0900
Fix remove unused props
commit 7970f69676c24b4aa9385fee8b1635c46ba52fcd
Author: noellabo <noel.yoshiba@gmail.com>
Date: Sun Jul 26 21:17:07 2020 +0900
Separate circle choice from privacy
commit 36f6a684c0b0c895d4d0f1b9d09b05c91b104666
Author: noellabo <noel.yoshiba@gmail.com>
Date: Thu Jul 23 10:54:25 2020 +0900
Add UI for posting to circles
commit 7ef48003c1407275663dd603b124d292db2aa93a
Author: noellabo <noel.yoshiba@gmail.com>
Date: Fri Jul 24 12:55:10 2020 +0900
Fix silent mention by circle
commit 7a1caed49333c3d3241301afb77639cdf1cabdc0
Author: noellabo <noel.yoshiba@gmail.com>
Date: Sat Sep 5 11:38:10 2020 +0900
Squashed commit of the following:
commit dca71fab86c830932ca760b7d8b3f89cc25c453e
Author: noellabo <noel.yoshiba@gmail.com>
Date: Sat Sep 5 09:31:26 2020 +0900
Revert "Add focus setting when opening the circle column"
This reverts commit 3a93ac99312a13b68b7edc2b81313fb0ffb7bcdc.
commit 0a1bc8307bb699c7eb3024072ce14a440df1fc87
Author: noellabo <noel.yoshiba@gmail.com>
Date: Sat Sep 5 09:31:11 2020 +0900
Change limited visibility icon
commit 9784f8b562f6592e9d9190ca29d2b2e870006d10
Author: noellabo <noel.yoshiba@gmail.com>
Date: Thu Aug 13 21:52:07 2020 +0900
Add focus setting when opening the circle column
commit a84f680c167fab9276550850c60f9108d251144e
Author: noellabo <noel.yoshiba@gmail.com>
Date: Thu Aug 13 15:55:27 2020 +0900
Fix message
commit e3f11c4adac57b6e6a15c981ed6f4721a1634212
Author: noellabo <noel.yoshiba@gmail.com>
Date: Mon Jul 27 01:01:23 2020 +0900
Fix light-theme
commit d7d96eda5b86d3e3f654ce79888e7cf5aa535db5
Author: noellabo <noel.yoshiba@gmail.com>
Date: Sun Jul 26 21:50:56 2020 +0900
Fix circles loading in share page and followers search
commit 10b821f7b8c0a87cea3df51f09deeadc2cb40b32
Author: noellabo <noel.yoshiba@gmail.com>
Date: Fri Jul 24 14:08:00 2020 +0900
Refactor list items
commit e020072915572ce409039ccf799d08f8d8b5b393
Author: noellabo <noel.yoshiba@gmail.com>
Date: Thu Jul 23 20:15:38 2020 +0900
Fixed a bug that circle name change is not reflected in the list
commit 735bc41161b4c09a8dafe2c0064096b3ca79f2a0
Author: noellabo <noel.yoshiba@gmail.com>
Date: Wed Jul 22 08:49:47 2020 +0900
Add UI for managing circle members
commit d7c3145b8fa84be0631bf7f41bb229f3e6d03ff1
Author: noellabo <noel.yoshiba@gmail.com>
Date: Wed Jul 22 07:34:52 2020 +0900
Add the followers option to AccountSearchSercive
commit 65e2b0c4299b72ede440b50089c1bd6afa6c9c05
Author: noellabo <noel.yoshiba@gmail.com>
Date: Wed Jul 22 07:05:56 2020 +0900
Add CircleSerializer
commit a639e1803abf5590068846dbe98bc5edfaa2ad82
Author: noellabo <noel.yoshiba@gmail.com>
Date: Sat Sep 5 11:37:30 2020 +0900
Squashed commit of the following:
commit 9cb3fb9d980e3ee066083076f508c5ab1447176a
Author: noellabo <noel.yoshiba@gmail.com>
Date: Sat Sep 5 07:15:19 2020 +0900
Move the link to the mention list to the menu
commit b32dd87b43f4e09b8e2c437f1fb5d3ebd6221215
Author: noellabo <noel.yoshiba@gmail.com>
Date: Sat Sep 5 00:56:12 2020 +0900
Change limited visibility icon
commit 8db0d024119d1c2cef8de849f2501496a166a2dd
Author: noellabo <noel.yoshiba@gmail.com>
Date: Tue Sep 1 01:42:13 2020 +0900
Fix to disallow getting the list of mentions in limited replies
commit 490a9d65a59a3dd0d86e81f6780e879dc4313dff
Author: noellabo <noel.yoshiba@gmail.com>
Date: Fri Jul 24 11:36:24 2020 +0900
Add column to list mentioned accounts of limited status
commit 62a423ac2729c16f26fafe111f257bc373218df2
Author: noellabo <noel.yoshiba@gmail.com>
Date: Thu Jul 23 13:30:17 2020 +0900
Fix visibility compatibility more
commit a5cfa54b259054f41e89037f299fa928a2361818
Author: noellabo <noel.yoshiba@gmail.com>
Date: Mon Jul 20 05:39:49 2020 +0900
Fix visibility compatibility
commit 7900ca5650c77565b86ddc594a221dfa3b5321b4
Author: noellabo <noel.yoshiba@gmail.com>
Date: Mon Jul 20 02:01:27 2020 +0900
Add limited visibility icon to status
commit 66b83965ef068e9ee8c940249c68bcbde15731fe
Author: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed Aug 26 03:16:47 2020 +0200
Add conversation-based forwarding for limited visibility statuses through bearcaps
commit 561abc65e0ace89318b3952047025b8d98515fbb
Author: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun Jul 19 02:05:16 2020 +0200
Add REST API for managing and posting to circles
Circles are the conceptual opposite of lists. A list is a subdivision
of your follows, a circle is a subdivision of your followers. Posting
to a circle means making content available to only some of your
followers. Circles have been internally supported in Mastodon for
the purposes of federation since #8950, this adds the REST API
necessary for making use of them in Mastodon itsef.
* Fix crash on receiving requests with missing Digest header
Return an error pointing out that Digest is missing, instead of crashing.
Fixes#15743
* Fix from review feedback
* Add honeypot fields to limit non-specialized spam
Add two honeypot fields: a fake website input and a fake password confirmation
one. The label/placeholder/aria-label tells not to fill them, and they are
hidden in CSS, so legitimate users should not fall into these.
This should cut down on some non-Mastodon-specific spambots.
* Require a 3 seconds delay before submitting the registration form
* Fix tests
* Move registration form time check to model validation
* Give people a chance to clear the honeypot fields
* Refactor honeypot translation strings
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
If someone tries logging in to an account and is prompted for a 2FA
code or sign-in token, even if the account's password or e-mail is
updated in the meantime, the session will show the prompt and allow
the login process to complete with a valid 2FA code or sign-in token
* Add more specific error message when request body digest is invalid
This may help other implementors debug their implementation.
* Relax Host parameter requirement to GET requests
The only POST requests processed by Mastodon need objects/actors (including
their host) to be explicitly mentioned in the request's body, so replaying
a legitimate request to another host should not be a security issue.
* Support Digest headers using multiple algorithms or lowercase alogirthm names
* Make Array-creation behavior of Paginable more predictable
Paginable.paginate_by_id usually returns ActiveRecord::Relation, but it
returns an Array if min_id option is present. The behavior caused problems
fixed with the following commits:
- 552e886b64
- b63ede5005
- 64ef37b89d
To prevent from recurring similar problems, this commit introduces two
changes:
- The scope now always returns an Array whether min_id option is present
or not.
- The scope is renamed to to_a_paginated_by_id to clarify it returns an
Array.
* Transform Paginable.to_a_paginated_by_id from a scope to a class method
https://api.rubyonrails.org/classes/ActiveRecord/Scoping/Named/ClassMethods.html#method-i-scope
> The method is intended to return an ActiveRecord::Relation object, which
> is composable with other scopes.
Paginable.to_a_paginated_by_id returns an Array and is not appropriate
as a scope.
* Replace incorrect use of distinct with group
Some uses of ActiveRecord::QueryMethods#distinct pass field names but they
are incorrect for the current version of Rails.
ActiveRecord::QueryMethods#group provides the expected behavior and
benefits performance. See commit 6da24aad4cafdef8d8a2c92bac2002a5fc2fe9c8.
* Introduce ApplicationController#cache_collection_paginated_by_id
ApplicationController#cache_collection_paginated_by_id fuses
ApplicationController#cache_collection and Paginable.paginate_by_id.
An advantage of this method is that it prevents from modifying scope which
Paginable.paginate_by_id may provide.
ApplicationController#cache_collection always return an array and there
is no possibility of the scope modification. It is also clear for a
programmer, considering the implication of "cache".
This method can also emit more efficient queries by using
Cacheable.cache_ids before calling Paginable.paginate_by_id.
* Add support for latest HTTP Signatures spec draft
https://www.ietf.org/id/draft-ietf-httpbis-message-signatures-00.html
- add support for the “hs2019” signature algorithm (assumed to be equivalent
to RSA-SHA256, since we do not have a mechanism to specify the algorithm
within the key metadata yet)
- add support for (created) and (expires) pseudo-headers and related
signature parameters, when using the hs2019 signature algorithm
- adjust default “headers” parameter while being backwards-compatible with
previous implementation
- change the acceptable time window logic from 12 hours surrounding the “date”
header to accepting signatures created up to 1 hour in the future and
expiring up to 1 hour in the past (but only allowing expiration dates up to
12 hours after the creation date)
This doesn't conform with the current draft, as it doesn't permit accounting
for clock skew.
This, however, should be addressed in a next version of the draft:
https://github.com/httpwg/http-extensions/pull/1235
* Add additional signature requirements
* Rewrite signature params parsing using Parslet
* Make apparent which signature algorithm Mastodon on verification failure
Mastodon uses RSASSA-PKCS1-v1_5, which is not recommended for new applications,
and new implementers may thus unknowingly use RSASSA-PSS.
* Add workaround for PeerTube's invalid signature header
The previous parser allowed incorrect Signature headers, such as
those produced by old versions of the `http-signature` node.js package,
and seemingly used by PeerTube.
This commit adds a workaround for that.
* Fix `signature_key_id` raising an exception
Previously, parsing failures would result in `signature_key_id` being nil,
but the parser changes made that result in an exception.
This commit changes the `signature_key_id` method to return `nil` in case
of parsing failures.
* Move extra HTTP signature helper methods to private methods
* Relax (request-target) requirement to (request-target) || digest
This lets requests from Plume work without lowering security significantly.
* 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>
Instead of returning a signature verification error, pretend there
was no signature (i.e., this does not allow access to resources that
need a valid signature), so public resources can still be fetched
Fix#13011
* Move signature verification stoplight to the requests themselves
This avoids blocking messages from known keys for 5 minutes when only one fails…
* Put the stoplight on the actual client IP, not a potential reverse proxy
* Refactor signature verification a bit
* Rescue signature verification if recorded public key is invalid
Fixes#8822
* Always re-fetch AP signing key when HTTP Signature verification fails
But when the account is not marked as stale, avoid fetching collections and
media, and avoid webfinger round-trip.
* Apply stoplight to key/account update as well as initial key retrieval
* 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
`@signature_verification_failure_reason` is used in most places but`@signed_verification_failure_reason` appears in two places. Likely those errors are not returned.
* Fix follow/unfollow buttons on public profile
- Present non-logged users with web+mastodon:// URLs for remote accounts
- Present logged-in users with appropriate links (authorize_follows and
remote_unfollows) for remote accounts
* Do not cache rendered cards if user is logged in
