Fixed spelling error

cwru-iso · Apr 21, 2020 · 0837db6 · 0837db6
1 parent e45ca83
commit 0837db6
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 81 deletions.
diff --git a/TA-TheHive-Addon/README/alert_actions.conf.spec b/TA-TheHive-Addon/README/alert_actions.conf.spec
@@ -1,13 +1,13 @@
 
 [thehive_create_alert]
-param.alert_tlp = <list> TLP. It's a required parameter. It's default value is 2.
 param.alert_source = <string> Source. It's a required parameter. It's default value is splunk.
+param.alert_type = <string> Type. It's a required parameter. It's default value is alert.
+param.alert_group_by = <string> Group by.
+param.alert_tlp = <list> TLP. It's a required parameter. It's default value is 2.
+param.alert_title = <string> Title. It's a required parameter. It's default value is $name$.
 param.alert_pap = <list> PAP. It's a required parameter. It's default value is 2.
-param.alert_tags = <string> Tags.
 param.alert_severity = <list> Severity. It's a required parameter. It's default value is 2.
 param.alert_description = <string> Description.
-param.alert_group_by = <string> Group by.
+param.alert_tags = <string> Tags.
 param.alert_case_template = <string> Case Template.
-param.alert_title = <string> Title. It's a required parameter. It's default value is $name$.
-param.alert_type = <string> Type. It's a required parameter. It's default value is alert.
 
diff --git a/TA-TheHive-Addon/TA-TheHive-Addon.aob_meta b/TA-TheHive-Addon/TA-TheHive-Addon.aob_meta
diff --git a/TA-TheHive-Addon/app.manifest b/TA-TheHive-Addon/app.manifest
@@ -5,7 +5,7 @@
     "id": {
       "group": null,
       "name": "TA-TheHive-Addon",
-      "version": "1.0.0"
+      "version": "1.0.1"
     },
     "author": [
       {

diff --git a/TA-TheHive-Addon/appserver/static/js/build/globalConfig.json b/TA-TheHive-Addon/appserver/static/js/build/globalConfig.json
@@ -1,8 +1,8 @@
 {
     "meta": {
-        "displayName": "TheHive Add-on", 
         "restRoot": "TA_TheHive_Addon", 
         "name": "TA-TheHive-Addon", 
+        "displayName": "TheHive Add-on", 
         "version": "1.0.0", 
         "apiVersion": "3.0.0"
     }, 
@@ -15,13 +15,12 @@
                     "options": {
                         "saveValidator": "function(formData) { if(!formData.proxy_enabled || formData.proxy_enabled === '0') {return true; } if(!formData.proxy_url) { return 'Proxy Host can not be empty'; } if(!formData.proxy_port) { return 'Proxy Port can not be empty'; } return true; }"
                     }, 
-                    "title": "Proxy", 
                     "name": "proxy", 
                     "entity": [
                         {
-                            "type": "checkbox", 
                             "field": "proxy_enabled", 
-                            "label": "Enable"
+                            "label": "Enable", 
+                            "type": "checkbox"
                         }, 
                         {
                             "options": {
@@ -41,74 +40,74 @@
                                     }
                                 ]
                             }, 
-                            "type": "singleSelect", 
-                            "defaultValue": "http", 
                             "field": "proxy_type", 
-                            "label": "Proxy Type"
+                            "defaultValue": "http", 
+                            "label": "Proxy Type", 
+                            "type": "singleSelect"
                         }, 
                         {
-                            "type": "text", 
                             "validators": [
                                 {
-                                    "type": "string", 
-                                    "maxLength": 4096, 
                                     "minLength": 0, 
-                                    "errorMsg": "Max host length is 4096"
+                                    "errorMsg": "Max host length is 4096", 
+                                    "maxLength": 4096, 
+                                    "type": "string"
                                 }
                             ], 
                             "field": "proxy_url", 
-                            "label": "Host"
+                            "label": "Host", 
+                            "type": "text"
                         }, 
                         {
-                            "type": "text", 
                             "validators": [
                                 {
-                                    "type": "number", 
                                     "range": [
                                         1, 
                                         65535
-                                    ]
+                                    ], 
+                                    "type": "number"
                                 }
                             ], 
                             "field": "proxy_port", 
-                            "label": "Port"
+                            "label": "Port", 
+                            "type": "text"
                         }, 
                         {
-                            "type": "text", 
                             "validators": [
                                 {
-                                    "type": "string", 
-                                    "maxLength": 50, 
                                     "minLength": 0, 
-                                    "errorMsg": "Max length of username is 50"
+                                    "errorMsg": "Max length of username is 50", 
+                                    "maxLength": 50, 
+                                    "type": "string"
                                 }
                             ], 
                             "field": "proxy_username", 
-                            "label": "Username"
+                            "label": "Username", 
+                            "type": "text"
                         }, 
                         {
-                            "type": "text", 
                             "encrypted": true, 
                             "field": "proxy_password", 
                             "validators": [
                                 {
-                                    "type": "string", 
-                                    "maxLength": 8192, 
                                     "minLength": 0, 
-                                    "errorMsg": "Max length of password is 8192"
+                                    "errorMsg": "Max length of password is 8192", 
+                                    "maxLength": 8192, 
+                                    "type": "string"
                                 }
                             ], 
-                            "label": "Password"
+                            "label": "Password", 
+                            "type": "text"
                         }, 
                         {
-                            "type": "checkbox", 
                             "field": "proxy_rdns", 
-                            "label": "Remote DNS resolution"
+                            "label": "Remote DNS resolution", 
+                            "type": "checkbox"
                         }
-                    ]
+                    ], 
+                    "title": "Proxy"
                 }, 
                 {
-                    "title": "Logging", 
                     "name": "logging", 
                     "entity": [
                         {
@@ -137,51 +136,52 @@
                                     }
                                 ]
                             }, 
