Commit f1830540 authored by GitLab Release Tools Bot's avatar GitLab Release Tools Bot

Merge branch 'security-dos-issue-and-commit-comments-master' into 'master'

Fix invalid byte sequence

See merge request gitlab/gitlabhq!3545
parents f92bc7b1 53834c18
---
title: Fix 500 error caused by invalid byte sequences in links
merge_request:
author:
type: security
...@@ -172,7 +172,7 @@ module Banzai ...@@ -172,7 +172,7 @@ module Banzai
end end
def cleaned_file_path(uri) def cleaned_file_path(uri)
Addressable::URI.unescape(uri.path).delete("\0").chomp("/") Addressable::URI.unescape(uri.path).scrub.delete("\0").chomp("/")
end end
def relative_file_path(uri) def relative_file_path(uri)
......
...@@ -119,6 +119,11 @@ describe Banzai::Filter::RelativeLinkFilter do ...@@ -119,6 +119,11 @@ describe Banzai::Filter::RelativeLinkFilter do
expect { filter(act) }.not_to raise_error expect { filter(act) }.not_to raise_error
end end
it 'does not raise an exception on URIs containing invalid utf-8 byte sequences' do
act = link("%FF")
expect { filter(act) }.not_to raise_error
end
it 'does not raise an exception with a garbled path' do it 'does not raise an exception with a garbled path' do
act = link("open(/var/tmp/):%20/location%0Afrom:%20/test") act = link("open(/var/tmp/):%20/location%0Afrom:%20/test")
expect { filter(act) }.not_to raise_error expect { filter(act) }.not_to raise_error
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment