Release 0.6.0

Fixed script naming scheme

.devcontainer/docker-compose.yml

@@ -2,6 +2,7 @@ version: '3.4'
 
 services:
   api-dev:
+    container_name: trmm-api-dev
     image: api-dev
     restart: always
     build:
@@ -21,6 +22,7 @@ services:
           - tactical-backend
 
   app-dev:
+    container_name: trmm-app-dev
     image: node:14-alpine
     restart: always
     command: /bin/sh -c "npm install npm@latest -g && npm install && npm run serve -- --host 0.0.0.0 --port ${APP_PORT}"
@@ -36,6 +38,7 @@ services:
 
   # nats
   nats-dev:
+    container_name: trmm-nats-dev
     image: ${IMAGE_REPO}tactical-nats:${VERSION}
     restart: always
     environment:
@@ -55,6 +58,7 @@ services:
 
   # meshcentral container
   meshcentral-dev:
+    container_name: trmm-meshcentral-dev
     image: ${IMAGE_REPO}tactical-meshcentral:${VERSION}
     restart: always
     environment: 
@@ -77,6 +81,7 @@ services:
 
   # mongodb container for meshcentral
   mongodb-dev:
+    container_name: trmm-mongodb-dev
     image: mongo:4.4
     restart: always
     environment:
@@ -92,6 +97,7 @@ services:
 
   # postgres database for api service
   postgres-dev:
+    container_name: trmm-postgres-dev
     image: postgres:13-alpine
     restart: always
     environment:
@@ -107,6 +113,7 @@ services:
 
   # redis container for celery tasks
   redis-dev:
+    container_name: trmm-redis-dev
     restart: always
     image: redis:6.0-alpine
     networks:
@@ -115,6 +122,7 @@ services:
           - tactical-redis
 
   init-dev:
+    container_name: trmm-init-dev
     image: api-dev
     build:
       context: .
@@ -143,6 +151,7 @@ services:
 
   # container for celery worker service
   celery-dev:
+    container_name: trmm-celery-dev
     image: api-dev
     build:
       context: .
@@ -160,6 +169,7 @@ services:
 
   # container for celery beat service
   celerybeat-dev:
+    container_name: trmm-celerybeat-dev
     image: api-dev
     build:
       context: .
@@ -175,8 +185,9 @@ services:
       - postgres-dev
       - redis-dev
 
-  # container for celery beat service
+  # container for websockets communication
   websockets-dev:
+    container_name: trmm-websockets-dev
     image: api-dev
     build:
       context: .
@@ -194,8 +205,9 @@ services:
       - postgres-dev
       - redis-dev
 
-  nginx-dev:
   # container for tactical reverse proxy
+  nginx-dev:
+    container_name: trmm-nginx-dev
     image: ${IMAGE_REPO}tactical-nginx:${VERSION}
     restart: always
     environment:

.devcontainer/entrypoint.sh

@@ -136,10 +136,11 @@ if [ "$1" = 'tactical-init-dev' ]; then
   webenv="$(cat << EOF
 PROD_URL = "${HTTP_PROTOCOL}://${API_HOST}"
 DEV_URL = "${HTTP_PROTOCOL}://${API_HOST}"
-APP_URL = https://${APP_HOST}
+APP_URL = "https://${APP_HOST}"
+DOCKER_BUILD = 1
 EOF
 )"
-  echo "${webenv}" | tee ${WORKSPACE_DIR}/web/.env > /dev/null
+  echo "${webenv}" | tee "${WORKSPACE_DIR}"/web/.env > /dev/null
 
   # chown everything to tactical user
   chown -R "${TACTICAL_USER}":"${TACTICAL_USER}" "${WORKSPACE_DIR}"

api/tacticalrmm/accounts/migrations/0014_user_client_tree_splitter.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2 on 2021-04-11 01:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0013_user_client_tree_sort'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='client_tree_splitter',
+            field=models.PositiveIntegerField(default=11),
+        ),
+    ]

api/tacticalrmm/accounts/migrations/0015_user_loading_bar_color.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2 on 2021-04-11 03:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0014_user_client_tree_splitter'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='loading_bar_color',
+            field=models.CharField(default='red', max_length=255),
+        ),
+    ]

api/tacticalrmm/accounts/models.py

@@ -36,6 +36,8 @@ class User(AbstractUser, BaseAuditModel):
     client_tree_sort = models.CharField(
         max_length=50, choices=CLIENT_TREE_SORT_CHOICES, default="alphafail"
     )
+    client_tree_splitter = models.PositiveIntegerField(default=11)
+    loading_bar_color = models.CharField(max_length=255, default="red")
 
     agent = models.OneToOneField(
         "agents.Agent",

api/tacticalrmm/accounts/serializers.py

@@ -13,6 +13,8 @@ class UserUISerializer(ModelSerializer):
             "agent_dblclick_action",
             "default_agent_tbl_tab",
             "client_tree_sort",
+            "client_tree_splitter",
+            "loading_bar_color",
         ]
 
 

api/tacticalrmm/accounts/tests.py

@@ -278,6 +278,8 @@ class TestUserAction(TacticalTestCase):
             "agent_dblclick_action": "editagent",
             "default_agent_tbl_tab": "mixed",
             "client_tree_sort": "alpha",
+            "client_tree_splitter": 14,
+            "loading_bar_color": "green",
         }
         r = self.client.patch(url, data, format="json")
         self.assertEqual(r.status_code, 200)

api/tacticalrmm/agents/models.py

@@ -195,6 +195,27 @@ class Agent(BaseAuditModel):
         except:
             return ["unknown cpu model"]
 
+    @property
+    def graphics(self):
+        ret, mrda = [], []
+        try:
+            graphics = self.wmi_detail["graphics"]
+            for i in graphics:
+                caption = [x["Caption"] for x in i if "Caption" in x][0]
+                if "microsoft remote display adapter" in caption.lower():
+                    mrda.append("yes")
+                    continue
+
+                ret.append([x["Caption"] for x in i if "Caption" in x][0])
+
+            # only return this if no other graphics cards
+            if not ret and mrda:
+                return "Microsoft Remote Display Adapter"
+
+            return ", ".join(ret)
+        except:
+            return "Graphics info requires agent v1.4.14"
+
     @property
     def local_ips(self):
         ret = []
@@ -322,7 +343,7 @@ class Agent(BaseAuditModel):
                 online = [
                     agent
                     for agent in Agent.objects.only(
-                        "pk", "last_seen", "overdue_time", "offline_time"
+                        "pk", "agent_id", "last_seen", "overdue_time", "offline_time"
                     )
                     if agent.status == "online"
                 ]
@@ -651,7 +672,11 @@ class Agent(BaseAuditModel):
             except ErrTimeout:
                 ret = "timeout"
             else:
-                ret = msgpack.loads(msg.data)  # type: ignore
+                try:
+                    ret = msgpack.loads(msg.data)  # type: ignore
+                except Exception as e:
+                    logger.error(e)
+                    ret = str(e)
 
             await nc.close()
             return ret
@@ -815,12 +840,6 @@ class RecoveryAction(models.Model):
     def __str__(self):
         return f"{self.agent.hostname} - {self.mode}"
 
-    def send(self):
-        ret = {"recovery": self.mode}
-        if self.mode == "command":
-            ret["cmd"] = self.command
-        return ret
-
 
 class Note(models.Model):
     agent = models.ForeignKey(

api/tacticalrmm/agents/serializers.py

@@ -16,6 +16,7 @@ class AgentSerializer(serializers.ModelSerializer):
     local_ips = serializers.ReadOnlyField()
     make_model = serializers.ReadOnlyField()
     physical_disks = serializers.ReadOnlyField()
+    graphics = serializers.ReadOnlyField()
     checks = serializers.ReadOnlyField()
     timezone = serializers.ReadOnlyField()
     all_timezones = serializers.SerializerMethodField()

api/tacticalrmm/agents/tasks.py

@@ -1,9 +1,8 @@
 import asyncio
 import datetime as dt
-import json
 import random
-import subprocess
-import tempfile
+import requests
+import urllib.parse
 from time import sleep
 from typing import Union
 
@@ -13,21 +12,33 @@ from loguru import logger
 from packaging import version as pyver
 
 from agents.models import Agent
-from core.models import CoreSettings
+from core.models import CoreSettings, CodeSignToken
 from logs.models import PendingAction
 from scripts.models import Script
 from tacticalrmm.celery import app
+from tacticalrmm.utils import run_nats_api_cmd
 
 logger.configure(**settings.LOG_CONFIG)
 
 
-def agent_update(pk: int) -> str:
+def _get_exegen_url() -> str:
+    urls: list[str] = settings.EXE_GEN_URLS
+    for url in urls:
+        try:
+            r = requests.get(url, timeout=10)
+        except:
+            continue
+
+        if r.status_code == 200:
+            return url
+
+    return random.choice(urls)
+
+
+def agent_update(pk: int, codesigntoken: str = None) -> str:
     agent = Agent.objects.get(pk=pk)
 
-    if pyver.parse(agent.version) <= pyver.parse("1.1.11"):
-        logger.warning(
-            f"{agent.hostname} v{agent.version} is running an unsupported version. Refusing to auto update."
-        )
+    if pyver.parse(agent.version) <= pyver.parse("1.3.0"):
         return "not supported"
 
     # skip if we can't determine the arch
@@ -37,18 +48,15 @@ def agent_update(pk: int) -> str:
         )
         return "noarch"
 
-    # removed sqlite in 1.4.0 to get rid of cgo dependency
-    # 1.3.0 has migration func to move from sqlite to win registry, so force an upgrade to 1.3.0 if old agent
-    if pyver.parse(agent.version) >= pyver.parse("1.3.0"):
-        version = settings.LATEST_AGENT_VER
-        url = agent.winagent_dl
-        inno = agent.win_inno_exe
+    version = settings.LATEST_AGENT_VER
+    inno = agent.win_inno_exe
+
+    if codesigntoken is not None and pyver.parse(version) >= pyver.parse("1.5.0"):
+        base_url = _get_exegen_url() + "/api/v1/winagents/?"
+        params = {"version": version, "arch": agent.arch, "token": codesigntoken}
+        url = base_url + urllib.parse.urlencode(params)
     else:
