Bad regex in CORS settings should throw a nicer error#34035
Merged
romseygeek merged 4 commits intoelastic:masterfrom Sep 27, 2018
Merged
Bad regex in CORS settings should throw a nicer error#34035romseygeek merged 4 commits intoelastic:masterfrom
romseygeek merged 4 commits intoelastic:masterfrom
Conversation
Currently a bad regex in CORS settings throws a PatternSyntaxException, which then bubbles up through the bootstrap code, meaning users have to parse a stack trace to work out where the problem is. We should instead catch this exception and rethrow with a more useful error message.
Collaborator
|
Pinging @elastic/es-core-infra |
Member
danielmitterdorfer
left a comment
There was a problem hiding this comment.
Looks fine but I left some suggestions.
| builder = Netty4CorsConfigBuilder.forPattern(p); | ||
| } | ||
| } | ||
| catch (PatternSyntaxException e) { |
Member
There was a problem hiding this comment.
Nit: catch should be on the same line as the closing brace of the try block.
| } | ||
| } | ||
| catch (PatternSyntaxException e) { | ||
| throw new SettingsException("Bad regex in " + SETTING_CORS_ALLOW_ORIGIN.getKey() + ": " + origin, e); |
Member
There was a problem hiding this comment.
Can you please enclose the parameters in square brackets? i.e.:
throw new SettingsException("Bad regex in [" + SETTING_CORS_ALLOW_ORIGIN.getKey() + "]: [" + origin + "]", e);| builder = NioCorsConfigBuilder.forPattern(p); | ||
| } | ||
| } | ||
| catch (PatternSyntaxException e) { |
Member
There was a problem hiding this comment.
Nit: catch should be on the same line as the closing brace of the try block.
| } | ||
| } | ||
| catch (PatternSyntaxException e) { | ||
| throw new SettingsException("Bad regex in " + SETTING_CORS_ALLOW_ORIGIN.getKey() + ": " + origin, e); |
Member
There was a problem hiding this comment.
Can you please enclose the parameters in square brackets?
danielmitterdorfer
approved these changes
Sep 25, 2018
Member
danielmitterdorfer
left a comment
There was a problem hiding this comment.
Thanks @romseygeek! LGTM
Contributor
Author
|
retest this please |
romseygeek
added a commit
that referenced
this pull request
Sep 27, 2018
Currently a bad regex in CORS settings throws a PatternSyntaxException, which then bubbles up through the bootstrap code, meaning users have to parse a stack trace to work out where the problem is. We should instead catch this exception and rethrow with a more useful error message.
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Sep 27, 2018
* master: (25 commits) [DOCS] Synchronize location of Breaking Changes (elastic#33588) [DOCS] Synchronizes captialization in top-level titles (elastic#33605) [SQL] Clean up LogicalPlanBuilder#doJoin (elastic#34048) Fix remote cluster seeds fallback (elastic#34090) [ML][HLRC] Replace REST-based ML test cleanup with the ML client (elastic#34109) Handle MatchNoDocsQuery in span query wrappers (elastic#34106) Update MovAvgIT AwaitsFix bug url Bad regex in CORS settings should throw a nicer error (elastic#34035) [HLRC] Support for role mapper expression dsl (elastic#33745) Watcher: Reduce script cache churn by checking for mustache tags (elastic#33978) Fold EngineSearcher into Engine.Searcher (elastic#34082) Mute SpanMultiTermQueryBuilderTests#testToQuery TESTS: Enable DEBUG Logging in Flaky Test (elastic#34091) TEST: Add engine is closed as expected failure msg Adjust bwc version for max_seq_no_of_updates Build DocStats from SegmentInfos in ReadOnlyEngine (elastic#34079) When creating wildcard queries, use MatchNoDocsQuery when the field type doesn't exist. (elastic#34093) [DOCS] Moves graph to docs folder (elastic#33472) Mute MovAvgIT#testHoltWintersNotEnoughData Security: use default scroll keepalive (elastic#33639) ...
kcm
pushed a commit
that referenced
this pull request
Oct 30, 2018
Currently a bad regex in CORS settings throws a PatternSyntaxException, which then bubbles up through the bootstrap code, meaning users have to parse a stack trace to work out where the problem is. We should instead catch this exception and rethrow with a more useful error message.
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
4 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.
Currently a bad regex in CORS settings throws a PatternSyntaxException, which
then bubbles up through the bootstrap code, meaning users have to parse a
stack trace to work out where the problem is. We should instead catch this
exception and rethrow with a more useful error message.