Skip to content

Commit 2541882

Browse files
committed
Use single quotes and fix formatting.
Signed-off-by: phi-go <[email protected]>
1 parent 2556714 commit 2541882

File tree

4 files changed

+51
-44
lines changed

4 files changed

+51
-44
lines changed

tools/web-fuzzing-introspection/app/static/assets/db/oss_fuzz.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,13 @@ def get_code_coverage_summary_url(project_name, datestr):
153153
project_url = base_url.format(project_name, datestr)
154154
return project_url
155155

156+
156157
def get_fuzzer_code_coverage_summary_url(project_name, datestr, fuzzer):
157158
base_url = 'https://storage.googleapis.com/oss-fuzz-coverage/{0}/reports-by-target/{1}/{2}/linux/summary.json'
158159
project_url = base_url.format(project_name, datestr, fuzzer)
159160
return project_url
160161

162+
161163
def get_coverage_report_url(project_name, datestr, language):
162164
if language == 'java' or language == 'python' or language == 'go':
163165
file_report = "index.html"
@@ -259,8 +261,10 @@ def get_code_coverage_summary(project_name, datestr):
259261
except:
260262
return None
261263

264+
262265
def get_fuzzer_code_coverage_summary(project_name, datestr, fuzzer):
263-
cov_summary_url = get_fuzzer_code_coverage_summary_url(project_name, datestr, fuzzer)
266+
cov_summary_url = get_fuzzer_code_coverage_summary_url(
267+
project_name, datestr, fuzzer)
264268
try:
265269
coverage_summary_raw = requests.get(cov_summary_url, timeout=20).text
266270
except:

tools/web-fuzzing-introspection/app/static/assets/db/web_db_creator_from_summary.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -309,13 +309,14 @@ def extract_code_coverage_data(code_coverage_summary):
309309
return line_total_summary
310310

311311

312-
def prepare_code_coverage_dict(code_coverage_summary, project_name: str, date_str: str,
313-
project_language: str) -> Optional[Dict[str, Any]]:
312+
def prepare_code_coverage_dict(
313+
code_coverage_summary, project_name: str, date_str: str,
314+
project_language: str) -> Optional[Dict[str, Any]]:
314315
"""Gets coverage URL and line coverage total of a project"""
315316
line_total_summary = extract_code_coverage_data(code_coverage_summary)
316317

