1.8.0 - update for 16.04

Security-Onion-Solutions · May 25, 2018 · 763c983 · 763c983
1 parent 406f1e9
commit 763c983
Show file tree

Hide file tree

Showing 23 changed files with 11,023 additions and 3,543 deletions.
diff --git a/.inc/callback.php b/.inc/callback.php
@@ -442,6 +442,10 @@ function level2() {
   $query->execute($merged_params);
   // fetch the data and encode to json
   $rows = $query->fetchAll(PDO::FETCH_ASSOC);
+  // the frontend expects all values to be strings
+  for ($i=0;$i<count($rows);$i++) {
+    $rows[$i] = array_map('strval', $rows[$i]);
+  }
   $theJSON = json_encode($rows);
   echo $theJSON;
 

diff --git a/.inc/functions.php b/.inc/functions.php
@@ -56,13 +56,13 @@ function retSD($x) {
 function dbC() {
     if (file_exists('.inc/config.php')) {
         global $dbHost,$dbName,$dbUser,$dbPass;
-        $link = mysql_connect($dbHost,$dbUser,$dbPass);
+        $link = mysqli_connect($dbHost,$dbUser,$dbPass);
 
         if (!$link) {
             die('Connection failed: ' . mysql_error());
         }
 
-        $db = mysql_select_db($dbName,$link);
+        $db = mysqli_select_db($link,$dbName);
 
         if (!$db) {
             die('Database selection failed: ' . mysql_error());

diff --git a/.inc/ip2c.php b/.inc/ip2c.php
@@ -19,41 +19,38 @@
 //
 //
 
-function IP2C($string,$isCLI) {
+include_once "config.php";
+include_once "functions.php";
 
-    include_once "config.php";
-    include_once "functions.php";
+$db = mysqli_connect($dbHost,$dbUser,$dbPass) or die(mysqli_error($db));
+mysqli_select_db($db,$dbName) or die(mysqli_error($db));
 
-    if ($isCLI == 'NO') {
-        // Running from a browser
-        $when = 'WHERE ' . hextostr($string) . ' AND ';
-    } else {
-        // Running from the command line
-        if ($string == 0) {
-            $when = "WHERE ";
-        }
-
-        if ($string == 1) {
-            $startDate = gmdate("Y-m-d");
-            $startTime = "00:00:00";
-            $endDate = gmdate("Y-m-d",strtotime($startDate . "+1 day"));
-            $endTime = "00:00:00";
-            $when = "WHERE e.timestamp BETWEEN '$startDate $startTime' AND '$endDate $endTime' AND";
-        }
+function IP2C($string) {
 
-        echo "Performing base queries (this can take a while)..\n\n";
+    if ($string == 0) {
+        $when = "WHERE ";
+    }
 
+    if ($string == 1) {
+        $startDate = gmdate("Y-m-d");
+        $startTime = "00:00:00";
+        $endDate = gmdate("Y-m-d",strtotime($startDate . "+1 day"));
+        $endTime = "00:00:00";
+        $when = "WHERE e.timestamp BETWEEN '$startDate $startTime' AND '$endDate $endTime' AND";
     }
 
+    echo "Performing base queries (this can take a while)..\n\n";
+
     function lookup($list) {
 
-        while ($row = mysql_fetch_row($list)) {
+	global $db;
+        while ($row = mysqli_fetch_row($list)) {
             $ip  = $row[0];
             $dot = long2ip((float)$ip);
-            $ipLookup = mysql_query("SELECT registry, cc, c_long, type, date, status FROM ip2c WHERE
+            $ipLookup = mysqli_query($db,"SELECT registry, cc, c_long, type, date, status FROM ip2c WHERE
                                      $ip >=start_ip AND $ip <= end_ip LIMIT 1");
 
-            $result = mysql_fetch_array($ipLookup);
+            $result = mysqli_fetch_array($ipLookup);
 
             if ($result) {
                 $registry       = $result[0];
@@ -63,60 +60,47 @@ function lookup($list) {
                 $date           = $result[4];
                 $status         = $result[5];
 
-                mysql_query("REPLACE INTO mappings (registry,cc,c_long,type,ip,date,status)
+                mysqli_query($db,"REPLACE INTO mappings (registry,cc,c_long,type,ip,date,status)
                              VALUES (\"$registry\",\"$cc\",\"$c_long\",\"$type\",\"$ip\",\"$date\",\"$status\")");
                 echo "-- Mapped $dot ($ip) to $cc ($c_long)\n";
             }
 
         }
     }
 
-    // DB Connect
-    $db = mysql_connect($dbHost,$dbUser,$dbPass) or die(mysql_error());
-    mysql_select_db($dbName,$db) or die(mysql_error());
-
     // Start timing
     $st = microtime(true);
-    $sipList = mysql_query("SELECT DISTINCT(e.src_ip) FROM event AS e LEFT JOIN mappings AS m ON e.src_ip=m.ip
+
+    // DB Connect
+    global $db;
+    $sipList = mysqli_query($db,"SELECT DISTINCT(e.src_ip) FROM event AS e LEFT JOIN mappings AS m ON e.src_ip=m.ip
                             WHERE (m.ip IS NULL OR m.cc = '01')");
-    $dipList = mysql_query("SELECT DISTINCT(e.dst_ip) FROM event AS e LEFT JOIN mappings AS m ON e.dst_ip=m.ip
+    $dipList = mysqli_query($db,"SELECT DISTINCT(e.dst_ip) FROM event AS e LEFT JOIN mappings AS m ON e.dst_ip=m.ip
                             WHERE (m.ip IS NULL OR m.cc = '01')");
     $sipCount = $dipCount = 0;
     if ($sipList) {
-        $sipCount = mysql_num_rows($sipList);
+        $sipCount = mysqli_num_rows($sipList);
         if ($sipCount > 0) {
             lookup($sipList);
         }
     }
 
     if ($dipList) {
-        $dipCount = mysql_num_rows($dipList);
+        $dipCount = mysqli_num_rows($dipList);
         if ($dipCount > 0) {
             lookup($dipList);
         }
     }
 
-    $allRecs = mysql_query("SELECT COUNT(*) FROM mappings");
-    $allCount = mysql_fetch_row($allRecs);
+    $allRecs = mysqli_query($db,"SELECT COUNT(*) FROM mappings");
+    $allCount = mysqli_fetch_row($allRecs);
 
     // Stop Timing
     $et = microtime(true);
     $time = $et - $st;
     $rt = sprintf("%01.3f",$time);
 
-    if ($isCLI == 'NO') {
-
-        $html = "\r<table align=left>
-                 \r<tr><td align=left style=\"font-size: 10px;\"><b>&nbsp;-> Query Time: $rt seconds</b></td></tr>
-                 \r<tr><td align=left style=\"font-size: 10px;\"><b>&nbsp;-> Source Count: $sipCount</b></td></tr>
-                 \r<tr><td align=left style=\"font-size: 10px;\"><b>&nbsp;-> Destination Count: $dipCount</b></td>
-                 \r<tr><td align=left style=\"font-size: 10px;\"><b>&nbsp;-> Total Mapped: $allCount[0]</b></td></tr>
-                 \r</table>";
-
-        return $html;
-    }
-
-    if ($isCLI == 'YES' && $string == 0) {
+    if ($string == 0) {
         echo "\n-> Query Time: $rt seconds
               \r-> Source Count: $sipCount
               \r-> Destination Count: $dipCount
@@ -125,30 +109,6 @@ function lookup($list) {
 
 }
 
-/*
-
-Commenting out the following function per
-https://github.com/int13h/squert/issues/76
-
-function TheHTML($string) {
-
-    echo "\r<html>
-          \r<head>
-          \r<script type=\"text/javascript\" src=\"../.js/squert.js\"></script>
-          \r<style type=\"text/css\" media=\"screen\">@import \"../.css/squert.css\";</style>
-          \r</head>
-          \r<body style=\"background: #ffffff;\">
-          \r<form id=ip2c method=post action=ip2c.php>
-          \r<center>          
-          \r<input class=rb onclick=\"poof('wrkn','yes');\" id=csync name=csync type=\"submit\" value=\"update\">
-          \r<br><br><span id=\"wrkn\" name=\"wrkn\" style=\"display: none;\"><img src=work.gif></span>
-          \r<input type=hidden id=qText name=qText value=\"$string\">
-          \r</center>
-          \r</body>
-          \r</html>";
-}
-*/
-
 if (isset($argc)) {
 
     if ($argc == 1 || $argc > 2 || $argv[1] > 1 || !is_numeric($argv[1])) {
@@ -159,21 +119,8 @@ function TheHTML($string) {
           \r1 - Update. This is intended to be called via Cron\n\n";
     exit;
     } else {
-        IP2C($argv[1],'YES');
-    }
-
-} else { 
-
-    $html = '';
-
-    if(!isset($_REQUEST['qText'])) { $string = $_REQUEST['qp']; } else { $string = $_REQUEST['qText']; }
-
-    if (@$_REQUEST['csync']) {
-        $string = $_REQUEST['qText'];
-        $html = IP2C($string,'NO');
+        IP2C($argv[1]);
     }
 
-    TheHTML($string);
-    echo $html;
 }
 ?>
diff --git a/auth/sso/squert/.js/squertMain.js → .js/squertMain.js b/auth/sso/squert/.js/squertMain.js → .js/squertMain.js
diff --git a/.scripts/securityonion-squert.cnf b/.scripts/securityonion-squert.cnf
@@ -1,5 +1,6 @@
 [mysqld]
 group_concat_max_len = 100000
+sql_mode=NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
 
 [mysqltcl]
 local-infile=1