1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/uri] Fix RFC3986 regexps

Browse Source 
https://github.com/ruby/uri/commit/8e38592241
This commit is contained in:
Nobuyoshi Nakada 2023-06-13 13:54:44 +09:00 committed by git
parent 3924dba552
commit 6d734a8975
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/uri/rfc3986_parser.rb
View File

@ -34,6 +34,7 @@ module URI
SCHEME = %r[[A-Za-z][+\-.0-9A-Za-z]*+].source SCHEME = %r[[A-Za-z][+\-.0-9A-Za-z]*+].source
SEG = %r[(?:%\h\h|[!$&-.0-9:;=@A-Z_a-z~/])].source SEG = %r[(?:%\h\h|[!$&-.0-9:;=@A-Z_a-z~/])].source
SEG_NC = %r[(?:%\h\h|[!$&-.0-9;=@A-Z_a-z~])].source
FRAGMENT = %r[(?:%\h\h|[!$&-.0-9:;=@A-Z_a-z~/?])*+].source FRAGMENT = %r[(?:%\h\h|[!$&-.0-9:;=@A-Z_a-z~/?])*+].source
RFC3986_URI = %r[\A RFC3986_URI = %r[\A
@ -43,8 +44,8 @@ module URI
(?<hier-part>// (?<hier-part>//
(?<authority>#{AUTHORITY}) (?<authority>#{AUTHORITY})
(?<path-abempty>(?:/\g<seg>*+)?) (?<path-abempty>(?:/\g<seg>*+)?)
| (?<path-absolute>/\g<seg>*+) | (?<path-absolute>/((?!/)\g<seg>++)?)
| (?<path-rootless>(?!=/)\g<seg>++) | (?<path-rootless>(?!/)\g<seg>++)
| (?<path-empty>) | (?<path-empty>)
) )
(?:\?(?<query>[^\#]*+))? (?:\?(?<query>[^\#]*+))?
@ -58,7 +59,7 @@ module URI
(?<authority>#{AUTHORITY}) (?<authority>#{AUTHORITY})
(?<path-abempty>(?:/\g<seg>*+)?) (?<path-abempty>(?:/\g<seg>*+)?)
| (?<path-absolute>/\g<seg>*+) | (?<path-absolute>/\g<seg>*+)
| (?<path-noscheme>(?!=[:/])\g<seg>++) | (?<path-noscheme>#{SEG_NC}++(?:/\g<seg>*+)?)
| (?<path-empty>) | (?<path-empty>)
) )
(?:\?(?<query>[^#]*+))? (?:\?(?<query>[^#]*+))?
@ -156,7 +157,7 @@ module URI
USERINFO: %r[\A#{USERINFO}\z]o, USERINFO: %r[\A#{USERINFO}\z]o,
HOST: %r[\A#{HOST}\z]o, HOST: %r[\A#{HOST}\z]o,
ABS_PATH: %r[\A/#{SEG}*+\z]o, ABS_PATH: %r[\A/#{SEG}*+\z]o,
REL_PATH: %r[\A(?!=/)#{SEG}++\z]o, REL_PATH: %r[\A(?!/)#{SEG}++\z]o,
QUERY: %r[\A(?:%\h\h|[!$&-.0-9:;=@A-Z_a-z~/?])*+\z], QUERY: %r[\A(?:%\h\h|[!$&-.0-9:;=@A-Z_a-z~/?])*+\z],
FRAGMENT: %r[\A#{FRAGMENT}\z]o, FRAGMENT: %r[\A#{FRAGMENT}\z]o,
OPAQUE: %r[\A(?:[^/].*)?\z], OPAQUE: %r[\A(?:[^/].*)?\z],

8
test/uri/test_parser.rb
View File

@ -78,5 +78,13 @@ class URI::TestParser < Test::Unit::TestCase
assert_equal(["http", nil, "[0::0]", nil, nil, "", nil, nil, nil], URI.split("http://[0::0]")) assert_equal(["http", nil, "[0::0]", nil, nil, "", nil, nil, nil], URI.split("http://[0::0]"))
assert_equal([nil, nil, "example.com", nil, nil, "", nil, nil, nil], URI.split("//example.com")) assert_equal([nil, nil, "example.com", nil, nil, "", nil, nil, nil], URI.split("//example.com"))
assert_equal([nil, nil, "[0::0]", nil, nil, "", nil, nil, nil], URI.split("//[0::0]")) assert_equal([nil, nil, "[0::0]", nil, nil, "", nil, nil, nil], URI.split("//[0::0]"))
assert_equal(["a", nil, nil, nil, nil, "", nil, nil, nil], URI.split("a:"))
assert_raise(URI::InvalidURIError) do
URI.parse("::")
end
assert_raise(URI::InvalidURIError) do
URI.parse("foo@example:foo")
end
end end
end end