Merge pull request #339 from CybercentreCanada/hotfix/default_service_params

Fix odm for default service params values

Author: cccs-sgaron

assemblyline/odm/models/service.py

@@ -74,6 +74,7 @@ class SubmissionParams(odm.Model):
     type = odm.Enum(values=['str', 'int', 'list', 'bool'])
     value = odm.Any()
     list = odm.Optional(odm.Any())
+    hide = odm.Boolean(default=False)
 
 
 @odm.model(index=True, store=False)

assemblyline/odm/models/service_delta.py

@@ -68,6 +68,7 @@ class SubmissionParamsDelta(odm.Model):
     type = odm.Optional(odm.Enum(values=['str', 'int', 'list', 'bool']))
     value = odm.Optional(odm.Any())
     list = odm.Optional(odm.Any())
+    hide = odm.Optional(odm.Any())
 
 
 @odm.model(index=True, store=False)

assemblyline/odm/models/user_settings.py

@@ -22,7 +22,7 @@ class UserSettings(odm.Model):                                      # User's def
     malicious = odm.Boolean(default=False)                            # Is the file submitted known to be malicious
     priority = odm.Integer(default=1000)                              # Default priority for the submissions
     profile = odm.Boolean(default=False)                              # Should the submission do extra profiling
-    service_spec = odm.Mapping(odm.Any(), default={})                 # Default service specific settings
+    service_spec = odm.Mapping(odm.Mapping(odm.Any()), default={})    # Default service specific settings
     services = odm.Compound(ServiceSelection, default={})             # Default service selection
     submission_view = odm.Enum(values=VIEWS, default="report")        # Default view for completed submissions
     ttl = odm.Integer(default=30)                                     # Default submission Time to Live (days)