Better setup page and error reporting

Signed-off-by: Shivam Sandbhor <shivam.sandbhor@gmail.com>

Author: sbs2001

appserver/static/javascript/views/app.js

@@ -30,7 +30,7 @@ define(["react", "splunkjs/splunk"], function(react, splunk_js_sdk){
         e("div", null, [
           e("form", { onSubmit: this.handleSubmit }, [
             e("label", null, [
-              "Password ",
+              " ",
               e("input", { type: "text", name: "password", value: this.state.password, onChange: this.handleChange })
             ]),
             e("input", { type: "submit", value: "Submit" })

bin/cssmoke.py

@@ -21,68 +21,68 @@
 )
 
 def attach_resp_to_event(event, data):
-    event["ip_range_score"] = data["ip_range_score"]
-    event["ip"] = data["ip"]
-    event["ip_range"] = data["ip_range"]
-    event["as_name"] = data["as_name"]
-    event["as_num"] = data["as_num"]
+    event["crowdsec_ip_range_score"] = data["ip_range_score"]
+    event["crowdsec_ip"] = data["ip"]
+    event["crowdsec_ip_range"] = data["ip_range"]
+    event["crowdsec_as_name"] = data["as_name"]
+    event["crowdsec_as_num"] = data["as_num"]
 
-    event["country"] = data["location"]["country"]
-    event["city"] = data["location"]["city"]
-    event["latitude"] = data["location"]["latitude"]
-    event["longitude"] = data["location"]["longitude"]
-    event["reverse_dns"] = data["reverse_dns"]
+    event["crowdsec_country"] = data["location"]["country"]
+    event["crowdsec_city"] = data["location"]["city"]
+    event["crowdsec_latitude"] = data["location"]["latitude"]
+    event["crowdsec_longitude"] = data["location"]["longitude"]
+    event["crowdsec_reverse_dns"] = data["reverse_dns"]
 
-    event["behaviors"] = data["behaviors"]
+    event["crowdsec_behaviors"] = data["behaviors"]
 
-    event["first_seen"] = data["history"]["first_seen"]
-    event["last_seen"] = data["history"]["last_seen"]
-    event["full_age"] = data["history"]["full_age"]
-    event["days_age"] = data["history"]["days_age"]
+    event["crowdsec_first_seen"] = data["history"]["first_seen"]
+    event["crowdsec_last_seen"] = data["history"]["last_seen"]
+    event["crowdsec_full_age"] = data["history"]["full_age"]
+    event["crowdsec_days_age"] = data["history"]["days_age"]
 
-    event["false_positives"] = data["classifications"]["false_positives"]
-    event["classifications"] = data["classifications"]["classifications"]
+    event["crowdsec_false_positives"] = data["classifications"]["false_positives"]
+    event["crowdsec_classifications"] = data["classifications"]["classifications"]
 
     # attack_details
-    event["attack_details"] = data["attack_details"]
+    event["crowdsec_attack_details"] = data["attack_details"]
 
     # target_countries
-    event["target_countries"] = data["target_countries"]
+    event["crowdsec_target_countries"] = data["target_countries"]
 
     # background_noise_score
-    event["background_noise_score"] = data["background_noise_score"]
+    event["crowdsec_background_noise_score"] = data["background_noise_score"]
 
     # overall
-    event["overall_aggresiveness"] = data["scores"]["overall"]["aggressiveness"]
-    event["overall_threat"] = data["scores"]["overall"]["threat"]
-    event["overall_trust"] = data["scores"]["overall"]["trust"]
-    event["overall_anomaly"] = data["scores"]["overall"]["anomaly"]
-    event["overall_total"] = data["scores"]["overall"]["total"]
+    event["crowdsec_overall_aggresiveness"] = data["scores"]["overall"]["aggressiveness"]
+    event["crowdsec_overall_threat"] = data["scores"]["overall"]["threat"]
+    event["crowdsec_overall_trust"] = data["scores"]["overall"]["trust"]
+    event["crowdsec_overall_anomaly"] = data["scores"]["overall"]["anomaly"]
+    event["crowdsec_overall_total"] = data["scores"]["overall"]["total"]
 
     # last_day
-    event["last_day_aggresiveness"] = data["scores"]["last_day"]["aggressiveness"]
-    event["last_day_threat"] = data["scores"]["last_day"]["threat"]
-    event["last_day_trust"] = data["scores"]["last_day"]["trust"]
-    event["last_day_anomaly"] = data["scores"]["last_day"]["anomaly"]
-    event["last_day_total"] = data["scores"]["last_day"]["total"]
+    event["crowdsec_last_day_aggresiveness"] = data["scores"]["last_day"]["aggressiveness"]
+    event["crowdsec_last_day_threat"] = data["scores"]["last_day"]["threat"]
+    event["crowdsec_last_day_trust"] = data["scores"]["last_day"]["trust"]
+    event["crowdsec_last_day_anomaly"] = data["scores"]["last_day"]["anomaly"]
+    event["crowdsec_last_day_total"] = data["scores"]["last_day"]["total"]
 
     # last_week
-    event["last_week_aggressiveness"] = data["scores"]["last_week"]["aggressiveness"]
-    event["last_week_threat"] = data["scores"]["last_week"]["threat"]
-    event["last_week_trust"] = data["scores"]["last_week"]["trust"]
-    event["last_week_anomaly"] = data["scores"]["last_week"]["anomaly"]
-    event["last_week_total"] = data["scores"]["last_week"]["total"]
+    event["crowdsec_last_week_aggressiveness"] = data["scores"]["last_week"]["aggressiveness"]
+    event["crowdsec_last_week_threat"] = data["scores"]["last_week"]["threat"]
+    event["crowdsec_last_week_trust"] = data["scores"]["last_week"]["trust"]
+    event["crowdsec_last_week_anomaly"] = data["scores"]["last_week"]["anomaly"]
+    event["crowdsec_last_week_total"] = data["scores"]["last_week"]["total"]
 
     # last_month
-    event["last_month_aggressiveness"] = data["scores"]["last_month"][
+    event["crowdsec_last_month_aggressiveness"] = data["scores"]["last_month"][
         "aggressiveness"
     ]
-    event["last_month_threat"] = data["scores"]["last_month"]["threat"]
-    event["last_month_trust"] = data["scores"]["last_month"]["trust"]
-    event["last_month_anomaly"] = data["scores"]["last_month"]["anomaly"]
-    event["last_month_total"] = data["scores"]["last_month"]["total"]
+    event["crowdsec_last_month_threat"] = data["scores"]["last_month"]["threat"]
+    event["crowdsec_last_month_trust"] = data["scores"]["last_month"]["trust"]
+    event["crowdsec_last_month_anomaly"] = data["scores"]["last_month"]["anomaly"]
+    event["crowdsec_last_month_total"] = data["scores"]["last_month"]["total"]
     # references
-    event["references"] = data["references"]
+    event["crowdsec_references"] = data["references"]
     return event
 
 
@@ -127,13 +127,13 @@ def stream(self, events):
 
         for event in events:
             event_dest_ip = event[self.ipfield]
+            event["crowdsec_error"] = "None"
             # API required parameters
             params = (
                 ("ipAddress", event_dest_ip),
                 ("verbose", ""),
             )
             # Make API Request
-            error = 0
             response = req.get(
                 f"https://cti.api.crowdsec.net/v2/smoke/{event_dest_ip}",
                 headers=headers,
@@ -143,9 +143,9 @@ def stream(self, events):
                 data = response.json()
                 event = attach_resp_to_event(event, data)
             elif response.status_code == 429:
-                event["error"] = '"Quota exceeded for CrowdSec CTI API. Please visit https://www.crowdsec.net/pricing to upgrade your plan."'
+                event["crowdsec_error"] = '"Quota exceeded for CrowdSec CTI API. Please visit https://www.crowdsec.net/pricing to upgrade your plan."'
             else:
-                event["error"] = f"Error {response.status_code} : {response.text}"
+                event["crowdsec_error"] = f"Error {response.status_code} : {response.text}"
 
             # Finalize event
             yield event