Don't allow URLs that contain non-normalized paths to be verified (#20999)
* Don't allow URLs that contain non-normalized paths to be verified This stops things like https://example.com/otheruser/../realuser where "/otheruser" appears to be the verified URL, but the actual URL being verified is "/realuser" due to the "/../". Also fix a test to use 'https', so it is testing the right thing, now that since #20304 https is required. * missing dopull/1966/head^2
parent
48e136605a
commit
69378eac99
|
@ -46,7 +46,8 @@ class Account::Field < ActiveModelSerializers::Model
|
||||||
parsed_url.user.nil? &&
|
parsed_url.user.nil? &&
|
||||||
parsed_url.password.nil? &&
|
parsed_url.password.nil? &&
|
||||||
parsed_url.host.present? &&
|
parsed_url.host.present? &&
|
||||||
parsed_url.normalized_host == parsed_url.host
|
parsed_url.normalized_host == parsed_url.host &&
|
||||||
|
(parsed_url.path.empty? || parsed_url.path == parsed_url.normalized_path)
|
||||||
rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
|
rescue Addressable::URI::InvalidURIError, IDN::Idna::IdnaError
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
|
|
|
@ -67,7 +67,15 @@ RSpec.describe Account::Field, type: :model do
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'for an IDN URL' do
|
context 'for an IDN URL' do
|
||||||
let(:value) { 'http://twitter.com∕dougallj∕status∕1590357240443437057.ê.cc/twitter.html' }
|
let(:value) { 'https://twitter.com∕dougallj∕status∕1590357240443437057.ê.cc/twitter.html' }
|
||||||
|
|
||||||
|
it 'returns false' do
|
||||||
|
expect(subject.verifiable?).to be false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'for a URL with a non-normalized path' do
|
||||||
|
let(:value) { 'https://github.com/octocatxxxxxxxx/../mastodon' }
|
||||||
|
|
||||||
it 'returns false' do
|
it 'returns false' do
|
||||||
expect(subject.verifiable?).to be false
|
expect(subject.verifiable?).to be false
|
||||||
|
|
Loading…
Reference in New Issue