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 thread safety issue with encoding tables #515

Merged
merged 2 commits into from
Jul 31, 2023
Merged

Fix thread safety issue with encoding tables #515

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
203eafd
Fix thread safety issue with encoding tables
byroot Jul 31, 2023
6ab4966
Merge branch 'main' into precompute-constants
dentarg Jul 31, 2023
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
32 changes: 14 additions & 18 deletions lib/addressable/uri.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,17 +344,13 @@ def self.join(*uris)
##
# Tables used to optimize encoding operations in `self.encode_component`
# and `self.normalize_component`
SEQUENCE_ENCODING_TABLE = Hash.new do |hash, sequence|
hash[sequence] = sequence.unpack("C*").map do |c|
format("%02x", c)
end.join
end
SEQUENCE_ENCODING_TABLE = (0..255).map do |byte|
format("%02x", byte).freeze
end.freeze

SEQUENCE_UPCASED_PERCENT_ENCODING_TABLE = Hash.new do |hash, sequence|
hash[sequence] = sequence.unpack("C*").map do |c|
format("%%%02X", c)
end.join
end
SEQUENCE_UPCASED_PERCENT_ENCODING_TABLE = (0..255).map do |byte|
format("%%%02X", byte).freeze
end.freeze

##
# Percent encodes a URI component.
Expand Down Expand Up @@ -421,16 +417,17 @@ def self.encode_component(component, character_class=
component = component.dup
component.force_encoding(Encoding::ASCII_8BIT)
# Avoiding gsub! because there are edge cases with frozen strings
component = component.gsub(character_class) do |sequence|
SEQUENCE_UPCASED_PERCENT_ENCODING_TABLE[sequence]
component = component.gsub(character_class) do |char|
SEQUENCE_UPCASED_PERCENT_ENCODING_TABLE[char.ord]
end
if upcase_encoded.length > 0
upcase_encoded_chars = upcase_encoded.chars.map do |char|
SEQUENCE_ENCODING_TABLE[char]
upcase_encoded_chars = upcase_encoded.bytes.map do |byte|
SEQUENCE_ENCODING_TABLE[byte]
end
component = component.gsub(/%(#{upcase_encoded_chars.join('|')})/,
&:upcase)
end

return component
end

Expand Down Expand Up @@ -560,10 +557,9 @@ def self.normalize_component(component, character_class=
leave_re = if leave_encoded.length > 0
character_class = "#{character_class}%" unless character_class.include?('%')

"|%(?!#{leave_encoded.chars.flat_map do |char|
seq = SEQUENCE_ENCODING_TABLE[char]
[seq.upcase, seq.downcase]
end.join('|')})"
bytes = leave_encoded.bytes
leave_encoded_pattern = bytes.map { |b| SEQUENCE_ENCODING_TABLE[b] }.join('|')
"|%(?!#{leave_encoded_pattern}|#{leave_encoded_pattern.upcase})"
end

character_class = if leave_re
Expand Down