Merge pull request #13 from Security-Onion-Solutions/dev

Merge 2.3.30 from dev to master
Security-Onion-Solutions · Mar 1, 2021 · 67d3ec0 · 67d3ec0
2 parents d8007af + 328fae7
commit 67d3ec0
Show file tree

Hide file tree

Showing 104 changed files with 285 additions and 47 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,5 @@
 # Copyright 2019 Jason Ertel (jertel). All rights reserved.
+# Copyright 2020-2021 Security Onion Solutions, LLC. All rights reserved.
 #
 # This program is distributed under the terms of version 2 of the
 # GNU General Public License.  See LICENSE for further details.

diff --git a/Dockerfile.kratos b/Dockerfile.kratos
@@ -1,3 +1,13 @@
+# Copyright 2019 Jason Ertel (jertel). All rights reserved.
+# Copyright 2020-2021 Security Onion Solutions, LLC. All rights reserved.
+#
+# This program is distributed under the terms of version 2 of the
+# GNU General Public License.  See LICENSE for further details.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
 FROM ghcr.io/security-onion-solutions/golang:alpine AS builder
 
 RUN addgroup -S ory; \
@@ -32,6 +42,8 @@ RUN addgroup --gid "$GID" -S kratos; \
     adduser -u "$UID" -S kratos -G kratos -D -H -s /bin/nologin
 RUN apk add -U --no-cache ca-certificates
 
+RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
+
 RUN echo "#!/bin/sh" > /start-kratos.sh
 RUN echo "kratos -c /kratos-conf/kratos.yaml migrate sql -e --yes >> /kratos-log/kratos-migrate.log 2>&1" >> /start-kratos.sh
 RUN echo "chown kratos:kratos /kratos-data/db.sqlite" >> /start-kratos.sh

diff --git a/agent/agent.go b/agent/agent.go
@@ -1,4 +1,5 @@
 // Copyright 2019 Jason Ertel (jertel). All rights reserved.
+// Copyright 2020-2021 Security Onion Solutions, LLC. All rights reserved.
 //
 // This program is distributed under the terms of version 2 of the
 // GNU General Public License.  See LICENSE for further details.

diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -1,4 +1,5 @@
 // Copyright 2019 Jason Ertel (jertel). All rights reserved.
+// Copyright 2020-2021 Security Onion Solutions, LLC. All rights reserved.
 //
 // This program is distributed under the terms of version 2 of the
 // GNU General Public License.  See LICENSE for further details.

diff --git a/agent/jobmanager.go b/agent/jobmanager.go
@@ -1,4 +1,5 @@
 // Copyright 2019 Jason Ertel (jertel). All rights reserved.
+// Copyright 2020-2021 Security Onion Solutions, LLC. All rights reserved.
 //
 // This program is distributed under the terms of version 2 of the
 // GNU General Public License.  See LICENSE for further details.

diff --git a/agent/jobprocessor.go b/agent/jobprocessor.go
@@ -1,4 +1,5 @@
 // Copyright 2019 Jason Ertel (jertel). All rights reserved.
+// Copyright 2020-2021 Security Onion Solutions, LLC. All rights reserved.
 //
 // This program is distributed under the terms of version 2 of the
 // GNU General Public License.  See LICENSE for further details.

diff --git a/cmd/sensoroni.go b/cmd/sensoroni.go
@@ -1,4 +1,5 @@
 // Copyright 2019 Jason Ertel (jertel). All rights reserved.
+// Copyright 2020-2021 Security Onion Solutions, LLC. All rights reserved.
 //
 // This program is distributed under the terms of version 2 of the
 // GNU General Public License.  See LICENSE for further details.

diff --git a/cmd/sensoroni_test.go b/cmd/sensoroni_test.go
@@ -1,4 +1,5 @@
 // Copyright 2019 Jason Ertel (jertel). All rights reserved.
