Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Escape user supplied data in html report (#2126) #2127

Merged
merged 2 commits into from
Jul 5, 2022

Conversation

herrmanntom
Copy link
Contributor

This is a quick fix for issue #2126, possibly not the most elegant solution.

@cyberw
Copy link
Collaborator

cyberw commented Jul 5, 2022

LGTM. Have you tested a few cases? Like spaces in filenames etc?

@herrmanntom
Copy link
Contributor Author

LGTM. Have you tested a few cases? Like spaces in filenames etc?

Yes I did. HTML harmful stuff in locust-script-name, request names, error messages and exceptions. Did not test node-names, hostname and tasks, as I am unsure how to control them (easily). But I think escaping them just in case does not harm.

@herrmanntom
Copy link
Contributor Author

tox runs for me (only with python3.9 as I do not have other versions installed), not sure what the reason of failure in the "checks" here are... there is just empty error message

@cyberw
Copy link
Collaborator

cyberw commented Jul 5, 2022

I think the problems on GH are real errors. Can you check if your package versions are different from the ones listed in the build? (or just try installing the latest ones yourself)

@herrmanntom
Copy link
Contributor Author

Maybe I did it somehow wrong before. Now everything seems to be fixed.

@cyberw cyberw merged commit 0be56b3 into locustio:master Jul 5, 2022
@cyberw
Copy link
Collaborator

cyberw commented Jul 5, 2022

Thx!

danigoland added a commit to danigoland/locust that referenced this pull request Aug 9, 2022
* More robust handling of ZMQ/RPC errors (locustio#2120)

* More robust RPC error handling on msg from worker

* Use dedicated exceptions, fewer nested try blocks

* Fix test_zmqrpc.py

* Undo function split since added new exceptions

* Fix more tests

* Fix some tests

* Fix typo

* Fix scoping of variables

* Add tests for RPC/ZMQ changes

* flake and black fixes

* Remove debug print line

Co-authored-by: Ryan Warner <[email protected]>

* Remove timeout parameter from FastHttpUser unit tests

* Update changelog for 2.10

* Increase CONNECT_RETRY_COUNT to avoid workers giving up too soon if master is not up yet

* Escape user supplied data in html report (locustio#2126) (locustio#2127)

* Escape user supplied data in html report (locustio#2126)

authored-by: Tom Herrmann <[email protected]>

* Replace the MD5 usage by SHA256

MD5 is old, insecure, and can create problems for people using this package when they are trying to pass some compliance requirements (for example, FIPS).

* Fix escaping for exceptions in normal web ui (related to locustio#2126)

* implement table-sorting in report.html

* fix: Fix typo at user/wait_time.py

* improve report sorting

* enabled sorting of error messages as well as stacktraces

* Minor edits to the documentation

* Small documentation correction

* Minor edits to the documentation

* Log an error for every failed attempt to connect to master

The connection timeout and number of attempts are hardcoded, so a failure will take very long
These log lines will allow to troubleshoot issues with the connection to master

* Minor edits to the documentation

* Minor edits to the documentation

* Minor edits to the documentation

* Stop calling attributes 'properties' in some places.

* Give a better error message when someone accidentally sets User.task instead of User.tasks

* Fix detection of accidental TaskSet.task attribute

* fix spelling in comment

* style: add a report favicon

* Removed cache_timeout kwarg from request_stats_full_history_csv for flask 2.2.0

* temporary change to see logs for py38

* restored resource warning masking

* enabled tracemalloc temporarily

* removed tracemalloc

* Ensure no caching of stats history csv (replaces cache_timeout=None which was removed in locustio#2148)

* Update changelog for 2.10.2 (automatic changelog generation is broken, so CHANGELOG.md is incomplete)

* test: Implement failing test for issue locustio#2135

* fix: Set users_dispatcher to None when test is stopped

* chore: Remove misleading docstring in test

* chore: Do not use intermediate variable for one-use

* perf(test): Decrease test runtime

Co-authored-by: solowalker27 <[email protected]>
Co-authored-by: Ryan Warner <[email protected]>
Co-authored-by: Lars Holmberg <[email protected]>
Co-authored-by: Tom Herrmann <[email protected]>
Co-authored-by: Renan Gomes Barreto <[email protected]>
Co-authored-by: Tom Herrmann <[email protected]>
Co-authored-by: Lukas Lanzner <[email protected]>
Co-authored-by: Dmytro Litvinov <[email protected]>
Co-authored-by: Xavier Sosnovsky <[email protected]>
Co-authored-by: Andy Byrne <[email protected]>
Co-authored-by: gdm85 <[email protected]>
Co-authored-by: Xavier Sosnovsky <[email protected]>
Co-authored-by: Lars Holmberg <[email protected]>
Co-authored-by: Lijiawei <[email protected]>
Co-authored-by: Michael Nester <[email protected]>
Co-authored-by: Maxence Boutet <[email protected]>
Co-authored-by: Maxence Boutet <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants