Skip to content

Commit 21aab02

Browse files
paulOsinskipaulOsinski
committed
replace <pre> wrappers and update CSS on reports
1 parent 5c47b14 commit 21aab02

8 files changed

Lines changed: 67 additions & 49 deletions

‎dojo/templates/dojo/endpoint_pdf_report.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -178,15 +178,15 @@ <h5>
178178

179179
{% if finding.cvssv3 %}
180180
<h6>CVSS v3</h6>
181-
<pre>{{ finding.cvssv3|markdown_render }}</pre>
181+
<div class="report-field">{{ finding.cvssv3|markdown_render }}</div>
182182
{% endif %}
183183

184184
<h6>Description</h6>
185-
<pre>{{ finding.description|markdown_render }}</pre>
185+
<div class="report-field">{{ finding.description|markdown_render }}</div>
186186

187187
{% if finding.mitigation %}
188188
<h6>Mitigation</h6>
189-
<pre>{{ finding.mitigation|markdown_render }}</pre>
189+
<div class="report-field">{{ finding.mitigation|markdown_render }}</div>
190190
{% endif %}
191191

192192
{% if finding.get_report_requests %}
@@ -203,22 +203,22 @@ <h6>Response {{forloop.counter}}</h6>
203203

204204
{% if finding.impact %}
205205
<h6>Impact</h6>
206-
<pre>{{ finding.impact|markdown_render }}</pre>
206+
<div class="report-field">{{ finding.impact|markdown_render }}</div>
207207
{% endif %}
208208

209209
{% if finding.steps_to_reproduce %}
210210
<h6>Steps to Reproduce</h6>
211-
<pre>{{ finding.steps_to_reproduce|markdown_render }}</pre>
211+
<div class="report-field">{{ finding.steps_to_reproduce|markdown_render }}</div>
212212
{% endif %}
213213

214214
{% if finding.severity_justification %}
215215
<h6>Severity Justification</h6>
216-
<pre>{{ finding.severity_justification|markdown_render }}</pre>
216+
<div class="report-field">{{ finding.severity_justification|markdown_render }}</div>
217217
{% endif %}
218218

219219
{% if finding.references %}
220220
<h6>References</h6>
221-
<pre>{{ finding.references|markdown_render }}</pre>
221+
<div class="report-field">{{ finding.references|markdown_render }}</div>
222222
{% endif %}
223223

224224
{% if include_finding_images %}

‎dojo/templates/dojo/engagement_pdf_report.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -313,15 +313,15 @@ <h5>
313313

314314
{% if finding.cvssv3 %}
315315
<h6>CVSS v3</h6>
316-
<pre>{{ finding.cvssv3|markdown_render }}</pre>
316+
<div class="report-field">{{ finding.cvssv3|markdown_render }}</div>
317317
{% endif %}
318318

319319
<h6>Description</h6>
320-
<pre>{{ finding.description|markdown_render }}</pre>
320+
<div class="report-field">{{ finding.description|markdown_render }}</div>
321321

322322
{% if finding.mitigation %}
323323
<h6>Mitigation</h6>
324-
<pre>{{ finding.mitigation|markdown_render }}</pre>
324+
<div class="report-field">{{ finding.mitigation|markdown_render }}</div>
325325
{% endif %}
326326

327327
{% if finding.get_report_requests %}
@@ -338,22 +338,22 @@ <h6>Response {{forloop.counter}}</h6>
338338

339339
{% if finding.impact %}
340340
<h6>Impact</h6>
341-
<pre>{{ finding.impact|markdown_render }}</pre>
341+
<div class="report-field">{{ finding.impact|markdown_render }}</div>
342342
{% endif %}
343343

344344
{% if finding.steps_to_reproduce %}
345345
<h6>Steps to Reproduce</h6>
346-
<pre>{{ finding.steps_to_reproduce|markdown_render }}</pre>
346+
<div class="report-field">{{ finding.steps_to_reproduce|markdown_render }}</div>
347347
{% endif %}
348348