+// Copyright 2020-2021 Security Onion Solutions, LLC. All rights reserved.
 //
 // This program is distributed under the terms of version 2 of the
 // GNU General Public License.  See LICENSE for further details.

diff --git a/config/agentconfig.go b/config/agentconfig.go
@@ -1,4 +1,5 @@
 // Copyright 2019 Jason Ertel (jertel). All rights reserved.
+// Copyright 2020-2021 Security Onion Solutions, LLC. All rights reserved.
 //
 // This program is distributed under the terms of version 2 of the
 // GNU General Public License.  See LICENSE for further details.

diff --git a/config/agentconfig_test.go b/config/agentconfig_test.go
@@ -1,4 +1,5 @@
 // Copyright 2019 Jason Ertel (jertel). All rights reserved.
+// Copyright 2020-2021 Security Onion Solutions, LLC. All rights reserved.
 //
 // This program is distributed under the terms of version 2 of the
 // GNU General Public License.  See LICENSE for further details.

diff --git a/config/clientparameters.go b/config/clientparameters.go
@@ -1,4 +1,5 @@
 // Copyright 2019 Jason Ertel (jertel). All rights reserved.
+// Copyright 2020-2021 Security Onion Solutions, LLC. All rights reserved.
 //
 // This program is distributed under the terms of version 2 of the
 // GNU General Public License.  See LICENSE for further details.

diff --git a/config/clientparameters_test.go b/config/clientparameters_test.go
@@ -1,4 +1,5 @@
 // Copyright 2019 Jason Ertel (jertel). All rights reserved.
+// Copyright 2020-2021 Security Onion Solutions, LLC. All rights reserved.
 //
 // This program is distributed under the terms of version 2 of the
 // GNU General Public License.  See LICENSE for further details.

diff --git a/config/config.go b/config/config.go
@@ -1,4 +1,5 @@
 // Copyright 2019 Jason Ertel (jertel). All rights reserved.
+// Copyright 2020-2021 Security Onion Solutions, LLC. All rights reserved.
 //
 // This program is distributed under the terms of version 2 of the
 // GNU General Public License.  See LICENSE for further details.

diff --git a/config/serverconfig.go b/config/serverconfig.go
@@ -1,4 +1,5 @@
 // Copyright 2019 Jason Ertel (jertel). All rights reserved.
+// Copyright 2020-2021 Security Onion Solutions, LLC. All rights reserved.
 //
 // This program is distributed under the terms of version 2 of the
 // GNU General Public License.  See LICENSE for further details.

diff --git a/config/serverconfig_test.go b/config/serverconfig_test.go
@@ -1,4 +1,5 @@
 // Copyright 2019 Jason Ertel (jertel). All rights reserved.
+// Copyright 2020-2021 Security Onion Solutions, LLC. All rights reserved.
 //
 // This program is distributed under the terms of version 2 of the
 // GNU General Public License.  See LICENSE for further details.

