Changes to make the services work with django 1.8.

crits · Sep 2, 2015 · a6272b6 · a6272b6
1 parent e147cba
commit a6272b6
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 0 deletions.
diff --git a/OPSWAT_Service/forms.py b/OPSWAT_Service/forms.py
@@ -15,4 +15,5 @@ class OPSWATConfigForm(forms.Form):
                                    help_text="Use proxy for connecting to OPSWAT service")
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(OPSWATConfigForm, self).__init__(*args, **kwargs)
diff --git a/chopshop_service/forms.py b/chopshop_service/forms.py
@@ -22,6 +22,7 @@ class FileCarverForm(forms.Form):
                               help_text="Carve raw TCP (one per side).")
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(FileCarverForm, self).__init__(*args, **kwargs)
 
 class ChopShopConfigForm(forms.Form):
@@ -33,6 +34,7 @@ class ChopShopConfigForm(forms.Form):
                               help_text="The base directory where all the modules and libraries exist.")
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(ChopShopConfigForm, self).__init__(*args, **kwargs)
 
 class ChopShopRunForm(forms.Form):
@@ -47,4 +49,5 @@ class ChopShopRunForm(forms.Form):
                                         help_text="Generate metadata for these protocols.")
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(ChopShopRunForm, self).__init__(*args, **kwargs)
diff --git a/clamd_service/forms.py b/clamd_service/forms.py
@@ -23,4 +23,5 @@ class clamdServiceConfigForm(forms.Form):
                                 initial=False)
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(clamdServiceConfigForm, self).__init__(*args, **kwargs)
diff --git a/cuckoo_service/forms.py b/cuckoo_service/forms.py
@@ -55,6 +55,7 @@ class CuckooConfigForm(forms.Form):
                                                    "period.")
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(CuckooConfigForm, self).__init__(*args, **kwargs)
 
 class CuckooRunForm(forms.Form):
