mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 12:52:52 +00:00
21ad21cb50
* 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
139 lines
3.3 KiB
Ruby
139 lines
3.3 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
describe ApplicationController, type: :controller do
|
|
controller do
|
|
include SignatureVerification
|
|
|
|
def success
|
|
head 200
|
|
end
|
|
|
|
def alternative_success
|
|
head 200
|
|
end
|
|
end
|
|
|
|
before do
|
|
routes.draw { match via: [:get, :post], 'success' => 'anonymous#success' }
|
|
end
|
|
|
|
context 'without signature header' do
|
|
before do
|
|
get :success
|
|
end
|
|
|
|
describe '#signed_request?' do
|
|
it 'returns false' do
|
|
expect(controller.signed_request?).to be false
|
|
end
|
|
end
|
|
|
|
describe '#signed_request_account' do
|
|
it 'returns nil' do
|
|
expect(controller.signed_request_account).to be_nil
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'with signature header' do
|
|
let!(:author) { Fabricate(:account) }
|
|
|
|
context 'without body' do
|
|
before do
|
|
get :success
|
|
|
|
fake_request = Request.new(:get, request.url)
|
|
fake_request.on_behalf_of(author)
|
|
|
|
request.headers.merge!(fake_request.headers)
|
|
end
|
|
|
|
describe '#signed_request?' do
|
|
it 'returns true' do
|
|
expect(controller.signed_request?).to be true
|
|
end
|
|
end
|
|
|
|
describe '#signed_request_account' do
|
|
it 'returns an account' do
|
|
expect(controller.signed_request_account).to eq author
|
|
end
|
|
|
|
it 'returns nil when path does not match' do
|
|
request.path = '/alternative-path'
|
|
expect(controller.signed_request_account).to be_nil
|
|
end
|
|
|
|
it 'returns nil when method does not match' do
|
|
post :success
|
|
expect(controller.signed_request_account).to be_nil
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'with request older than a day' do
|
|
before do
|
|
get :success
|
|
|
|
fake_request = Request.new(:get, request.url)
|
|
fake_request.add_headers({ 'Date' => 2.days.ago.utc.httpdate })
|
|
fake_request.on_behalf_of(author)
|
|
|
|
request.headers.merge!(fake_request.headers)
|
|
end
|
|
|
|
describe '#signed_request?' do
|
|
it 'returns true' do
|
|
expect(controller.signed_request?).to be true
|
|
end
|
|
end
|
|
|
|
describe '#signed_request_account' do
|
|
it 'returns nil' do
|
|
expect(controller.signed_request_account).to be_nil
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'with body' do
|
|
before do
|
|
post :success, body: 'Hello world'
|
|
|
|
fake_request = Request.new(:post, request.url, body: 'Hello world')
|
|
fake_request.on_behalf_of(author)
|
|
|
|
request.headers.merge!(fake_request.headers)
|
|
end
|
|
|
|
describe '#signed_request?' do
|
|
it 'returns true' do
|
|
expect(controller.signed_request?).to be true
|
|
end
|
|
end
|
|
|
|
describe '#signed_request_account' do
|
|
it 'returns an account' do
|
|
expect(controller.signed_request_account).to eq author
|
|
end
|
|
|
|
it 'returns nil when path does not match' do
|
|
request.path = '/alternative-path'
|
|
expect(controller.signed_request_account).to be_nil
|
|
end
|
|
|
|
it 'returns nil when method does not match' do
|
|
get :success
|
|
expect(controller.signed_request_account).to be_nil
|
|
end
|
|
|
|
it 'returns nil when body has been tampered' do
|
|
post :success, body: 'doo doo doo'
|
|
expect(controller.signed_request_account).to be_nil
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|