[CXF-8947] - Avoid expensive regex operations in Rfc3986UriValidator#1483
Merged
gnodet merged 2 commits intoapache:mainfrom Mar 11, 2026
Merged
Conversation
…if URI.getHost() returns a host name Signed-off-by: Adam Anderson <atanderson9383@gmail.com>
reta
reviewed
Oct 24, 2023
| if (HttpUtils.isHttpScheme(uri.getScheme())) { | ||
| // If URI.getHost() returns a host name, validate it and | ||
| // skip the expensive regular expression logic. | ||
| final String uriHost = uri.getHost(); |
Member
There was a problem hiding this comment.
@WhiteCat22 the reason for this validator to exists sadly is the fact that Java's URI is not RFC-3986 complaint. The host is not trustful source here hence we validate it against the pattern.
Contributor
Author
There was a problem hiding this comment.
That is a good point that we had not considered.
reta
reviewed
Oct 24, 2023
| private static final Set<String> KNOWN_HTTP_VERBS_WITH_NO_RESPONSE_CONTENT = | ||
| new HashSet<>(Arrays.asList(new String[]{"HEAD", "OPTIONS"})); | ||
|
|
||
| private static final Pattern HTTP_SCHEME_PATTERN = Pattern.compile("^(?i)(http|https)$"); |
Member
There was a problem hiding this comment.
This pattern is super straightforward to look up, what are exactly the gains here (vs adding the set + comparator + lowecasing)?
Contributor
Author
There was a problem hiding this comment.
Hi @reta , Sorry for the delay. The reason we changed this was because HashSet.contains(String) uses "WAY" less CPU than Pattern.matcher(String).matches()
Member
There was a problem hiding this comment.
Fair enough, may be we could just have two constants instead?
…isHttpScheme() - Remove the URI.getHost() shortcut in Rfc3986UriValidator since Java's URI.getHost() is not RFC-3986 compliant (per reviewer feedback) - Replace HashSet-based HTTP scheme check with simple String.equalsIgnoreCase() comparisons using constants Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Contributor
|
Hi @reta, I've pushed a commit addressing your review feedback:
|
reta
approved these changes
Mar 11, 2026
reta
pushed a commit
that referenced
this pull request
Mar 11, 2026
…1483) * [CXF-8947] - Avoid expensive regex operations in Rfc3986UriValidator if URI.getHost() returns a host name Signed-off-by: Adam Anderson <atanderson9383@gmail.com> * Address review feedback: drop Rfc3986UriValidator shortcut, simplify isHttpScheme() - Remove the URI.getHost() shortcut in Rfc3986UriValidator since Java's URI.getHost() is not RFC-3986 compliant (per reviewer feedback) - Replace HashSet-based HTTP scheme check with simple String.equalsIgnoreCase() comparisons using constants Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Signed-off-by: Adam Anderson <atanderson9383@gmail.com> Co-authored-by: Guillaume Nodet <gnodet@gmail.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> (cherry picked from commit 3046dda)
reta
pushed a commit
that referenced
this pull request
Mar 11, 2026
…1483) * [CXF-8947] - Avoid expensive regex operations in Rfc3986UriValidator if URI.getHost() returns a host name Signed-off-by: Adam Anderson <atanderson9383@gmail.com> * Address review feedback: drop Rfc3986UriValidator shortcut, simplify isHttpScheme() - Remove the URI.getHost() shortcut in Rfc3986UriValidator since Java's URI.getHost() is not RFC-3986 compliant (per reviewer feedback) - Replace HashSet-based HTTP scheme check with simple String.equalsIgnoreCase() comparisons using constants Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Signed-off-by: Adam Anderson <atanderson9383@gmail.com> Co-authored-by: Guillaume Nodet <gnodet@gmail.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> (cherry picked from commit 3046dda)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
https://issues.apache.org/jira/browse/CXF-8947