Skip to content

Use URI::RFC2396_Parser#regex explicitly.#138

Merged
dentarg merged 1 commit intosinatra:mainfrom
hsbt:fix-uri-default-parser-change
Jul 30, 2024
Merged

Use URI::RFC2396_Parser#regex explicitly.#138
dentarg merged 1 commit intosinatra:mainfrom
hsbt:fix-uri-default-parser-change

Conversation

@hsbt
Copy link
Contributor

@hsbt hsbt commented Jul 19, 2024 •
edited
Loading

I got the following error with the current develop version of ruby/ruby.

  87) Mustermann::Template level 4 operator + pattern "/{a}/{+b}" is expected to expand {:a=>"foo/bar", :b=>"foo/bar"}
      Failure/Error: it { should expand(a: 'foo/bar', b: 'foo/bar').to('/foo%2Fbar/foo/bar') }

      TypeError:
        no implicit conversion of nil into String
      # ./mustermann/lib/mustermann/ast/translator.rb:122:in 'Regexp.union'

In background, URI will change DEFAULT_PARSER to RFC3986_Parser.

ruby/uri#107

After that, we lost some of regex pattern like UNSAFE.

@hsbt
Use URI::RFC2396_Parser#regex explicitly.
0ed6aa3 
In background, URI will change DEFAULT_PARSER to RFC2396_Parser.

ruby/uri#107

After that, we lost some of regex pattern like UNSAFE.
@hsbt hsbt mentioned this pull request Jul 19, 2024
Merged
4 tasks
dentarg
dentarg approved these changes Jul 30, 2024
View reviewed changes
Copy link
Member

@dentarg dentarg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

root@a48d10429c21:/# ruby -v
ruby 2.6.10p210 (2022-04-12 revision 67958) [aarch64-linux]
root@a48d10429c21:/#
root@a48d10429c21:/# ruby -e 'p URI::RFC2396_Parser.new.regexp[:UNSAFE]'
/[^\-_.!~*'()a-zA-Z\d;\/?:@&=+$,\[\]]/

@dentarg dentarg merged commit 0b8554b into sinatra:main Jul 30, 2024
@dentarg
Copy link
Member

dentarg commented Jul 30, 2024

Looks like there is a constant URI::RFC2396_PARSER that could be used in Ruby 3.4+ https://github.com/octokit/octokit.rb/pull/1708/files

@hsbt hsbt deleted the fix-uri-default-parser-change branch July 30, 2024 21:41
@dentarg
Copy link
Member

dentarg commented Jul 31, 2024

Released in v3.0.1

@hsbt
Copy link
Contributor Author

hsbt commented Jul 31, 2024

@dentarg Thanks!

This was referenced Aug 1, 2024
Merged
Merged
dentarg pushed a commit that referenced this pull request Aug 9, 2024
@hsbt
Use rfc2396 parser (#139)
015b05d 
`URI::DEFAULT_PARSER.escape` is obsoleted at next stable release of URI. We should use `URI::RFC2396_PARSER.escape` instead of `URI::DEFAULT_PARSER`.

Follow-up to #138
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dentarg dentarg dentarg approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@hsbt @dentarg