diff --git a/agents/MeshCmd-signed.exe b/agents/MeshCmd-signed.exe index 0ca5dff4..4ff74012 100644 Binary files a/agents/MeshCmd-signed.exe and b/agents/MeshCmd-signed.exe differ diff --git a/agents/MeshCmd64-signed.exe b/agents/MeshCmd64-signed.exe index 8a2b9525..8645d22b 100644 Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ diff --git a/agents/MeshService-signed.exe b/agents/MeshService-signed.exe index 52c52e23..1c82bef3 100644 Binary files a/agents/MeshService-signed.exe and b/agents/MeshService-signed.exe differ diff --git a/agents/MeshService.exe b/agents/MeshService.exe index ac3d780f..74876ef5 100644 Binary files a/agents/MeshService.exe and b/agents/MeshService.exe differ diff --git a/agents/MeshService64-signed.exe b/agents/MeshService64-signed.exe index 13a58adc..b421ba33 100644 Binary files a/agents/MeshService64-signed.exe and b/agents/MeshService64-signed.exe differ diff --git a/agents/MeshService64.exe b/agents/MeshService64.exe index e2c7a0dd..f1c47d1a 100644 Binary files a/agents/MeshService64.exe and b/agents/MeshService64.exe differ diff --git a/agents/agents-new/MeshCmd-signed.exe b/agents/agents-new/MeshCmd-signed.exe new file mode 100644 index 00000000..4ff74012 Binary files /dev/null and b/agents/agents-new/MeshCmd-signed.exe differ diff --git a/agents/agents-new/MeshCmd64-signed.exe b/agents/agents-new/MeshCmd64-signed.exe new file mode 100644 index 00000000..8645d22b Binary files /dev/null and b/agents/agents-new/MeshCmd64-signed.exe differ diff --git a/agents/agents-new/MeshService-signed.exe b/agents/agents-new/MeshService-signed.exe new file mode 100644 index 00000000..1c82bef3 Binary files /dev/null and b/agents/agents-new/MeshService-signed.exe differ diff --git a/agents/agents-new/MeshService.exe b/agents/agents-new/MeshService.exe new file mode 100644 index 00000000..74876ef5 Binary files /dev/null and b/agents/agents-new/MeshService.exe differ diff --git a/agents/agents-new/MeshService64-signed.exe b/agents/agents-new/MeshService64-signed.exe new file mode 100644 index 00000000..b421ba33 Binary files /dev/null and b/agents/agents-new/MeshService64-signed.exe differ diff --git a/agents/agents-new/MeshService64.exe b/agents/agents-new/MeshService64.exe new file mode 100644 index 00000000..f1c47d1a Binary files /dev/null and b/agents/agents-new/MeshService64.exe differ diff --git a/agents/agents-new/meshagent_arm b/agents/agents-new/meshagent_arm new file mode 100644 index 00000000..bfcf8b3f Binary files /dev/null and b/agents/agents-new/meshagent_arm differ diff --git a/agents/agents-new/meshagent_arm-linaro b/agents/agents-new/meshagent_arm-linaro new file mode 100644 index 00000000..2c0578b3 Binary files /dev/null and b/agents/agents-new/meshagent_arm-linaro differ diff --git a/agents/agents-new/meshagent_arm64 b/agents/agents-new/meshagent_arm64 new file mode 100644 index 00000000..c91119ca Binary files /dev/null and b/agents/agents-new/meshagent_arm64 differ diff --git a/agents/agents-new/meshagent_armhf2 b/agents/agents-new/meshagent_armhf2 new file mode 100644 index 00000000..ddc9965e Binary files /dev/null and b/agents/agents-new/meshagent_armhf2 differ diff --git a/agents/agents-new/meshagent_mips b/agents/agents-new/meshagent_mips new file mode 100644 index 00000000..40242140 Binary files /dev/null and b/agents/agents-new/meshagent_mips differ diff --git a/agents/agents-new/meshagent_pogo b/agents/agents-new/meshagent_pogo new file mode 100644 index 00000000..b362567a Binary files /dev/null and b/agents/agents-new/meshagent_pogo differ diff --git a/agents/agents-new/meshagent_poky b/agents/agents-new/meshagent_poky new file mode 100644 index 00000000..d8be0fff Binary files /dev/null and b/agents/agents-new/meshagent_poky differ diff --git a/agents/agents-new/meshagent_poky64 b/agents/agents-new/meshagent_poky64 new file mode 100644 index 00000000..7e2653fb Binary files /dev/null and b/agents/agents-new/meshagent_poky64 differ diff --git a/agents/agents-new/meshagent_x86 b/agents/agents-new/meshagent_x86 new file mode 100644 index 00000000..afb3e87b Binary files /dev/null and b/agents/agents-new/meshagent_x86 differ diff --git a/agents/agents-new/meshagent_x86-64 b/agents/agents-new/meshagent_x86-64 new file mode 100644 index 00000000..0b4d6d87 Binary files /dev/null and b/agents/agents-new/meshagent_x86-64 differ diff --git a/agents/agents-new/meshagent_x86-64_nokvm b/agents/agents-new/meshagent_x86-64_nokvm new file mode 100644 index 00000000..df813fb7 Binary files /dev/null and b/agents/agents-new/meshagent_x86-64_nokvm differ diff --git a/agents/agents-new/meshagent_x86_nokvm b/agents/agents-new/meshagent_x86_nokvm new file mode 100644 index 00000000..1c4a9337 Binary files /dev/null and b/agents/agents-new/meshagent_x86_nokvm differ diff --git a/agents/agents-old/MeshCmd-signed.exe b/agents/agents-old/MeshCmd-signed.exe new file mode 100644 index 00000000..0ca5dff4 Binary files /dev/null and b/agents/agents-old/MeshCmd-signed.exe differ diff --git a/agents/agents-old/MeshCmd64-signed.exe b/agents/agents-old/MeshCmd64-signed.exe new file mode 100644 index 00000000..8a2b9525 Binary files /dev/null and b/agents/agents-old/MeshCmd64-signed.exe differ diff --git a/agents/agents-old/MeshService-signed.exe b/agents/agents-old/MeshService-signed.exe new file mode 100644 index 00000000..52c52e23 Binary files /dev/null and b/agents/agents-old/MeshService-signed.exe differ diff --git a/agents/agents-old/MeshService.exe b/agents/agents-old/MeshService.exe new file mode 100644 index 00000000..ac3d780f Binary files /dev/null and b/agents/agents-old/MeshService.exe differ diff --git a/agents/agents-old/MeshService64-signed.exe b/agents/agents-old/MeshService64-signed.exe new file mode 100644 index 00000000..13a58adc Binary files /dev/null and b/agents/agents-old/MeshService64-signed.exe differ diff --git a/agents/agents-old/MeshService64.exe b/agents/agents-old/MeshService64.exe new file mode 100644 index 00000000..e2c7a0dd Binary files /dev/null and b/agents/agents-old/MeshService64.exe differ diff --git a/agents/meshagent_aarch64 b/agents/agents-old/meshagent_aarch64 similarity index 100% rename from agents/meshagent_aarch64 rename to agents/agents-old/meshagent_aarch64 diff --git a/agents/meshagent_aarch64-cortex-a53 b/agents/agents-old/meshagent_aarch64-cortex-a53 similarity index 100% rename from agents/meshagent_aarch64-cortex-a53 rename to agents/agents-old/meshagent_aarch64-cortex-a53 diff --git a/agents/meshagent_alpine-x86-64 b/agents/agents-old/meshagent_alpine-x86-64 similarity index 100% rename from agents/meshagent_alpine-x86-64 rename to agents/agents-old/meshagent_alpine-x86-64 diff --git a/agents/agents-old/meshagent_arm b/agents/agents-old/meshagent_arm new file mode 100644 index 00000000..911fff3f Binary files /dev/null and b/agents/agents-old/meshagent_arm differ diff --git a/agents/agents-old/meshagent_arm-linaro b/agents/agents-old/meshagent_arm-linaro new file mode 100644 index 00000000..38479042 Binary files /dev/null and b/agents/agents-old/meshagent_arm-linaro differ diff --git a/agents/agents-old/meshagent_arm64 b/agents/agents-old/meshagent_arm64 new file mode 100644 index 00000000..f2eb2802 Binary files /dev/null and b/agents/agents-old/meshagent_arm64 differ diff --git a/agents/meshagent_armhf b/agents/agents-old/meshagent_armhf similarity index 100% rename from agents/meshagent_armhf rename to agents/agents-old/meshagent_armhf diff --git a/agents/agents-old/meshagent_armhf2 b/agents/agents-old/meshagent_armhf2 new file mode 100644 index 00000000..7e5d4c21 Binary files /dev/null and b/agents/agents-old/meshagent_armhf2 differ diff --git a/agents/meshagent_freebsd_x86-64 b/agents/agents-old/meshagent_freebsd_x86-64 similarity index 100% rename from agents/meshagent_freebsd_x86-64 rename to agents/agents-old/meshagent_freebsd_x86-64 diff --git a/agents/meshagent_linux-armada370-hf b/agents/agents-old/meshagent_linux-armada370-hf similarity index 100% rename from agents/meshagent_linux-armada370-hf rename to agents/agents-old/meshagent_linux-armada370-hf diff --git a/agents/agents-old/meshagent_mips b/agents/agents-old/meshagent_mips new file mode 100644 index 00000000..9cc92001 Binary files /dev/null and b/agents/agents-old/meshagent_mips differ diff --git a/agents/meshagent_mips24kc b/agents/agents-old/meshagent_mips24kc similarity index 100% rename from agents/meshagent_mips24kc rename to agents/agents-old/meshagent_mips24kc diff --git a/agents/meshagent_mipsel24kc b/agents/agents-old/meshagent_mipsel24kc similarity index 100% rename from agents/meshagent_mipsel24kc rename to agents/agents-old/meshagent_mipsel24kc diff --git a/agents/meshagent_openwrt_x86_64 b/agents/agents-old/meshagent_openwrt_x86_64 similarity index 100% rename from agents/meshagent_openwrt_x86_64 rename to agents/agents-old/meshagent_openwrt_x86_64 diff --git a/agents/meshagent_osx-arm-64 b/agents/agents-old/meshagent_osx-arm-64 similarity index 100% rename from agents/meshagent_osx-arm-64 rename to agents/agents-old/meshagent_osx-arm-64 diff --git a/agents/meshagent_osx-universal-64 b/agents/agents-old/meshagent_osx-universal-64 similarity index 100% rename from agents/meshagent_osx-universal-64 rename to agents/agents-old/meshagent_osx-universal-64 diff --git a/agents/meshagent_osx-x86-64 b/agents/agents-old/meshagent_osx-x86-64 similarity index 100% rename from agents/meshagent_osx-x86-64 rename to agents/agents-old/meshagent_osx-x86-64 diff --git a/agents/agents-old/meshagent_pogo b/agents/agents-old/meshagent_pogo new file mode 100644 index 00000000..90927c64 Binary files /dev/null and b/agents/agents-old/meshagent_pogo differ diff --git a/agents/agents-old/meshagent_poky b/agents/agents-old/meshagent_poky new file mode 100644 index 00000000..be518726 Binary files /dev/null and b/agents/agents-old/meshagent_poky differ diff --git a/agents/agents-old/meshagent_poky64 b/agents/agents-old/meshagent_poky64 new file mode 100644 index 00000000..75c53ec9 Binary files /dev/null and b/agents/agents-old/meshagent_poky64 differ diff --git a/agents/agents-old/meshagent_x86 b/agents/agents-old/meshagent_x86 new file mode 100644 index 00000000..fe70408b Binary files /dev/null and b/agents/agents-old/meshagent_x86 differ diff --git a/agents/agents-old/meshagent_x86-64 b/agents/agents-old/meshagent_x86-64 new file mode 100644 index 00000000..55ea8357 Binary files /dev/null and b/agents/agents-old/meshagent_x86-64 differ diff --git a/agents/agents-old/meshagent_x86-64_nokvm b/agents/agents-old/meshagent_x86-64_nokvm new file mode 100644 index 00000000..0a456e68 Binary files /dev/null and b/agents/agents-old/meshagent_x86-64_nokvm differ diff --git a/agents/agents-old/meshagent_x86_nokvm b/agents/agents-old/meshagent_x86_nokvm new file mode 100644 index 00000000..923108f3 Binary files /dev/null and b/agents/agents-old/meshagent_x86_nokvm differ diff --git a/agents/meshagent_arm b/agents/meshagent_arm index 911fff3f..bfcf8b3f 100644 Binary files a/agents/meshagent_arm and b/agents/meshagent_arm differ diff --git a/agents/meshagent_arm-linaro b/agents/meshagent_arm-linaro index 38479042..2c0578b3 100644 Binary files a/agents/meshagent_arm-linaro and b/agents/meshagent_arm-linaro differ diff --git a/agents/meshagent_arm64 b/agents/meshagent_arm64 index f2eb2802..c91119ca 100644 Binary files a/agents/meshagent_arm64 and b/agents/meshagent_arm64 differ diff --git a/agents/meshagent_armhf2 b/agents/meshagent_armhf2 index 7e5d4c21..ddc9965e 100644 Binary files a/agents/meshagent_armhf2 and b/agents/meshagent_armhf2 differ diff --git a/agents/meshagent_mips b/agents/meshagent_mips index 9cc92001..40242140 100644 Binary files a/agents/meshagent_mips and b/agents/meshagent_mips differ diff --git a/agents/meshagent_pogo b/agents/meshagent_pogo index 90927c64..b362567a 100644 Binary files a/agents/meshagent_pogo and b/agents/meshagent_pogo differ diff --git a/agents/meshagent_poky b/agents/meshagent_poky index be518726..d8be0fff 100644 Binary files a/agents/meshagent_poky and b/agents/meshagent_poky differ diff --git a/agents/meshagent_poky64 b/agents/meshagent_poky64 index 75c53ec9..7e2653fb 100644 Binary files a/agents/meshagent_poky64 and b/agents/meshagent_poky64 differ diff --git a/agents/meshagent_x86 b/agents/meshagent_x86 index fe70408b..afb3e87b 100644 Binary files a/agents/meshagent_x86 and b/agents/meshagent_x86 differ diff --git a/agents/meshagent_x86-64 b/agents/meshagent_x86-64 index 55ea8357..0b4d6d87 100644 Binary files a/agents/meshagent_x86-64 and b/agents/meshagent_x86-64 differ diff --git a/agents/meshagent_x86-64_nokvm b/agents/meshagent_x86-64_nokvm index 0a456e68..df813fb7 100644 Binary files a/agents/meshagent_x86-64_nokvm and b/agents/meshagent_x86-64_nokvm differ diff --git a/agents/meshagent_x86_nokvm b/agents/meshagent_x86_nokvm index 923108f3..1c4a9337 100644 Binary files a/agents/meshagent_x86_nokvm and b/agents/meshagent_x86_nokvm differ diff --git a/package.json b/package.json index af973eb9..a0cef419 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,8 @@ "sample-config-advanced.json" ], "dependencies": { + "archiver": "^4.0.2", + "archiver-zip-encrypted": "^1.0.10", "body-parser": "^1.19.0", "cbor": "~5.2.0", "compression": "^1.7.4", @@ -43,13 +45,22 @@ "express": "^4.17.0", "express-handlebars": "^3.1.0", "express-ws": "^4.0.0", + "image-size": "^1.0.0", "ipcheck": "^0.1.0", + "loadavg-windows": "^1.1.1", "minimist": "^1.2.0", + "mongodb": "^4.1.0", "multiparty": "^4.2.1", "nedb": "^1.8.0", "node-forge": "^0.10.0", + "node-rdpjs-2": "^0.3.5", + "node-windows": "^1.0.0-beta.5", + "otplib": "^10.2.3", + "ssh2": "^1.3.0", + "web-push": "^3.4.5", "ws": "^5.2.3", - "yauzl": "^2.10.0" + "yauzl": "^2.10.0", + "yubikeyotp": "^0.2.0" }, "repository": { "type": "git", diff --git a/views/default.handlebars b/views/default.handlebars index d865104c..3f108989 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -6633,9 +6633,9 @@ var groupingTags = '' + "None" + ''; if (node.tags != null) { groupingTags = ''; for (var i in node.tags) { groupingTags += '' + EscapeHtml(node.tags[i]) + ' '; } } if ((meshrights & 4) != 0) { - x += addDeviceAttribute("Tags", '' + groupingTags + ' '); + x += addDeviceAttribute("Tags", '' + groupingTags + ' '); } else { - x += addDeviceAttribute("Tags", '' + groupingTags + ''); + x += addDeviceAttribute("Tags", '' + groupingTags + ''); } // SSH & RDP Credentials