317318
coverage_url = oss_fuzz.get_coverage_report_url(project_name,
318-
date_str.replace("-", ""),
319+
date_str.replace('-', ''),
319320
project_language)
320321
code_coverage_data_dict = {
321322
'coverage_url': coverage_url,
@@ -472,8 +473,8 @@ def extract_local_project_data(project_name, oss_fuzz_path,
472473
dictionary_key = '%s###%s' % (project_name, '')
473474
manager_return_dict[dictionary_key] = {
474475
'project_timestamp': project_timestamp,
475-
"introspector-data-dict": introspector_data_dict,
476-
"coverage-data-dict": code_coverage_data_dict,
476+
'introspector-data-dict': introspector_data_dict,
477+
'coverage-data-dict': code_coverage_data_dict,
477478
'all-header-files': all_header_files,
478479
}
479480

@@ -722,7 +723,8 @@ def extract_project_data(project_name, date_str, should_include_details,
722723
amount_of_fuzzers = len(all_fuzzers)
723724
for ff in all_fuzzers:
724725
try:
725-
fuzzer_cov = oss_fuzz.get_fuzzer_code_coverage_summary(project_name, date_str.replace("-", ""), ff)
726+
fuzzer_cov = oss_fuzz.get_fuzzer_code_coverage_summary(
727+
project_name, date_str.replace("-", ""), ff)
726728
fuzzer_cov_data = extract_code_coverage_data(fuzzer_cov)
727729
per_fuzzer_cov[ff] = fuzzer_cov_data
728730
except:

tools/web-fuzzing-introspection/app/webapp/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ def load_db() -> None:
6060
project_name=project_timestamp['project_name'],
6161
language=project_timestamp['language'],
6262
coverage_data=project_timestamp['coverage-data'],
63-
per_fuzzer_coverage_data=project_timestamp.get('per-fuzzer-coverage-data', None),
63+
per_fuzzer_coverage_data=project_timestamp.get(
64+
'per-fuzzer-coverage-data', None),
6465
introspector_data=project_timestamp['introspector-data'],
6566
fuzzer_count=project_timestamp['fuzzer-count'],
6667
introspector_url=project_timestamp.get('introspector_url',

tools/web-fuzzing-introspection/app/webapp/templates/project-profile.html

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ <h1 class="section__title">
264264

265265
{% for project_timestamp in project_statistics %}
266266
{% if project_timestamp.coverage_data != None %}
267-
code_coverage_lines_x.push("{{project_timestamp.date}}");
267+
code_coverage_lines_x.push('{{project_timestamp.date}}');
268268
code_coverage_lines_y.push({{project_timestamp.coverage_data.line_coverage.percent}});
269269
fuzzer_count_y.push({{project_timestamp.fuzzer_count}});
270270
max_fuzzer_count = Math.max(max_fuzzer_count, {{project_timestamp.fuzzer_count}});
@@ -277,11 +277,11 @@ <h1 class="section__title">
277277

278278
{% if project_timestamp.per_fuzzer_coverage_data != None %}
279279
{% for (fuzzer, cov_data) in project_timestamp.per_fuzzer_coverage_data.items() %}
280-
if (fuzzers.get("{{fuzzer}}") === undefined) {
281-
fuzzers.set("{{fuzzer}}", {x: [], y: []});
280+
if (fuzzers.get('{{fuzzer}}') === undefined) {
281+
fuzzers.set('{{fuzzer}}', {x: [], y: []});
282282
}
283-
var vv = fuzzers.get("{{fuzzer}}");
284-
vv.x.push("{{project_timestamp.date}}");
283+
var vv = fuzzers.get('{{fuzzer}}');
284+
vv.x.push('{{project_timestamp.date}}');
285285
vv.y.push({{cov_data.percent}});
286286
{%endfor%}
287287
{% endif %}
@@ -292,17 +292,17 @@ <h1 class="section__title">
292292
const code_coverage_lines_data = [{
293293
x: code_coverage_lines_x,
294294
y: code_coverage_lines_y,
295-
mode:"lines"
295+
mode:'lines'
296296
}];
297297
const code_coverage_lines_layout = {
298-
xaxis: {title: "Date"},
299-
yaxis: {title: "Coverage", range: [0.0, 100.0]},
300-
title: "Code Coverage (lines) %",
301-
type: "scatter"
298+
xaxis: {title: 'Date'},
299+
yaxis: {title: 'Coverage', range: [0.0, 100.0]},
300+
title: 'Code Coverage (lines) %',
301+
type: 'scatter'
302302
};
303-
Plotly.newPlot("codeCoverageLinesOverTimePlot", code_coverage_lines_data, code_coverage_lines_layout);
303+
Plotly.newPlot('codeCoverageLinesOverTimePlot', code_coverage_lines_data, code_coverage_lines_layout);
304304

305-
const progress_graph_div = document.getElementById("progress_graphs")
305+
const progress_graph_div = document.getElementById('progress_graphs')
306306

307307
for (const [fuzzer_name, coverage_percentage] of fuzzers) {
308308
const per_fuzzer_id = 'perFuzzerCoverageLinesOverTimePlot' + fuzzer_name;
@@ -317,20 +317,20 @@ <h1 class="section__title">
317317

318318
const the_div = document.createElement('div')
319319
the_div.id = per_fuzzer_id
320-
the_div.style = "width:100%;max-width:500px"
320+
the_div.style = 'width:100%;max-width:500px'
321321
gc_div.appendChild(the_div);
322322

323323
// Plot for fuzzer counter over time
324324
const per_fuzzer_code_coverage_lines_data = [{
325325
x: coverage_percentage.x,
326326
y: coverage_percentage.y,
327-
mode:"lines"
327+
mode:'lines'
328328
}];
329329
const per_fuzzer_code_coverage_lines_layout = {
330-
xaxis: {title: "Date"},
331-
yaxis: {title: "Coverage", range: [0.0, 100.0]},
332-
title: "Code Coverage (lines) %<br>" + fuzzer_name,
333-
type: "scatter"
330+
xaxis: {title: 'Date'},
331+
yaxis: {title: 'Coverage', range: [0.0, 100.0]},
332+
title: 'Code Coverage (lines) %<br>' + fuzzer_name,
333+
type: 'scatter'
334334
};
335335
Plotly.newPlot(per_fuzzer_id, per_fuzzer_code_coverage_lines_data, per_fuzzer_code_coverage_lines_layout);
336336
}
@@ -339,15 +339,15 @@ <h1 class="section__title">
339339
const fuzzer_count_data = [{
340340
x: code_coverage_lines_x,
341341
y: fuzzer_count_y,
342-
mode:"lines"
342+
mode:'lines'
343343
}];
344344
const fuzzer_count_layout = {
345-
xaxis: {title: "Date"},
346-
yaxis: {title: "Fuzzers", range: [0.0, max_fuzzer_count + 5]},
347-
title: "Fuzzer count",
348-
type: "scatter"
345+
xaxis: {title: 'Date'},
346+
yaxis: {title: 'Fuzzers', range: [0.0, max_fuzzer_count + 5]},
347+
title: 'Fuzzer count',
348+
type: 'scatter'
349349
};
350-
Plotly.newPlot("fuzzerCountOverTimePlot", fuzzer_count_data, fuzzer_count_layout);
350+
Plotly.newPlot('fuzzerCountOverTimePlot', fuzzer_count_data, fuzzer_count_layout);
351351

352352
{% endif %} // has_project_stats
353353

@@ -357,30 +357,30 @@ <h1 class="section__title">
357357
const code_coverage_functions_data = [{
358358
x: code_coverage_lines_x,
359359
y: code_coverage_functions_y,
360-
mode:"lines"
360+
mode:'lines'
361361
}];
362362
const code_coverage_functions_layout = {
363-
xaxis: {title: "Date"},
364-
yaxis: {title: "Coverage", range: [0.0, 100.0]},
365-
title: "Code Coverage (functions) %",
366-
type: "scatter"
363+
xaxis: {title: 'Date'},
364+
yaxis: {title: 'Coverage', range: [0.0, 100.0]},
365+
title: 'Code Coverage (functions) %',
366+
type: 'scatter'
367367
};
368-
Plotly.newPlot("codeCoverageFunctionsOverTimePlot", code_coverage_functions_data, code_coverage_functions_layout);
368+
Plotly.newPlot('codeCoverageFunctionsOverTimePlot', code_coverage_functions_data, code_coverage_functions_layout);
369369

370370

371371
// Plot for static rachability over time
372372
const code_reachability_data = [{
373373
x: code_coverage_lines_x,
374374
y: code_reachability_y,
375-
mode:"lines"
375+
mode:'lines'
376376
}];
377377
const code_reachability_layout = {
378-
xaxis: {title: "Date"},
379-
yaxis: {title: "Reachability", range: [0.0, 100.0]},
380-
title: "Static reachability %",
381-
type: "scatter"
378+
xaxis: {title: 'Date'},
379+
yaxis: {title: 'Reachability', range: [0.0, 100.0]},
380+
title: 'Static reachability %',
381+
type: 'scatter'
382382
};
383-
Plotly.newPlot("staticReachabilityOverTimePlot", code_reachability_data, code_reachability_layout);
383+
Plotly.newPlot('staticReachabilityOverTimePlot', code_reachability_data, code_reachability_layout);
384384
{% endif %}
385385

386386

0 commit comments

Comments
 (0)