Merge pull request #514 from aaronweaver/master

Update links to correct 404 on Product Metric Page

Author: devGregA

dojo/metrics/views.py

@@ -42,7 +42,8 @@ def critical_product_metrics(request, mtype):
     add_breadcrumb(title=page_name, top_level=not len(request.GET), request=request)
     return render(request, template, {
         'name': page_name,
-        'critical_prods': critical_products
+        'critical_prods': critical_products,
+        'url_prefix': get_system_setting('url_prefix')
     })
 
 @cache_page(60 * 5)  # cache for 5 minutes

dojo/models.py

@@ -1364,6 +1364,22 @@ class App_Analysis(models.Model):
     website_found = models.URLField(max_length=400, null=True, blank=True)
     created = models.DateTimeField(null=False, editable=False, default=now)
 
+class Objects_Review(models.Model):
+    name = models.CharField(max_length=100, null=True)
+    created = models.DateTimeField(null=False, editable=False, default=now)
+
+class Objects(models.Model):
+    engagement = models.ForeignKey(Engagement)
+    name = models.CharField(max_length=100, null=True)
+    path = models.CharField(max_length=600, null=False)
+    review_status = models.ForeignKey(Objects_Review)
+    created = models.DateTimeField(null=False, editable=False, default=now)
+
+class Objects_Engagement(models.Model):
+    engagement = models.ForeignKey(Engagement)
+    object = models.ForeignKey(Objects)
+    created = models.DateTimeField(null=False, editable=False, default=now)
+
 # Register for automatic logging to database
 auditlog.register(Dojo_User)
 auditlog.register(Endpoint)
@@ -1383,7 +1399,11 @@ class App_Analysis(models.Model):
 tag_register(Endpoint)
 tag_register(Finding_Template)
 tag_register(App_Analysis)
+tag_register(Objects)
 
+admin.site.register(Objects)
+admin.site.register(Objects_Review)
+admin.site.register(Objects_Engagement)
 admin.site.register(Languages)
 admin.site.register(Language_Type)
 admin.site.register(App_Analysis)

dojo/templates/dojo/metrics.html

@@ -141,24 +141,24 @@ <h3 {% if not critical_prods %}class="has-filters" {% endif %}>
                                     <p> {{ c_prod.name }} is affected by <b>both</b> critical and high severity
                                         vulnerabilities.</p>
                                     <p>
-                                        <a href="/dojo/finding/open?title=&date=&severity=Critical&mitigated_by=&last_reviewed_by=&last_reviewed=&test__engagement__product__prod_type={{ c_prod.id }}&o=numerical_severity&page_size=25">Critical
+                                        <a href="{{ url_prefix }}/finding/open?title=&date=&severity=Critical&mitigated_by=&last_reviewed_by=&last_reviewed=&test__engagement__product__prod_type={{ c_prod.id }}&o=numerical_severity&page_size=25">Critical
                                             Severity Vulnerabilities</a></p>
                                     <p>
-                                        <a href="/dojo/finding/open?title=&date=&severity=High&mitigated_by=&last_reviewed_by=&last_reviewed=&test__engagement__product__prod_type={{ c_prod.id }}&o=numerical_severity&page_size=25">High
+                                        <a href="{{ url_prefix }}/finding/open?title=&date=&severity=High&mitigated_by=&last_reviewed_by=&last_reviewed=&test__engagement__product__prod_type={{ c_prod.id }}&o=numerical_severity&page_size=25">High
                                             Severity Vulnerabilities</a></p>
                                 {% elif c_prod.critical_present %}
                                     <p> {{ c_prod.name }} is affected by critical vulnerabilities. </p>
                                     <p>
-                                        <a href="/dojo/finding/open?title=&date=&severity=Critical&mitigated_by=&last_reviewed_by=&last_reviewed=&test__engagement__product__prod_type={{ c_prod.id }}&o=numerical_severity&page_size=25">Critical
+                                        <a href="{{ url_prefix }}/finding/open?title=&date=&severity=Critical&mitigated_by=&last_reviewed_by=&last_reviewed=&test__engagement__product__prod_type={{ c_prod.id }}&o=numerical_severity&page_size=25">Critical
                                             Severity Vulnerabilities</a></p>
                                 {% elif c_prod.high_present %}
                                     <p> {{ c_prod.name }} is affected by high severity vulnerabilities.</p>
                                     <p>
-                                        <a href="/dojo/finding/open?title=&date=&severity=High&mitigated_by=&last_reviewed_by=&last_reviewed=&test__engagement__product__prod_type={{ c_prod.id }}&o=numerical_severity&page_size=25">High
+                                        <a href="{{ url_prefix }}/finding/open?title=&date=&severity=High&mitigated_by=&last_reviewed_by=&last_reviewed=&test__engagement__product__prod_type={{ c_prod.id }}&o=numerical_severity&page_size=25">High
                                             Severity Vulnerabilities</a></p>
                                 {% endif %}
                                 <p>
-                                    <a href='/dojo/metrics/product/type?date=2&test__engagement__product__prod_type={{ c_prod.id }}&status='>
+                                    <a href='{{ url_prefix }}/metrics/product/type?date=2&test__engagement__product__prod_type={{ c_prod.id }}&status='>
                                         Full Metrics</a></p></div>
                             <br>
                         </div>