-        version = "1.3.0"
-        inno = (
-            "winagent-v1.3.0.exe" if agent.arch == "64" else "winagent-v1.3.0-x86.exe"
-        )
-        url = f"https://github.com/wh1te909/rmmagent/releases/download/v1.3.0/{inno}"
+        url = agent.winagent_dl
 
     if agent.pendingactions.filter(
         action_type="agentupdate", status="pending"
@@ -81,10 +89,15 @@ def agent_update(pk: int) -> str:
 
 @app.task
 def send_agent_update_task(pks: list[int]) -> None:
+    try:
+        codesigntoken = CodeSignToken.objects.first().token
+    except:
+        codesigntoken = None
+
     chunks = (pks[i : i + 30] for i in range(0, len(pks), 30))
     for chunk in chunks:
         for pk in chunk:
-            agent_update(pk)
+            agent_update(pk, codesigntoken)
             sleep(0.05)
         sleep(4)
 
@@ -95,6 +108,11 @@ def auto_self_agent_update_task() -> None:
     if not core.agent_auto_update:
         return
 
+    try:
+        codesigntoken = CodeSignToken.objects.first().token
+    except:
+        codesigntoken = None
+
     q = Agent.objects.only("pk", "version")
     pks: list[int] = [
         i.pk
@@ -105,7 +123,7 @@ def auto_self_agent_update_task() -> None:
     chunks = (pks[i : i + 30] for i in range(0, len(pks), 30))
     for chunk in chunks:
         for pk in chunk:
-            agent_update(pk)
+            agent_update(pk, codesigntoken)
             sleep(0.05)
         sleep(4)
 
@@ -257,30 +275,13 @@ def run_script_email_results_task(
         logger.error(e)
 
 
-def _get_nats_config() -> dict:
-    return {
-        "key": settings.SECRET_KEY,
-        "natsurl": f"tls://{settings.ALLOWED_HOSTS[0]}:4222",
-    }
-
-
 @app.task
 def monitor_agents_task() -> None:
     agents = Agent.objects.only(
         "pk", "agent_id", "last_seen", "overdue_time", "offline_time"
     )
-    ret = [i.agent_id for i in agents if i.status != "online"]
-    config = _get_nats_config()
-    config["agents"] = ret
-    with tempfile.NamedTemporaryFile() as fp:
-        with open(fp.name, "w") as f:
-            json.dump(config, f)
-
-        cmd = ["/usr/local/bin/nats-api", "-c", fp.name, "-m", "monitor"]
-        try:
-            subprocess.run(cmd, capture_output=True, timeout=30)
-        except Exception as e:
-            logger.error(e)
+    ids = [i.agent_id for i in agents if i.status != "online"]
+    run_nats_api_cmd("monitor", ids)
 
 
 @app.task
@@ -288,15 +289,5 @@ def get_wmi_task() -> None:
     agents = Agent.objects.only(
         "pk", "agent_id", "last_seen", "overdue_time", "offline_time"
     )
-    ret = [i.agent_id for i in agents if i.status == "online"]
-    config = _get_nats_config()
-    config["agents"] = ret
-    with tempfile.NamedTemporaryFile() as fp:
-        with open(fp.name, "w") as f:
-            json.dump(config, f)
-
-        cmd = ["/usr/local/bin/nats-api", "-c", fp.name, "-m", "wmi"]
-        try:
-            subprocess.run(cmd, capture_output=True, timeout=30)
-        except Exception as e:
-            logger.error(e)
+    ids = [i.agent_id for i in agents if i.status == "online"]
+    run_nats_api_cmd("wmi", ids)

api/tacticalrmm/agents/tests.py

@@ -914,8 +914,9 @@ class TestAgentTasks(TacticalTestCase):
         self.authenticate()
         self.setup_coresettings()
 
+    @patch("agents.tasks._get_exegen_url")
     @patch("agents.models.Agent.nats_cmd")
-    def test_agent_update(self, nats_cmd):
+    def test_agent_update(self, nats_cmd, get_exe):
         from agents.tasks import agent_update
 
         agent_noarch = baker.make_recipe(
@@ -926,63 +927,96 @@ class TestAgentTasks(TacticalTestCase):
         r = agent_update(agent_noarch.pk)
         self.assertEqual(r, "noarch")
 
-        agent_1111 = baker.make_recipe(
-            "agents.agent",
-            operating_system="Windows 10 Pro, 64 bit (build 19041.450)",
-            version="1.1.11",
-        )
-        r = agent_update(agent_1111.pk)
-        self.assertEqual(r, "not supported")
-
-        agent64_1112 = baker.make_recipe(
-            "agents.agent",
-            operating_system="Windows 10 Pro, 64 bit (build 19041.450)",
-            version="1.1.12",
-        )
-
-        r = agent_update(agent64_1112.pk)
-        self.assertEqual(r, "created")
-        action = PendingAction.objects.get(agent__pk=agent64_1112.pk)
-        self.assertEqual(action.action_type, "agentupdate")
-        self.assertEqual(action.status, "pending")
-        self.assertEqual(
-            action.details["url"],
-            "https://github.com/wh1te909/rmmagent/releases/download/v1.3.0/winagent-v1.3.0.exe",
-        )
-        self.assertEqual(action.details["inno"], "winagent-v1.3.0.exe")
-        self.assertEqual(action.details["version"], "1.3.0")
-        nats_cmd.assert_called_with(
-            {
-                "func": "agentupdate",
-                "payload": {
-                    "url": "https://github.com/wh1te909/rmmagent/releases/download/v1.3.0/winagent-v1.3.0.exe",
-                    "version": "1.3.0",
-                    "inno": "winagent-v1.3.0.exe",
-                },
-            },
-            wait=False,
-        )
-
-        agent_64_130 = baker.make_recipe(
+        agent_130 = baker.make_recipe(
             "agents.agent",
             operating_system="Windows 10 Pro, 64 bit (build 19041.450)",
             version="1.3.0",
         )
-        nats_cmd.return_value = "ok"
-        r = agent_update(agent_64_130.pk)
+        r = agent_update(agent_130.pk)
+        self.assertEqual(r, "not supported")
+
+        # test __without__ code signing
+        agent64_nosign = baker.make_recipe(
+            "agents.agent",
+            operating_system="Windows 10 Pro, 64 bit (build 19041.450)",
+            version="1.4.14",
+        )
+
+        r = agent_update(agent64_nosign.pk, None)
         self.assertEqual(r, "created")
+        action = PendingAction.objects.get(agent__pk=agent64_nosign.pk)
+        self.assertEqual(action.action_type, "agentupdate")
+        self.assertEqual(action.status, "pending")
+        self.assertEqual(
+            action.details["url"],
+            f"https://github.com/wh1te909/rmmagent/releases/download/v{settings.LATEST_AGENT_VER}/winagent-v{settings.LATEST_AGENT_VER}.exe",
+        )
+        self.assertEqual(
+            action.details["inno"], f"winagent-v{settings.LATEST_AGENT_VER}.exe"
+        )
+        self.assertEqual(action.details["version"], settings.LATEST_AGENT_VER)
         nats_cmd.assert_called_with(
             {
                 "func": "agentupdate",
                 "payload": {
-                    "url": settings.DL_64,
+                    "url": f"https://github.com/wh1te909/rmmagent/releases/download/v{settings.LATEST_AGENT_VER}/winagent-v{settings.LATEST_AGENT_VER}.exe",
                     "version": settings.LATEST_AGENT_VER,
                     "inno": f"winagent-v{settings.LATEST_AGENT_VER}.exe",
                 },
             },
             wait=False,
         )
-        action = PendingAction.objects.get(agent__pk=agent_64_130.pk)
+
+        # test __with__ code signing (64 bit)
+        codesign = baker.make("core.CodeSignToken", token="testtoken123")
+        agent64_sign = baker.make_recipe(
+            "agents.agent",
+            operating_system="Windows 10 Pro, 64 bit (build 19041.450)",
+            version="1.4.14",
+        )
+
+        nats_cmd.return_value = "ok"
+        get_exe.return_value = "https://exe.tacticalrmm.io"
+        r = agent_update(agent64_sign.pk, codesign.token)  # type: ignore
+        self.assertEqual(r, "created")
+        nats_cmd.assert_called_with(
+            {
+                "func": "agentupdate",
+                "payload": {
+                    "url": f"https://exe.tacticalrmm.io/api/v1/winagents/?version={settings.LATEST_AGENT_VER}&arch=64&token=testtoken123",  # type: ignore
+                    "version": settings.LATEST_AGENT_VER,
+                    "inno": f"winagent-v{settings.LATEST_AGENT_VER}.exe",
+                },
+            },
+            wait=False,
+        )
+        action = PendingAction.objects.get(agent__pk=agent64_sign.pk)
+        self.assertEqual(action.action_type, "agentupdate")
+        self.assertEqual(action.status, "pending")
+
+        # test __with__ code signing (32 bit)
+        agent32_sign = baker.make_recipe(
+            "agents.agent",
+            operating_system="Windows 10 Pro, 32 bit (build 19041.450)",
+            version="1.4.14",
+        )
+
+        nats_cmd.return_value = "ok"
+        get_exe.return_value = "https://exe.tacticalrmm.io"
+        r = agent_update(agent32_sign.pk, codesign.token)  # type: ignore
+        self.assertEqual(r, "created")
+        nats_cmd.assert_called_with(
+            {
+                "func": "agentupdate",
+                "payload": {
+                    "url": f"https://exe.tacticalrmm.io/api/v1/winagents/?version={settings.LATEST_AGENT_VER}&arch=32&token=testtoken123",  # type: ignore
+                    "version": settings.LATEST_AGENT_VER,
+                    "inno": f"winagent-v{settings.LATEST_AGENT_VER}-x86.exe",
+                },
+            },
+            wait=False,
+        )
+        action = PendingAction.objects.get(agent__pk=agent32_sign.pk)
         self.assertEqual(action.action_type, "agentupdate")
         self.assertEqual(action.status, "pending")
 

api/tacticalrmm/agents/views.py

@@ -40,7 +40,7 @@ logger.configure(**settings.LOG_CONFIG)
 
 @api_view()
 def get_agent_versions(request):
-    agents = Agent.objects.only("pk")
+    agents = Agent.objects.prefetch_related("site").only("pk", "hostname")
     return Response(
         {
             "versions": [settings.LATEST_AGENT_VER],

api/tacticalrmm/checks/models.py

@@ -633,12 +633,15 @@ class Check(BaseAuditModel):
             if self.error_threshold:
                 text += f" Error Threshold: {self.error_threshold}%"
 
-            percent_used = [
-                d["percent"] for d in self.agent.disks if d["device"] == self.disk
-            ][0]
-            percent_free = 100 - percent_used
+            try:
+                percent_used = [
+                    d["percent"] for d in self.agent.disks if d["device"] == self.disk
+                ][0]
+                percent_free = 100 - percent_used
 
-            body = subject + f" - Free: {percent_free}%, {text}"
+                body = subject + f" - Free: {percent_free}%, {text}"
+            except:
+                body = subject + f" - Disk {self.disk} does not exist"
 
         elif self.check_type == "script":
 
@@ -667,16 +670,7 @@ class Check(BaseAuditModel):
                 body = subject + f" - Average memory usage: {avg}%, {text}"
 
         elif self.check_type == "winsvc":
-
-            try:
-                status = list(
-                    filter(lambda x: x["name"] == self.svc_name, self.agent.services)
-                )[0]["status"]
-            # catch services that don't exist if policy check
-            except:
-                status = "Unknown"
-
-            body = subject + f" - Status: {status.upper()}"
+            body = subject + f" - Status: {self.more_info}"
 
         elif self.check_type == "eventlog":
 
@@ -719,11 +713,15 @@ class Check(BaseAuditModel):
             if self.error_threshold:
                 text += f" Error Threshold: {self.error_threshold}%"
 
-            percent_used = [
-                d["percent"] for d in self.agent.disks if d["device"] == self.disk
-            ][0]
-            percent_free = 100 - percent_used
-            body = subject + f" - Free: {percent_free}%, {text}"
+            try:
+                percent_used = [
+                    d["percent"] for d in self.agent.disks if d["device"] == self.disk
+                ][0]
+                percent_free = 100 - percent_used
+                body = subject + f" - Free: {percent_free}%, {text}"
+            except:
+                body = subject + f" - Disk {self.disk} does not exist"
+
         elif self.check_type == "script":
             body = subject + f" - Return code: {self.retcode}"
         elif self.check_type == "ping":
@@ -741,10 +739,7 @@ class Check(BaseAuditModel):
             elif self.check_type == "memory":
                 body = subject + f" - Average memory usage: {avg}%, {text}"
         elif self.check_type == "winsvc":
-            status = list(
-                filter(lambda x: x["name"] == self.svc_name, self.agent.services)
-            )[0]["status"]
-            body = subject + f" - Status: {status.upper()}"
+            body = subject + f" - Status: {self.more_info}"
         elif self.check_type == "eventlog":
             body = subject
 

api/tacticalrmm/core/admin.py

@@ -1,6 +1,7 @@
 from django.contrib import admin
 
-from .models import CoreSettings, CustomField
+from .models import CoreSettings, CustomField, CodeSignToken
 
 admin.site.register(CoreSettings)
 admin.site.register(CustomField)
+admin.site.register(CodeSignToken)

api/tacticalrmm/core/installer.ps1

@@ -10,6 +10,8 @@ $ping = pingchange
 $auth = '"tokenchange"'
 $downloadlink = 'downloadchange'
 
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
 $serviceName = 'tacticalagent'
 If (Get-Service $serviceName -ErrorAction SilentlyContinue) {
     write-host ('Tactical RMM Is Already Installed')

api/tacticalrmm/core/migrations/0019_codesigntoken.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2 on 2021-04-13 05:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0018_auto_20210329_1709'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CodeSignToken',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('token', models.CharField(blank=True, max_length=255, null=True)),
+            ],
+        ),
+    ]

api/tacticalrmm/core/models.py

@@ -266,3 +266,16 @@ class CustomField(models.Model):
             return self.default_value_bool
         else:
             return self.default_value_string
+
+
+class CodeSignToken(models.Model):
+    token = models.CharField(max_length=255, null=True, blank=True)
+
+    def save(self, *args, **kwargs):
+        if not self.pk and CodeSignToken.objects.exists():
+            raise ValidationError("There can only be one CodeSignToken instance")
+
+        super(CodeSignToken, self).save(*args, **kwargs)
+
+    def __str__(self):
+        return "Code signing token"

api/tacticalrmm/core/serializers.py

@@ -1,7 +1,7 @@
 import pytz
 from rest_framework import serializers
 
-from .models import CoreSettings, CustomField
+from .models import CoreSettings, CustomField, CodeSignToken
 
 
 class CoreSettingsSerializer(serializers.ModelSerializer):
@@ -27,3 +27,9 @@ class CustomFieldSerializer(serializers.ModelSerializer):
     class Meta:
         model = CustomField
         fields = "__all__"
+
+
+class CodeSignTokenSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = CodeSignToken
+        fields = "__all__"

api/tacticalrmm/core/tests.py

@@ -1,3 +1,4 @@
+import requests
 from unittest.mock import patch
 
 from channels.db import database_sync_to_async
@@ -12,6 +13,28 @@ from .serializers import CustomFieldSerializer
 from .tasks import core_maintenance_tasks
 
 
+class TestCodeSign(TacticalTestCase):
+    def setUp(self):
+        self.setup_coresettings()
+        self.authenticate()
+        self.url = "/core/codesign/"
+
+    def test_get_codesign(self):
+        r = self.client.get(self.url)
+        self.assertEqual(r.status_code, 200)
+
+        self.check_not_authenticated("get", self.url)
+
+    @patch("requests.post")
+    def test_edit_codesign_timeout(self, mock_post):
+        mock_post.side_effect = requests.exceptions.ConnectionError()
+        data = {"token": "token123"}
+        r = self.client.patch(self.url, data, format="json")
+        self.assertEqual(r.status_code, 400)
+
+        self.check_not_authenticated("patch", self.url)
+
+
 class TestConsumers(TacticalTestCase):
     def setUp(self):
         self.setup_coresettings()

api/tacticalrmm/core/urls.py

@@ -12,4 +12,5 @@ urlpatterns = [
     path("servermaintenance/", views.server_maintenance),
     path("customfields/", views.GetAddCustomFields.as_view()),
     path("customfields/<int:pk>/", views.GetUpdateDeleteCustomFields.as_view()),
+    path("codesign/", views.CodeSign.as_view()),
 ]

api/tacticalrmm/core/views.py

@@ -11,8 +11,12 @@ from rest_framework.views import APIView
 
 from tacticalrmm.utils import notify_error
 
-from .models import CoreSettings, CustomField
-from .serializers import CoreSettingsSerializer, CustomFieldSerializer
+from .models import CoreSettings, CustomField, CodeSignToken
+from .serializers import (
+    CoreSettingsSerializer,
+    CustomFieldSerializer,
+    CodeSignTokenSerializer,
+)
 
 
 class UploadMeshAgent(APIView):
@@ -65,6 +69,8 @@ def dashboard_info(request):
             "dbl_click_action": request.user.agent_dblclick_action,
             "default_agent_tbl_tab": request.user.default_agent_tbl_tab,
             "client_tree_sort": request.user.client_tree_sort,
+            "client_tree_splitter": request.user.client_tree_splitter,
+            "loading_bar_color": request.user.loading_bar_color,
         }
     )
 
@@ -177,3 +183,48 @@ class GetUpdateDeleteCustomFields(APIView):
         get_object_or_404(CustomField, pk=pk).delete()
 
         return Response("ok")
+
+
+class CodeSign(APIView):
+    def get(self, request):
+        token = CodeSignToken.objects.first()
+        return Response(CodeSignTokenSerializer(token).data)
+
+    def patch(self, request):
+        import requests
+
+        errors = []
+        for url in settings.EXE_GEN_URLS:
+            try:
+                r = requests.post(
+                    f"{url}/api/v1/checktoken",
+                    json={"token": request.data["token"]},
+                    headers={"Content-type": "application/json"},
+                    timeout=15,
+                )
+            except Exception as e:
+                errors.append(str(e))
+            else:
+                errors = []
+                break
+
+        if errors:
+            return notify_error(", ".join(errors))
+
+        if r.status_code == 400 or r.status_code == 401:  # type: ignore
+            return notify_error(r.json()["ret"])  # type: ignore
+        elif r.status_code == 200:  # type: ignore
+            t = CodeSignToken.objects.first()
+            if t is None:
+                CodeSignToken.objects.create(token=request.data["token"])
+            else:
+                serializer = CodeSignTokenSerializer(instance=t, data=request.data)
+                serializer.is_valid(raise_exception=True)
+                serializer.save()
+            return Response("Token was saved")
+
+        try:
+            ret = r.json()["ret"]  # type: ignore
+        except:
+            ret = "Something went wrong"
+        return notify_error(ret)

api/tacticalrmm/requirements.txt

@@ -1,4 +1,4 @@
-asgiref==3.3.1
+asgiref==3.3.4
 asyncio-nats-client==0.11.4
 celery==5.0.5
 certifi==2020.12.5
@@ -6,7 +6,8 @@ cffi==1.14.5
 channels==3.0.3
 chardet==4.0.0
 cryptography==3.4.7
-Django==3.1.7
+daphne==3.0.2
+Django==3.2.0
 django-cors-headers==3.7.0
 django-rest-knox==4.1.0
 djangorestframework==3.12.4
@@ -26,7 +27,7 @@ redis==3.5.3
 requests==2.25.1
 six==1.15.0
 sqlparse==0.4.1
-twilio==6.55.0
+twilio==6.56.0
 urllib3==1.26.4
 uWSGI==2.0.19.1
 validators==0.18.2

api/tacticalrmm/scripts/community_scripts.json

@@ -1,83 +1,105 @@
 [
   {
-    "filename": "ClearFirefoxCache.ps1",
+    "guid": "6820cb5e-5a7f-4d9b-8c22-d54677e3cc04",
+    "filename": "Win_Clear_Firefox_Cache.ps1",
     "submittedBy": "https://github.com/Omnicef",
-    "name": "Clear Firefox Cache",
+    "name": "Firefox - Clean Cache",
     "description": "This script will clean up Mozilla Firefox for all users.",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):Browsers"
   },
   {
-    "filename": "ClearGoogleChromeCache.ps1",
+    "guid": "3ff6a386-11d1-4f9d-8cca-1b0563bb6443",
+    "filename": "Win_Clear_Google_Chrome_Cache.ps1",
     "submittedBy": "https://github.com/Omnicef",
-    "name": "Clear Google Chrome Cache",
+    "name": "Chrome - Clear Cache for All Users",
     "description": "This script will clean up Google Chrome for all users.",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):Browsers"
   },
   {
-    "filename": "InstallAdobeReader.ps1",
+    "guid": "be1de837-f677-4ac5-aa0c-37a0fc9991fc",
+    "filename": "Win_Install_Adobe_Reader.ps1",
     "submittedBy": "https://github.com/Omnicef",
-    "name": "Install Adobe Reader DC",
+    "name": "Adobe Reader DC - Install",
     "description": "Installs Adobe Reader DC.",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):3rd Party Software>Chocolatey"
   },
   {
+    "guid": "2ee134d5-76aa-4160-b334-a1efbc62079f",
     "filename": "Win_Install_Duplicati.ps1",
     "submittedBy": "https://github.com/Omnicef",
-    "name": "Install Duplicati",
+    "name": "Duplicati - Install",
     "description": "This script installs Duplicati 2.0.5.1 as a service.",
     "shell": "powershell",
     "category": "TRMM (Win):3rd Party Software"
   },
   {
-    "filename": "Reset-WindowsUpdate.ps1",
+    "guid": "81cc5bcb-01bf-4b0c-89b9-0ac0f3fe0c04",
+    "filename": "Win_Reset_Windows_Update.ps1",
     "submittedBy": "https://github.com/Omnicef",
-    "name": "Reset Windows Update",
+    "name": "Windows Update - Reset",
     "description": "This script will reset all of the Windows Updates components to DEFAULT SETTINGS.",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):Updates"
   },
   {
-    "filename": "Start-Cleanup.ps1",
+    "guid": "8db87ff0-a9b4-4d9d-bc55-377bbcb85b6d",
+    "filename": "Win_Start_Cleanup.ps1",
     "submittedBy": "https://github.com/Omnicef",
-    "name": "Cleanup C: drive",
+    "name": "Disk - Cleanup C: drive",
     "description": "Cleans the C: drive's Window Temperary files, Windows SoftwareDistribution folder, the local users Temperary folder, IIS logs (if applicable) and empties the recycling bin. All deleted files will go into a log transcript in $env:TEMP. By default this script leaves files that are newer than 7 days old however this variable can be edited.",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):Other"
   },
   {
-    "filename": "WindowsDefenderFullScanBackground.ps1",
+    "guid": "2f28e8c1-ae0f-4b46-a826-f513974526a3",
+    "filename": "Win_Defender_FullScan_Background.ps1",
     "submittedBy": "https://github.com/Omnicef",
-    "name": "Windows Defender Full Scan",
+    "name": "Defender - Full Scan",
     "description": "Runs a Windows Defender Full background scan.",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):Security>Antivirus"
   },
   {
-    "filename": "WindowsDefenderQuickScanBackground.ps1",
+    "guid": "adf81ddb-3b77-415c-a89b-2ccc826b5aa7",
+    "filename": "Win_Defender_QuickScan_Background.ps1",
     "submittedBy": "https://github.com/Omnicef",
-    "name": "Windows Defender Quick Scan",
+    "name": "Defender - Quick Scan",
     "description": "Runs a Quick Scan using Windows Defender in the Background.",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):Security>Antivirus"
   },
   {
-    "filename": "speedtest.py",
+    "guid": "3c46290b-85db-4cd2-93a2-943c8c93b3b1",
+    "filename": "Speedtest.py",
     "submittedBy": "https://github.com/wh1te909",
-    "name": "Speed Test",
-    "description": "Runs a Speed Test",
-    "shell": "python"
+    "name": "Network - Speed Test",
+    "description": "Runs a Speed Test using Python",
+    "shell": "python",
+    "category": "TRMM (Win):Network"
   },
   {
-    "filename": "Rename-Installed-App.ps1",
+    "guid": "9d34f482-1f0c-4b2f-b65f-a9cf3c13ef5f",
+    "filename": "Win_Rename_Installed_App.ps1",
     "submittedBy": "https://github.com/bradhawkins85",
-    "name": "Rename Tactical RMM Agent",
+    "name": "TacticalRMM Agent Rename",
     "description": "Updates the DisplayName registry entry for the Tactical RMM windows agent to your desired name. This script takes 1 required argument: the name you wish to set.",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):TacticalRMM Related"
   },
   {
-    "filename": "bitlocker_encrypted_drive_c.ps1",
+    "guid": "525ae965-1dcf-4c17-92b3-5da3cf6819f5",
+    "filename": "Win_Bitlocker_Encrypted_Drive_c.ps1",
     "submittedBy": "https://github.com/ThatsNASt",
-    "name": "Check C Drive for Bitlocker Status",
+    "name": "Bitlocker - Check C Drive for Status",
     "description": "Runs a check on drive C for Bitlocker status.",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):Storage"
   },
   {
+    "guid": "2ea35fa2-c227-4d17-a40e-4d39f252e27a",
     "filename": "Win_Bitlocker_Create_Status_Report.ps1",
     "submittedBy": "https://github.com/ThatsNASt",
     "name": "Create Bitlocker Status Report",
@@ -86,140 +108,223 @@
     "category": "TRMM (Win):Storage"
   },
   {
-    "filename": "bitlocker_retrieve_status_report.ps1",
+    "guid": "9e5769c1-3873-4941-bf70-e851e0afbd6d",
+    "filename": "Win_Bitlocker_Retrieve_Status_Report.ps1",
     "submittedBy": "https://github.com/ThatsNASt",
-    "name": "Retreive Bitlocker Status Report",
+    "name": "Bitlocker - Retrieve Status Report",
     "description": "Retreives a Bitlocker status report.",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):Storage"
   },
   {
+    "guid": "72b93487-0266-43f0-97cc-03d4c7ee0b44",
+    "filename": "Win_Bitlocker_Get_Recovery_Keys.ps1",
+    "submittedBy": "https://github.com/silversword411",
+    "name": "Bitlocker - Get Recovery Keys",
+    "description": "Retreives a Bitlocker Recovery Keys",
+    "shell": "powershell",
+    "category": "TRMM (Win):Storage"
+  },
+  {
+    "guid": "cfa14c28-4dfc-4d4e-95ee-a380652e058d",
     "filename": "Win_Bios_Check.ps1",
     "submittedBy": "https://github.com/ThatsNASt",
-    "name": "Check BIOS Information",
+    "name": "BIOS - Check Information",
     "description": "Retreives and reports on BIOS make, version, and date.",
     "shell": "powershell",
     "category": "TRMM (Win):Hardware"
   },
   {
-    "filename": "ResetHighPerformancePowerProfiletoDefaults.ps1",
+    "guid": "e1c27982-b955-4766-85b6-d92527a177cf",
+    "filename": "Win_Hardware_Monitor_Get_Info.ps1",
+    "submittedBy": "https://github.com/MaxAnderson95/",
+    "name": "Monitor - Get Info",
+    "description": "Retreives and reports on Monitor info: Manufacturer, Model, Serial",
+    "shell": "powershell",
+    "category": "TRMM (Win):Hardware"
+  },
+  {
+    "guid": "ae231ac4-b01f-4a39-a9d2-3d817af75260",
+    "filename": "Win_Hardware_RAM_Status.ps1",
+    "submittedBy": "https://github.com/silversword411",
+    "name": "RAM - Check Information",
+    "description": "Retreives and reports on RAM info: DIMM's, total memory, slots total and used",
+    "shell": "powershell",
+    "category": "TRMM (Win):Hardware"
+  },
+  {
+    "guid": "95a2ee6f-b89b-4551-856e-3081b041caa7",
+    "filename": "Win_Reset_High_Performance_Power_Profile_to_Defaults.ps1",
     "submittedBy": "https://github.com/azulskyknight",
-    "name": "Reset High Perf Power Profile",
+    "name": "Power Profile - Reset High Perf Power Profile to defaults",
     "description": "Resets monitor, disk, standby, and hibernate timers in the default High Performance power profile to their default values. It also re-indexes the AC and DC power profiles into their default order.",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):Power"
   },
   {
-    "filename": "SetHighPerformancePowerProfile.ps1",
+    "guid": "2cbd30b0-84dd-4388-a36d-2e2e980f1a3e",
+    "filename": "Win_Set_High_Performance_Power_Profile.ps1",
     "submittedBy": "https://github.com/azulskyknight",
-    "name": "Set High Perf Power Profile",
+    "name": "Power Profile - Set High Performance",
     "description": "Sets the High Performance Power profile to the active power profile. Use this to keep machines from falling asleep.",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):Power"
   },
   {
-    "filename": "Windows10Upgrade.ps1",
+    "guid": "553236d3-81bc-49f4-af8a-0cff925a7f6d",
+    "filename": "Win_10_Upgrade.ps1",
     "submittedBy": "https://github.com/RVL-Solutions and https://github.com/darimm",
     "name": "Windows 10 Upgrade",
     "description": "Forces an upgrade to the latest release of Windows 10.",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):Updates"
   },
   {
-    "filename": "DiskStatus.ps1",
+    "guid": "375323e5-cac6-4f35-a304-bb7cef35902d",
+    "filename": "Win_Disk_Status.ps1",
     "submittedBy": "https://github.com/dinger1986",
-    "name": "Check Disks",
+    "name": "Disk Hardware Health Check (using Event Viewer errors)",
     "description": "Checks local disks for errors reported in event viewer within the last 24 hours",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):Hardware"
   },
   {
-    "filename": "DuplicatiStatus.ps1",
+    "guid": "7c14beb4-d1c3-41aa-8e70-92a267d6e080",
+    "filename": "Win_Duplicati_Status.ps1",
     "submittedBy": "https://github.com/dinger1986",
-    "name": "Check Duplicati",
+    "name": "Duplicati - Check",
     "description": "Checks Duplicati Backup is running properly over the last 24 hours",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):3rd Party Software"
   },
   {
-    "filename": "EnableDefender.ps1",
+    "guid": "da51111c-aff6-4d87-9d76-0608e1f67fe5",
+    "filename": "Win_Defender_Enable.ps1",
     "submittedBy": "https://github.com/dinger1986",
-    "name": "Enable Windows Defender",
+    "name": "Defender - Enable",
     "description": "Enables Windows Defender and sets preferences",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):Security>Antivirus"
   },
   {
-    "filename": "OpenSSHServerInstall.ps1",
+    "guid": "a223d03a-e22e-40e0-94f2-92dd8c481d14",
+    "filename": "Win_Open_SSH_Server_Install.ps1",
     "submittedBy": "https://github.com/dinger1986",
-    "name": "Install SSH",
-    "description": "Installs and enabled OpenSSH Server",
-    "shell": "powershell"
+    "name": "SSH - Install Feature and Enable",
+    "description": "Installs and enabled OpenSSH Server Feature in Win10",
+    "shell": "powershell",
+    "category": "TRMM (Win):Windows Features"
   },
   {
-    "filename": "RDP_enable.bat",
+    "guid": "2435297a-6263-4e90-8688-1847400d0e22",
+    "filename": "Win_RDP_enable.bat",
     "submittedBy": "https://github.com/dinger1986",
-    "name": "Enable RDP",
+    "name": "RDP - Enable",
     "description": "Enables RDP",
-    "shell": "cmd"
+    "shell": "cmd",
+    "category": "TRMM (Win):Windows Features"
   },
   {
-    "filename": "Speedtest.ps1",
+    "guid": "24f19ead-fdfe-46b4-9dcb-4cd0e12a3940",
+    "filename": "Win_Speedtest.ps1",
     "submittedBy": "https://github.com/dinger1986",
-    "name": "PS Speed Test",
-    "description": "Powershell speed test (win 10 or server2016+)",
-    "shell": "powershell"
+    "name": "Speed Test Powershell",
+    "description": "Speed Test with Powershell(win 10 or server2016+)",
+    "shell": "powershell",
+    "category": "TRMM (Win):Network"
   },
   {
-    "filename": "SyncTime.bat",
+    "guid": "a821975c-60df-4d58-8990-6cf8a55b4ee0",
+    "filename": "Win_Sync_Time.bat",
     "submittedBy": "https://github.com/dinger1986",
-    "name": "Sync DC Time",
+    "name": "ADDC - Sync DC Time",
     "description": "Syncs time with domain controller",
-    "shell": "cmd"
+    "shell": "cmd",
+    "category": "TRMM (Win):Active Directory"
   },
   {
-    "filename": "WinDefenderClearLogs.ps1",
+    "guid": "b6b9912f-4274-4162-99cc-9fd47fbcb292",
+    "filename": "Win_ADDC_Sync_Start.bat",
+    "submittedBy": "https://github.com/silversword411",
+    "name": "ADDC - Sync AD",
+    "description": "Trigger AD Sync on domain controller",
+    "shell": "cmd",
+    "category": "TRMM (Win):Active Directory"
+  },
+  {
+    "guid": "b720e320-7755-4c89-9992-e1a6c43699ed",
+    "filename": "Win_Defender_Clear_Logs.ps1",
     "submittedBy": "https://github.com/dinger1986",
-    "name": "Clear Defender Logs",
+    "name": "Defender - Clear Logs",
     "description": "Clears Windows Defender Logs",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):Security>Antivirus"
   },
   {
-    "filename": "WinDefenderStatus.ps1",
+    "guid": "d980fda3-a068-47eb-8495-1aab07a24e64",
+    "filename": "Win_Defender_Status.ps1",
     "submittedBy": "https://github.com/dinger1986",
-    "name": "Defender Status",
+    "name": "Defender - Status",
     "description": "This will check for Malware, Antispyware, that Windows Defender is Healthy, last scan etc within the last 24 hours",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):Security>Antivirus"
   },
   {
-    "filename": "disable_FastStartup.bat",
+    "guid": "9956e936-6fdb-4488-a9d8-8b274658037f",
+    "filename": "Win_Disable_Fast_Startup.bat",
     "submittedBy": "https://github.com/dinger1986",
-    "name": "Disable Fast Startup",
+    "name": "Power - Fast Startup Disable",
     "description": "Disables Faststartup on Windows 10",
-    "shell": "cmd"
+    "shell": "cmd",
+    "category": "TRMM (Win):Power"
   },
   {
-    "filename": "updatetacticalexclusion.ps1",
+    "guid": "f628a02b-16c3-4ab5-b788-dec5bc2af1d9",
+    "filename": "Win_Power_Disable_Hibernation.bat",
+    "submittedBy": "https://github.com/silversword411",
+    "name": "Power - Hibernate Disable",
+    "description": "Disables Hibernation",
+    "shell": "cmd",
+    "category": "TRMM (Win):Power"
+  },
+  {
+    "guid": "2472bbaf-1941-4722-8a58-d1dd0f528801",
+    "filename": "Win_Update_Tactical_Exclusion.ps1",
     "submittedBy": "https://github.com/dinger1986",
     "name": "TRMM Defender Exclusions",
     "description": "Windows Defender Exclusions for Tactical RMM",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):Security>Antivirus"
   },
   {
-    "filename": "Display_Message_To_User.ps1",
+    "guid": "b253dc76-41a0-48ca-9cea-bee4277402c4",
+    "filename": "Win_Display_Message_To_User.ps1",
     "submittedBy": "https://github.com/bradhawkins85",
-    "name": "Display Message To User",
+    "name": "Message Popup To User",
     "description": "Displays a popup message to the currently logged on user",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):Other"
   },
   {
-    "filename": "VerifyAntivirus.ps1",
+    "guid": "19224d21-bd39-44bc-b9cf-8f1ba3ca9c11",
+    "filename": "Win_Antivirus_Verify.ps1",
     "submittedBy": "https://github.com/beejayzed",
-    "name": "Verify Antivirus Status",
+    "name": "Antivirus - Verify Status",
     "description": "Verify and display status for all installed Antiviruses",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):Security>Antivirus"
   },
   {
-    "filename": "CreateAllUserLogonScript.ps1",
+    "guid": "f88c5c52-c6fe-44db-b727-b7912a4279ed",
+    "filename": "Win_Create_All_User_Logon_Script.ps1",
     "submittedBy": "https://github.com/nr-plaxon",
-    "name": "Create User Logon Script",
+    "name": "Template Example - Create User Logon Script",
     "description": "Creates a powershell script that runs at logon of any user on the machine in the security context of the user.",
-    "shell": "powershell"
+    "shell": "powershell",
+    "category": "TRMM (Win):Other"
   },
   {
+    "guid": "5615aa90-0272-427b-8acf-0ca019612501",
     "filename": "Win_Chocolatey_Update_Installed.bat",
     "submittedBy": "https://github.com/silversword411",
     "name": "Chocolatey Update Installed Apps",
@@ -228,22 +333,52 @@
     "category": "TRMM (Win):3rd Party Software>Chocolatey"
   },
   {
+    "guid": "fff8024d-d72e-4457-84fa-6c780f69a16f",
     "filename": "Win_AD_Check_And_Enable_AD_Recycle_Bin.ps1",
     "submittedBy": "https://github.com/silversword411",
-    "name": "AD - Check and Enable AD Recycle Bin",
+    "name": "ADDC - Check and Enable AD Recycle Bin",
     "description": "Only run on Domain Controllers, checks for Active Directory Recycle Bin and enables if not already enabled",
     "shell": "powershell",
     "category": "TRMM (Win):Active Directory"
   },
   {
-    "filename": "Check_Events_for_Bluescreens.ps1",
+    "guid": "71090fc4-faa6-460b-adb0-95d7863544e1",
+    "filename": "Win_Check_Events_for_Bluescreens.ps1",
     "submittedBy": "https://github.com/dinger1986",
-    "name": "Event Viewer - Check for Bluescreens",
-    "description": "This will check for Bluescreen events on your system",
+    "name": "Event Viewer - Bluescreen Notification",
+    "description": "Event Viewer Monitor - Notify Bluescreen events on your system",
     "shell": "powershell",
     "category": "TRMM (Win):Monitoring"
   },
   {
+    "guid": "8373846f-facc-49b9-9891-3a780a394c89",
+    "filename": "Win_Local_User_Created_Monitor.ps1",
+    "submittedBy": "https://github.com/dinger1986",
+    "name": "Event Viewer - New User Notification",
+    "description": "Event Viewer Monitor - Notify when new Local user is created",
+    "shell": "powershell",
+    "category": "TRMM (Win):Monitoring"
+  },
+  {
+    "guid": "65e5cef1-8338-4180-a0bc-cd54e62de690",
+    "filename": "Win_Task_Scheduler_New_Items_Monitor.ps1",
+    "submittedBy": "https://github.com/dinger1986",
+    "name": "Event Viewer - Task Scheduler New Item Notification",
+    "description": "Event Viewer Monitor - Notify when new Task Scheduler item is created",
+    "shell": "powershell",
+    "category": "TRMM (Win):Monitoring"
+  },
+  {
+    "guid": "08ca81f2-f044-4dfc-ad47-090b19b19d76",
+    "filename": "Win_User_Logged_in_with_Temp_Profile.ps1",
+    "submittedBy": "https://github.com/dinger1986",
+    "name": "User Logged in with temp profile check",
+    "description": "Check if users are logged in with a temp profile",
+    "shell": "powershell",
+    "category": "TRMM (Win):Other"
+  },
+  {
+    "guid": "5d905886-9eb1-4129-8b81-a013f842eb24",
     "filename": "Win_Rename_Computer.ps1",
     "submittedBy": "https://github.com/silversword411",
     "name": "Rename Computer",
@@ -253,18 +388,194 @@
     "default_timeout": 30
   },
   {
-    "filename": "Finish_updates_and_restart.ps1",
+    "guid": "f396dae2-c768-45c5-bd6c-176e56ed3614",
+    "filename": "Win_Finish_updates_and_restart.ps1",
     "submittedBy": "https://github.com/tremor021",
-    "name": "Finish updates and restart",
-    "description": "Finish installing updates and restart PC",
+    "name": "Updates - Finish and restart",
+    "description": "Finish installing Windows updates and restart PC",
     "shell": "powershell",
     "category": "TRMM (Win):Other"
   },
   {
-    "filename": "Finish_updates_and_shutdown.ps1",
+    "guid": "63f89be0-a9c9-4c61-9b55-bce0b28b90b2",
+    "filename": "Win_Finish_updates_and_shutdown.ps1",
     "submittedBy": "https://github.com/tremor021",
-    "name": "Finish updates and shutdown",
-    "description": "Finish installing updates and shutdown PC",
+    "name": "Updates - Finish and Shutdown",
+    "description": "Finish installing Windows updates and shutdown PC",
+    "shell": "powershell",
+    "category": "TRMM (Win):Other"
+  },
+  {
+    "guid": "e09895d5-ca13-44a2-a38c-6e77c740f0e8",
+    "filename": "Win_ScreenConnectAIO.ps1",
+    "submittedBy": "https://github.com/bradhawkins85",
+    "name": "ScreenConnect AIO",
+    "description": "Install, Uninstall, Start and Stop ScreenConnect Access Agent",
+    "args": [
+      "-serviceName {{client.ScreenConnectService}}",
+      "-url {{client.ScreenConnectInstaller}}",
+      "-action install"
+    ],
+    "default_timeout": "90",
+    "shell": "powershell",
+    "category": "TRMM (Win):3rd Party Software"
+  },
+  {
+    "guid": "3abbb62a-3757-492c-8979-b4fc6174845d",
+    "filename": "Win_Disable_AutoRun.bat",
+    "submittedBy": "https://github.com/silversword411",
+    "name": "Autorun - Disable",
+    "description": "Disable Autorun System Wide",
+    "shell": "cmd",
+    "category": "TRMM (Win):Other",
+    "default_timeout": "30"
+  },
+  {
+    "guid": "4a11877a-7555-494c-ac74-29d6df3c1989",
+    "filename": "Win_Disable_Cortana.bat",
+    "submittedBy": "https://github.com/silversword411",
+    "name": "Cortana - Disable",
+    "description": "Disable Cortana System Wide",
+    "shell": "cmd",
+    "category": "TRMM (Win):Other",
+    "default_timeout": "30"
+  },
+  {
+    "guid": "28ef1387-dd4f-4bab-b042-26250914e370",
+    "filename": "Win_WOL_Enable_Status.ps1",
+    "submittedBy": "https://github.com/silversword411",
+    "name": "Network WoL - Enable function",
+    "description": "Wake on Lan enable on Dell, HP, Lenovo",
+    "shell": "powershell",
+    "category": "TRMM (Win):Network",
+    "default_timeout": "90"
+  },
+  {
+    "guid": "685d5432-0b84-46d5-98e8-3ec2054150fe",
+    "filename": "Win_WOL_Test_State.ps1",
+    "submittedBy": "https://github.com/silversword411",
+    "name": "Network WoL - Test State",
+    "description": "Wake on Lan test status",
+    "shell": "powershell",
+    "category": "TRMM (Win):Network",
+    "default_timeout": "90"
+  },
+  {
+    "guid": "6ce5682a-49db-4c0b-9417-609cf905ac43",
+    "filename": "Win_Win10_Change_Key_and_Activate.ps1",
+    "submittedBy": "https://github.com/silversword411",
+    "name": "Product Key in Win10 Change and Activate",
+    "description": "Insert new product key and Activate. Requires 1 parameter the product key you want to use",
+    "shell": "powershell",
+    "category": "TRMM (Win):Other",
+    "default_timeout": "90"
+  },
+  {
+    "guid": "83f6c6ea-6120-4fd3-bec8-d3abc505dcdf",
+    "filename": "Win_TRMM_Start_Menu_Delete_Shortcut.ps1",
+    "submittedBy": "https://github.com/silversword411",
+    "name": "TRMM Delete Start Menu Shortcut for App",
+    "description": "Tactical RMM delete its application shortcut that's installed in the start menu",
+    "shell": "powershell",
+    "category": "TRMM (Win):TacticalRMM Related",
+    "default_timeout": "10"
+  },
+  {
+    "guid": "60130fca-7636-446e-acd7-cc5d29d609c2",
+    "filename": "Win_Firewall_Check_Status.ps1",
+    "submittedBy": "https://github.com/dinger1986",
+    "name": "Windows Firewall - Check Status",
+    "description": "Windows Firewall - Check state, report status",
+    "shell": "powershell",
+    "category": "TRMM (Win):Network"
+  },
+  {
+    "guid": "93379675-c01c-433f-87df-a11597c959f0",
+    "filename": "Win_UAC_Check_Status.ps1",
+    "submittedBy": "https://github.com/dinger1986",
+    "name": "Windows UAC - Check Status",
+    "description": "Windows UAC - Report status",
+    "shell": "powershell",
+    "category": "TRMM (Win):Security"
+  },
+  {
+    "guid": "7ea6a11a-05c0-4151-b5c1-cb8af029299f",
+    "filename": "Win_AzureAD_Check_Connection_Status.ps1",
+    "submittedBy": "https://github.com/dinger1986",
+    "name": "Azure AD - Check Status",
+    "description": "Azure AD - Check if joined or not",
+    "shell": "powershell",
+    "category": "TRMM (Win):Azure>AD"
+  },
+  {
+    "guid": "7d81859a-1ba3-42b0-8664-29844f0dd765",
+    "filename": "Win_Azure_Mars_Cloud_Backup_Status.ps1",
+    "submittedBy": "https://github.com/dinger1986",
+    "name": "Azure - Mars Cloud backup Status",
+    "description": "Azure - Mars Cloud backup Check Status",
+    "shell": "powershell",
+    "category": "TRMM (Win):Azure>Backup"
+  },
+  {
+    "guid": "e18c64d0-b783-4b52-b44b-9bb7592b439b",
+    "filename": "Win_FileSystem_Enable_Long_Paths.bat",
+    "submittedBy": "https://github.com/silversword411",
+    "name": "File System - Enable Long Paths",
+    "description": "Enables NTFS Long paths greater than 260 characters",
+    "shell": "cmd",
+    "category": "TRMM (Win):Storage"
+  },
+  {
+    "guid": "c6252ca8-5172-42ea-9114-e447f80868f5",
+    "filename": "Win_USB_Disable_Access.bat",
+    "submittedBy": "https://github.com/silversword411",
+    "name": "USB - Disable Access",
+    "description": "USB - Disable Plugged in USB devices",
+    "shell": "cmd",
+    "category": "TRMM (Win):Storage"
+  },
+  {
+    "guid": "3785952f-69fb-4bda-b2fe-5e3e8642738a",
+    "filename": "Win_USB_Enable_Access.bat",
+    "submittedBy": "https://github.com/silversword411",
+    "name": "USB - Enable Access",
+    "description": "USB - Enable Plugged in USB devices",
+    "shell": "cmd",
+    "category": "TRMM (Win):Storage"
+  },
+  {
+    "guid": "c6014da2-b188-4e1b-b96a-e3440ade3a6a",
+    "filename": "Win_RecycleBin_Empty.ps1",
+    "submittedBy": "https://github.com/silversword411",
+    "name": "File System - Empty Recycle Bin",
+    "description": "Empty the recycle bin",
+    "shell": "powershell",
+    "category": "TRMM (Win):Storage"
+  },
+  {
+    "guid": "57997ec7-b293-4fd5-9f90-a25426d0eb90",
+    "filename": "Win_Get_Computer_Users.ps1",
+    "submittedBy": "https://github.com/tremor021",
+    "name": "Get Computer Users",
+    "description": "Get list of computer users and show which one is enabled",
+    "shell": "powershell",
+    "category": "TRMM (Win):Other"
+  },
+  {
+    "guid": "77da9c87-5a7a-4ba1-bdde-3eeb3b01d62d",
+    "filename": "Win_Set_Network_To_Private.ps1",
+    "submittedBy": "https://github.com/tremor021",
+    "name": "Set Network To Private",
+    "description": "Sets current network type to Private",
+    "shell": "powershell",
+    "category": "TRMM (Win):Network"
+  },
+  {
+    "guid": "768f42d5-7b45-45ed-8233-254ae537aaa2",
+    "filename": "Win_TaskScheduler_Add_Task.ps1",
+    "submittedBy": "https://github.com/tremor021",
+    "name": "Add task to TaskScheduler",
+    "description": "Add a task to Task Scheduler, needs editing",
     "shell": "powershell",
     "category": "TRMM (Win):Other"
   }

