Commit Graph

2730 Commits (main)

Author SHA1 Message Date
Jeremy Kescher ce878a78bb
Merge branch 'glitch-soc' into develop 3 months ago
Claire 6c1b6194f7 Merge pull request from GHSA-jhrq-qvrm-qr36
* Fix insufficient Content-Type checking of fetched ActivityStreams objects

* Allow JSON-LD documents with multiple profiles
3 months ago
Claire e7ca82762d Fix user creation failure handling in OAuth paths (#29207) 3 months ago
Jeremy Kescher 1c9291adcd
Merge branch 'glitch-soc' into develop
# Conflicts:
#	app/javascript/flavours/glitch/styles/components/accounts.scss
#	app/javascript/flavours/glitch/styles/components/status.scss
3 months ago
Claire 486e4bc7d3 Fix OmniAuth tests (#29201) 3 months ago
Claire 53b73ed6a2 Merge pull request from GHSA-vm39-j3vx-pch3
* Prevent different identities from a same SSO provider from accessing a same account

* Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true`

* Rename methods to avoid confusion between OAuth and OmniAuth
3 months ago
Emelia Smith 436419cc2f Merge pull request from GHSA-7w3c-p9j8-mq3x
* Ensure destruction of OAuth Applications notifies streaming

Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens.

* Ensure password resets revoke access to Streaming API

* Improve performance of deleting OAuth tokens

---------

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
3 months ago
Emelia Smith eae436c5a8 Disable administrative doorkeeper routes (#29187) 3 months ago
Jeremy Kescher c7e37c256e
Merge branch 'glitch-soc' into develop 3 months ago
Claire ff58ec0103 Merge pull request from GHSA-3fjr-858r-92rw
* Fix insufficient origin validation

* Bump version to 4.3.0-alpha.1
3 months ago
Matt Jankowski f4416e6b3a Configure selenium to use Chrome version 120 (#29038) 3 months ago
Jeremy Kescher bf4d613731
Merge branch 'glitch-soc' into develop 3 months ago
Jeremy Kescher c2c2afc294
Merge branch 'glitch-soc' into develop 3 months ago
Claire bf153b384b Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
  Upstream refactored, changing lines textually close of glitch-soc-only lines
  pertaining to the theming system.
  Resolved the conflict.
- `app/controllers/auth/passwords_controller.rb`:
  Upstream refactored, changing lines textually close of glitch-soc-only lines
  pertaining to the theming system.
  Resolved the conflict.
- `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`:
  Upstream refactored, changing lines textually close of glitch-soc-only lines
  pertaining to the theming system.
  Resolved the conflict.
3 months ago
Claire 5fa2821853 Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream 3 months ago
Claire 70de52c297 Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream 3 months ago
Matt Jankowski 42ab855b23
Add specs for `Instance` model scopes and add `with_domain_follows` scope (#28767) 3 months ago
Matt Jankowski 2866106ec1
Reduce factory creation in `spec/models/account_statuses_cleanup_policy` (#28361) 3 months ago
Matt Jankowski 6b6586f5d0
Add `CustomFilterKeyword#to_regex` method (#28893) 3 months ago
Matt Jankowski 7c9c6c7f80
Fix remaining `Rails/WhereExists` cop violations, regenerate todo (#28892) 3 months ago
Claire 087415d0fe
Add tests for processing statuses using bearcap URIs (#28904) 3 months ago
Claire 0471a78055
Add tests for redirect confirmations (#28903) 3 months ago
Claire 22cfab0ebf Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream
Conflicts:
- `tsconfig.json`:
  Upstream made style fixes, while glitch-soc had extra options.
  Ported upstream's style fixes.
3 months ago
Matt Jankowski a11a2fb052
Add error classes to api/base errors coverage (#28864) 3 months ago
Matt Jankowski b0207d7757
Add coverage for `Tag.recently_used` scope (#28850) 3 months ago
Claire 102eff7c05 Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream 3 months ago
Claire 0700eb58bc Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream 3 months ago
Claire e2d9635074
Add notification email on invalid second authenticator (#28822) 3 months ago
Matt Jankowski 18004bf227
Add `Account.matches_uri_prefix` scope and use in activitypub/followers_synchronizations controller (#28820) 3 months ago
Matt Jankowski 7ecf7f5403
Move controller->request specs for api/v1/statuses/* (#28818) 4 months ago
Claire cf2a2ed71c
Fix processing of compacted single-item JSON-LD collections (#28816) 4 months ago
Claire 3593ee2e36
Add rate-limit of TOTP authentication attempts at controller level (#28801) 4 months ago
Matt Jankowski 329911b0a3
Migrate controller->request spec for api/v1/follow* (#28811) 4 months ago
Matt Jankowski 1480573c83
Add `Account.auditable` scope, fix N+1 in admin/action_logs#index (#28812) 4 months ago
Jeremy Kescher 93ae46fa14
Merge branch 'glitch-soc' into develop 4 months ago
Claire 528a8fa495 Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream 4 months ago
Matt Jankowski d0b3bc23d7
Remove unused `matches_domain` scopes on Account, DomainAllow, DomainBlock (#28803) 4 months ago
Matt Jankowski 0b853678a4
Add coverage for `api/v1/peers/search` endpoint and extract controller query to Instance scope (#28796) 4 months ago
Matt Jankowski 3d82040b26
Reduced repeated setup in `UnallowDomainService` spec (#28785) 4 months ago
Matt Jankowski 6c5a2d51bc
Reduced repeated setup in `PurgeDomainService` spec (#28786) 4 months ago
Matt Jankowski 07e10e3747
Combine assertions about same setup in `Account#suspend!` spec (#28787) 4 months ago
Jeremy Kescher 5d4cfe4cd8
Merge branch 'glitch-soc' into develop 4 months ago
Claire c59fb65ddc Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Conflict due to glitch-soc's option to hide followers count.
  Ported upstream changes.

Additional changes:
- `app/views/application/mailer/_account.html.haml`:
  Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
  Ported the `frontend_asset_url` helper change to glitch-soc.
4 months ago
Matt Jankowski 9a475ea8b3
Finish up the CLI spec area pattern adoption for `CLI::Accounts#refresh` specs (#28764) 4 months ago
Matt Jankowski 1b0cb3b54d
Announcement reactions query spec improvement and refactor (#28768) 4 months ago
Claire dee561604b Merge commit 'b4c332104a8b3748f619de250f77c0acc8e80628' into glitch-soc/merge-upstream 4 months ago
Matt Jankowski b4c332104a
Use top-level `warn` in JS errors check (#28745) 4 months ago
Claire 278597c161 Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream 4 months ago
Claire 2f521bc84a Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream 4 months ago
Claire 464051c2d2 Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream 4 months ago