diff --git a/html/css/app.css b/html/css/app.css
@@ -1,5 +1,6 @@
 /*
   Copyright 2019 Jason Ertel (jertel). All rights reserved.
+  Copyright 2020-2021 Security Onion Solutions, LLC. All rights reserved.
 
   This program is distributed under the terms of version 2 of the
   GNU General Public License.  See LICENSE for further details.

diff --git a/html/index.html b/html/index.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <!--
   Copyright 2019 Jason Ertel (jertel). All rights reserved.
-  Copyright 2020 Security Onion Solutions, LLC. All rights reserved.
+  Copyright 2020-2021 Security Onion Solutions, LLC. All rights reserved.
 
   This program is distributed under the terms of version 2 of the
   GNU General Public License.  See LICENSE for further details.
@@ -1150,7 +1150,7 @@ <h3 class="mb-4"  v-text="i18n.updateProfile"></h3>
     <script src="js/external/vue-2.6.11.min.js"></script>
     <script src="js/external/vue-router-3.4.9.min.js"></script>
     <script src="js/external/vuetify-v2.3.19.min.js"></script>
-    <script src="js/external/axios-0.21.0.min.js"></script>
+    <script src="js/external/axios-0.21.1.min.js"></script>
     <script src="js/external/moment-2.29.1.min.js"></script>
     <script src="js/external/moment-timezone-data-0.5.32.min.js"></script>
     <script src="js/external/chart-2.9.4.min.js"></script>
@@ -1169,5 +1169,6 @@ <h3 class="mb-4"  v-text="i18n.updateProfile"></h3>
     <script src="js/routes/terms.js?v=VERSION_PLACEHOLDER"></script>
     <script src="js/routes/user.js?v=VERSION_PLACEHOLDER"></script>
     <script src="js/routes/users.js?v=VERSION_PLACEHOLDER"></script>
+    <script src="js/custom.js?v=VERSION_PLACEHOLDER"></script>
   </body>
 </html>
diff --git a/html/js/app.js b/html/js/app.js
@@ -1,4 +1,5 @@
 // Copyright 2019 Jason Ertel (jertel). All rights reserved.
+// Copyright 2020-2021 Security Onion Solutions, LLC. All rights reserved.
 //
 // This program is distributed under the terms of version 2 of the
 // GNU General Public License.  See LICENSE for further details.
@@ -59,7 +60,8 @@ $(document).ready(function() {
       elasticVersion: '0.0.0',
       wazuhVersion: '0.0.0',
       papi: null,
-      connectionTimeout: 15000,
+      connectionTimeout: 120000,
+      wsConnectionTimeout: 15000,
       socket: null,
       subscriptions: [],
       parameters: {},
@@ -151,10 +153,11 @@ $(document).ready(function() {
 
         if (pngFavicon && svgFavicon) {
           const ext = ".svg";
-          const tagIndex = svgFavicon.href.indexOf("-"),
-                extIndex = svgFavicon.href.indexOf(ext),
-                baseText = svgFavicon.href.substring(0, tagIndex !== -1 ? tagIndex : extIndex),
-                queryParam = svgFavicon.href.substring(extIndex + ext.length);
+          var tagIndex = svgFavicon.href.indexOf("-");
+          const extIndex = svgFavicon.href.indexOf(ext);
+          if (tagIndex > extIndex) tagIndex = -1;
+          const baseText = svgFavicon.href.substring(0, tagIndex !== -1 ? tagIndex : extIndex);
+          const queryParam = svgFavicon.href.substring(extIndex + ext.length);
 
           const attention = this.isAttentionNeeded() ? '-attention' : '' 
           pngFavicon.href = `${baseText}${colorSchemeString}${attention}.png${queryParam}`;
@@ -294,7 +297,7 @@ $(document).ready(function() {
           this.connected = false;
           this.reconnecting = false;
           this.openWebsocket();
-          window.setInterval(this.openWebsocket, this.connectionTimeout);    
+          window.setInterval(this.openWebsocket, this.wsConnectionTimeout);    
         }
       },
       openWebsocket() {

diff --git a/html/js/custom.js b/html/js/custom.js
@@ -0,0 +1,21 @@
+// Copyright 2019 Jason Ertel (jertel). All rights reserved.
+// Copyright 2021 Security Onion Solutions, LLC. All rights reserved.
+//
+// This program is distributed under the terms of version 2 of the
+// GNU General Public License.  See LICENSE for further details.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+/* 
+
+   *** WARNING *** WARNING *** WARNING ***
+
+   Future upgrades of Security Onion are NOT guaranteed to work
+   with any content added to this file. Knowing this, it is strongly
+   suggested to avoid and/or minimize the extent of any
+   content placed here so that upgrading to newer version of 
+   Security Onion do not become a burden.
+
+*/
diff --git a/html/js/external/.DS_Store b/html/js/external/.DS_Store