api/tacticalrmm/scripts/migrations/0008_script_guid.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.7 on 2021-04-15 02:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('scripts', '0007_script_args'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='script',
+            name='guid',
+            field=models.CharField(blank=True, max_length=64, null=True),
+        ),
+    ]

api/tacticalrmm/scripts/models.py

@@ -23,6 +23,7 @@ logger.configure(**settings.LOG_CONFIG)
 
 
 class Script(BaseAuditModel):
+    guid = name = models.CharField(max_length=64, null=True, blank=True)
     name = models.CharField(max_length=255)
     description = models.TextField(null=True, blank=True)
     filename = models.CharField(max_length=255)  # deprecated
@@ -78,16 +79,14 @@ class Script(BaseAuditModel):
 
         for script in info:
             if os.path.exists(os.path.join(scripts_dir, script["filename"])):
-                s = cls.objects.filter(script_type="builtin").filter(
-                    name=script["name"]
-                )
+                s = cls.objects.filter(script_type="builtin", guid=script["guid"])
 
                 category = (
                     script["category"] if "category" in script.keys() else "Community"
                 )
 
                 default_timeout = (
-                    script["default_timeout"]
+                    int(script["default_timeout"])
                     if "default_timeout" in script.keys()
                     else 90
                 )
@@ -120,6 +119,46 @@ class Script(BaseAuditModel):
                             "args",
                         ]
                     )