-                            "type": "singleSelect", 
-                            "defaultValue": "INFO", 
                             "field": "loglevel", 
-                            "label": "Log level"
+                            "defaultValue": "INFO", 
+                            "label": "Log level", 
+                            "type": "singleSelect"
                         }
-                    ]
+                    ], 
+                    "title": "Logging"
                 }, 
                 {
-                    "title": "Add-on Settings", 
                     "name": "additional_parameters", 
                     "entity": [
                         {
-                            "help": "Base URL for your instance of TheHive. eg: \"https://thehive.example.com\"", 
-                            "type": "text", 
-                            "required": true, 
-                            "defaultValue": "", 
+                            "label": "TheHive URL", 
                             "field": "thehive_url", 
                             "validators": [
                                 {
-                                    "type": "string", 
-                                    "maxLength": 8192, 
                                     "minLength": 0, 
-                                    "errorMsg": "Max length of text input is 8192"
+                                    "errorMsg": "Max length of text input is 8192", 
+                                    "maxLength": 8192, 
+                                    "type": "string"
                                 }
                             ], 
-                            "label": "TheHive URL"
-                        }, 
-                        {
-                            "help": "API key for the user account that will be creating alerts in TheHive.", 
-                            "type": "text", 
                             "required": true, 
                             "defaultValue": "", 
-                            "field": "thehive_key", 
+                            "help": "Base URL for your instance of TheHive. eg: \"https://thehive.example.com\"", 
+                            "type": "text"
+                        }, 
+                        {
+                            "label": "API Key", 
                             "encrypted": true, 
+                            "field": "thehive_key", 
                             "validators": [
                                 {
-                                    "type": "string", 
-                                    "maxLength": 8192, 
                                     "minLength": 0, 
-                                    "errorMsg": "Max length of password is 8192"
+                                    "errorMsg": "Max length of password is 8192", 
+                                    "maxLength": 8192, 
+                                    "type": "string"
                                 }
                             ], 
-                            "label": "API Key"
+                            "required": true, 
+                            "defaultValue": "", 
+                            "help": "API key for the user account that will be creating alerts in TheHive.", 
+                            "type": "text"
                         }
-                    ]
+                    ], 
+                    "title": "Add-on Settings"
                 }
             ]
         }