349349
{% if finding.severity_justification %}
350350
<h6>Severity Justification</h6>
351-
<pre>{{ finding.severity_justification|markdown_render }}</pre>
351+
<div class="report-field">{{ finding.severity_justification|markdown_render }}</div>
352352
{% endif %}
353353

354354
{% if finding.references %}
355355
<h6>References</h6>
356-
<pre>{{ finding.references|markdown_render }}</pre>
356+
<div class="report-field">{{ finding.references|markdown_render }}</div>
357357
{% endif %}
358358

359359
{% if include_finding_images %}

‎dojo/templates/dojo/finding_pdf_report.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,15 @@ <h5>
157157

158158
{% if finding.cvssv3 %}
159159
<h6>CVSS v3</h6>
160-
<pre>{{ finding.cvssv3|markdown_render }}</pre>
160+
<div class="report-field">{{ finding.cvssv3|markdown_render }}</div>
161161
{% endif %}
162162

163163
<h6>Description</h6>
164-
<pre>{{ finding.description|markdown_render }}</pre>
164+
<div class="report-field">{{ finding.description|markdown_render }}</div>
165165

166166
{% if finding.mitigation %}
167167
<h6>Mitigation</h6>
168-
<pre>{{ finding.mitigation|markdown_render }}</pre>
168+
<div class="report-field">{{ finding.mitigation|markdown_render }}</div>
169169
{% endif %}
170170

171171
{% if finding.get_report_requests %}
@@ -182,22 +182,22 @@ <h6>Response {{forloop.counter}}</h6>
182182

183183
{% if finding.impact %}
184184
<h6>Impact</h6>
185-
<pre>{{ finding.impact|markdown_render }}</pre>
185+
<div class="report-field">{{ finding.impact|markdown_render }}</div>
186186
{% endif %}
187187

188188
{% if finding.steps_to_reproduce %}
189189
<h6>Steps to Reproduce</h6>
190-
<pre>{{ finding.steps_to_reproduce|markdown_render }}</pre>
190+
<div class="report-field">{{ finding.steps_to_reproduce|markdown_render }}</div>
191191
{% endif %}
192192

193193
{% if finding.severity_justification %}
194194
<h6>Severity Justification</h6>
195-
<pre>{{ finding.severity_justification|markdown_render }}</pre>
195+
<div class="report-field">{{ finding.severity_justification|markdown_render }}</div>
196196
{% endif %}
197197

198198
{% if finding.references %}
199199
<h6>References</h6>
200-
<pre>{{ finding.references|markdown_render }}</pre>
200+
<div class="report-field">{{ finding.references|markdown_render }}</div>
201201
{% endif %}
202202

203203
{% if include_finding_images %}

‎dojo/templates/dojo/product_endpoint_pdf_report.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -227,15 +227,15 @@ <h5>
227227

228228
{% if finding.cvssv3 %}
229229
<h6>CVSS v3</h6>
230-
<pre>{{ finding.cvssv3|markdown_render }}</pre>
230+
<div class="report-field">{{ finding.cvssv3|markdown_render }}</div>
231231
{% endif %}
232232

233233
<h6>Description</h6>
234-
<pre>{{ finding.description|markdown_render }}</pre>
234+
<div class="report-field">{{ finding.description|markdown_render }}</div>
235235

236236
{% if finding.mitigation %}
237237
<h6>Mitigation</h6>
238-
<pre>{{ finding.mitigation|markdown_render }}</pre>
238+
<div class="report-field">{{ finding.mitigation|markdown_render }}</div>
239239
{% endif %}
240240

241241
{% if finding.get_report_requests %}
@@ -252,22 +252,22 @@ <h6>Response {{forloop.counter}}</h6>
252252

253253
{% if finding.impact %}
254254
<h6>Impact</h6>
255-
<pre>{{ finding.impact|markdown_render }}</pre>
255+
<div class="report-field">{{ finding.impact|markdown_render }}</div>
256256
{% endif %}
257257

