untangle · dhadarau · Feb 1, 2024 · Feb 1, 2024 · Feb 1, 2024 · Feb 5, 2024
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ GTAGS
 core
 .DS_Store
 .sass-cache
+rake.log
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -56,7 +56,7 @@
             "id": "target_address",
             "type":"promptString",
             "description": "IP of NGFW",
-            "default": ""
+            "default": "192.168.2.101"
         },
         {
             "id": "test_client_address",

diff --git a/threat-prevention/js/common/Converter.js b/threat-prevention/js/common/Converter.js
@@ -1,7 +1,7 @@
 Ext.define('Ung.common.Converter.threatprevention', {
     singleton: true,
 
-    reason: function (v) { return Map.webReasons[v] || 'no rule applied'.t(); },
+    reason: function (v) { return Mapper.webReasons[v] || 'no rule applied'.t(); },
 
     ruleIdMap: {},
     ruleId: function (value, record) {
@@ -11,9 +11,9 @@ Ext.define('Ung.common.Converter.threatprevention', {
         var policyId = record && record.get && record.get('policy_id') ? record.get('policy_id') : 1;
         var reason = record && record.get && record.get('threat_prevention_reason') ? record.get('threat_prevention_reason') : 'N';
         if(reason != 'N'){
-            for(var id in Map.webReasons){
-                if(Map.webReasons.hasOwnProperty(id)){
-                    if(Map.webReasons[id] == reason){
+            for (var id in Mapper.webReasons) {
+                if (Mapper.webReasons.hasOwnProperty(id)) {
+                    if (Mapper.webReasons[id] == reason) {
                         reason = id;
                         if(reason == 'default'){
                             reason = 'N';

diff --git a/threat-prevention/js/common/TableConfig.js b/threat-prevention/js/common/TableConfig.js
@@ -94,15 +94,15 @@ Ext.define('Ung.common.TableConfig.threatprevention', {
          * Add threat prevention fields and tables configuration
          * to the main Map
          */
-        Ext.apply(Map.fields, this.map.fields);
+        Ext.apply(Mapper.fields, this.map.fields);
         Ext.Object.each(this.map.tables, function (table, fields) {
-            Ext.Array.push(Map.tables[table], fields);
+            Ext.Array.push(Mapper.tables[table], fields);
         });
 
-        Map.listeners['sessions'] = {
+        Mapper.listeners['sessions'] = {
             select: Ung.common.TableConfig.threatprevention.getIpDetails
         };
-        Map.listeners['http_events'] = {
+        Mapper.listeners['http_events'] = {
             select: Ung.common.TableConfig.threatprevention.getHttpDetails
         };
 

diff --git a/uvm/hier/usr/share/untangle/conf/apache2/conf.d/admin-old.conf b/uvm/hier/usr/share/untangle/conf/apache2/conf.d/admin-old.conf
@@ -0,0 +1,20 @@
+JkMount /admin-old* uvmWorker
+
+<Location /admin-old>
+    AuthType Basic
+    AuthName "Administrator"
+    require valid-user
+
+    <IfModule mod_auth_basic.c>
+         AuthBasicAuthoritative Off
+         AuthUserFile /dev/null
+    </IfModule>
+    <IfModule mod_auth_pam.c>
+        AuthPAM_Enabled Off
+    </IfModule>
+
+    PythonOption Realm Administrator
+    PythonPath "['@PREFIX@/usr/lib/python3/dist-packages/'] + sys.path"
+    PythonAuthenHandler uvm_login
+    PythonHeaderParserHandler uvm_login
+</Location>
diff --git a/uvm/hier/usr/share/untangle/conf/apache2/conf.d/vue.conf b/uvm/hier/usr/share/untangle/conf/apache2/conf.d/vue.conf
@@ -0,0 +1,13 @@
+# Vue app/components
+
+Alias /vue @PREFIX@/usr/share/untangle/web/vue
+<Directory @PREFIX@/usr/share/untangle/web/vue>
+  Require all granted
+  Satisfy Any
+
+  RewriteEngine On
+  RewriteBase /vue
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteRule . index.html [L]
+</Directory>
diff --git a/uvm/hier/usr/share/untangle/web/vue/css/app.59724673.css b/uvm/hier/usr/share/untangle/web/vue/css/app.59724673.css
diff --git a/uvm/hier/usr/share/untangle/web/vue/css/chunk-vendors.0d7763ef.css b/uvm/hier/usr/share/untangle/web/vue/css/chunk-vendors.0d7763ef.css
diff --git a/uvm/hier/usr/share/untangle/web/vue/favicon.ico b/uvm/hier/usr/share/untangle/web/vue/favicon.ico
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/materialdesignicons-webfont.147e3378.woff b/uvm/hier/usr/share/untangle/web/vue/fonts/materialdesignicons-webfont.147e3378.woff
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/materialdesignicons-webfont.174c02fc.ttf b/uvm/hier/usr/share/untangle/web/vue/fonts/materialdesignicons-webfont.174c02fc.ttf
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/materialdesignicons-webfont.64d4cf64.eot b/uvm/hier/usr/share/untangle/web/vue/fonts/materialdesignicons-webfont.64d4cf64.eot
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/materialdesignicons-webfont.7a44ea19.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/materialdesignicons-webfont.7a44ea19.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-all-100-normal.06ce76a1.woff b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-all-100-normal.06ce76a1.woff
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-all-300-normal.2323284e.woff b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-all-300-normal.2323284e.woff
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-all-400-normal.62b936e1.woff b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-all-400-normal.62b936e1.woff
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-all-500-normal.68d75d95.woff b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-all-500-normal.68d75d95.woff
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-all-700-normal.aa462125.woff b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-all-700-normal.aa462125.woff
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-cyrillic-100-normal.4f18a79f.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-cyrillic-100-normal.4f18a79f.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-cyrillic-300-normal.9b9ec295.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-cyrillic-300-normal.9b9ec295.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-cyrillic-400-normal.d9ac47c7.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-cyrillic-400-normal.d9ac47c7.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-cyrillic-500-normal.7b08b9e1.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-cyrillic-500-normal.7b08b9e1.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-cyrillic-700-normal.6f112ec2.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-cyrillic-700-normal.6f112ec2.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-cyrillic-ext-100-normal.29547e48.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-cyrillic-ext-100-normal.29547e48.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-cyrillic-ext-300-normal.d0441335.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-cyrillic-ext-300-normal.d0441335.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-cyrillic-ext-400-normal.c00467dc.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-cyrillic-ext-400-normal.c00467dc.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-cyrillic-ext-500-normal.2742d81a.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-cyrillic-ext-500-normal.2742d81a.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-cyrillic-ext-700-normal.e0bc9313.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-cyrillic-ext-700-normal.e0bc9313.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-greek-100-normal.31003a41.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-greek-100-normal.31003a41.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-greek-300-normal.dcdaee37.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-greek-300-normal.dcdaee37.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-greek-400-normal.28668857.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-greek-400-normal.28668857.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-greek-500-normal.53f395eb.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-greek-500-normal.53f395eb.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-greek-700-normal.3f8b2aa4.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-greek-700-normal.3f8b2aa4.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-latin-100-normal.603b8950.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-latin-100-normal.603b8950.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-latin-300-normal.b9c29351.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-latin-300-normal.b9c29351.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-latin-400-normal.15d9f621.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-latin-400-normal.15d9f621.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-latin-500-normal.3a44e06e.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-latin-500-normal.3a44e06e.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-latin-700-normal.e9f5aaf5.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-latin-700-normal.e9f5aaf5.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-latin-ext-100-normal.cde68d64.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-latin-ext-100-normal.cde68d64.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-latin-ext-300-normal.716871ec.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-latin-ext-300-normal.716871ec.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-latin-ext-400-normal.87ace200.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-latin-ext-400-normal.87ace200.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-latin-ext-500-normal.e36fccd0.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-latin-ext-500-normal.e36fccd0.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-latin-ext-700-normal.deb26e9b.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-latin-ext-700-normal.deb26e9b.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-vietnamese-100-normal.99a3869b.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-vietnamese-100-normal.99a3869b.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-vietnamese-300-normal.48c684d9.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-vietnamese-300-normal.48c684d9.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-vietnamese-400-normal.ca3b09b6.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-vietnamese-400-normal.ca3b09b6.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-vietnamese-500-normal.7cda2cfe.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-vietnamese-500-normal.7cda2cfe.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-vietnamese-700-normal.cdaab836.woff2 b/uvm/hier/usr/share/untangle/web/vue/fonts/roboto-vietnamese-700-normal.cdaab836.woff2
diff --git a/uvm/hier/usr/share/untangle/web/vue/img/arista-logo-blue.e439bed4.svg b/uvm/hier/usr/share/untangle/web/vue/img/arista-logo-blue.e439bed4.svg
diff --git a/uvm/hier/usr/share/untangle/web/vue/img/arista-logo-white.9e62b51e.svg b/uvm/hier/usr/share/untangle/web/vue/img/arista-logo-white.9e62b51e.svg
diff --git a/uvm/hier/usr/share/untangle/web/vue/img/wireguard-logo.7c96f8bc.svg b/uvm/hier/usr/share/untangle/web/vue/img/wireguard-logo.7c96f8bc.svg
diff --git a/uvm/hier/usr/share/untangle/web/vue/index.html b/uvm/hier/usr/share/untangle/web/vue/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/vue/favicon.ico"><script src="/vue/jsonrpc.js"></script><title>Arista - NGFW</title><link href="/vue/css/app.59724673.css" rel="preload" as="style"><link href="/vue/css/chunk-vendors.0d7763ef.css" rel="preload" as="style"><link href="/vue/js/app.091e7637.js" rel="preload" as="script"><link href="/vue/js/chunk-vendors.ea82e840.js" rel="preload" as="script"><link href="/vue/css/chunk-vendors.0d7763ef.css" rel="stylesheet"><link href="/vue/css/app.59724673.css" rel="stylesheet"></head><body><div id="app"></div><script src="/vue/js/chunk-vendors.ea82e840.js"></script><script src="/vue/js/app.091e7637.js"></script></body></html>
diff --git a/uvm/hier/usr/share/untangle/web/vue/js/app.091e7637.js b/uvm/hier/usr/share/untangle/web/vue/js/app.091e7637.js
diff --git a/uvm/hier/usr/share/untangle/web/vue/js/app.091e7637.js.map b/uvm/hier/usr/share/untangle/web/vue/js/app.091e7637.js.map
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/vue/favicon.ico"><script src="/vue/jsonrpc.js"></script><title>Arista - NGFW</title><link href="/vue/css/app.59724673.css" rel="preload" as="style"><link href="/vue/css/chunk-vendors.0d7763ef.css" rel="preload" as="style"><link href="/vue/js/app.091e7637.js" rel="preload" as="script"><link href="/vue/js/chunk-vendors.ea82e840.js" rel="preload" as="script"><link href="/vue/css/chunk-vendors.0d7763ef.css" rel="stylesheet"><link href="/vue/css/app.59724673.css" rel="stylesheet"></head><body><div id="app"></div><script src="/vue/js/chunk-vendors.ea82e840.js"></script><script src="/vue/js/app.091e7637.js"></script></body></html>