diff --git a/TA-TheHive-Addon/bin/TA_TheHive_Addon_rh_settings.py b/TA-TheHive-Addon/bin/TA_TheHive_Addon_rh_settings.py
@@ -34,8 +34,8 @@
         encrypted=False,
         default=None,
         validator=validator.String(
-            min_len=0, 
             max_len=4096, 
+            min_len=0, 
         )
     ), 
     field.RestField(
@@ -44,8 +44,8 @@
         encrypted=False,
         default=None,
         validator=validator.Number(
-            min_val=1, 
             max_val=65535, 
+            min_val=1, 
         )
     ), 
     field.RestField(
@@ -54,8 +54,8 @@
         encrypted=False,
         default=None,
         validator=validator.String(
-            min_len=0, 
             max_len=50, 
+            min_len=0, 
         )
     ), 
     field.RestField(
@@ -64,8 +64,8 @@
         encrypted=True,
         default=None,
         validator=validator.String(
-            min_len=0, 
             max_len=8192, 
+            min_len=0, 
         )
     ), 
     field.RestField(
@@ -98,8 +98,8 @@
         encrypted=False,
         default='',
         validator=validator.String(
-            min_len=0, 
             max_len=8192, 
+            min_len=0, 
         )
     ), 
     field.RestField(
@@ -108,8 +108,8 @@
         encrypted=True,
         default='',
         validator=validator.String(
-            min_len=0, 
             max_len=8192, 
+            min_len=0, 
         )
     )
 ]

diff --git a/TA-TheHive-Addon/default/data/ui/alerts/thehive_create_alert.html b/TA-TheHive-Addon/default/data/ui/alerts/thehive_create_alert.html
@@ -57,12 +57,12 @@
 	<label class="control-label" for="thehive_create_alert_alert_severity">Severity <span class="required">*</span> </label>
     <div class="controls">
 <select name="action.thehive_create_alert.param.alert_severity" id="thehive_create_alert_alert_severity">
+        <option value="2">MEDIUM</option>
         <option value="1">LOW</option>
         <option value="3">HIGH</option>
-        <option value="2">MEDIUM</option>
 </select>
                 <span class="help-block"> 
-                    Severity of the new alert entry. Default = "AMBER"
+                    Severity of the new alert entry. Default = "MEDIUM"
                 </span>
     </div>
 </div>
@@ -72,8 +72,8 @@
 <select name="action.thehive_create_alert.param.alert_tlp" id="thehive_create_alert_alert_tlp">
         <option value="2">AMBER</option>
         <option value="0">WHITE</option>
-        <option value="3">RED</option>
         <option value="1">GREEN</option>
+        <option value="3">RED</option>
 </select>
                 <span class="help-block"> 
                     TLP of the new alert entry. Default = "AMBER"
@@ -86,8 +86,8 @@
 <select name="action.thehive_create_alert.param.alert_pap" id="thehive_create_alert_alert_pap">
         <option value="2">AMBER</option>
         <option value="0">WHITE</option>
-        <option value="3">RED</option>
         <option value="1">GREEN</option>
+        <option value="3">RED</option>
 </select>
                 <span class="help-block"> 
                     PAP of the new alert entry. Default = "AMBER"

diff --git a/TA-TheHive-Addon/local/alert_actions.conf b/TA-TheHive-Addon/local/alert_actions.conf
@@ -1,18 +1,18 @@
 
 [thehive_create_alert]
-is_custom = 1
+param.alert_source = splunk
+param.alert_title = $name$
+icon_path = alert_thehive_create_alert.png
+param.alert_severity = 2
+param.alert_description = 
 param.alert_pap = 2
 description = Creates a new Alert entry in TheHive with fields attached as Artifacts.
-param.alert_severity = 2
-icon_path = alert_thehive_create_alert.png
+param.alert_type = alert
 param.alert_group_by = 
-param.alert_case_template = 
-param.alert_title = $name$
-param.alert_source = splunk
 param.alert_tlp = 2
-param.alert_tags = 
-param.alert_description = 
 payload_format = json
+param.alert_tags = 
+is_custom = 1
 label = Create Alert in TheHive
-param.alert_type = alert
+param.alert_case_template = 
 
diff --git a/TA-TheHive-Addon/local/app.conf b/TA-TheHive-Addon/local/app.conf
@@ -3,11 +3,11 @@
 state_change_requires_restart = true
 is_configured = false
 state = enabled
-build = 3
+build = 4
 
 [launcher]
 author = Kyle Colantonio
-version = 1.0.0
+version = 1.0.1
 description = An add-on that adds an Alert Action for creating alerts in TheHive.
 
 [ui]