258258
{% if finding.steps_to_reproduce %}
259259
<h6>Steps to Reproduce</h6>
260-
<pre>{{ finding.steps_to_reproduce|markdown_render }}</pre>
260+
<div class="report-field">{{ finding.steps_to_reproduce|markdown_render }}</div>
261261
{% endif %}
262262

263263
{% if finding.severity_justification %}
264264
<h6>Severity Justification</h6>
265-
<pre>{{ finding.severity_justification|markdown_render }}</pre>
265+
<div class="report-field">{{ finding.severity_justification|markdown_render }}</div>
266266
{% endif %}
267267

268268
{% if finding.references %}
269269
<h6>References</h6>
270-
<pre>{{ finding.references|markdown_render }}</pre>
270+
<div class="report-field">{{ finding.references|markdown_render }}</div>
271271
{% endif %}
272272

273273
{% if include_finding_images %}

‎dojo/templates/dojo/product_pdf_report.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -283,15 +283,15 @@ <h5>
283283

284284
{% if finding.cvssv3 %}
285285
<h6>CVSS v3</h6>
286-
<pre>{{ finding.cvssv3|markdown_render }}</pre>
286+
<div class="report-field">{{ finding.cvssv3|markdown_render }}</div>
287287
{% endif %}
288288

289289
<h6>Description</h6>
290-
<pre>{{ finding.description|markdown_render }}</pre>
290+
<div class="report-field">{{ finding.description|markdown_render }}</div>
291291

292292
{% if finding.mitigation %}
293293
<h6>Mitigation</h6>
294-
<pre>{{ finding.mitigation|markdown_render }}</pre>
294+
<div class="report-field">{{ finding.mitigation|markdown_render }}</div>
295295
{% endif %}
296296

297297
{% if finding.get_report_requests %}
@@ -308,22 +308,22 @@ <h6>Response {{forloop.counter}}</h6>
308308

309309
{% if finding.impact %}
310310
<h6>Impact</h6>
311-
<pre>{{ finding.impact|markdown_render }}</pre>
311+
<div class="report-field">{{ finding.impact|markdown_render }}</div>
312312
{% endif %}
313313

314314
{% if finding.steps_to_reproduce %}
315315
<h6>Steps to Reproduce</h6>
316-
<pre>{{ finding.steps_to_reproduce|markdown_render }}</pre>
316+
<div class="report-field">{{ finding.steps_to_reproduce|markdown_render }}</div>
317317
{% endif %}
318318

319319
{% if finding.severity_justification %}
320320
<h6>Severity Justification</h6>
321-
<pre>{{ finding.severity_justification|markdown_render }}</pre>
321+
<div class="report-field">{{ finding.severity_justification|markdown_render }}</div>
322322
{% endif %}
323323

324324
{% if finding.references %}
325325
<h6>References</h6>
326-
<pre>{{ finding.references|markdown_render }}</pre>
326+
<div class="report-field">{{ finding.references|markdown_render }}</div>
327327
{% endif %}
328328

329329
{% if include_finding_images %}

‎dojo/templates/dojo/product_type_pdf_report.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,15 +212,15 @@ <h5>
212212

213213
{% if finding.cvssv3 %}
214214
<h6>CVSS v3</h6>
215-
<pre>{{ finding.cvssv3|markdown_render }}</pre>
215+
<div class="report-field">{{ finding.cvssv3|markdown_render }}</div>
216216
{% endif %}
217217

218218
<h6>Description</h6>
219-
<pre>{{ finding.description|markdown_render }}</pre>
219+
<div class="report-field">{{ finding.description|markdown_render }}</div>
220220

221221
{% if finding.mitigation %}
222222
<h6>Mitigation</h6>
223-
<pre>{{ finding.mitigation|markdown_render }}</pre>
223+
<div class="report-field">{{ finding.mitigation|markdown_render }}</div>
224224
{% endif %}
225225

226226
{% if finding.get_report_requests %}
@@ -237,22 +237,22 @@ <h6>Response {{forloop.counter}}</h6>
237237

