Skip to content

Commit 9b3105d

Browse files
aaronweaveraaronweaver
authored
Merge pull request #656 from aaronweaver/dev
severity and environment
2 parents bb38633 + ad78cfc commit 9b3105d

File tree

13 files changed

+99
-31
lines changed

13 files changed

+99
-31
lines changed

‎dojo/development_environment/views.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ def dev_env(request):
2323
initial_queryset]
2424
devs = DevelopmentEnvironmentFilter(request.GET, queryset=initial_queryset)
2525
dev_page = get_page_items(request, devs.qs, 25)
26-
add_breadcrumb(title="Development Environment List", top_level=True, request=request)
26+
add_breadcrumb(title="Environment List", top_level=True, request=request)
2727
return render(request, 'dojo/dev_env.html', {
28-
'name': 'Development Environment List',
28+
'name': 'Environment',
2929
'metric': False,
3030
'user': request.user,
3131
'devs': dev_page,
@@ -42,12 +42,12 @@ def add_dev_env(request):
4242
form.save()
4343
messages.add_message(request,
4444
messages.SUCCESS,
45-
'Development environment added successfully.',
45+
'Environment added successfully.',
4646
extra_tags='alert-success')
4747
return HttpResponseRedirect(reverse('dev_env'))
48-
add_breadcrumb(title="Add Development Environment", top_level=False, request=request)
48+
add_breadcrumb(title="Add Environment", top_level=False, request=request)
4949
return render(request, 'dojo/new_dev_env.html', {
50-
'name': 'Add Development Environment',
50+
'name': 'Add Environment',
5151
'metric': False,
5252
'user': request.user,
5353
'form': form,
@@ -65,12 +65,12 @@ def edit_dev_env(request, deid):
6565
messages.add_message(
6666
request,
6767
messages.SUCCESS,
68-
'Development environment updated successfully.',
68+
'Environment updated successfully.',
6969
extra_tags='alert-success')
7070
return HttpResponseRedirect(reverse('dev_env'))
71-
add_breadcrumb(title="Edit Development Environment", top_level=False, request=request)
71+
add_breadcrumb(title="Edit Environment", top_level=False, request=request)
7272
return render(request, 'dojo/edit_dev_env.html', {
73-
'name': 'Edit Development Environment',
73+
'name': 'Edit Environment',
7474
'metric': False,
7575
'user': request.user,
7676
'form': form,

‎dojo/models.py‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,27 @@ class System_Settings(models.Model):
180180
verbose_name="Engagement Auto-Close Days",
181181
help_text="Closes an engagement after the specified number of days past due date including last update.")
182182

183+
enable_finding_sla = models.BooleanField(
184+
default=True,
185+
blank=False,
186+
verbose_name="Enable Finding SLA's",
187+
help_text="Enables Finding SLA's for time to remediate.")
188+
189+
sla_critical = models.IntegerField(default=7,
190+
verbose_name="Crital Finding SLA Days",
191+
help_text="# of days to remediate a critical finding.")
192+
193+
sla_high = models.IntegerField(default=30,
194+
verbose_name="High Finding SLA Days",
195+
help_text="# of days to remediate a high finding.")
196+
sla_medium = models.IntegerField(default=90,
197+
verbose_name="Medium Finding SLA Days",
198+
help_text="# of days to remediate a medium finding.")
199+
200+
sla_low = models.IntegerField(default=120,
201+
verbose_name="Low Finding SLA Days",
202+
help_text="# of days to remediate a low finding.")
203+
183204

184205
class SystemSettingsFormAdmin(forms.ModelForm):
185206
product_grade = forms.CharField(widget=forms.Textarea)
@@ -1064,6 +1085,12 @@ def age(self):
10641085

10651086
return days if days > 0 else 0
10661087

1088+
def sla(self):
1089+
severity = self.severity
1090+
from dojo.utils import get_system_setting
1091+
sla_age = get_system_setting('sla_' + self.severity.lower())
1092+
return sla_age - self.age()
1093+
10671094
def jira(self):
10681095
try:
10691096
jissue = JIRA_Issue.objects.get(finding=self)
@@ -1675,9 +1702,6 @@ def __unicode__(self):
16751702

16761703
return name
16771704

1678-
class Meta:
1679-
unique_together = [('product', 'path')]
1680-
16811705

16821706
class Objects_Engagement(models.Model):
16831707
engagement = models.ForeignKey(Engagement)
@@ -1895,6 +1919,7 @@ class FieldRule(models.Model):
18951919
update_type = models.CharField(max_length=30, choices=update_options)
18961920
text = models.CharField(max_length=200)
18971921

1922+
18981923
# Register for automatic logging to database
18991924
auditlog.register(Dojo_User)
19001925
auditlog.register(Endpoint)

‎dojo/static/dojo/css/dojo.css‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,14 @@ form ul#id_accepted_findings input {
543543
background-color: #d9534f;
544544
}
545545

546+
.age-red {
547+
background-color: #d9534f;
548+
}
549+
550+
.age-green {
551+
background-color: green;
552+
}
553+
546554
.dojo-search {
547555
clear: right !important;
548556
display: inline-block !important;

‎dojo/templates/base.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
<a href="{% url 'test_type' %}">Test Types</a>
167167
</li>
168168
<li>
169-
<a href="{% url 'dev_env' %}">Development Environments</a>
169+
<a href="{% url 'dev_env' %}">Environments</a>
170170
</li>
171171
</ul>
172172
<!-- /.nav-second-level -->

‎dojo/templates/dojo/dev_env.html‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<div class="panel panel-default">
77
<div class="panel-heading tight">
88
<h3 class="has-filters">
9-
Development Environment List
9+
Environment List
1010
<div class="dropdown pull-right">
1111
<button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenu1"
1212
data-toggle="dropdown" aria-expanded="true">
@@ -18,7 +18,7 @@ <h3 class="has-filters">
1818
{% if request.user.is_staff %}
1919
<li role="presentation">
2020
<a href="{% url 'add_dev_env' %}">
21-
<i class="fa fa-plus"></i> New Dev Environment </a>
21+
<i class="fa fa-plus"></i> New Environment </a>
2222
</li>
2323
{% endif %}
2424
</ul>
@@ -38,7 +38,7 @@ <h3 class="has-filters">
3838
class="tablesorter-bootstrap table table-bordered table-condensed table-striped">
3939
<thead>
4040
<tr>
41-
<th>{% dojo_sort request 'Development Environment' 'name' 'asc' %}</th>
41+
<th>{% dojo_sort request 'Environment' 'name' 'asc' %}</th>
4242
</tr>
4343
</thead>
4444
<tbody>
@@ -58,7 +58,7 @@ <h3 class="has-filters">
5858
{% include "dojo/paging_snippet.html" with page=devs page_size=True%}
5959
</div>
6060
{% else %}
61-
<p class="text-center">No development environments found.</p>
61+
<p class="text-center">No environments found.</p>
6262
{% endif %}
6363
</div>
6464

@@ -79,11 +79,3 @@ <h3 class="has-filters">
7979
</script>
8080
{% include "dojo/filter_js_snippet.html" %}
8181
{% endblock %}
82-
83-
84-
85-
86-
87-
88-
89-

‎dojo/templates/dojo/edit_dev_env.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% extends "base.html" %}
22
{% block content %}
3-
<h3> Edit Development Environment {{ pt.name }}</h3>
3+
<h3> Edit Environment {{ pt.name }}</h3>
44
<form class="form-horizontal" action="{% url 'edit_dev_env' de.id %}" method="post">{% csrf_token %}
55
{% include "dojo/form_fields.html" with form=form %}
66
<div class="form-group">

‎dojo/templates/dojo/findings_list.html‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ <h3 class="has-filters">
114114
<th>CWE</th>
115115
<th class="nowrap">{% dojo_sort request 'Date' 'date'%}</th>
116116
<th class="nowrap">Age</th>
117+
{% if 'enable_finding_sla'|fetch_system_setting %}
118+
<th>SLA</th>
119+
{% endif %}
117120
<th>Reporter</th>
118121
<th>Found By</th>
119122
{% if "enable_jira"|get_system_setting %}
@@ -263,6 +266,11 @@ <h3 class="has-filters">
263266
</td>
264267
<td class="nowrap">{{ finding.date }}</td>
265268
<td>{{ finding.age }}</td>
269+
{% if 'enable_finding_sla'|fetch_system_setting %}
270+
<td>
271+
{{ finding|finding_sla }}
272+
</td>
273+
{% endif %}
266274
<td>
267275
{% if finding.reporter.get_full_name and finding.reporter.get_full_name.strip %}
268276
{{ finding.reporter.get_full_name }}

‎dojo/templates/dojo/new_dev_env.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% extends "base.html" %}
22
{% block content %}
3-
<h3> Register a new Development Environment </h3>
3+
<h3> Register a new Environment </h3>
44
<form class="form-horizontal" action="{% url 'add_dev_env' %}" method="post">{% csrf_token %}
55
{% include "dojo/form_fields.html" with form=form %}
66
<div class="form-group">

‎dojo/templates/dojo/view_finding.html‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,9 @@ <h3 class="pull-left to_highlight finding-title">
161161
{% endif %}
162162
<tr>
163163
<th>Severity</th>
164+
{% if 'enable_finding_sla'|fetch_system_setting %}
165+
<th>SLA</th>
166+
{% endif %}
164167
{% if finding.scanner_confidence %}
165168
<th>Scanner Confidence</th>
166169
{% endif %}
@@ -194,6 +197,11 @@ <h3 class="pull-left to_highlight finding-title">
194197
{% endif %}
195198
</span>
196199
</td>
200+
{% if 'enable_finding_sla'|fetch_system_setting %}
201+
<td>
202+
{{ finding|finding_sla }}
203+
</td>
204+
{% endif %}
197205
{% if finding.scanner_confidence %}
198206
<td> {{finding.get_scanner_confidence_text}}</td>
199207
{% endif %}

‎dojo/templates/dojo/view_product_details.html‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,13 +206,11 @@ <h3 class="panel-title"><span class="fa fa-language" aria-hidden="true"></span>
206206
<div class="panel-body">
207207
<div class="chart" id="donut-lang"></div>
208208
<div style="text-align: center;padding-top: 10px;">
209-
<strong>Total Files: </strong>
210209
{% if langSummary.files__sum > 0 %}
211-
{{ langSummary.files__sum|intcomma }}
210+
<strong>{{ langSummary.files__sum|intcomma }}</strong> files {% if langSummary.code__sum %} and {%endif%}
212211
{% endif %}
213-
<strong>Lines of Code: </strong>
214212
{% if langSummary.code__sum %}
215-
{{ langSummary.code__sum|intcomma }}
213+
<strong>{{ langSummary.code__sum|intcomma }}</strong> lines of code
216214
{% endif %}
217215
</div>
218216
</div>

0 commit comments

Comments
 (0)