Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix invalid byte sequence in UTF-8 exception when unencoding URLs containing non UTF-8 characters #459

Merged
merged 4 commits into from Jul 30, 2022
Merged

fix invalid byte sequence in UTF-8 exception when unencoding URLs containing non UTF-8 characters #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3b04eb
fix "invalid byte sequence in UTF-8" exception when unencoding URLs c…
jarthod Jul 2, 2022
baed0e4
Merge branch 'main' into iso-encoding-problem
sporkmonger Jul 30, 2022
a5af6b0
Merge branch 'main' into iso-encoding-problem
sporkmonger Jul 30, 2022
b4c9882
Merge branch 'main' into iso-encoding-problem
sporkmonger Jul 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 3 additions & 9 deletions lib/addressable/uri.rb
View file
Open in desktop
Expand Up @@ -468,19 +468,13 @@ def self.unencode(uri, return_type=String, leave_encoded='')
"Expected Class (String or Addressable::URI), " +
"got #{return_type.inspect}"
end
uri = uri.dup
# Seriously, only use UTF-8. I'm really not kidding!
uri.force_encoding("utf-8")

unless leave_encoded.empty?
leave_encoded = leave_encoded.dup.force_encoding("utf-8")
end

result = uri.gsub(/%[0-9a-f]{2}/iu) do |sequence|
result = uri.gsub(/%[0-9a-f]{2}/i) do |sequence|
c = sequence[1..3].to_i(16).chr
c.force_encoding("utf-8")
c.force_encoding(sequence.encoding)
leave_encoded.include?(c) ? sequence : c
end

result.force_encoding("utf-8")
if return_type == String
return result
Expand Down
5 changes: 5 additions & 0 deletions spec/addressable/uri_spec.rb
View file
Open in desktop
Expand Up @@ -5992,6 +5992,11 @@ def to_str
expect(Addressable::URI.unencode_component("ski=%BA%DAɫ")).to eq("ski=\xBA\xDAɫ")
end

it "should not fail with UTF-8 incompatible string" do
url = "/M%E9/\xE9?p=\xFC".b
expect(Addressable::URI.unencode_component(url)).to eq("/M\xE9/\xE9?p=\xFC")
end

it "should result in correct percent encoded sequence as a URI" do
expect(Addressable::URI.unencode(
"/path?g%C3%BCnther", ::Addressable::URI
Expand Down