@@ -102,6 +103,7 @@ class CuckooRunForm(forms.Form):
                                               "automatically resubmitted.")
 
     def __init__(self, machines=[], *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(CuckooRunForm, self).__init__(*args, **kwargs)
 
         self.fields['machine'].choices = machines

diff --git a/farsight_service/forms.py b/farsight_service/forms.py
@@ -15,4 +15,5 @@ class FarsightConfigForm(forms.Form):
                                        initial='https://api.dnsdb.info')
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(FarsightConfigForm, self).__init__(*args, **kwargs)
diff --git a/metacap_service/forms.py b/metacap_service/forms.py
@@ -27,6 +27,7 @@ class TCPDumpForm(forms.Form):
                                help_text="Save resulting PCAP to the database.")
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(TCPDumpForm, self).__init__(*args, **kwargs)
         self.fields['timestamp'].choices = [("", ""),
                                             ("-t", "(-t) Don't print"),
@@ -65,4 +66,5 @@ class MetaCapConfigForm(forms.Form):
                               initial='')
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(MetaCapConfigForm, self).__init__(*args, **kwargs)
diff --git a/opendns_service/forms.py b/opendns_service/forms.py
@@ -14,4 +14,5 @@ class OpenDNSConfigForm(forms.Form):
                                       initial='https://investigate.api.opendns.com/')
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(OpenDNSConfigForm, self).__init__(*args, **kwargs)
diff --git a/passivetotal_service/forms.py b/passivetotal_service/forms.py
@@ -14,4 +14,5 @@ class PassiveTotalConfigForm(forms.Form):
                                    initial='https://www.passivetotal.org/api/v1')
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(PassiveTotalConfigForm, self).__init__(*args, **kwargs)
diff --git a/pyew/forms.py b/pyew/forms.py
@@ -17,4 +17,5 @@ class pyewConfigForm(forms.Form):
                                 help_text="Use secure websockets.")
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(pyewConfigForm, self).__init__(*args, **kwargs)
diff --git a/shodan_service/forms.py b/shodan_service/forms.py
@@ -11,4 +11,5 @@ class ShodanConfigForm(forms.Form):
                                      initial='')
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(ShodanConfigForm, self).__init__(*args, **kwargs)
diff --git a/taxii_service/forms.py b/taxii_service/forms.py
@@ -24,6 +24,7 @@ def __init__(self, username, item, *args, **kwargs):
         The way the form fields are populated ensures that only STIXifyable / CybOXable
         options are provided.
         """
+        kwargs.setdefault('label_suffix', ':')
         super(TAXIIForm, self).__init__(*args, **kwargs)
         sc = get_config('taxii_service')
 
@@ -140,6 +141,7 @@ class TAXIIServiceConfigForm(forms.Form):
                                           " source.")
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(TAXIIServiceConfigForm, self).__init__(*args, **kwargs)
 
 
@@ -156,6 +158,7 @@ class UploadStandardsForm(forms.Form):
     make_event = forms.BooleanField(required=False, label="Create event", initial=True)
 
     def __init__(self, username, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(UploadStandardsForm, self).__init__(*args, **kwargs)
         self.fields['source'].choices = [(c.name,
                                           c.name) for c in get_source_names(True,

diff --git a/threatgrid_service/forms.py b/threatgrid_service/forms.py
@@ -17,6 +17,7 @@ class ThreatGRIDConfigForm(forms.Form):
                                 initial=False,
                                 help_text="Automatically submit samples during triage.")
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(ThreatGRIDConfigForm, self).__init__(*args, **kwargs)
 
 class ThreatGRIDRunForm(forms.Form):
@@ -28,4 +29,5 @@ class ThreatGRIDRunForm(forms.Form):
                                   initial=True)
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(ThreatGRIDRunForm, self).__init__(*args, **kwargs)
diff --git a/threatrecon_service/forms.py b/threatrecon_service/forms.py
@@ -14,4 +14,5 @@ class ThreatreconConfigForm(forms.Form):
                                    initial='https://api.threatrecon.co/api/v1/search')
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(ThreatreconConfigForm, self).__init__(*args, **kwargs)
diff --git a/totalhash_service/forms.py b/totalhash_service/forms.py
@@ -18,4 +18,5 @@ class TotalHashConfigForm(forms.Form):
                                    initial='https://api.totalhash.com/')
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(TotalHashConfigForm, self).__init__(*args, **kwargs)
diff --git a/upx_service/forms.py b/upx_service/forms.py
@@ -10,4 +10,5 @@ class UPXConfigForm(forms.Form):
                                help_text="Full path to UPX binary.")
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(UPXConfigForm, self).__init__(*args, **kwargs)
diff --git a/virustotal_service/forms.py b/virustotal_service/forms.py
@@ -31,6 +31,7 @@ class VirusTotalConfigForm(forms.Form):
 
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(VirusTotalConfigForm, self).__init__(*args, **kwargs)
 
 class VirusTotalRunForm(forms.Form):
@@ -46,4 +47,5 @@ class VirusTotalRunForm(forms.Form):
                                         help_text="Add Domains")
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(VirusTotalRunForm, self).__init__(*args, **kwargs)
diff --git a/whois_service/forms.py b/whois_service/forms.py
@@ -20,6 +20,7 @@ class WHOISConfigForm(forms.Form):
                                   initial='')
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(WHOISConfigForm, self).__init__(*args, **kwargs)
 
 class WHOISRunForm(forms.Form):
@@ -30,6 +31,7 @@ class WHOISRunForm(forms.Form):
                                     help_text="Perform a live query.")
 
     def __init__(self, pydat_url=None, dt_api_key=None, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(WHOISRunForm, self).__init__(*args, **kwargs)
 
         # If pyDat or DomainTools are configured, add a checkbox and

diff --git a/yara_service/forms.py b/yara_service/forms.py
@@ -32,6 +32,7 @@ class YaraConfigForm(forms.Form):
                                   help_text="Distribution routing key. Leave blank if not distributed.")
 
     def __init__(self, *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(YaraConfigForm, self).__init__(*args, **kwargs)
 
 class YaraRunForm(forms.Form):
@@ -43,6 +44,7 @@ class YaraRunForm(forms.Form):
                                          help_text="Signature files to use.")
 
     def __init__(self, sigfiles=[], api_keys=[], *args, **kwargs):
+        kwargs.setdefault('label_suffix', ':')
         super(YaraRunForm, self).__init__(*args, **kwargs)
 
         self.fields['sigfiles'].choices = sigfiles