From 5ad5939bd50a791627071f37afe50d9eb3f28a84 Mon Sep 17 00:00:00 2001
From: Terrtia <or1994@hotmail.fr>
Date: Wed, 25 Jul 2018 16:48:44 +0200
Subject: [PATCH 1/3] chg: display last logs

---
 bin/Credential.py                             |  2 -
 var/www/modules/dashboard/Flask_dashboard.py  | 72 ++++++++++++++++++-
 .../modules/dashboard/templates/index.html    | 60 ++++++++++++++++
 var/www/static/js/indexjavascript.js          | 21 +++---
 4 files changed, 143 insertions(+), 12 deletions(-)

diff --git a/bin/Credential.py b/bin/Credential.py
index 5112f534..d1016586 100755
--- a/bin/Credential.py
+++ b/bin/Credential.py
@@ -79,8 +79,6 @@ if __name__ == "__main__":
         content = paste.get_p_content()
         creds = set(re.findall(regex_cred, content))
 
-        publisher.warning('to_print')
-
         if len(creds) == 0:
             continue
 
diff --git a/var/www/modules/dashboard/Flask_dashboard.py b/var/www/modules/dashboard/Flask_dashboard.py
index 563eb007..7773f1d5 100644
--- a/var/www/modules/dashboard/Flask_dashboard.py
+++ b/var/www/modules/dashboard/Flask_dashboard.py
@@ -5,9 +5,12 @@
     Flask functions and routes for the dashboard page
 '''
 import json
-
+import os
 import datetime
 import flask
+
+from Date import Date
+
 from flask import Flask, render_template, jsonify, request, Blueprint
 
 # ============ VARIABLES ============
@@ -35,6 +38,8 @@ def event_stream():
         msg = {'channel': channel, 'type': type, 'pattern': pattern, 'data': data}
 
         level = (msg['channel']).split('.')[1]
+        #if msg['type'] == 'pmessage' and (level == "WARNING" or level == "CRITICAL"):
+            #print(msg)
         if msg['type'] == 'pmessage' and level != "DEBUG":
             yield 'data: %s\n\n' % json.dumps(msg)
 
@@ -62,12 +67,77 @@ def get_queues(r):
 
     return newData
 
+def get_date_range(date_from, num_day):
+    date = Date(str(date_from[0:4])+str(date_from[4:6]).zfill(2)+str(date_from[6:8]).zfill(2))
+    date_list = []
+
+    for i in range(0, num_day+1):
+        new_date = date.substract_day(i)
+        date_list.append(new_date[0:4] +'-'+ new_date[4:6] +'-'+ new_date[6:8])
+
+    return date_list
+
+def dashboard_alert(log):
+    # check if we need to display this log
+    if len(log)>50:
+        date = log[1:5]+log[6:8]+log[9:11]
+        time = log[12:20]
+        log = log[46:].split(';')
+        if len(log) == 6:
+            res = {'date': date, 'time': time, 'script': log[0], 'domain': log[1], 'date_paste': log[2], 'paste': log[3], 'message': log[4]}
+            return res
+        else:
+            return False
+    else:
+        return False
+
+
 # ============ ROUTES ============
 
 @dashboard.route("/_logs")
 def logs():
     return flask.Response(event_stream(), mimetype="text/event-stream")
 
+@dashboard.route("/_get_last_logs_json")
+def get_last_logs_json():
+    date = datetime.datetime.now().strftime("%Y%m%d")
+
+    max_day_search = 6
+    day_search = 0
+    warning_found = 0
+    warning_to_found = 10
+
+    last_logs = []
+
+    date_range = get_date_range(date, max_day_search)
+    while max_day_search != day_search | warning_found != warning_to_found:
+
+        filename_warning_log = 'logs/Script_warn-'+ date_range[day_search] +'.log'
+        filename_log = os.path.join(os.environ['AIL_HOME'], filename_warning_log)
+
+        try:
+            with open(filename_log, 'r') as f:
+                lines = f.read().splitlines()
+                curr_index = -1
+                while warning_found != warning_to_found:
+                    try:
+                        # get lasts warning logs
+                        log_warn = dashboard_alert(lines[curr_index])
+                        if log_warn != False:
+                            last_logs.append(log_warn)
+                            warning_found = warning_found + 1
+                        curr_index = curr_index - 1
+
+                    except IndexError:
+                        # check previous warning log file
+                        day_search = day_search + 1
+                        break
+        except FileNotFoundError:
+            # check previous warning log file
+            day_search = day_search + 1
+
+    return jsonify(last_logs)
+
 
 @dashboard.route("/_stuff", methods=['GET'])
 def stuff():
diff --git a/var/www/modules/dashboard/templates/index.html b/var/www/modules/dashboard/templates/index.html
index e5d61014..2254ce52 100644
--- a/var/www/modules/dashboard/templates/index.html
+++ b/var/www/modules/dashboard/templates/index.html
@@ -31,6 +31,14 @@
       };
       update_values();
   </script>
+  <style>
+			.tableQueue tbody tr td,
+      .tableQueue tbody tr th,
+      .tableQueue thead tr td,
+      .tableQueue thead tr th{
+				padding: 1px;
+			}
+	</style>
 
 </head>
 <body>
@@ -182,6 +190,58 @@
     <script>
         activePage = "page-index";
         $("#"+activePage).addClass("active");
+
+        var tableBody = document.getElementById('tab_body')
+        $.getJSON('/_get_last_logs_json', function(data) {
+          console.log(data);
+          data.forEach(function (d) {
+            var tr = document.createElement('TR')
+            var time = document.createElement('TD')
+            var chan = document.createElement('TD')
+            var level = document.createElement('TD')
+            var scrpt = document.createElement('TD')
+            var src = document.createElement('TD')
+            var pdate = document.createElement('TD')
+            var nam = document.createElement('TD')
+            var msage = document.createElement('TD')
+            var inspect = document.createElement('TD')
+
+            time.appendChild(document.createTextNode(d.time))
+            chan.appendChild(document.createTextNode('Script'))
+            level.appendChild(document.createTextNode('WARNING'))
+            scrpt.appendChild(document.createTextNode(d.script))
+            src.appendChild(document.createTextNode(d.domain))
+            pdate.appendChild(document.createTextNode(d.date_paste))
+            nam.appendChild(document.createTextNode(d.paste))
+
+            var iconspan = document.createElement('SPAN');
+            var message = d.message.split(" ")
+            if (message[0] == "Detected"){
+                iconspan.className = "glyphicon glyphicon-eye-open";
+            }
+            else if (message[0] == "Checked"){
+                iconspan.className = "glyphicon glyphicon-thumbs-up";
+            }
+            iconspan.innerHTML = "&nbsp;";
+            msage.appendChild(iconspan);
+            msage.appendChild(document.createTextNode(message.join(" ")));
+
+            inspect.appendChild(document.createTextNode(' '))
+
+            tr.appendChild(time)
+            tr.appendChild(chan);
+            tr.appendChild(level);
+            tr.appendChild(scrpt);
+            tr.appendChild(src);
+            tr.appendChild(pdate);
+            tr.appendChild(nam);
+            tr.appendChild(msage);
+            tr.appendChild(inspect);
+
+            tableBody.appendChild(tr);
+
+		      });
+        });
     </script>
 
     <script type="text/javascript">
diff --git a/var/www/static/js/indexjavascript.js b/var/www/static/js/indexjavascript.js
index 5f058f6f..3765111b 100644
--- a/var/www/static/js/indexjavascript.js
+++ b/var/www/static/js/indexjavascript.js
@@ -115,7 +115,7 @@ function update_processed_pastes(graph, dataset, graph_type) {
 }
 
 
-// END PROCESSED PASTES    
+// END PROCESSED PASTES
 
 function initfunc( csvay, scroot) {
   window.csv = csvay;
@@ -134,6 +134,7 @@ function pad_2(number) {
 }
 
 function create_log_table(obj_json) {
+  console.log(obj_json);
     tableBody = document.getElementById("tab_body")
     var tr = document.createElement('TR')
     var time = document.createElement('TD')
@@ -149,11 +150,11 @@ function create_log_table(obj_json) {
     var chansplit = obj_json.channel.split('.');
     var parsedmess = obj_json.data.split(';');
 
-  
+
     if (parsedmess[0] == "Mixer"){
         var feeder = parsedmess[4].split(" ")[1];
         var paste_processed = parsedmess[4].split(" ")[3];
-        var msg_type = parsedmess[4].split(" ")[2]; 
+        var msg_type = parsedmess[4].split(" ")[2];
 
         if (feeder == "All_feeders"){
             if(list_feeder.indexOf("global") == -1) {
@@ -246,7 +247,7 @@ function create_log_table(obj_json) {
     var action_icon_span = document.createElement('SPAN');
     action_icon_span.className = "fa fa-search-plus";
     action_icon_a.appendChild(action_icon_span);
- 
+
     inspect.appendChild(action_icon_a);
 
     tr.appendChild(time)
@@ -281,7 +282,7 @@ function create_queue_table() {
     document.getElementById("queueing").innerHTML = "";
     var Tablediv = document.getElementById("queueing")
     var table = document.createElement('TABLE')
-    table.className = "table table-bordered table-hover table-striped";
+    table.className = "table table-bordered table-hover table-striped tableQueue";
     var tableHead = document.createElement('THEAD')
     var tableBody = document.createElement('TBODY')
 
@@ -295,7 +296,11 @@ function create_queue_table() {
 
     for (i = 0; i < heading.length; i++) {
         var th = document.createElement('TH')
-        th.width = '100';
+        if (heading[i] == "Amount") {
+          th.width = '50';
+        } else {
+          th.width = '100';
+        }
         th.appendChild(document.createTextNode(heading[i]));
         tr.appendChild(th);
     }
@@ -441,7 +446,7 @@ function load_queues() {
                                 queues_pushed.push(glob_tabvar.row1[i][0].split(".")[0]);
                                 tmp_values.push(parseInt(glob_tabvar.row1[i][1]));
                             }
-                            
+
                         }
                     }
                     tmp_values.unshift(x);
@@ -494,5 +499,3 @@ function manage_undefined() {
 $(document).ready(function () {
     manage_undefined();
 });
-
-

From 0a82482db4512e64596e0f13fd51252e8301ea77 Mon Sep 17 00:00:00 2001
From: Terrtia <or1994@hotmail.fr>
Date: Thu, 26 Jul 2018 10:34:43 +0200
Subject: [PATCH 2/3] chg: [UI-dashboard] convert time to local

---
 var/www/modules/dashboard/Flask_dashboard.py  | 23 +++++++++++++------
 .../modules/dashboard/templates/index.html    | 11 ++++++++-
 var/www/static/js/indexjavascript.js          |  1 +
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/var/www/modules/dashboard/Flask_dashboard.py b/var/www/modules/dashboard/Flask_dashboard.py
index 7773f1d5..96806f98 100644
--- a/var/www/modules/dashboard/Flask_dashboard.py
+++ b/var/www/modules/dashboard/Flask_dashboard.py
@@ -7,11 +7,12 @@
 import json
 import os
 import datetime
+import time
 import flask
 
 from Date import Date
 
-from flask import Flask, render_template, jsonify, request, Blueprint
+from flask import Flask, render_template, jsonify, request, Blueprint, url_for
 
 # ============ VARIABLES ============
 import Flask_config
@@ -38,8 +39,6 @@ def event_stream():
         msg = {'channel': channel, 'type': type, 'pattern': pattern, 'data': data}
 
         level = (msg['channel']).split('.')[1]
-        #if msg['type'] == 'pmessage' and (level == "WARNING" or level == "CRITICAL"):
-            #print(msg)
         if msg['type'] == 'pmessage' and level != "DEBUG":
             yield 'data: %s\n\n' % json.dumps(msg)
 
@@ -81,16 +80,26 @@ def dashboard_alert(log):
     # check if we need to display this log
     if len(log)>50:
         date = log[1:5]+log[6:8]+log[9:11]
-        time = log[12:20]
+        utc_str = log[1:20]
         log = log[46:].split(';')
         if len(log) == 6:
-            res = {'date': date, 'time': time, 'script': log[0], 'domain': log[1], 'date_paste': log[2], 'paste': log[3], 'message': log[4]}
+            time = datetime_from_utc_to_local(utc_str)
+            path = url_for('showsavedpastes.showsavedpaste',paste=log[5])
+
+            res = {'date': date, 'time': time, 'script': log[0], 'domain': log[1], 'date_paste': log[2],
+                  'paste': log[3], 'message': log[4], 'path': path}
             return res
         else:
             return False
     else:
         return False
 
+def datetime_from_utc_to_local(utc_str):
+    utc_datetime = datetime.datetime.strptime(utc_str, '%Y-%m-%d %H:%M:%S')
+    now_timestamp = time.time()
+    offset = datetime.datetime.fromtimestamp(now_timestamp) - datetime.datetime.utcfromtimestamp(now_timestamp)
+    local_time_str = (utc_datetime + offset).strftime('%H:%M:%S')
+    return local_time_str
 
 # ============ ROUTES ============
 
@@ -110,7 +119,7 @@ def get_last_logs_json():
     last_logs = []
 
     date_range = get_date_range(date, max_day_search)
-    while max_day_search != day_search | warning_found != warning_to_found:
+    while max_day_search != day_search and warning_found != warning_to_found:
 
         filename_warning_log = 'logs/Script_warn-'+ date_range[day_search] +'.log'
         filename_log = os.path.join(os.environ['AIL_HOME'], filename_warning_log)
@@ -136,7 +145,7 @@ def get_last_logs_json():
             # check previous warning log file
             day_search = day_search + 1
 
-    return jsonify(last_logs)
+    return jsonify(list(reversed(last_logs)))
 
 
 @dashboard.route("/_stuff", methods=['GET'])
diff --git a/var/www/modules/dashboard/templates/index.html b/var/www/modules/dashboard/templates/index.html
index 2254ce52..4c1c8b00 100644
--- a/var/www/modules/dashboard/templates/index.html
+++ b/var/www/modules/dashboard/templates/index.html
@@ -206,6 +206,7 @@
             var msage = document.createElement('TD')
             var inspect = document.createElement('TD')
 
+            tr.className = "warning";
             time.appendChild(document.createTextNode(d.time))
             chan.appendChild(document.createTextNode('Script'))
             level.appendChild(document.createTextNode('WARNING'))
@@ -226,7 +227,15 @@
             msage.appendChild(iconspan);
             msage.appendChild(document.createTextNode(message.join(" ")));
 
-            inspect.appendChild(document.createTextNode(' '))
+            var action_icon_a = document.createElement("A");
+            action_icon_a.setAttribute("TARGET", "_blank");
+            action_icon_a.setAttribute("HREF", d.path);
+            var action_icon_span = document.createElement('SPAN');
+            action_icon_span.className = "fa fa-search-plus";
+            action_icon_a.appendChild(action_icon_span);
+            inspect.appendChild(action_icon_a)
+            inspect.setAttribute("style", "text-align:center;");
+
 
             tr.appendChild(time)
             tr.appendChild(chan);
diff --git a/var/www/static/js/indexjavascript.js b/var/www/static/js/indexjavascript.js
index 3765111b..aeba7c8d 100644
--- a/var/www/static/js/indexjavascript.js
+++ b/var/www/static/js/indexjavascript.js
@@ -249,6 +249,7 @@ function create_log_table(obj_json) {
     action_icon_a.appendChild(action_icon_span);
 
     inspect.appendChild(action_icon_a);
+    inspect.setAttribute("style", "text-align:center;");
 
     tr.appendChild(time)
     tr.appendChild(chan);

From b02cbee179a123ec4289a4743f9d356f7b05ce75 Mon Sep 17 00:00:00 2001
From: Terrtia <or1994@hotmail.fr>
Date: Thu, 26 Jul 2018 11:35:54 +0200
Subject: [PATCH 3/3] chg: [UI-dashboard] add logs number configuration

---
 var/www/modules/Flask_config.py                |  2 ++
 var/www/modules/dashboard/Flask_dashboard.py   | 11 +++++++++--
 var/www/modules/dashboard/templates/index.html | 12 +++++++-----
 var/www/static/js/indexjavascript.js           |  1 -
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/var/www/modules/Flask_config.py b/var/www/modules/Flask_config.py
index 80ef9f18..2c3e736a 100644
--- a/var/www/modules/Flask_config.py
+++ b/var/www/modules/Flask_config.py
@@ -143,3 +143,5 @@ DiffMaxLineLength =  int(cfg.get("Flask", "DiffMaxLineLength"))#Use to display t
 bootstrap_label = ['primary', 'success', 'danger', 'warning', 'info']
 
 UPLOAD_FOLDER = os.path.join(os.environ['AIL_FLASK'], 'submitted')
+
+max_dashboard_logs = int(cfg.get("Flask", "max_dashboard_logs"))
diff --git a/var/www/modules/dashboard/Flask_dashboard.py b/var/www/modules/dashboard/Flask_dashboard.py
index 96806f98..6d7992d7 100644
--- a/var/www/modules/dashboard/Flask_dashboard.py
+++ b/var/www/modules/dashboard/Flask_dashboard.py
@@ -22,6 +22,8 @@ cfg = Flask_config.cfg
 r_serv = Flask_config.r_serv
 r_serv_log = Flask_config.r_serv_log
 
+max_dashboard_logs = Flask_config.max_dashboard_logs
+
 dashboard = Blueprint('dashboard', __name__, template_folder='templates')
 
 # ============ FUNCTIONS ============
@@ -114,7 +116,7 @@ def get_last_logs_json():
     max_day_search = 6
     day_search = 0
     warning_found = 0
-    warning_to_found = 10
+    warning_to_found = max_dashboard_logs
 
     last_logs = []
 
@@ -157,7 +159,12 @@ def stuff():
 def index():
     default_minute = cfg.get("Flask", "minute_processed_paste")
     threshold_stucked_module = cfg.getint("Module_ModuleInformation", "threshold_stucked_module")
-    return render_template("index.html", default_minute = default_minute, threshold_stucked_module=threshold_stucked_module)
+    log_select = {10, 25, 50, 100}
+    log_select.add(max_dashboard_logs)
+    log_select = list(log_select)
+    log_select.sort()
+    return render_template("index.html", default_minute = default_minute, threshold_stucked_module=threshold_stucked_module,
+                            log_select=log_select, selected=max_dashboard_logs)
 
 # ========= REGISTRATION =========
 app.register_blueprint(dashboard)
diff --git a/var/www/modules/dashboard/templates/index.html b/var/www/modules/dashboard/templates/index.html
index 4c1c8b00..33ba2781 100644
--- a/var/www/modules/dashboard/templates/index.html
+++ b/var/www/modules/dashboard/templates/index.html
@@ -144,10 +144,13 @@
             <div class="pull-right">
                 <label style="padding-bottom:2px;">
 		<select class="form-control input-sm" id="log_select">
-		<option value="10">10</option>
-		<option value="25">25</option>
-		<option value="50">50</option>
-		<option value="100">100</option>
+      {% for log_selection in log_select %}
+        {% if log_selection == selected %}
+          <option value="{{ log_selection }}" selected>{{ log_selection }}</option>
+        {% else %}
+    		  <option value="{{ log_selection }}">{{ log_selection }}</option>
+        {% endif %}
+      {% endfor %}
 		</select>
                 </label>
 		<input id="checkbox_log_info" type="checkbox" value="info"> INFO
@@ -193,7 +196,6 @@
 
         var tableBody = document.getElementById('tab_body')
         $.getJSON('/_get_last_logs_json', function(data) {
-          console.log(data);
           data.forEach(function (d) {
             var tr = document.createElement('TR')
             var time = document.createElement('TD')
diff --git a/var/www/static/js/indexjavascript.js b/var/www/static/js/indexjavascript.js
index aeba7c8d..c3dd3176 100644
--- a/var/www/static/js/indexjavascript.js
+++ b/var/www/static/js/indexjavascript.js
@@ -134,7 +134,6 @@ function pad_2(number) {
 }
 
 function create_log_table(obj_json) {
-  console.log(obj_json);
     tableBody = document.getElementById("tab_body")
     var tr = document.createElement('TR')
     var time = document.createElement('TD')