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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 2 commits into from
Jul 5, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
286339e
Escape user supplied data in html report (#2126)
Jul 5, 2022
099cfe5
Fix some tests
Jul 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion locust/html.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ def get_html_report(environment, show_download_link=True):
"report.html",
int=int,
round=round,
escape=escape,
str=str,
requests_statistics=requests_statistics,
failures_statistics=failures_statistics,
exceptions_statistics=exceptions_statistics,
Expand All @@ -91,7 +93,7 @@ def get_html_report(environment, show_download_link=True):
static_css="\n".join(static_css),
show_download_link=show_download_link,
locustfile=environment.locustfile,
tasks=escape(dumps(task_data)),
tasks=dumps(task_data),
)

return res
28 changes: 14 additions & 14 deletions locust/templates/report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Test Report for {{ locustfile }}</title>
<title>Test Report for {{ escape(str(locustfile)) }}</title>
<style>
body {
background: #173529;
Expand Down Expand Up @@ -45,8 +45,8 @@ <h1>Locust Test Report</h1>
<p class="download"><a href="?download=1">Download the Report</a></p>
{% endif %}
<p>During: <span class="l10n datetime">{{ start_time }}</span> - <span class="l10n datetime">{{ end_time }}</span></p>
<p>Target Host: <span>{{ host }}</span></p>
<p>Script: <span>{{ locustfile }}</span></p>
<p>Target Host: <span>{{ escape(str(host)) }}</span></p>
<p>Script: <span>{{ escape(str(locustfile)) }}</span></p>
</div>

<div class="requests">
Expand All @@ -69,8 +69,8 @@ <h2>Request Statistics</h2>
<tbody>
{% for s in requests_statistics %}
<tr{% if loop.last %} class="total"{% endif %}>
<td>{{ s.method or "" }}</td>
<td>{{ s.name }}</td>
<td>{{ escape(s.method or "") }}</td>
<td>{{ escape(s.name) }}</td>
<td>{{ int(s.num_requests) }}</td>
<td>{{ int(s.num_failures) }}</td>
<td>{{ int(s.avg_response_time) }}</td>
Expand Down Expand Up @@ -105,8 +105,8 @@ <h2>Response Time Statistics</h2>
<tbody>
{% for s in requests_statistics %}
<tr{% if loop.last %} class="total"{% endif %}>
<td>{{ s.method or "" }}</td>
<td>{{ s.name }}</td>
<td>{{ escape(s.method or "") }}</td>
<td>{{ escape(s.name) }}</td>
<td>{{ int(s.get_response_time_percentile(0.5)) }}</td>
<td>{{ int(s.get_response_time_percentile(0.6)) }}</td>
<td>{{ int(s.get_response_time_percentile(0.7)) }}</td>
Expand Down Expand Up @@ -136,9 +136,9 @@ <h2>Failures Statistics</h2>
<tbody>
{% for s in failures_statistics %}
<tr>
<td>{{ s.method or "" }}</td>
<td>{{ s.name }}</td>
<td>{{ s.error }}</td>
<td>{{ escape(s.method or "") }}</td>
<td>{{ escape(s.name) }}</td>
<td>{{ escape(str(s.error)) }}</td>
<td>{{ s.occurrences }}</td>
</tr>
{% endfor %}
Expand All @@ -163,9 +163,9 @@ <h2>Exceptions Statistics</h2>
{% for s in exceptions_statistics %}
<tr>
<td>{{ s.count }}</td>
<td>{{ s.msg }}</td>
<td>{{ s.traceback }}</td>
<td>{{ s.nodes }}</td>
<td>{{ escape(s.msg) }}</td>
<td>{{ escape(s.traceback) }}</td>
<td>{{ escape(s.nodes) }}</td>
</tr>
{% endfor %}
</tbody>
Expand All @@ -181,7 +181,7 @@ <h2>Charts</h2>

<div id="tasks">
<h2>Final ratio</h2>
<div class="tasks" data-tasks="{{tasks}}"></div>
<div class="tasks" data-tasks="{{ escape(tasks) }}"></div>
</div>

</div>
Expand Down