Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream has updated their README, we have a completely different one.
  Kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream has updated their development CSPs, while we disable CSPs in
  the development environment.
  Kept our version.
This commit is contained in:
Claire
2023-09-02 13:31:15 +02:00
10 changed files with 79 additions and 19 deletions

View File

@@ -119,6 +119,8 @@ module SignatureVerification
private
def fail_with!(message, **options)
Rails.logger.warn { "Signature verification failed: #{message}" }
@signature_verification_failure_reason = { error: message }.merge(options)
@signed_request_actor = nil
end