Support cancel rendering requests on client cancellation #588
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
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| } catch (err) { | ||
| this.log.error('Error while trying to prepare page for screenshot', 'url', options.url, 'err', err.stack); | ||
| } | ||
| await page.goto(options.url, { waitUntil: 'networkidle0', timeout: options.timeout * 1000, signal }); |
Check failure
Code scanning / CodeQL
Server-side request forgery Critical
Show autofix suggestion
Hide autofix suggestion
Copilot Autofix AI 22 days ago
To fix the problem, we need to ensure that the user input is validated and sanitized before being used in the page.goto method. One effective way to do this is to use an allow-list of acceptable URLs or domains. This way, we can ensure that only trusted URLs are used in the request.
- Create an allow-list of acceptable URLs or domains.
- Validate the user input against this allow-list.
- If the input is valid, proceed with the request; otherwise, reject the request with an appropriate error message.
Suggested changeset
1
src/service/http-server.ts
Outside changed files
| @@ -181,2 +181,3 @@ | ||
|
|
||
| const allowedUrls = ['https://example.com', 'https://another-example.com']; | ||
| if (!req.query.url) { | ||
| @@ -184,2 +185,5 @@ | ||
| } | ||
| if (!allowedUrls.includes(req.query.url)) { | ||
| throw boom.badRequest('Invalid url parameter'); | ||
| } | ||
|
|
Copilot is powered by AI and may make mistakes. Always verify output.
|
|
||
| await page.goto(options.url, { waitUntil: 'networkidle0', timeout: options.timeout * 1000 }); | ||
| await page.goto(options.url, { waitUntil: 'networkidle0', timeout: options.timeout * 1000, signal }); |
Check failure
Code scanning / CodeQL
Server-side request forgery Critical
AgnesToulet
requested review from
a team,
juanicabanas and
evictorero
and removed request for
a team
juanicabanas
approved these changes
Dec 18, 2024
AgnesToulet
changed the title
Merged
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.
Currently when client cancels the requests, the rendering request continues to run until it ends.
This PR fixes that by stopping the rendering process.
It has two main benefits:
Failed to get render key from cache. This is displayed when the image renderer tries to access Grafana after the request is cancelled because the render key has been deleted but this makes it more complicated to investigate real issues.Fixes #186