From 3a71d07f7804b01a731fa09e6277e3c621738e7e Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Wed, 24 Oct 2018 11:38:21 +0200
Subject: [PATCH 1/2] [Chrome extension] Added support to ssl, fixed
 exportation and added minor and major severity

---
 extras/chrome_extension/css/popup.css      |  7 +++++
 extras/chrome_extension/js/background.js   | 30 +++++++++++-----------
 extras/chrome_extension/js/notification.js |  5 +---
 extras/chrome_extension/manifest.json      |  1 +
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/extras/chrome_extension/css/popup.css b/extras/chrome_extension/css/popup.css
index a736abea57..e505e720cc 100644
--- a/extras/chrome_extension/css/popup.css
+++ b/extras/chrome_extension/css/popup.css
@@ -247,4 +247,11 @@ button h3 {
 }
 .sev-Maintenance {
     background: #A8A8A8;
+}
+.sev-Minor {
+    background: #F099A2;
+    color: #333;
+}
+.sev-Major {
+    background: #C97A4A;
 }
\ No newline at end of file
diff --git a/extras/chrome_extension/js/background.js b/extras/chrome_extension/js/background.js
index 8f3b80e866..5c390f5880 100644
--- a/extras/chrome_extension/js/background.js
+++ b/extras/chrome_extension/js/background.js
@@ -29,11 +29,13 @@ function main() {
 	if (isFetching) return;
 	isFetching = true;
 
-	var feedUrl = localStorage["ip_address"]+'/include/api.php?op=get&op2=events&return_type=csv&apipass='+localStorage["api_pass"]+'&user='+localStorage["user_name"]+'&pass='+localStorage["pass"];
+	var feedUrl = localStorage["ip_address"]+'/include/api.php?op=get&op2=events&return_type=json&apipass='+localStorage["api_pass"]+'&user='+localStorage["user_name"]+'&pass='+localStorage["pass"];
+
 	req = new XMLHttpRequest();
 	req.onload = handleResponse;
 	req.onerror = handleError;
 	req.open("GET", feedUrl, true);
+	req.withCredentials = true
 	req.send(null);
 }
 
@@ -132,25 +134,23 @@ function fetchNewEvents(A,B){
 function parseReplyEvents (reply) {
 
 	// Split the API response
-	var e_array = reply.split("\n");
+	var data = JSON.parse(reply)
+	var e_array = JSON.parse(reply).data;
 
 	// Form a properly object
 	var fetchedEvents=new Array();
 	for(var i=0;i<e_array.length;i++){
-		// Avoid to parse empty lines
-		if (e_array[i].length == 0) continue;
-
-		var event=e_array[i].split(";");
+		var event=e_array[i];
 		fetchedEvents.push({
-			'id' : event[0],
-			'agent_name' : event[1],
-			'agent' : event[2],
-			'date' : event[5],
-			'title' : event[6],
-			'module' : event[9],
-			'type' : event[14],
-			'source' : event[17],
-			'severity' : event[28],
+			'id' : event.id_evento,
+			'agent_name' : event.agent_name,
+			'agent' : event.id_agent,
+			'date' : event.timestamp,
+			'title' : event.evento,
+			'module' : event.id_agentmodule,
+			'type' : event.event_type,
+			'source' : event.source,
+			'severity' : event.criticity_name,
 			'visited' : false
 		});
 	}
diff --git a/extras/chrome_extension/js/notification.js b/extras/chrome_extension/js/notification.js
index 0cf483cae1..6a66f0ef19 100644
--- a/extras/chrome_extension/js/notification.js
+++ b/extras/chrome_extension/js/notification.js
@@ -1,17 +1,14 @@
-console.log("hola");
+
 var url = window.location.href;
 var re = /\?event=(\d+)/;
-console.log("hola");
 if(re.exec(url)) {
 	if(!isNaN(RegExp.$1)) {
 		var eventId = RegExp.$1;
 		document.write(chrome.extension.getBackgroundPage().getNotification(eventId));
 	}
 }
-console.log("hola");
 window.onload = function () {
 	setTimeout(function() {
 		window.close();
 	}, 10000);	
 }
-console.log("hola");
diff --git a/extras/chrome_extension/manifest.json b/extras/chrome_extension/manifest.json
index 85e62c1f13..f71b2e7cd6 100644
--- a/extras/chrome_extension/manifest.json
+++ b/extras/chrome_extension/manifest.json
@@ -23,6 +23,7 @@
         "tabs",
         "notifications",
         "http://*/*",
+        "https://*/*",
         "background"
     ],
     "default_locale": "en"

From 3fb243017c887b8e8f8a6da6d2b0686d7fc5af33 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Wed, 24 Oct 2018 11:43:01 +0200
Subject: [PATCH 2/2] [Chrome extension] Updated to version 2.1

---
 extras/chrome_extension/manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/chrome_extension/manifest.json b/extras/chrome_extension/manifest.json
index f71b2e7cd6..b591121309 100644
--- a/extras/chrome_extension/manifest.json
+++ b/extras/chrome_extension/manifest.json
@@ -1,6 +1,6 @@
 {
     "name": "__MSG_name__",
-    "version": "2.0",
+    "version": "2.1",
     "manifest_version": 2,
     "description": "Pandora FMS Event viewer Chrome extension",
     "homepage_url": "http://pandorafms.com",