238238
{% if finding.impact %}
239239
<h6>Impact</h6>
240-
<pre>{{ finding.impact|markdown_render }}</pre>
240+
<div class="report-field">{{ finding.impact|markdown_render }}</div>
241241
{% endif %}
242242

243243
{% if finding.steps_to_reproduce %}
244244
<h6>Steps to Reproduce</h6>
245-
<pre>{{ finding.steps_to_reproduce|markdown_render }}</pre>
245+
<div class="report-field">{{ finding.steps_to_reproduce|markdown_render }}</div>
246246
{% endif %}
247247

248248
{% if finding.severity_justification %}
249249
<h6>Severity Justification</h6>
250-
<pre>{{ finding.severity_justification|markdown_render }}</pre>
250+
<div class="report-field">{{ finding.severity_justification|markdown_render }}</div>
251251
{% endif %}
252252

253253
{% if finding.references %}
254254
<h6>References</h6>
255-
<pre>{{ finding.references|markdown_render }}</pre>
255+
<div class="report-field">{{ finding.references|markdown_render }}</div>
256256
{% endif %}
257257

258258
{% if include_finding_images %}

‎dojo/templates/dojo/test_pdf_report.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -325,15 +325,15 @@ <h5>
325325

326326
{% if finding.cvssv3 %}
327327
<h6>CVSS v3</h6>
328-
<pre>{{ finding.cvssv3|markdown_render }}</pre>
328+
<div class="report-field">{{ finding.cvssv3|markdown_render }}</div>
329329
{% endif %}
330330

331331
<h6>Description</h6>
332-
<pre>{{ finding.description|markdown_render }}</pre>
332+
<div class="report-field">{{ finding.description|markdown_render }}</div>
333333

334334
{% if finding.mitigation %}
335335
<h6>Mitigation</h6>
336-
<pre>{{ finding.mitigation|markdown_render }}</pre>
336+
<div class="report-field">{{ finding.mitigation|markdown_render }}</div>
337337
{% endif %}
338338

339339
{% if finding.get_report_requests %}
@@ -350,22 +350,22 @@ <h6>Response {{forloop.counter}}</h6>
350350

351351
{% if finding.impact %}
352352
<h6>Impact</h6>
353-
<pre>{{ finding.impact|markdown_render }}</pre>
353+
<div class="report-field">{{ finding.impact|markdown_render }}</div>
354354
{% endif %}
355355

356356
{% if finding.steps_to_reproduce %}
357357
<h6>Steps to Reproduce</h6>
358-
<pre>{{ finding.steps_to_reproduce|markdown_render }}</pre>
358+
<div class="report-field">{{ finding.steps_to_reproduce|markdown_render }}</div>
359359
{% endif %}
360360

361361
{% if finding.severity_justification %}
362362
<h6>Severity Justification</h6>
363-
<pre>{{ finding.severity_justification|markdown_render }}</pre>
363+
<div class="report-field">{{ finding.severity_justification|markdown_render }}</div>
364364
{% endif %}
365365

366366
{% if finding.references %}
367367
<h6>References</h6>
368-
<pre>{{ finding.references|markdown_render }}</pre>
368+
<div class="report-field">{{ finding.references|markdown_render }}</div>
369369
{% endif %}
370370

371371
{% if include_finding_images %}

‎dojo/templates/report_base.html‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,24 @@
134134
padding: 0 !important;
135135
overflow: visible !important;
136136
word-break: normal !important;
137+
overflow-wrap: break-word !important;
138+
}
139+
140+
.report-field {
141+
margin-bottom: 15px !important;
142+
overflow-wrap: break-word !important;
143+
word-break: normal !important;
144+
}
145+
146+
.report-field pre {
147+
white-space: pre-wrap !important;
148+
padding: 0 !important;
149+
border: 0 !important;
150+
background-color: transparent !important;
151+
overflow: visible !important;
152+
overflow-wrap: break-word !important;
153+
word-break: normal !important;
154+
margin: 0 !important;
137155
}
138156

139157
ul{

0 commit comments

Comments
 (0)