+
+                # check if script was added without a guid
+                elif cls.objects.filter(
+                    script_type="builtin", name=script["name"]
+                ).exists():
+                    s = cls.objects.get(script_type="builtin", name=script["name"])
+
+                    if not s.guid:
+                        print(f"Updating GUID for: {script['name']}")
+                        s.guid = script["guid"]
+                        s.name = script["name"]
+                        s.description = script["description"]
+                        s.category = category
+                        s.shell = script["shell"]
+                        s.default_timeout = default_timeout
+                        s.args = args
+
+                        with open(
+                            os.path.join(scripts_dir, script["filename"]), "rb"
+                        ) as f:
+                            script_bytes = (
+                                f.read().decode("utf-8").encode("ascii", "ignore")
+                            )
+                            s.code_base64 = base64.b64encode(script_bytes).decode(
+                                "ascii"
+                            )
+
+                        s.save(
+                            update_fields=[
+                                "guid",
+                                "name",
+                                "description",
+                                "category",
+                                "default_timeout",
+                                "code_base64",
+                                "shell",
+                                "args",
+                            ]
+                        )
+
                 else:
                     print(f"Adding new community script: {script['name']}")
 
@@ -131,6 +170,7 @@ class Script(BaseAuditModel):
 
                         cls(
                             code_base64=code_base64,
+                            guid=script["guid"],
                             name=script["name"],
                             description=script["description"],
                             filename=script["filename"],
@@ -141,6 +181,9 @@ class Script(BaseAuditModel):
                             args=args,
                         ).save()
 
