[Actions] Removed double parsing when passing action url for validation #87928
Conversation
This file contains 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
ymao1
commented
Jan 11, 2021
| return false; | ||
| } | ||
|
|
||
| function isHostnameAllowedInUri(config: ActionsConfigType, uri: string): boolean { | ||
| return pipe( | ||
| tryCatch(() => new URL(uri)), | ||
| map((url) => url.hostname), | ||
| tryCatch(() => url.parse(uri)), |
There was a problem hiding this comment.
Updated to match how axios handles urls https://github.com/axios/axios/blob/59ab559386273a185be18857a12ab0305b753e50/lib/adapters/http.js#L91.
| } catch (err) { | ||
| return i18n.translate('xpack.actions.builtin.slack.slackConfigurationErrorNoHostname', { | ||
| defaultMessage: 'error configuring slack action: unable to parse host name from webhookUrl', | ||
| }); | ||
| } | ||
|
|
||
| try { | ||
| configurationUtilities.ensureHostnameAllowed(url.hostname); | ||
| configurationUtilities.ensureUriAllowed(configuredUrl); |
There was a problem hiding this comment.
I am calling ensureUriAllowed both here and in the teams connector to be consistent with how I updated the webhook action. Pagerduty, Jira, Resilient and Servicenow were already all using ensureUriAllowed
ymao1
added
Feature:Alerting
release_note:skip
|
Pinging @elastic/kibana-alerting-services (Team:Alerting Services) |
|
@elasticmachine merge upstream |
pmuellr
approved these changes
Jan 14, 2021
There was a problem hiding this comment.
LGTM, made a nit comment about a potentially extraneous boolean check
Was there an issue associated with this? For some reason I'm thinking there was, something about the parse, re-gen, parse yielding a different URL because of escaping or something? I didn't see an issue referenced, maybe I missed it. If there was, we should add a test for that case.
…ns/allowed-hosts
💚 Build SucceededMetrics [docs]
History
To update your PR or re-run it, just comment with: |
ymao1
added a commit
to ymao1/kibana
that referenced
this pull request
Jan 19, 2021
…on (elastic#87928) * Removed double parsing when passing action url for validation * Fixing functional test * PR fixes * PR fixes Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
ymao1
added a commit
to ymao1/kibana
that referenced
this pull request
Jan 19, 2021
…on (elastic#87928) * Removed double parsing when passing action url for validation * Fixing functional test * PR fixes * PR fixes Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
ymao1
added a commit
to ymao1/kibana
that referenced
this pull request
Jan 19, 2021
…on (elastic#87928) * Removed double parsing when passing action url for validation * Fixing functional test * PR fixes * PR fixes Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> # Conflicts: # x-pack/plugins/actions/server/builtin_action_types/slack.ts # x-pack/plugins/actions/server/builtin_action_types/teams.test.ts # x-pack/plugins/actions/server/builtin_action_types/teams.ts
ymao1
added a commit
that referenced
this pull request
Jan 20, 2021
…alidation (#87928) (#88730) * [Actions] Removed double parsing when passing action url for validation (#87928) * Removed double parsing when passing action url for validation * Fixing functional test * PR fixes * PR fixes Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> # Conflicts: # x-pack/plugins/actions/server/builtin_action_types/slack.ts # x-pack/plugins/actions/server/builtin_action_types/teams.test.ts # x-pack/plugins/actions/server/builtin_action_types/teams.ts * Fixing bad merge * Fixing types check
mikecote
added
release_note:fix
and removed
release_note:skip
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
When creating actions, webhook action URLs were being double parsed as URLs (parsed as URL, then
toString, then parsed again as URL) while during validation. This updates validation to pass in the configured URL as is and allow the shared validation method to parse the URL and hostname.Checklist
Delete any items that are not applicable to this PR.