Add team_name to settings model, switch to using it

Author: patriknordlen

dojo/management/commands/notify_isoc.py

@@ -45,7 +45,7 @@ def handle(self, *args, **options):
         # Send one giant email to External Unit with a list  of all the
         # ipaddresses that will be scanned
         msg = "\nGreetings, \n\n"
-        msg += settings.TEAM_NAME + " will be performing port scans of "
+        msg += get_system_setting('team_name') + " will be performing port scans of "
         msg += "the following products and target IPs:"
         msg += "\n\nStart Time: " + str(scan_start_time)
         msg += "\n\nStop Time (est): " + str(scan_stop_time)
@@ -62,7 +62,7 @@ def handle(self, *args, **options):
 
         msg += "\n\nPlease let us know if you have any questions.\n Thanks,\n"
         msg += settings.PORT_SCAN_RESULT_EMAIL_FROM
-        send_mail(settings.TEAM_NAME + ' Port Scan',
+        send_mail(get_system_setting('team_name') + ' Port Scan',
                   msg,
                   settings.PORT_SCAN_RESULT_EMAIL_FROM,
                   settings.PORT_SCAN_EXTERNAL_UNIT_EMAIL_LIST,

dojo/management/commands/run_scan.py

@@ -82,11 +82,11 @@ def runScan(prod_id, p_dict):
             msg += "\nFor any questions please email "
             msg += settings.PORT_SCAN_CONTACT_EMAIL + "\n"
             msg += "Thanks,\nThe "
-            msg += settings.TEAM_NAME
+            msg += get_system_setting('team_name')
             msg += " Team"
             email_to = current_scan.scan_settings.email
 
-            send_mail(settings.TEAM_NAME + ' Port Scan Report',
+            send_mail(get_system_setting('team_name') + ' Port Scan Report',
                       msg,
                       settings.PORT_SCAN_RESULT_EMAIL_FROM,
                       [email_to],

dojo/metrics/views.py

@@ -297,7 +297,7 @@ def metrics(request, mtype):
 
     if 'view' in request.GET and 'dashboard' == request.GET['view']:
         punchcard, ticks, highest_count = get_punchcard_data(findings.qs, weeks_between, start_date)
-        page_name = (settings.TEAM_NAME if settings.TEAM_NAME else "") + " Metrics"
+        page_name = (get_system_setting('team_name')) + " Metrics"
         template = 'dojo/dashboard-metrics.html'
 
     add_breadcrumb(title=page_name, top_level=not len(request.GET), request=request)

dojo/models.py

@@ -35,6 +35,7 @@ class System_Settings(models.Model):
                                                     help_text='With this setting turned on, Dojo will display S0, S1, S2, etc ' \
                                                     'in most places, whereas if turned off Critical, High, Medium, etc will be displayed.')
     url_prefix = models.CharField(max_length=300, default='', blank=True)
+    team_name = models.CharField(max_length=100, default='', blank=True)
     time_zone = models.CharField(max_length=50,
                                  choices=[(tz,tz) for tz in all_timezones],
                                  default='UTC',blank=False)

dojo/reports/views.py

@@ -506,7 +506,7 @@ def product_endpoint_report(request, pid):
                                             'include_executive_summary': include_executive_summary,
                                             'include_table_of_contents': include_table_of_contents,
                                             'user': user,
-                                            'team_name': settings.TEAM_NAME,
+                                            'team_name': get_system_setting('team_name'),
                                             'title': 'Generate Report',
                                             'host': report_url_resolver(request),
                                             'user_id': request.user.id},
@@ -735,7 +735,7 @@ def generate_report(request, obj):
                    'include_executive_summary': include_executive_summary,
                    'include_table_of_contents': include_table_of_contents,
                    'user': user,
-                   'team_name': settings.TEAM_NAME,
+                   'team_name': get_system_setting('team_name'),
                    'title': 'Generate Report',
                    'host': report_url_resolver(request),
                    'user_id': request.user.id}