+        # delete community scripts that had their name changed
+        cls.objects.filter(script_type="builtin", guid=None).delete()
+
     @staticmethod
     def serialize(script):
         # serializes the script and returns json

api/tacticalrmm/scripts/tests.py

@@ -1,3 +1,4 @@
+from email.policy import default
 import json
 import os
 from pathlib import Path
@@ -206,6 +207,7 @@ class TestScriptViews(TacticalTestCase):
         ) as f:
             info = json.load(f)
 
+        guids = []
         for script in info:
             fn: str = script["filename"]
             self.assertTrue(os.path.exists(os.path.join(scripts_dir, fn)))
@@ -222,6 +224,19 @@ class TestScriptViews(TacticalTestCase):
             elif fn.endswith(".py"):
                 self.assertEqual(script["shell"], "python")
 
+            if "args" in script.keys():
+                self.assertIsInstance(script["args"], list)
+
+            # allows strings as long as they can be type casted to int
+            if "default_timeout" in script.keys():
+                self.assertIsInstance(int(script["default_timeout"]), int)
+
+            self.assertIn("guid", script.keys())
+            guids.append(script["guid"])
+
+        # check guids are unique
+        self.assertEqual(len(guids), len(set(guids)))
+
     def test_load_community_scripts(self):
         with open(
             os.path.join(settings.BASE_DIR, "scripts/community_scripts.json")
@@ -230,12 +245,39 @@ class TestScriptViews(TacticalTestCase):
 
         Script.load_community_scripts()
 
-        community_scripts = Script.objects.filter(script_type="builtin").count()
-        self.assertEqual(len(info), community_scripts)
+        community_scripts_count = Script.objects.filter(script_type="builtin").count()
+        if len(info) != community_scripts_count:
+            raise Exception(
+                f"There are {len(info)} scripts in json file but only {community_scripts_count} in database"
+            )
 
         # test updating already added community scripts
         Script.load_community_scripts()
-        self.assertEqual(len(info), community_scripts)
+        community_scripts_count2 = Script.objects.filter(script_type="builtin").count()
+        self.assertEqual(len(info), community_scripts_count2)
+
+    def test_community_script_has_jsonfile_entry(self):
+        with open(
+            os.path.join(settings.BASE_DIR, "scripts/community_scripts.json")
+        ) as f:
+            info = json.load(f)
+
+        filenames = [i["filename"] for i in info]
+
+        # normal
+        if not settings.DOCKER_BUILD:
+            scripts_dir = os.path.join(Path(settings.BASE_DIR).parents[1], "scripts")
+        # docker
+        else:
+            scripts_dir = settings.SCRIPTS_DIR
+
+        with os.scandir(scripts_dir) as it:
+            for f in it:
+                if not f.name.startswith(".") and f.is_file():
+                    if f.name not in filenames:
+                        raise Exception(
+                            f"{f.name} is missing an entry in community_scripts.json"
+                        )
 
     def test_script_filenames_do_not_contain_spaces(self):
         with open(
@@ -244,4 +286,5 @@ class TestScriptViews(TacticalTestCase):
             info = json.load(f)
             for script in info:
                 fn: str = script["filename"]
-                self.assertTrue(" " not in fn)
+                if " " in fn:
+                    raise Exception(f"{fn} must not contain spaces in filename")

api/tacticalrmm/tacticalrmm/settings.py

@@ -15,28 +15,31 @@ EXE_DIR = os.path.join(BASE_DIR, "tacticalrmm/private/exe")
 AUTH_USER_MODEL = "accounts.User"
 
 # latest release
-TRMM_VERSION = "0.5.0"
+TRMM_VERSION = "0.6.0"
 
 # bump this version everytime vue code is changed
 # to alert user they need to manually refresh their browser
-APP_VER = "0.0.126"
+APP_VER = "0.0.129"
 
 # https://github.com/wh1te909/rmmagent
-LATEST_AGENT_VER = "1.4.13"
+LATEST_AGENT_VER = "1.5.0"
 
 MESH_VER = "0.7.93"
 
 # for the update script, bump when need to recreate venv or npm install
-PIP_VER = "14"
-NPM_VER = "13"
+PIP_VER = "15"
+NPM_VER = "14"
 
 DL_64 = f"https://github.com/wh1te909/rmmagent/releases/download/v{LATEST_AGENT_VER}/winagent-v{LATEST_AGENT_VER}.exe"
 DL_32 = f"https://github.com/wh1te909/rmmagent/releases/download/v{LATEST_AGENT_VER}/winagent-v{LATEST_AGENT_VER}-x86.exe"
 
 EXE_GEN_URLS = [
-    "https://exe.tacticalrmm.io/api/v1/exe",
+    "https://exe2.tacticalrmm.io",
+    "https://exe.tacticalrmm.io",
 ]
 
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
+
 ASGI_APPLICATION = "tacticalrmm.asgi.application"
 
 try:

api/tacticalrmm/tacticalrmm/tests.py

@@ -12,6 +12,7 @@ from .utils import (
     generate_winagent_exe,
     get_bit_days,
     reload_nats,
+    run_nats_api_cmd,
 )
 
 
@@ -74,6 +75,12 @@ class TestUtils(TestCase):
 
         mock_subprocess.assert_called_once()
 
+    @patch("subprocess.run")
+    def test_run_nats_api_cmd(self, mock_subprocess):
+        ids = ["a", "b", "c"]
+        _ = run_nats_api_cmd("monitor", ids)
+        mock_subprocess.assert_called_once()
+
     def test_bitdays_to_string(self):
         a = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
         all_days = [

api/tacticalrmm/tacticalrmm/utils.py

@@ -4,6 +4,7 @@ import string
 import subprocess
 import tempfile
 import time
+import urllib.parse
 from typing import Union
 
 import pytz
@@ -19,6 +20,7 @@ from rest_framework import status
 from rest_framework.response import Response
 
 from agents.models import Agent
+from core.models import CodeSignToken
 
 logger.configure(**settings.LOG_CONFIG)
 
@@ -50,12 +52,27 @@ def generate_winagent_exe(
     file_name: str,
 ) -> Union[Response, FileResponse]:
 
+    from agents.tasks import _get_exegen_url
+
     inno = (
         f"winagent-v{settings.LATEST_AGENT_VER}.exe"
         if arch == "64"
         else f"winagent-v{settings.LATEST_AGENT_VER}-x86.exe"
     )
 
+    try:
+        codetoken = CodeSignToken.objects.first().token
+        base_url = _get_exegen_url() + "/api/v1/winagents/?"
+        params = {
+            "version": settings.LATEST_AGENT_VER,
+            "arch": arch,
+            "token": codetoken,
+        }
+        dl_url = base_url + urllib.parse.urlencode(params)
+    except:
+        codetoken = ""
+        dl_url = settings.DL_64 if arch == "64" else settings.DL_32
+
     data = {
         "client": client,
         "site": site,
@@ -66,8 +83,9 @@ def generate_winagent_exe(
         "goarch": "amd64" if arch == "64" else "386",
         "token": token,
         "inno": inno,
-        "url": settings.DL_64 if arch == "64" else settings.DL_32,
+        "url": dl_url,
         "api": api,
+        "codesigntoken": codetoken,
     }
     headers = {"Content-type": "application/json"}
 
@@ -76,7 +94,7 @@ def generate_winagent_exe(
         for url in settings.EXE_GEN_URLS:
             try:
                 r = requests.post(
-                    url,
+                    f"{url}/api/v1/exe",
                     json=data,
                     headers=headers,
                     stream=True,
@@ -228,3 +246,20 @@ class KnoxAuthMiddlewareInstance:
 KnoxAuthMiddlewareStack = lambda inner: KnoxAuthMiddlewareInstance(
     AuthMiddlewareStack(inner)
 )
+
+
+def run_nats_api_cmd(mode: str, ids: list[str], timeout: int = 30) -> None:
+    config = {
+        "key": settings.SECRET_KEY,
+        "natsurl": f"tls://{settings.ALLOWED_HOSTS[0]}:4222",
+        "agents": ids,
+    }
+    with tempfile.NamedTemporaryFile() as fp:
+        with open(fp.name, "w") as f:
+            json.dump(config, f)
+
+        cmd = ["/usr/local/bin/nats-api", "-c", fp.name, "-m", mode]
+        try:
+            subprocess.run(cmd, capture_output=True, timeout=timeout)
+        except Exception as e:
+            logger.error(e)

api/tacticalrmm/winupdate/tests.py

@@ -14,8 +14,29 @@ class TestWinUpdateViews(TacticalTestCase):
         self.authenticate()
         self.setup_coresettings()
 
-    def test_get_winupdates(self):
+    @patch("agents.models.Agent.nats_cmd")
+    def test_run_update_scan(self, nats_cmd):
+        agent = baker.make_recipe("agents.agent")
+        url = f"/winupdate/{agent.pk}/runupdatescan/"
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        nats_cmd.assert_called_with({"func": "getwinupdates"}, wait=False)
 
+        self.check_not_authenticated("get", url)
+
+    @patch("agents.models.Agent.nats_cmd")
+    def test_install_updates(self, nats_cmd):
+        agent = baker.make_recipe("agents.agent")
+        baker.make("winupdate.WinUpdate", agent=agent, _quantity=4)
+        baker.make("winupdate.WinUpdatePolicy", agent=agent)
+        url = f"/winupdate/{agent.pk}/installnow/"
+        r = self.client.get(url)
+        self.assertEqual(r.status_code, 200)
+        nats_cmd.assert_called_once()
+
+        self.check_not_authenticated("get", url)
+
+    def test_get_winupdates(self):
         agent = baker.make_recipe("agents.agent")
         baker.make("winupdate.WinUpdate", agent=agent, _quantity=4)
 
@@ -27,8 +48,8 @@ class TestWinUpdateViews(TacticalTestCase):
         resp = self.client.get(url, format="json")
         serializer = UpdateSerializer(agent)
         self.assertEqual(resp.status_code, 200)
-        self.assertEqual(len(resp.data["winupdates"]), 4)
-        self.assertEqual(resp.data, serializer.data)
+        self.assertEqual(len(resp.data["winupdates"]), 4)  # type: ignore
+        self.assertEqual(resp.data, serializer.data)  # type: ignore
 
         self.check_not_authenticated("get", url)
 
@@ -99,7 +120,7 @@ class TestWinUpdateViews(TacticalTestCase):
         resp = self.client.patch(url, invalid_data, format="json")
         self.assertEqual(resp.status_code, 404)
 
-        data = {"pk": winupdate.pk, "policy": "inherit"}
+        data = {"pk": winupdate.pk, "policy": "inherit"}  # type: ignore
 
         resp = self.client.patch(url, data, format="json")
         self.assertEqual(resp.status_code, 200)

api/tacticalrmm/winupdate/views.py

@@ -1,12 +1,11 @@
 import asyncio
 
 from django.shortcuts import get_object_or_404
-from packaging import version as pyver
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
 
 from agents.models import Agent
-from tacticalrmm.utils import get_default_timezone, notify_error
+from tacticalrmm.utils import get_default_timezone
 
 from .models import WinUpdate
 from .serializers import UpdateSerializer
@@ -24,9 +23,6 @@ def get_win_updates(request, pk):
 def run_update_scan(request, pk):
     agent = get_object_or_404(Agent, pk=pk)
     agent.delete_superseded_updates()
-    if pyver.parse(agent.version) < pyver.parse("1.3.0"):
-        return notify_error("Requires agent version 1.3.0 or greater")
-
     asyncio.run(agent.nats_cmd({"func": "getwinupdates"}, wait=False))
     return Response("ok")
 
@@ -35,9 +31,6 @@ def run_update_scan(request, pk):
 def install_updates(request, pk):
     agent = get_object_or_404(Agent, pk=pk)
     agent.delete_superseded_updates()
-    if pyver.parse(agent.version) < pyver.parse("1.3.0"):
-        return notify_error("Requires agent version 1.3.0 or greater")
-
     agent.approve_updates()
     nats_data = {
         "func": "installwinupdates",

azure-pipelines.yml

@@ -27,7 +27,7 @@ jobs:
           source env/bin/activate
           cd /myagent/_work/1/s/api/tacticalrmm
           pip install --no-cache-dir --upgrade pip
-          pip install --no-cache-dir setuptools==53.0.0 wheel==0.36.2
+          pip install --no-cache-dir setuptools==54.2.0 wheel==0.36.2
           pip install --no-cache-dir -r requirements.txt -r requirements-test.txt -r requirements-dev.txt
         displayName: "Install Python Dependencies"
 

docker/containers/tactical/entrypoint.sh

@@ -29,15 +29,15 @@ function check_tactical_ready {
 # tactical-init
 if [ "$1" = 'tactical-init' ]; then
 
-  mkdir -p ${TACTICAL_DIR}/tmp
-  mkdir -p ${TACTICAL_DIR}/scripts/userdefined
-  mkdir -p ${TACTICAL_DIR}/api/tacticalrmm/private/exe
-
   test -f "${TACTICAL_READY_FILE}" && rm "${TACTICAL_READY_FILE}"
 
   # copy container data to volume
   rsync -a --no-perms --no-owner --delete --exclude "tmp/*" --exclude "certs/*" --exclude="api/tacticalrmm/private/*" "${TACTICAL_TMP_DIR}/" "${TACTICAL_DIR}/"
 
+  mkdir -p ${TACTICAL_DIR}/tmp
+  mkdir -p ${TACTICAL_DIR}/api/tacticalrmm/private/exe
+  mkdir -p ${TACTICAL_DIR}/api/tacticalrmm/logs
+  
   until (echo > /dev/tcp/"${POSTGRES_HOST}"/"${POSTGRES_PORT}") &> /dev/null; do
     echo "waiting for postgresql container to be ready..."
     sleep 5

docker/docker-compose.yml

@@ -22,6 +22,7 @@ volumes:
 services:
   # postgres database for api service
   tactical-postgres:
+    container_name: trmm-postgres
     image: postgres:13-alpine
     restart: always
     environment:
@@ -35,6 +36,7 @@ services:
 
   # redis container for celery tasks
   tactical-redis:
+    container_name: trmm-redis
     image: redis:6.0-alpine
     restart: always
     networks:
@@ -42,6 +44,7 @@ services:
 
   # used to initialize the docker environment
   tactical-init:
+    container_name: trmm-init
     image: ${IMAGE_REPO}tactical:${VERSION}
     restart: on-failure
     command: ["tactical-init"]
@@ -65,6 +68,7 @@ services:
   
   # nats
   tactical-nats:
+    container_name: trmm-nats
     image: ${IMAGE_REPO}tactical-nats:${VERSION}
     restart: always
     environment:
@@ -80,6 +84,7 @@ services:
 
   # meshcentral container
   tactical-meshcentral:
+    container_name: trmm-meshcentral
     image: ${IMAGE_REPO}tactical-meshcentral:${VERSION}
     restart: always
     environment: 
@@ -101,6 +106,7 @@ services:
 
   # mongodb container for meshcentral
   tactical-mongodb:
+    container_name: trmm-mongodb
     image: mongo:4.4
     restart: always
     environment:
@@ -114,6 +120,7 @@ services:
 
   # container that hosts vue frontend
   tactical-frontend:
+    container_name: trmm-frontend
     image: ${IMAGE_REPO}tactical-frontend:${VERSION}
     restart: always
     networks:
@@ -123,6 +130,7 @@ services:
 
   # container for django backend
   tactical-backend:
+    container_name: trmm-backend
     image: ${IMAGE_REPO}tactical:${VERSION}
     command: ["tactical-backend"]
     restart: always
@@ -135,8 +143,9 @@ services:
     depends_on:
       - tactical-postgres
 
-  # container for django backend
+  # container for django websockets connections
   tactical-websockets:
+    container_name: trmm-websockets
     image: ${IMAGE_REPO}tactical:${VERSION}
     command: ["tactical-websockets"]
     restart: always
@@ -150,8 +159,9 @@ services:
       - tactical-postgres
       - tactical-backend
 
-  tactical-nginx:
   # container for tactical reverse proxy
+  tactical-nginx:
+    container_name: trmm-nginx
     image: ${IMAGE_REPO}tactical-nginx:${VERSION}
     restart: always
     environment:
@@ -171,6 +181,7 @@ services:
 
   # container for celery worker service
   tactical-celery:
+    container_name: trmm-celery
     image: ${IMAGE_REPO}tactical:${VERSION}
     command: ["tactical-celery"]
     restart: always
@@ -186,6 +197,7 @@ services:
 
   # container for celery beat service
   tactical-celerybeat:
+    container_name: trmm-celerybeat
     image: ${IMAGE_REPO}tactical:${VERSION}
     command: ["tactical-celerybeat"]
     restart: always

docs/docs/contributing_using_devbox.md

@@ -0,0 +1,104 @@
+
+Hidden docs, needs work
+
+For local Hyper-v Devbox notes
+
+From https://raw.githubusercontent.com/silversword411/tacticalrmm-devdocs
+
+Needs an official install_devbox.sh script
+
+# Setup local devbox in hyper-v VM
+
+
+
+
+## Install Ubuntu 20.04 LTS
+Don't forget to 
+
+```
+sudo apt-get updates && sudo apt-get upgrade
+```
+
+### Optional
+Set all users in sudo group not to require password every time:
+
+```
+sudo visudo
+```
+
+Add this:
+
+```
+%sudo ALL=(ALL) NOPASSWD: ALL
+```
+
+## Download customized install script and tweak
+
+Create folder to dump into
+
+```
+sudo mkdir /rmm
+sudo chown ${USER}:${USER} -R /rmm
+cd /rmm
+```
+
+Get dev install script
+```
+wget https://raw.githubusercontent.com/silversword411/tacticalrmm-devdocs/blob/main/install_devbox.sh
+```
+
+Edit, and search for `REPLACEMEWITHYOURFORKEDREPOURL`
+
+and replace with your forked repo URL (example commented out below)
+
+## Run it
+
+```
+./install_devbox.sh
+```
+## Watch for
+
+![Image](images/installcomplete.png)
+
+!!!Note Unlike regular installs, don't worry about the QR code
+
+## Celebrate
+
+![Image](images/celebrate.gif)
+
+
+
+
+
+
+
+# Misc commands
+
+### Start mkdocs on dev box
+
+```bash
+cd /rmm/api
+source env/bin/activate
+pip install --upgrade pip
+pip install --upgrade setuptools wheel
+pip install -r tacticalrmm/requirements-dev.txt
+cd /rmm/docs
+mkdocs serve
+```
+
+### Running tests locally
+
+Prep and update
+
+```bash
+source /rmm/api/env/bin/activate
+cd /rmm/api/tacticalrmm
+pip install -r requirements.txt
+```
+
+Then run tests
+
+```
+python manage.py test
+```
+

docs/docs/contributing_using_vscode.md

@@ -0,0 +1,97 @@
+
+
+### 1. Install vscode
+[https://code.visualstudio.com/download](https://code.visualstudio.com/download)
+
+### 2. Fork Project in Github
+
+This is making a duplicate of the code under your Github that you can edit
+
+[https://github.com/wh1te909/tacticalrmm](https://github.com/wh1te909/tacticalrmm)
+
+![ForkIt](images/vscode-forkit.png)
+
+### 3. Add your (forked) repo to vscode
+
+Clone repository
+
+Login to your Github
+
+Choose local folder
+
+#### 3a. Install extra vscode Extensions
+
+GitLens
+
+Remote - SSH
+
+### 4. Open Terminal
+
+[https://code.visualstudio.com/docs/editor/integrated-terminal](https://code.visualstudio.com/docs/editor/integrated-terminal)
+
+```
+Ctrl+`
+```
+
+### 5. Configure a remote for your fork (in vscode)
+
+[https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork)
+
+Configure your local fork and tell it where the original code repo is so you can compare and merge updates later when official repo is updated
+
+Check repos
+
+```
+git remote -v
+```
+
+Add upstream repo
+
+```
+git remote add upstream https://github.com/wh1te909/tacticalrmm
+```
+
+Confirm changes
+
+```
+git remote -v
+```
+
+
+### 6. Contribute code
+
+Make changes to something.
+
+`Commit` (update something) and notate what you did
+
+`Push` (from your local vscode to your github fork)
+
+Open browser and look at your repo (It should reflect your commit)
+
+
+#### 6a. Request your changes to be pulled into the primary repo (Pull Request)
+
+![Changes you've made need integration with master repo](images/trmm_contribute-notice.png)
+
+In browser create pull request
+
+### 7. Sync your local fork
+
+[https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork)
+
+Bring changes from original repo to your local vscode copy so you're current with changes made in original Github repo
+
+![Sync Fork](images/trmm_need_sync_local_fork.png)
+
+```
+git pull --rebase upstream develop
+```
+#### 7a. Push your local updated copy to your Github fork
+
+Then you're `push`ing that updated local repo to your online Github fork
+
+![Sync push/pulls](images/trmm_vscode_git_pending.png)
+
+### 8. Verify and Repeat
+
+Check your Github fork in browser, should be up to date now with original. Repeat 6 or 7 as necessary

docs/docs/troubleshooting.md

@@ -53,7 +53,7 @@ Please then copy/paste the logs and post them either in our [Discord support cha
 
 <br/>
 
-#### Web UI frozen or not loading / website errors / general errors
+#### All other errors
 
 First, run the [update script](update_server.md#updating-to-the-latest-rmm-version) with the `--force` flag. <br/>This will fix permissions and reinstall python/node packages that might have gotten corrupted.
 
@@ -61,10 +61,15 @@ First, run the [update script](update_server.md#updating-to-the-latest-rmm-versi
 ./update.sh --force
 ```
 
+Check the debug log from the web UI: **File > Debug Log**
+
+Open your browser's dev tools (ctrl + shift + j on chrome) and check the Console tab for any errors
+
 Check all the systemd services that the rmm uses to function and check to make sure they're all active/running and enabled:
 
 ```bash
 sudo systemctl status rmm
+sudo systemctl status daphne
 sudo systemctl status celery
 sudo systemctl status celerybeat
 sudo systemctl status nginx

docs/mkdocs.yml

@@ -23,7 +23,9 @@ nav:
   - FAQ: faq.md
   - Management Commands: management_cmds.md
   - MeshCentral Integration: mesh_integration.md
-  - Contributing: contributing.md
+  - Contributing: 
+      - "Contributing to Docs": contributing.md
+      - "Contributing using VSCode": contributing_using_vscode.md
   - License: license.md
 site_description: "A remote monitoring and management tool"
 site_author: "wh1te909"

install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_VERSION="45"
+SCRIPT_VERSION="46"
 SCRIPT_URL='https://raw.githubusercontent.com/wh1te909/tacticalrmm/master/install.sh'
 
 sudo apt install -y curl wget dirmngr gnupg lsb-release
@@ -359,7 +359,7 @@ python3.9 -m venv env
 source /rmm/api/env/bin/activate
 cd /rmm/api/tacticalrmm
 pip install --no-cache-dir --upgrade pip
-pip install --no-cache-dir setuptools==53.0.0 wheel==0.36.2
+pip install --no-cache-dir setuptools==54.2.0 wheel==0.36.2
 pip install --no-cache-dir -r /rmm/api/tacticalrmm/requirements.txt
 python manage.py migrate
 python manage.py collectstatic --no-input

restore.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_VERSION="23"
+SCRIPT_VERSION="24"
 SCRIPT_URL='https://raw.githubusercontent.com/wh1te909/tacticalrmm/master/restore.sh'
 
 sudo apt update
@@ -291,8 +291,9 @@ python3.9 -m venv env
 source /rmm/api/env/bin/activate
 cd /rmm/api/tacticalrmm
 pip install --no-cache-dir --upgrade pip
-pip install --no-cache-dir setuptools==53.0.0 wheel==0.36.2
+pip install --no-cache-dir setuptools==54.2.0 wheel==0.36.2
 pip install --no-cache-dir -r /rmm/api/tacticalrmm/requirements.txt
+python manage.py migrate
 python manage.py collectstatic --no-input
 python manage.py reload_nats
 deactivate

scripts/DiskStatus.ps1

@@ -1,21 +0,0 @@
-# Checks local disks for errors reported in event viewer within the last 24 hours
-
-$ErrorActionPreference= 'silentlycontinue'
-$TimeSpan = (Get-Date) - (New-TimeSpan -Day 1)
-if (Get-WinEvent -FilterHashtable @{LogName='system';ID='11','9','15','52','129','7','98';Level=2,3;ProviderName='*disk*','*storsvc*','*ntfs*';StartTime=$TimeSpan})
-
-{
-Write-Output "Disk errors detected please investigate"
-Get-WinEvent -FilterHashtable @{LogName='system';ID='11','9','15','52','129','7','98';Level=2,3;ProviderName='*disk*','*storsvc*','*ntfs*';StartTime=$TimeSpan}
-exit 1
-}
-
-
-else
-{
-Write-Output "Disks are Healthy"
-exit 0
-}
-
-
-Exit $LASTEXITCODE

scripts/Finish_updates_and_restart.ps1

@@ -1 +0,0 @@
-Restart-Computer -ComputerName $env:COMPUTERNAME -Force 

scripts/Finish_updates_and_shutdown.ps1

@@ -1 +0,0 @@
-Stop-Computer -ComputerName $env:COMPUTERNAME -Force

scripts/Win_ADDC_Sync_Start.bat

@@ -0,0 +1,2 @@
+net start ADSync
+exit

scripts/Win_AzureAD_Check_Connection_Status.ps1

@@ -0,0 +1,15 @@
+$ErrorActionPreference = 'silentlycontinue'
+$aadchk = dsregcmd /status | Where-Object { $_ -match 'AzureAdJoined : ' } | ForEach-Object { $_.Trim() }
+
+if ($aadchk -Eq 'AzureAdJoined : Yes') {
+    Write-Output "Machine is Azure Ad Joined"
+    exit 0
+}
+
+else {
+    Write-Output "Machine is not Azure Ad Joined"
+    exit 1
+}
+
+
+Exit $LASTEXITCODE

scripts/Win_Azure_Mars_Cloud_Backup_Status.ps1

@@ -0,0 +1,23 @@
+$ErrorActionPreference= 'silentlycontinue'
+$TimeSpan = (Get-Date) - (New-TimeSpan -Day 1)
+
+##Check for Errors in Backup
+if (Get-WinEvent -FilterHashtable @{LogName='CloudBackup/Operational';ID='11','18';StartTime=$TimeSpan}) 
+
+{
+Write-Host "Cloud Backup Mars Ended with Errors"
+Get-WinEvent -FilterHashtable @{LogName='CloudBackup/Operational';ID='1','14','11','18','16';StartTime=$TimeSpan}
+exit 1
+}
+
+
+else 
+
+{
+Write-Host "Cloud Backup Mars Backup Is Working Correctly"
+Get-WinEvent -FilterHashtable @{LogName='CloudBackup/Operational';ID='1','14','16'}
+exit 0
+}
+
+
+Exit $LASTEXITCODE

scripts/Win_Bitlocker_Get_Recovery_Keys.ps1

@@ -0,0 +1 @@
+manage-bde -protectors C: -get

scripts/Win_Disable_AutoRun.bat

@@ -0,0 +1 @@
+reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer" /v NoDriveTypeAutoRun /t REG_DWORD /d 255 /f

scripts/Win_Disable_Cortana.bat

@@ -0,0 +1 @@
+reg add  "hklm\SOFTWARE\Policies\Microsoft\Windows\Windows Search" /d "AllowCortana"=dword:00000000

scripts/Win_Disk_Status.ps1

@@ -0,0 +1,19 @@
+# Checks local disks for errors reported in event viewer within the last 24 hours
+
+$ErrorActionPreference = 'silentlycontinue'
+$TimeSpan = (Get-Date) - (New-TimeSpan -Day 1)
+if (Get-WinEvent -FilterHashtable @{LogName = 'system'; ID = '11', '9', '15', '52', '129', '7', '98'; Level = 2, 3; ProviderName = '*disk*', '*storsvc*', '*ntfs*'; StartTime = $TimeSpan } -MaxEvents 10 | Where-Object -Property Message -Match Volume*)
+{
+    Write-Output "Disk errors detected please investigate"
+    Get-WinEvent -FilterHashtable @{LogName = 'system'; ID = '11', '9', '15', '52', '129', '7', '98'; Level = 2, 3; ProviderName = '*disk*', '*storsvc*', '*ntfs*'; StartTime = $TimeSpan }
+    exit 1
+}
+
+
+else {
+    Write-Output "Disks are Healthy"
+    exit 0
+}
+
+
+Exit $LASTEXITCODE

scripts/Win_FileSystem_Enable_Long_Paths.bat

@@ -0,0 +1 @@
+REG ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /V LongPathsEnabled /T REG_DWORD /D 1 /F

scripts/Win_Finish_updates_and_restart.ps1

@@ -0,0 +1,5 @@
+# This script will force the computer to finish installing updates
+# and restart. Normal restart doesn't install updates before issuing
+# a reboot command. This one does.
+
+Restart-Computer -ComputerName $env:COMPUTERNAME -Force 

scripts/Win_Finish_updates_and_shutdown.ps1

@@ -0,0 +1,5 @@
+# This script will force the computer to finish installing updates
+# and shutdown. Normal shutdown doesn't install updates before issuing
+# a shutdown command. This one does.
+
+Stop-Computer -ComputerName $env:COMPUTERNAME -Force

scripts/Win_Firewall_Check_Status.ps1

@@ -0,0 +1,17 @@
+$ErrorActionPreference = 'silentlycontinue'
+$fwenabled = (get-netfirewallprofile -policystore activestore).Enabled
+
+if ($fwenabled.Contains('True')) {
+    Write-Output "Firewall is Enabled"
+    netsh advfirewall show currentprofile
+    exit 0
+}
+
+
+else {
+    Write-Host "Firewall is Disabled"
+    exit 1
+}
+
+
+Exit $LASTEXITCODE

scripts/Win_Get_Computer_Users.ps1

@@ -0,0 +1,5 @@
+# This script return the list of all users and checks
+# if they are enabled or disabled
+
+get-localuser | Select name,Enabled > $env:TEMP\users.txt
+Get-Content $env:TEMP\users.txt | foreach {Write-Output $_}

scripts/Win_Hardware_Monitor_Get_Info.ps1

@@ -0,0 +1,154 @@
+<#
+      .SYNOPSIS
+      This powershell function gets information about the monitors attached to any computer. It uses EDID information provided by WMI. If this value is not specified it pulls the monitors of the computer that the script is being run on.
+      .DESCRIPTION
+      The function begins by looping through each computer specified. For each computer it gets a litst of monitors.
+      It then gets all of the necessary data from each monitor object and converts and cleans the data and places it in a custom PSObject. It then adds
+      the data to an array. At the end the array is displayed.
+      .PARAMETER ComputerName
+      Use this to specify the computer(s) which you'd like to retrieve information about monitors from.
+      .EXAMPLE
+      PS C:/> Get-Monitor.ps1 -ComputerName SSL1-F1102-1G2Z
+      Manufacturer Model    SerialNumber AttachedComputer
+      ------------ -----    ------------ ----------------
+      HP           HP E241i CN12345678   SSL1-F1102-1G2Z 
+      HP           HP E241i CN91234567   SSL1-F1102-1G2Z 
+      HP           HP E241i CN89123456   SSL1-F1102-1G2Z
+      .EXAMPLE
+      PS C:/> $Computers = @("SSL7-F108F-9D4Z","SSL1-F1102-1G2Z","SSA7-F1071-0T7F")
+      PS C:/> Get-Monitor.ps1 -ComputerName $Computers
+      Manufacturer Model      SerialNumber AttachedComputer
+      ------------ -----      ------------ ----------------
+      HP           HP LA2405x CN12345678   SSL7-F108F-9D4Z
+      HP           HP E241i   CN91234567   SSL1-F1102-1G2Z 
+      HP           HP E241i   CN89123456   SSL1-F1102-1G2Z 
+      HP           HP E241i   CN78912345   SSL1-F1102-1G2Z
+      HP           HP ZR22w   CN67891234   SSA7-F1071-0T7F
+  #>
+
+
+[CmdletBinding()]
+PARAM (
+    [Parameter(ValueFromPipeline = $True, ValueFromPipelineByPropertyName = $True)]
+    [String[]]$ComputerName = $env:ComputerName
+)
+  
+#List of Manufacture Codes that could be pulled from WMI and their respective full names. Used for translating later down.
+$ManufacturerHash = @{ 
+    "AAC" =	"AcerView";
+    "ACR" = "Acer";
+    "AOC" = "AOC";
+    "AIC" = "AG Neovo";
+    "APP" = "Apple Computer";
+    "AST" = "AST Research";
+    "AUO" = "Asus";
+    "BNQ" = "BenQ";
+    "CMO" = "Acer";
+    "CPL" = "Compal";
+    "CPQ" = "Compaq";
+    "CPT" = "Chunghwa Pciture Tubes, Ltd.";
+    "CTX" = "CTX";
+    "DEC" = "DEC";
+    "DEL" = "Dell";
+    "DPC" = "Delta";
+    "DWE" = "Daewoo";
+    "EIZ" = "EIZO";
+    "ELS" = "ELSA";
+    "ENC" = "EIZO";
+    "EPI" = "Envision";
+    "FCM" = "Funai";
+    "FUJ" = "Fujitsu";
+    "FUS" = "Fujitsu-Siemens";
+    "GSM" = "LG Electronics";
+    "GWY" = "Gateway 2000";
+    "HEI" = "Hyundai";
+    "HIT" = "Hyundai";
+    "HSL" = "Hansol";
+    "HTC" = "Hitachi/Nissei";
+    "HWP" = "HP";
+    "IBM" = "IBM";
+    "ICL" = "Fujitsu ICL";
+    "IVM" = "Iiyama";
+    "KDS" = "Korea Data Systems";
+    "LEN" = "Lenovo";
+    "LGD" = "Asus";
+    "LPL" = "Fujitsu";
+    "MAX" = "Belinea"; 
+    "MEI" = "Panasonic";
+    "MEL" = "Mitsubishi Electronics";
+    "MS_" = "Panasonic";
+    "NAN" = "Nanao";
+    "NEC" = "NEC";
+    "NOK" = "Nokia Data";
+    "NVD" = "Fujitsu";
+    "OPT" = "Optoma";
+    "PHL" = "Philips";
+    "REL" = "Relisys";
+    "SAN" = "Samsung";
+    "SAM" = "Samsung";
+    "SBI" = "Smarttech";
+    "SGI" = "SGI";
+    "SNY" = "Sony";
+    "SRC" = "Shamrock";
+    "SUN" = "Sun Microsystems";
+    "SEC" = "Hewlett-Packard";
+    "TAT" = "Tatung";
+    "TOS" = "Toshiba";
+    "TSB" = "Toshiba";
+    "VSC" = "ViewSonic";
+    "ZCM" = "Zenith";
+    "UNK" = "Unknown";
+    "_YV" = "Fujitsu";
+}
+      
+  
+#Takes each computer specified and runs the following code:
+ForEach ($Computer in $ComputerName) {
+  
+    #Grabs the Monitor objects from WMI
+    $Monitors = Get-WmiObject -Namespace "root\WMI" -Class "WMIMonitorID" -ComputerName $Computer -ErrorAction SilentlyContinue
+    
+    #Creates an empty array to hold the data
+    $Monitor_Array = @()
+    
+    
+    #Takes each monitor object found and runs the following code:
+    ForEach ($Monitor in $Monitors) {
+      
+        #Grabs respective data and converts it from ASCII encoding and removes any trailing ASCII null values
+        If ([System.Text.Encoding]::ASCII.GetString($Monitor.UserFriendlyName) -ne $null) {
+            $Mon_Model = ([System.Text.Encoding]::ASCII.GetString($Monitor.UserFriendlyName)).Replace("$([char]0x0000)", "")
+        }
+        else {
+            $Mon_Model = $null
+        }
+        $Mon_Serial_Number = ([System.Text.Encoding]::ASCII.GetString($Monitor.SerialNumberID)).Replace("$([char]0x0000)", "")
+        $Mon_Attached_Computer = ($Monitor.PSComputerName).Replace("$([char]0x0000)", "")
+        $Mon_Manufacturer = ([System.Text.Encoding]::ASCII.GetString($Monitor.ManufacturerName)).Replace("$([char]0x0000)", "")
+      
+        #Filters out "non monitors". Place any of your own filters here. These two are all-in-one computers with built in displays. I don't need the info from these.
+        If ($Mon_Model -like "*800 AIO*" -or $Mon_Model -like "*8300 AiO*") { Break }
+      
+        #Sets a friendly name based on the hash table above. If no entry found sets it to the original 3 character code
+        $Mon_Manufacturer_Friendly = $ManufacturerHash.$Mon_Manufacturer
+        If ($Mon_Manufacturer_Friendly -eq $null) {
+            $Mon_Manufacturer_Friendly = $Mon_Manufacturer
+        }
+      
+        #Creates a custom monitor object and fills it with 4 NoteProperty members and the respective data
+        $Monitor_Obj = [PSCustomObject]@{
+            Manufacturer     = $Mon_Manufacturer_Friendly
+            Model            = $Mon_Model
+            SerialNumber     = $Mon_Serial_Number
+            AttachedComputer = $Mon_Attached_Computer
+        }
+      
+        #Appends the object to the array
+        $Monitor_Array += $Monitor_Obj
+
+    } #End ForEach Monitor
+  
+    #Outputs the Array
+    $Monitor_Array
+    
+} #End ForEach Computer

scripts/Win_Hardware_RAM_Status.ps1

@@ -0,0 +1,26 @@
+#Identifies Computer RAM capacity and status
+
+[Cmdletbinding()] 
+Param( 
+    [string]$Computername = "localhost" 
+) 
+cls 
+$PysicalMemory = Get-WmiObject -class "win32_physicalmemory" -namespace "root\CIMV2" -ComputerName $Computername 
+ 
+Write-Host "RAM Modules:" -ForegroundColor Green 
+$PysicalMemory | Format-Table Tag, BankLabel, @{n = "Capacity(GB)"; e = { $_.Capacity / 1GB } }, Manufacturer, PartNumber, Speed -AutoSize 
+ 
+Write-Host "Total Memory:" -ForegroundColor Green 
+Write-Host "$((($PysicalMemory).Capacity | Measure-Object -Sum).Sum/1GB)GB" 
+ 
+$TotalSlots = ((Get-WmiObject -Class "win32_PhysicalMemoryArray" -namespace "root\CIMV2" -ComputerName $Computername).MemoryDevices | Measure-Object -Sum).Sum 
+Write-Host "`nTotal Memory Slots:" -ForegroundColor Green 
+Write-Host $TotalSlots 
+ 
+$UsedSlots = (($PysicalMemory) | Measure-Object).Count  
+Write-Host "`nUsed Memory Slots:" -ForegroundColor Green 
+Write-Host $UsedSlots 
+ 
+If ($UsedSlots -eq $TotalSlots) { 
+    Write-Host "All memory slots are filled up, none is empty!" -ForegroundColor Yellow 
+}

scripts/Win_Local_User_Created_Monitor.ps1

@@ -0,0 +1,17 @@
+$ErrorActionPreference= 'silentlycontinue'
+$TimeSpan = (Get-Date) - (New-TimeSpan -Day 1)
+if (Get-WinEvent -FilterHashtable @{LogName='security';ID='4720','4720','4728','4732','4756','4767';StartTime=$TimeSpan})
+{
+Write-Output "A change has been made to local users"
+Get-WinEvent -FilterHashtable @{LogName='security';ID='4720','4720','4728','4732','4756','4767';StartTime=$TimeSpan}
+exit 1
+}
+
+else
+{
+Write-Output "No changes all looks fine"
+exit 0
+}
+
+
+Exit $LASTEXITCODE

scripts/Win_Power_Disable_Hibernation.bat

@@ -0,0 +1 @@
+%SYSTEMROOT%\System32\powercfg.exe -H OFF

scripts/Win_RecycleBin_Empty.ps1

@@ -0,0 +1 @@
+Clear-RecycleBin -Force

scripts/Win_ScreenConnectAIO.ps1

@@ -0,0 +1,103 @@
+<#
+Requires global variables for serviceName "ScreenConnectService" and url "ScreenConnectInstaller"
+serviceName is the name of the ScreenConnect Service once it is installed EG: "ScreenConnect Client (1327465grctq84yrtocq)"
+url is the path the download the exe version of the ScreenConnect Access installer
+Both variables values must start and end with "
+Also accepts uninstall variable to remove the installed instance if required. 
+#>
+
+param (
+  [string] $serviceName,
+  [string] $url,
+  [string] $action
+)
+
+$ErrorCount = 0
+
+if (!$serviceName) {
+    write-output "Variable not specified ScreenConnectService, please create a global custom field under Client called ScreenConnectService, Example Value: `"ScreenConnect Client (1327465grctq84yrtocq)`" `n"
+    $ErrorCount += 1
+}
+if (!$url) {
+    write-output "Variable not specified ScreenConnectInstaller, please create a global custom field under Client called ScreenConnectInstaller, Example Value: `"https://myinstance.screenconnect.com/Bin/ConnectWiseControl.ClientSetup.exe?h=stupidlylongurlhere`" `n"
+    $ErrorCount += 1
+}
+
+if (!$ErrorCount -eq 0) {
+exit 1
+}
+
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+if ($action -eq "uninstall") {
+        $MyApp = Get-WmiObject -Class Win32_Product | Where-Object{$_.Name -eq "$serviceName"}
+        $MyApp.Uninstall()
+} else {
+    If (Get-Service $serviceName -ErrorAction SilentlyContinue) {
+
+        If ((Get-Service $serviceName).Status -eq 'Running') {
+            Try
+            {
+            Write-Output "Stopping $serviceName"
+            Set-Service -Name $serviceName -Status stopped -StartupType disabled
+            exit 0
+            }
+            Catch
+                {
+                $ErrorMessage = $_.Exception.Message
+                $FailedItem = $_.Exception.ItemName
+                Write-Error -Message "$ErrorMessage $FailedItem"
+                exit 1
+                }
+            Finally
+                {
+                }
+
+        } Else {
+
+            Try
+            {
+            Write-Host "Starting $serviceName"
+            Set-Service -Name $serviceName -Status running -StartupType automatic
+            exit 0
+            }
+            Catch
+                {
+                $ErrorMessage = $_.Exception.Message
+                $FailedItem = $_.Exception.ItemName
+                Write-Error -Message "$ErrorMessage $FailedItem"
+                exit 1
+                }
+            Finally
+                {
+                }
+
+        }
+
+    } Else {
+
+        $OutPath = $env:TMP
+        $output = "screenconnect.exe"
+
+        Try
+        {
+			    $start_time = Get-Date
+			    $wc = New-Object System.Net.WebClient
+			    $wc.DownloadFile("$url", "$OutPath\$output")
+            Start-Process -FilePath $OutPath\$output -Wait
+			    Write-Output "Time taken to download and install: $((Get-Date).Subtract($start_time).Seconds) second(s)"
+            exit 0
+        }
+        Catch
+        {
+            $ErrorMessage = $_.Exception.Message
+            $FailedItem = $_.Exception.ItemName
+            Write-Error -Message "$ErrorMessage $FailedItem"
+            exit 1
+        }
+        Finally
+        {
+            Remove-Item -Path $OutPath\$output
+        }
+
+    }
+}

scripts/Win_Set_Network_To_Private.ps1

@@ -0,0 +1,3 @@
+#This script sets current network profile to Private
+
+$net = get-netconnectionprofile;Set-NetConnectionProfile -Name $net.Name -NetworkCategory Private

scripts/Win_Start_Cleanup.ps1

@@ -10,7 +10,7 @@
    script leaves files that are newer than 7 days old however this variable can be edited.
 
 .EXAMPLE
-   PS C:\> .\Start-Cleanup.ps1
+   PS C:\> .\Win_Start_Cleanup.ps1
    Save the file to your hard drive with a .PS1 extention and run the file from an elavated PowerShell prompt.
 
 .NOTES

scripts/Win_TRMM_Start_Menu_Delete_Shortcut.ps1

@@ -0,0 +1 @@
+Remove-Item -Path "C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Tactical RMM Agent.lnk" -Force

scripts/Win_TaskScheduler_Add_Task.ps1

@@ -0,0 +1,6 @@
+# Add a task to Task Scheduler
+
+$Trigger = New-ScheduledTaskTrigger -At 10:00am –Daily # Specify the trigger settings
+$User = "NT AUTHORITY\SYSTEM" # Specify the account to run the script
+$Action = New-ScheduledTaskAction -Execute "PowerShell.exe" -Argument "YOUR COMMAND HERE" # Specify what program to run and with its parameters
+Register-ScheduledTask -TaskName "SomeTaskName" -Trigger $Trigger -User $User -Action $Action -RunLevel Highest –Force # Specify the name of the task

scripts/Win_Task_Scheduler_New_Items_Monitor.ps1

@@ -0,0 +1,18 @@
+$ErrorActionPreference= 'silentlycontinue'
+$TimeSpan = (Get-Date) - (New-TimeSpan -Day 1)
+if (Get-WinEvent -FilterHashtable @{LogName='Microsoft-Windows-TaskScheduler/Operational';ID='106';StartTime=$TimeSpan} | Where-Object -Property Message -notlike *$env:COMPUTERNAME*)
+{
+Write-Output "New Task Has Been Added"
+Get-WinEvent -FilterHashtable @{LogName='Microsoft-Windows-TaskScheduler/Operational';ID='106';StartTime=$TimeSpan}
+Get-WinEvent -FilterHashtable @{LogName='Microsoft-Windows-TaskScheduler/Operational';ID='141';StartTime=$TimeSpan}
+exit 1
+}
+
+else
+{
+Write-Output "No changes with Task Scheduler"
+exit 0
+}
+
+
+Exit $LASTEXITCODE

scripts/Win_UAC_Check_Status.ps1

@@ -0,0 +1,22 @@
+$ErrorActionPreference = 'silentlycontinue'
+$PSDenabled = (Get-ItemProperty HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System).PromptOnSecureDesktop
+$CPAenabled = (Get-ItemProperty HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System).ConsentPromptBehaviorAdmin
+
+
+if ($PSDenabled -Eq 1 -And $CPAenabled -Eq 5) {
+    Write-Output "UAC is Enabled"
+    exit 0
+}
+
+elseif ($PSDenabled -Eq 1 -And $CPAenabled -Eq 2) {
+    Write-Output "UAC is Enabled"
+    exit 0
+}
+
+else {
+    Write-Output "UAC is Disabled"
+    exit 1
+}
+
+
+Exit $LASTEXITCODE

scripts/Win_USB_Disable_Access.bat

@@ -0,0 +1 @@
+reg add HKLM\SYSTEM\CurrentControlSet\Services\UsbStor /v "Start" /t REG_DWORD /d "4" /f 

scripts/Win_USB_Enable_Access.bat

@@ -0,0 +1 @@
+reg add HKLM\SYSTEM\CurrentControlSet\Services\UsbStor /v "Start" /t REG_DWORD /d "3" /f