Release 0.16.3

The current timeout results in an error "ERROR: Input redirection is not supported, exiting the process immediately.".

Reusing the ping tool to act as a timeout resolves this error because the batch script is not producing a user interruptable timeout but will still produce a 4-5 second timeout.

.devcontainer/api.dockerfile

@@ -1,11 +1,11 @@
 # pulls community scripts from git repo
-FROM python:3.11.8-slim AS GET_SCRIPTS_STAGE
+FROM python:3.11.4-slim AS GET_SCRIPTS_STAGE
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends git && \
+RUN apt-get update &&
+    apt-get install -y --no-install-recommends git &&
     git clone https://github.com/amidaware/community-scripts.git /community-scripts
 
-FROM python:3.11.8-slim
+FROM python:3.11.4-slim
 
 ENV TACTICAL_DIR /opt/tactical
 ENV TACTICAL_READY_FILE ${TACTICAL_DIR}/tmp/tactical.ready
@@ -17,10 +17,10 @@ ENV PYTHONUNBUFFERED=1
 
 EXPOSE 8000 8383 8005
 
-RUN apt-get update && \
-    apt-get install -y build-essential weasyprint
+RUN apt-get update &&
+    apt-get install -y build-essential
 
-RUN groupadd -g 1000 tactical && \
+RUN groupadd -g 1000 tactical &&
     useradd -u 1000 -g 1000 tactical
 
 # copy community scripts

.devcontainer/docker-compose.yml

@@ -216,7 +216,6 @@ services:
       - "443:4443"
     volumes:
       - tactical-data-dev:/opt/tactical
-      - ..:/workspace:cached
 
 volumes:
   tactical-data-dev: null

.devcontainer/entrypoint.sh

@@ -33,12 +33,12 @@ function check_tactical_ready {
 }
 
 function django_setup {
-  until (echo >/dev/tcp/"${POSTGRES_HOST}"/"${POSTGRES_PORT}") &>/dev/null; do
+  until (echo > /dev/tcp/"${POSTGRES_HOST}"/"${POSTGRES_PORT}") &> /dev/null; do
     echo "waiting for postgresql container to be ready..."
     sleep 5
   done
 
-  until (echo >/dev/tcp/"${MESH_SERVICE}"/4443) &>/dev/null; do
+  until (echo > /dev/tcp/"${MESH_SERVICE}"/4443) &> /dev/null; do
     echo "waiting for meshcentral container to be ready..."
     sleep 5
   done
@@ -49,11 +49,8 @@ function django_setup {
   MESH_TOKEN="$(cat ${TACTICAL_DIR}/tmp/mesh_token)"
 
   DJANGO_SEKRET=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 80 | head -n 1)
-
-  BASE_DOMAIN=$(echo "import tldextract; no_fetch_extract = tldextract.TLDExtract(suffix_list_urls=()); extracted = no_fetch_extract('${API_HOST}'); print(f'{extracted.domain}.{extracted.suffix}')" | python)
-
-  localvars="$(
-    cat <<EOF
+  
+  localvars="$(cat << EOF
 SECRET_KEY = '${DJANGO_SEKRET}'
 
 DEBUG = True
@@ -67,17 +64,11 @@ KEY_FILE = '${CERT_PRIV_PATH}'
 
 SCRIPTS_DIR = '/community-scripts'
 
+ALLOWED_HOSTS = ['${API_HOST}', '*']
+
 ADMIN_URL = 'admin/'
 
-ALLOWED_HOSTS = ['${API_HOST}', '${APP_HOST}', '*']
-
-CORS_ORIGIN_WHITELIST = ['https://${APP_HOST}']
-
-SESSION_COOKIE_DOMAIN = '${BASE_DOMAIN}'
-CSRF_COOKIE_DOMAIN = '${BASE_DOMAIN}'
-CSRF_TRUSTED_ORIGINS = ['https://${API_HOST}', 'https://${APP_HOST}']
-
-HEADLESS_FRONTEND_URLS = {'socialaccount_login_error': 'https://${APP_HOST}/account/provider/callback'}
+CORS_ORIGIN_ALLOW_ALL = True
 
 DATABASES = {
     'default': {
@@ -87,17 +78,6 @@ DATABASES = {
         'PASSWORD': '${POSTGRES_PASS}',
         'HOST': '${POSTGRES_HOST}',
         'PORT': '${POSTGRES_PORT}',
-    },
-    'reporting': {
-        'ENGINE': 'django.db.backends.postgresql',
-        'NAME': '${POSTGRES_DB}',
-        'USER': 'reporting_user',
-        'PASSWORD': 'read_password',
-        'HOST': '${POSTGRES_HOST}',
-        'PORT': '${POSTGRES_PORT}',
-        'OPTIONS': {
-            'options': '-c default_transaction_read_only=on'
-        }
     }
 }
 
@@ -107,16 +87,14 @@ MESH_TOKEN_KEY = '${MESH_TOKEN}'
 REDIS_HOST    = '${REDIS_HOST}'
 MESH_WS_URL = '${MESH_WS_URL}'
 ADMIN_ENABLED = True
-TRMM_INSECURE = True
 EOF
-  )"
+)"
 
-  echo "${localvars}" >${WORKSPACE_DIR}/api/tacticalrmm/tacticalrmm/local_settings.py
+  echo "${localvars}" > ${WORKSPACE_DIR}/api/tacticalrmm/tacticalrmm/local_settings.py
 
   # run migrations and init scripts
   "${VIRTUAL_ENV}"/bin/python manage.py pre_update_tasks
   "${VIRTUAL_ENV}"/bin/python manage.py migrate --no-input
-  "${VIRTUAL_ENV}"/bin/python manage.py generate_json_schemas
   "${VIRTUAL_ENV}"/bin/python manage.py collectstatic --no-input
   "${VIRTUAL_ENV}"/bin/python manage.py initial_db_setup
   "${VIRTUAL_ENV}"/bin/python manage.py initial_mesh_setup
@@ -126,8 +104,9 @@ EOF
   "${VIRTUAL_ENV}"/bin/python manage.py create_natsapi_conf
   "${VIRTUAL_ENV}"/bin/python manage.py create_installer_user
   "${VIRTUAL_ENV}"/bin/python manage.py post_update_tasks
+  
 
-  # create super user
+  # create super user 
   echo "from accounts.models import User; User.objects.create_superuser('${TRMM_USER}', 'admin@example.com', '${TRMM_PASS}') if not User.objects.filter(username='${TRMM_USER}').exists() else 0;" | python manage.py shell
 }
 
@@ -141,8 +120,6 @@ if [ "$1" = 'tactical-init-dev' ]; then
   mkdir -p /meshcentral-data
   mkdir -p ${TACTICAL_DIR}/tmp
   mkdir -p ${TACTICAL_DIR}/certs
-  mkdir -p ${TACTICAL_DIR}/reporting
-  mkdir -p ${TACTICAL_DIR}/reporting/assets
   mkdir -p /mongo/data/db
   mkdir -p /redis/data
   touch /meshcentral-data/.initialized && chown -R 1000:1000 /meshcentral-data
@@ -150,7 +127,6 @@ if [ "$1" = 'tactical-init-dev' ]; then
   touch ${TACTICAL_DIR}/certs/.initialized && chown -R 1000:1000 ${TACTICAL_DIR}/certs
   touch /mongo/data/db/.initialized && chown -R 1000:1000 /mongo/data/db
   touch /redis/data/.initialized && chown -R 1000:1000 /redis/data
-  touch ${TACTICAL_DIR}/reporting && chown -R 1000:1000 ${TACTICAL_DIR}/reporting
   mkdir -p ${TACTICAL_DIR}/api/tacticalrmm/private/exe
   mkdir -p ${TACTICAL_DIR}/api/tacticalrmm/private/log
   touch ${TACTICAL_DIR}/api/tacticalrmm/private/log/django_debug.log

.github/ISSUE_TEMPLATE/bug_report.md

@@ -14,12 +14,11 @@ assignees: ''
 
 **Installation Method:**
   - [ ] Standard
-  - [ ] Standard with `--insecure` flag at install
   - [ ] Docker
 
 **Agent Info (please complete the following information):**
 - Agent version (as shown in the 'Summary' tab of the agent from web UI):
-- Agent OS: [e.g. Win 10 v2004, Server 2016]
+- Agent OS: [e.g. Win 10 v2004, Server 2012 R2]
 
 **Describe the bug**
 A clear and concise description of what the bug is.

.github/workflows/ci-tests.yml

@@ -14,10 +14,10 @@ jobs:
     name: Tests
     strategy:
       matrix:
-        python-version: ["3.11.8"]
+        python-version: ["3.11.4"]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - uses: harmon758/postgresql-action@v1
         with:

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ develop ]
+  schedule:
+    - cron: '19 14 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go', 'python' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/docker-build-push.yml

@@ -9,24 +9,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4
-
+        uses: actions/checkout@v2
+        
       - name: Get Github Tag
         id: prep
         run: |
           echo ::set-output name=version::${GITHUB_REF#refs/tags/v}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
-
+        
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-
+        
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v1 
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-
+        
       - name: Build and Push Tactical Image
         uses: docker/build-push-action@v2
         with:
@@ -36,7 +36,7 @@ jobs:
           file: ./docker/containers/tactical/dockerfile
           platforms: linux/amd64
           tags: tacticalrmm/tactical:${{ steps.prep.outputs.version }},tacticalrmm/tactical:latest
-
+          
       - name: Build and Push Tactical MeshCentral Image
         uses: docker/build-push-action@v2
         with:
@@ -46,7 +46,7 @@ jobs:
           file: ./docker/containers/tactical-meshcentral/dockerfile
           platforms: linux/amd64
           tags: tacticalrmm/tactical-meshcentral:${{ steps.prep.outputs.version }},tacticalrmm/tactical-meshcentral:latest
-
+          
       - name: Build and Push Tactical NATS Image
         uses: docker/build-push-action@v2
         with:
@@ -56,7 +56,7 @@ jobs:
           file: ./docker/containers/tactical-nats/dockerfile
           platforms: linux/amd64
           tags: tacticalrmm/tactical-nats:${{ steps.prep.outputs.version }},tacticalrmm/tactical-nats:latest
-
+          
       - name: Build and Push Tactical Frontend Image
         uses: docker/build-push-action@v2
         with:
@@ -66,7 +66,7 @@ jobs:
           file: ./docker/containers/tactical-frontend/dockerfile
           platforms: linux/amd64
           tags: tacticalrmm/tactical-frontend:${{ steps.prep.outputs.version }},tacticalrmm/tactical-frontend:latest
-
+          
       - name: Build and Push Tactical Nginx Image
         uses: docker/build-push-action@v2
         with:

.gitignore

@@ -57,5 +57,3 @@ daphne.sock.lock
 coverage.xml
 setup_dev.yml
 11env/
-query_schema.json
-gunicorn_config.py

.vscode/settings.json

@@ -5,10 +5,27 @@
   "python.analysis.diagnosticSeverityOverrides": {
     "reportUnusedImport": "error",
     "reportDuplicateImport": "error",
-    "reportGeneralTypeIssues": "none",
-    "reportOptionalMemberAccess": "none",
+    "reportGeneralTypeIssues": "none"
   },
   "python.analysis.typeCheckingMode": "basic",
+  "python.linting.enabled": true,
+  "python.linting.mypyEnabled": true,
+  "python.linting.mypyArgs": [
+    "--ignore-missing-imports",
+    "--follow-imports=silent",
+    "--show-column-numbers",
+    "--strict"
+  ],
+  "python.linting.ignorePatterns": [
+    "**/site-packages/**/*.py",
+    ".vscode/*.py",
+    "**env/**"
+  ],
+  "python.formatting.provider": "none",
+  //"mypy.targets": [
+  //"api/tacticalrmm"
+  //],
+  //"mypy.runUsingActiveInterpreter": true,
   "editor.bracketPairColorization.enabled": true,
   "editor.guides.bracketPairs": true,
   "editor.formatOnSave": true,
@@ -17,6 +34,7 @@
     "**/docker/**/docker-compose*.yml": "dockercompose"
   },
   "files.watcherExclude": {
+    "files.watcherExclude": {
       "**/.git/objects/**": true,
       "**/.git/subtree-cache/**": true,
       "**/node_modules/": true,
@@ -35,17 +53,18 @@
       "**/*.parquet*": true,
       "**/*.pyc": true,
       "**/*.zip": true
+    }
   },
   "go.useLanguageServer": true,
   "[go]": {
     "editor.codeActionsOnSave": {
-      "source.organizeImports": "never"
+      "source.organizeImports": false
     },
     "editor.snippetSuggestions": "none"
   },
   "[go.mod]": {
     "editor.codeActionsOnSave": {
-      "source.organizeImports": "explicit"
+      "source.organizeImports": true
     }
   },
   "gopls": {

README.md

@@ -8,7 +8,6 @@ Tactical RMM is a remote monitoring & management tool, built with Django and Vue
 It uses an [agent](https://github.com/amidaware/rmmagent) written in golang and integrates with [MeshCentral](https://github.com/Ylianst/MeshCentral)
 
 # [LIVE DEMO](https://demo.tacticalrmm.com/)
-
 Demo database resets every hour. A lot of features are disabled for obvious reasons due to the nature of this app.
 
 ### [Discord Chat](https://discord.gg/upGTkWp)
@@ -20,11 +19,11 @@ Demo database resets every hour. A lot of features are disabled for obvious reas
 - Teamviewer-like remote desktop control
 - Real-time remote shell
 - Remote file browser (download and upload files)
-- Remote command and script execution (batch, powershell, python, nushell and deno scripts)
+- Remote command and script execution (batch, powershell and python scripts)
 - Event log viewer
 - Services management
 - Windows patch management
-- Automated checks with email/SMS/Webhook alerting (cpu, disk, memory, services, scripts, event logs)
+- Automated checks with email/SMS alerting (cpu, disk, memory, services, scripts, event logs)
 - Automated task runner (run scripts on a schedule)
 - Remote software installation via chocolatey
 - Software and hardware inventory
@@ -34,19 +33,10 @@ Demo database resets every hour. A lot of features are disabled for obvious reas
 - Windows 7, 8.1, 10, 11, Server 2008R2, 2012R2, 2016, 2019, 2022
 
 ## Linux agent versions supported
-
 - Any distro with systemd which includes but is not limited to: Debian (10, 11), Ubuntu x86_64 (18.04, 20.04, 22.04), Synology 7, centos, freepbx and more!
 
 ## Mac agent versions supported
-
-- 64 bit Intel and Apple Silicon (M-Series)
-
-## Sponsorship Features
-
-- Mac and Linux Agents
-- Windows [Code Signed](https://docs.tacticalrmm.com/code_signing/) Agents
-- Fully Customizable [Reporting](https://docs.tacticalrmm.com/ee/reporting/reporting_overview/) Module
-- [Single Sign-On](https://docs.tacticalrmm.com/ee/sso/sso/) (SSO)
+- 64 bit Intel and Apple Silicon (M1, M2)
 
 ## Installation / Backup / Restore / Usage
 

ansible/roles/trmm_dev/defaults/main.yml

@@ -1,7 +1,7 @@
 ---
 user: "tactical"
-python_ver: "3.11.8"
-go_ver: "1.20.7"
+python_ver: "3.11.4"
+go_ver: "1.20.4"
 backend_repo: "https://github.com/amidaware/tacticalrmm.git"
 frontend_repo: "https://github.com/amidaware/tacticalrmm-web.git"
 scripts_repo: "https://github.com/amidaware/community-scripts.git"

ansible/roles/trmm_dev/files/nginx-default.conf

@@ -13,7 +13,7 @@ http {
         server_tokens off;
         tcp_nopush on;
         types_hash_max_size 2048;
-        server_names_hash_bucket_size 256;
+        server_names_hash_bucket_size 64;
         include /etc/nginx/mime.types;
         default_type application/octet-stream;
         ssl_protocols TLSv1.2 TLSv1.3;

ansible/roles/trmm_dev/tasks/main.yml

@@ -329,7 +329,7 @@
   tags: nginx
   become: yes
   ansible.builtin.apt_key:
-    url: https://nginx.org/keys/nginx_signing.key
+    url: https://nginx.org/packages/keys/nginx_signing.key
     state: present
 
 - name: add nginx repo

ansible/roles/trmm_dev/templates/local_settings.j2

@@ -13,6 +13,7 @@ DATABASES = {
         'PORT': '5432',
     }
 }
+REDIS_HOST    = "localhost"
 ADMIN_ENABLED = True
 CERT_FILE = "{{ fullchain_dest }}"
 KEY_FILE = "{{ privkey_dest }}"

api/tacticalrmm/accounts/management/commands/reset_2fa.py

@@ -1,11 +1,10 @@
 import subprocess
 
 import pyotp
-from django.conf import settings
 from django.core.management.base import BaseCommand
 
 from accounts.models import User
-from tacticalrmm.util_settings import get_webdomain
+from tacticalrmm.helpers import get_webdomain
 
 
 class Command(BaseCommand):
@@ -27,7 +26,7 @@ class Command(BaseCommand):
         user.save(update_fields=["totp_key"])
 
         url = pyotp.totp.TOTP(code).provisioning_uri(
-            username, issuer_name=get_webdomain(settings.CORS_ORIGIN_WHITELIST[0])
+            username, issuer_name=get_webdomain()
         )
         subprocess.run(f'qr "{url}"', shell=True)
         self.stdout.write(

api/tacticalrmm/accounts/migrations/0035_role_can_manage_reports_role_can_view_reports.py

@@ -1,22 +0,0 @@
-# Generated by Django 4.2.5 on 2023-10-08 22:24
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("accounts", "0034_role_can_send_wol"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="role",
-            name="can_manage_reports",
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name="role",
-            name="can_view_reports",
-            field=models.BooleanField(default=False),
-        ),
-    ]

api/tacticalrmm/accounts/migrations/0036_remove_role_can_ping_agents.py

@@ -1,16 +0,0 @@
-# Generated by Django 4.2.7 on 2023-11-09 19:57
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("accounts", "0035_role_can_manage_reports_role_can_view_reports"),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name="role",
-            name="can_ping_agents",
-        ),
-    ]

api/tacticalrmm/accounts/migrations/0037_role_can_run_server_scripts_role_can_use_webterm.py

@@ -1,23 +0,0 @@
-# Generated by Django 4.2.13 on 2024-06-28 20:21
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("accounts", "0036_remove_role_can_ping_agents"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="role",
-            name="can_run_server_scripts",
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name="role",
-            name="can_use_webterm",
-            field=models.BooleanField(default=False),
-        ),
-    ]

api/tacticalrmm/accounts/migrations/0038_role_can_edit_global_keystore_and_more.py

@@ -1,23 +0,0 @@
-# Generated by Django 4.2.16 on 2024-10-06 05:44
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("accounts", "0037_role_can_run_server_scripts_role_can_use_webterm"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="role",
-            name="can_edit_global_keystore",
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name="role",
-            name="can_view_global_keystore",
-            field=models.BooleanField(default=False),
-        ),
-    ]

api/tacticalrmm/accounts/models.py

@@ -1,6 +1,5 @@
 from typing import Optional
 
-from allauth.socialaccount.models import SocialAccount
 from django.contrib.auth.models import AbstractUser
 from django.core.cache import cache
 from django.db import models
@@ -65,19 +64,6 @@ class User(AbstractUser, BaseAuditModel):
         on_delete=models.SET_NULL,
     )
 
-    @property
-    def mesh_user_id(self):
-        return f"user//{self.mesh_username}"
-
-    @property
-    def mesh_username(self):
-        # lower() needed for mesh api
-        return f"{self.username.replace(' ', '').lower()}___{self.pk}"
-
-    @property
-    def is_sso_user(self):
-        return SocialAccount.objects.filter(user_id=self.pk).exists()
-
     @staticmethod
     def serialize(user):
         # serializes the task and returns json
@@ -109,6 +95,7 @@ class Role(BaseAuditModel):
 
     # agents
     can_list_agents = models.BooleanField(default=False)
+    can_ping_agents = models.BooleanField(default=False)
     can_use_mesh = models.BooleanField(default=False)
     can_uninstall_agents = models.BooleanField(default=False)
     can_update_agents = models.BooleanField(default=False)
@@ -134,10 +121,6 @@ class Role(BaseAuditModel):
     can_run_urlactions = models.BooleanField(default=False)
     can_view_customfields = models.BooleanField(default=False)
     can_manage_customfields = models.BooleanField(default=False)
-    can_run_server_scripts = models.BooleanField(default=False)
-    can_use_webterm = models.BooleanField(default=False)
-    can_view_global_keystore = models.BooleanField(default=False)
-    can_edit_global_keystore = models.BooleanField(default=False)
 
     # checks
     can_list_checks = models.BooleanField(default=False)
@@ -203,17 +186,13 @@ class Role(BaseAuditModel):
     can_list_api_keys = models.BooleanField(default=False)
     can_manage_api_keys = models.BooleanField(default=False)
 
-    # reporting
-    can_view_reports = models.BooleanField(default=False)
-    can_manage_reports = models.BooleanField(default=False)
-
     def __str__(self):
         return self.name
 
     def save(self, *args, **kwargs) -> None:
         # delete cache on save
         cache.delete(f"{ROLE_CACHE_PREFIX}{self.name}")
-        super().save(*args, **kwargs)
+        super(BaseAuditModel, self).save(*args, **kwargs)
 
     @staticmethod
     def serialize(role):

api/tacticalrmm/accounts/permissions.py

@@ -1,7 +1,6 @@
 from rest_framework import permissions
 
 from tacticalrmm.permissions import _has_perm
-from tacticalrmm.utils import get_core_settings
 
 
 class AccountsPerms(permissions.BasePermission):
@@ -41,14 +40,3 @@ class APIKeyPerms(permissions.BasePermission):
             return _has_perm(r, "can_list_api_keys")
 
         return _has_perm(r, "can_manage_api_keys")
-
-
-class LocalUserPerms(permissions.BasePermission):
-    def has_permission(self, r, view) -> bool:
-        settings = get_core_settings()
-        return not settings.block_local_user_logon
-
-
-class SelfResetSSOPerms(permissions.BasePermission):
-    def has_permission(self, r, view) -> bool:
-        return not r.user.is_sso_user

api/tacticalrmm/accounts/serializers.py

@@ -1,12 +1,11 @@
 import pyotp
-from django.conf import settings
 from rest_framework.serializers import (
     ModelSerializer,
     ReadOnlyField,
     SerializerMethodField,
 )
 
-from tacticalrmm.util_settings import get_webdomain
+from tacticalrmm.helpers import get_webdomain
 
 from .models import APIKey, Role, User
 
@@ -64,7 +63,7 @@ class TOTPSetupSerializer(ModelSerializer):
 
     def get_qr_url(self, obj):
         return pyotp.totp.TOTP(obj.totp_key).provisioning_uri(
-            obj.username, issuer_name=get_webdomain(settings.CORS_ORIGIN_WHITELIST[0])
+            obj.username, issuer_name=get_webdomain()
         )
 
 

api/tacticalrmm/accounts/tests.py

@@ -11,20 +11,19 @@ from tacticalrmm.test import TacticalTestCase
 
 class TestAccounts(TacticalTestCase):
     def setUp(self):
-        self.setup_coresettings()
         self.setup_client()
         self.bob = User(username="bob")
         self.bob.set_password("hunter2")
         self.bob.save()
 
     def test_check_creds(self):
-        url = "/v2/checkcreds/"
+        url = "/checkcreds/"
 
         data = {"username": "bob", "password": "hunter2"}
         r = self.client.post(url, data, format="json")
         self.assertEqual(r.status_code, 200)
         self.assertIn("totp", r.data.keys())
-        self.assertEqual(r.data["totp"], False)
+        self.assertEqual(r.data["totp"], "totp not set")
 
         data = {"username": "bob", "password": "a3asdsa2314"}
         r = self.client.post(url, data, format="json")
@@ -41,7 +40,7 @@ class TestAccounts(TacticalTestCase):
         data = {"username": "bob", "password": "hunter2"}
         r = self.client.post(url, data, format="json")
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.data["totp"], True)
+        self.assertEqual(r.data, "ok")
 
         # test user set to block dashboard logins
         self.bob.block_dashboard_login = True
@@ -51,7 +50,7 @@ class TestAccounts(TacticalTestCase):
 
     @patch("pyotp.TOTP.verify")
     def test_login_view(self, mock_verify):
-        url = "/v2/login/"
+        url = "/login/"
 
         mock_verify.return_value = True
         data = {"username": "bob", "password": "hunter2", "twofactor": "123456"}
@@ -405,7 +404,7 @@ class TestTOTPSetup(TacticalTestCase):
 
         r = self.client.post(url)
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.data, False)
+        self.assertEqual(r.data, "totp token already set")
 
 
 class TestAPIAuthentication(TacticalTestCase):

api/tacticalrmm/accounts/urls.py

@@ -5,10 +5,6 @@ from . import views
 urlpatterns = [
     path("users/", views.GetAddUsers.as_view()),
     path("<int:pk>/users/", views.GetUpdateDeleteUser.as_view()),
-    path("sessions/<str:pk>/", views.DeleteActiveLoginSession.as_view()),
-    path(
-        "users/<int:pk>/sessions/", views.GetDeleteActiveLoginSessionsPerUser.as_view()
-    ),
     path("users/reset/", views.UserActions.as_view()),
     path("users/reset_totp/", views.UserActions.as_view()),
     path("users/setup_totp/", views.TOTPSetup.as_view()),

api/tacticalrmm/accounts/utils.py

@@ -1,10 +1,8 @@
 from typing import TYPE_CHECKING
-
 from django.conf import settings
 
 if TYPE_CHECKING:
     from django.http import HttpRequest
-
     from accounts.models import User
 
 
@@ -18,7 +16,3 @@ def is_root_user(*, request: "HttpRequest", user: "User") -> bool:
         getattr(settings, "DEMO", False) and request.user.username == settings.ROOT_USER
     )
     return root or demo
-
-
-def is_superuser(user: "User") -> bool:
-    return user.role and getattr(user.role, "is_superuser")

api/tacticalrmm/accounts/views.py

@@ -1,39 +1,20 @@
-import datetime
-
 import pyotp
-from allauth.socialaccount.models import SocialAccount, SocialApp
 from django.conf import settings
 from django.contrib.auth import login
 from django.db import IntegrityError
 from django.shortcuts import get_object_or_404
-from django.utils import timezone as djangotime
-from knox.models import AuthToken
+from ipware import get_client_ip
 from knox.views import LoginView as KnoxLoginView
-from python_ipware import IpWare
 from rest_framework.authtoken.serializers import AuthTokenSerializer
 from rest_framework.permissions import AllowAny, IsAuthenticated
 from rest_framework.response import Response
-from rest_framework.serializers import (
-    ModelSerializer,
-    ReadOnlyField,
-    SerializerMethodField,
-)
 from rest_framework.views import APIView
 
-from accounts.utils import is_root_user
-from core.tasks import sync_mesh_perms_task
 from logs.models import AuditLog
 from tacticalrmm.helpers import notify_error
-from tacticalrmm.utils import get_core_settings
 
 from .models import APIKey, Role, User
-from .permissions import (
-    AccountsPerms,
-    APIKeyPerms,
-    LocalUserPerms,
-    RolesPerms,
-    SelfResetSSOPerms,
-)
+from .permissions import AccountsPerms, APIKeyPerms, RolesPerms
 from .serializers import (
     APIKeySerializer,
     RoleSerializer,
@@ -41,15 +22,12 @@ from .serializers import (
     UserSerializer,
     UserUISerializer,
 )
+from accounts.utils import is_root_user
 
 
-class CheckCredsV2(KnoxLoginView):
+class CheckCreds(KnoxLoginView):
     permission_classes = (AllowAny,)
 
-    # restrict time on tokens issued by this view to 3 min
-    def get_token_ttl(self):
-        return datetime.timedelta(seconds=180)
-
     def post(self, request, format=None):
         # check credentials
         serializer = AuthTokenSerializer(data=request.data)
@@ -61,25 +39,20 @@ class CheckCredsV2(KnoxLoginView):
 
         user = serializer.validated_data["user"]
 
-        if user.block_dashboard_login or user.is_sso_user:
-            return notify_error("Bad credentials")
-
-        # block local logon if configured
-        core_settings = get_core_settings()
-        if not user.is_superuser and core_settings.block_local_user_logon:
+        if user.block_dashboard_login:
             return notify_error("Bad credentials")
 
         # if totp token not set modify response to notify frontend
         if not user.totp_key:
             login(request, user)
-            response = super().post(request, format=None)
-            response.data["totp"] = False
+            response = super(CheckCreds, self).post(request, format=None)
+            response.data["totp"] = "totp not set"
             return response
 
-        return Response({"totp": True})
+        return Response("ok")
 
 
-class LoginViewV2(KnoxLoginView):
+class LoginView(KnoxLoginView):
     permission_classes = (AllowAny,)
 
     def post(self, request, format=None):
@@ -92,14 +65,6 @@ class LoginViewV2(KnoxLoginView):
         if user.block_dashboard_login:
             return notify_error("Bad credentials")
 
-        # block local logon if configured
-        core_settings = get_core_settings()
-        if not user.is_superuser and core_settings.block_local_user_logon:
-            return notify_error("Bad credentials")
-
-        if user.is_sso_user:
-            return notify_error("Bad credentials")
-
         token = request.data["twofactor"]
         totp = pyotp.TOTP(user.totp_key)
 
@@ -114,20 +79,14 @@ class LoginViewV2(KnoxLoginView):
             login(request, user)
 
             # save ip information
-            ipw = IpWare()
-            client_ip, _ = ipw.get_client_ip(request.META)
-            if client_ip:
-                user.last_login_ip = str(client_ip)
-                user.save()
+            client_ip, _ = get_client_ip(request)
+            user.last_login_ip = client_ip
+            user.save()
 
             AuditLog.audit_user_login_successful(
                 request.data["username"], debug_info={"ip": request._client_ip}
             )
-            response = super().post(request, format=None)
-            response.data["username"] = request.user.username
-            response.data["name"] = None
-
-            return Response(response.data)
+            return super(LoginView, self).post(request, format=None)
         else:
             AuditLog.audit_user_failed_twofactor(
                 request.data["username"], debug_info={"ip": request._client_ip}
@@ -135,100 +94,9 @@ class LoginViewV2(KnoxLoginView):
             return notify_error("Bad credentials")
 
 
-class GetDeleteActiveLoginSessionsPerUser(APIView):
-    permission_classes = [IsAuthenticated, AccountsPerms]
-
-    class TokenSerializer(ModelSerializer):
-        user = ReadOnlyField(source="user.username")
-
-        class Meta:
-            model = AuthToken
-            fields = (
-                "digest",
-                "user",
-                "created",
-                "expiry",
-            )
-
-    def get(self, request, pk):
-        tokens = get_object_or_404(User, pk=pk).auth_token_set.filter(
-            expiry__gt=djangotime.now()
-        )
-
-        return Response(self.TokenSerializer(tokens, many=True).data)
-
-    def delete(self, request, pk):
-        tokens = get_object_or_404(User, pk=pk).auth_token_set.filter(
-            expiry__gt=djangotime.now()
-        )
-
-        tokens.delete()
-        return Response("ok")
-
-
-class DeleteActiveLoginSession(APIView):
-    permission_classes = [IsAuthenticated, AccountsPerms]
-
-    def delete(self, request, pk):
-        token = get_object_or_404(AuthToken, digest=pk)
-
-        token.delete()
-
-        return Response("ok")
-
-
 class GetAddUsers(APIView):
     permission_classes = [IsAuthenticated, AccountsPerms]
 
-    class UserSerializerSSO(ModelSerializer):
-        social_accounts = SerializerMethodField()
-
-        def get_social_accounts(self, obj):
-            accounts = SocialAccount.objects.filter(user_id=obj.pk)
-
-            if accounts:
-                social_accounts = []
-                for account in accounts:
-                    try:
-                        provider_account = account.get_provider_account()
-                        display = provider_account.to_str()
-                    except SocialApp.DoesNotExist:
-                        display = "Orphaned Provider"
-                    except Exception:
-                        display = "Unknown"
-
-                    social_accounts.append(
-                        {
-                            "uid": account.uid,
-                            "provider": account.provider,
-                            "display": display,
-                            "last_login": account.last_login,
-                            "date_joined": account.date_joined,
-                            "extra_data": account.extra_data,
-                        }
-                    )
-
-                return social_accounts
-
-            return []
-
-        class Meta:
-            model = User
-            fields = [
-                "id",
-                "username",
-                "first_name",
-                "last_name",
-                "email",
-                "is_active",
-                "last_login",
-                "last_login_ip",
-                "role",
-                "block_dashboard_login",
-                "date_format",
-                "social_accounts",
-            ]
-
     def get(self, request):
         search = request.GET.get("search", None)
 
@@ -239,7 +107,7 @@ class GetAddUsers(APIView):
         else:
             users = User.objects.filter(agent=None, is_installer_user=False)
 
-        return Response(self.UserSerializerSSO(users, many=True).data)
+        return Response(UserSerializer(users, many=True).data)
 
     def post(self, request):
         # add new user
@@ -263,7 +131,6 @@ class GetAddUsers(APIView):
             user.role = role
 
         user.save()
-        sync_mesh_perms_task.delay()
         return Response(user.username)
 
 
@@ -284,7 +151,6 @@ class GetUpdateDeleteUser(APIView):
         serializer = UserSerializer(instance=user, data=request.data, partial=True)
         serializer.is_valid(raise_exception=True)
         serializer.save()
-        sync_mesh_perms_task.delay()
 
         return Response("ok")
 
@@ -294,12 +160,12 @@ class GetUpdateDeleteUser(APIView):
             return notify_error("The root user cannot be deleted from the UI")
 
         user.delete()
-        sync_mesh_perms_task.delay()
+
         return Response("ok")
 
 
 class UserActions(APIView):
-    permission_classes = [IsAuthenticated, AccountsPerms, LocalUserPerms]
+    permission_classes = [IsAuthenticated, AccountsPerms]
 
     # reset password
     def post(self, request):
@@ -336,7 +202,7 @@ class TOTPSetup(APIView):
             user.save(update_fields=["totp_key"])
             return Response(TOTPSetupSerializer(user).data)
 
-        return Response(False)
+        return Response("totp token already set")
 
 
 class UserUI(APIView):
@@ -375,13 +241,11 @@ class GetUpdateDeleteRole(APIView):
         serializer = RoleSerializer(instance=role, data=request.data)
         serializer.is_valid(raise_exception=True)
         serializer.save()
-        sync_mesh_perms_task.delay()
         return Response("Role was edited")
 
     def delete(self, request, pk):
         role = get_object_or_404(Role, pk=pk)
         role.delete()
-        sync_mesh_perms_task.delay()
         return Response("Role was removed")
 
 
@@ -425,7 +289,7 @@ class GetUpdateDeleteAPIKey(APIView):
 
 
 class ResetPass(APIView):
-    permission_classes = [IsAuthenticated, SelfResetSSOPerms]
+    permission_classes = [IsAuthenticated]
 
     def put(self, request):
         user = request.user
@@ -435,7 +299,7 @@ class ResetPass(APIView):
 
 
 class Reset2FA(APIView):
-    permission_classes = [IsAuthenticated, SelfResetSSOPerms]
+    permission_classes = [IsAuthenticated]
 
     def put(self, request):
         user = request.user

api/tacticalrmm/agents/migrations/0058_alter_agent_time_zone.py

@@ -1,633 +0,0 @@
-# Generated by Django 4.2.7 on 2023-11-09 19:56
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("agents", "0057_alter_agentcustomfield_unique_together"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="agent",
-            name="time_zone",
-            field=models.CharField(
-                blank=True,
-                choices=[
-                    ("Africa/Abidjan", "Africa/Abidjan"),
-                    ("Africa/Accra", "Africa/Accra"),
-                    ("Africa/Addis_Ababa", "Africa/Addis_Ababa"),
-                    ("Africa/Algiers", "Africa/Algiers"),
-                    ("Africa/Asmara", "Africa/Asmara"),
-                    ("Africa/Asmera", "Africa/Asmera"),
-                    ("Africa/Bamako", "Africa/Bamako"),
-                    ("Africa/Bangui", "Africa/Bangui"),
-                    ("Africa/Banjul", "Africa/Banjul"),
-                    ("Africa/Bissau", "Africa/Bissau"),
-                    ("Africa/Blantyre", "Africa/Blantyre"),
-                    ("Africa/Brazzaville", "Africa/Brazzaville"),
-                    ("Africa/Bujumbura", "Africa/Bujumbura"),
-                    ("Africa/Cairo", "Africa/Cairo"),
-                    ("Africa/Casablanca", "Africa/Casablanca"),
-                    ("Africa/Ceuta", "Africa/Ceuta"),
-                    ("Africa/Conakry", "Africa/Conakry"),
-                    ("Africa/Dakar", "Africa/Dakar"),
-                    ("Africa/Dar_es_Salaam", "Africa/Dar_es_Salaam"),
-                    ("Africa/Djibouti", "Africa/Djibouti"),
-                    ("Africa/Douala", "Africa/Douala"),
-                    ("Africa/El_Aaiun", "Africa/El_Aaiun"),
-                    ("Africa/Freetown", "Africa/Freetown"),
-                    ("Africa/Gaborone", "Africa/Gaborone"),
-                    ("Africa/Harare", "Africa/Harare"),
-                    ("Africa/Johannesburg", "Africa/Johannesburg"),
-                    ("Africa/Juba", "Africa/Juba"),
-                    ("Africa/Kampala", "Africa/Kampala"),
-                    ("Africa/Khartoum", "Africa/Khartoum"),
-                    ("Africa/Kigali", "Africa/Kigali"),
-                    ("Africa/Kinshasa", "Africa/Kinshasa"),
-                    ("Africa/Lagos", "Africa/Lagos"),
-                    ("Africa/Libreville", "Africa/Libreville"),
-                    ("Africa/Lome", "Africa/Lome"),
-                    ("Africa/Luanda", "Africa/Luanda"),
-                    ("Africa/Lubumbashi", "Africa/Lubumbashi"),
-                    ("Africa/Lusaka", "Africa/Lusaka"),
-                    ("Africa/Malabo", "Africa/Malabo"),
-                    ("Africa/Maputo", "Africa/Maputo"),
-                    ("Africa/Maseru", "Africa/Maseru"),
-                    ("Africa/Mbabane", "Africa/Mbabane"),
-                    ("Africa/Mogadishu", "Africa/Mogadishu"),
-                    ("Africa/Monrovia", "Africa/Monrovia"),
-                    ("Africa/Nairobi", "Africa/Nairobi"),
-                    ("Africa/Ndjamena", "Africa/Ndjamena"),
-                    ("Africa/Niamey", "Africa/Niamey"),
-                    ("Africa/Nouakchott", "Africa/Nouakchott"),
-                    ("Africa/Ouagadougou", "Africa/Ouagadougou"),
-                    ("Africa/Porto-Novo", "Africa/Porto-Novo"),
-                    ("Africa/Sao_Tome", "Africa/Sao_Tome"),
-                    ("Africa/Timbuktu", "Africa/Timbuktu"),
-                    ("Africa/Tripoli", "Africa/Tripoli"),
-                    ("Africa/Tunis", "Africa/Tunis"),
-                    ("Africa/Windhoek", "Africa/Windhoek"),
-                    ("America/Adak", "America/Adak"),
-                    ("America/Anchorage", "America/Anchorage"),
-                    ("America/Anguilla", "America/Anguilla"),
-                    ("America/Antigua", "America/Antigua"),
-                    ("America/Araguaina", "America/Araguaina"),
-                    (
-                        "America/Argentina/Buenos_Aires",
-                        "America/Argentina/Buenos_Aires",
-                    ),
-                    ("America/Argentina/Catamarca", "America/Argentina/Catamarca"),
-                    (
-                        "America/Argentina/ComodRivadavia",
-                        "America/Argentina/ComodRivadavia",
-                    ),
-                    ("America/Argentina/Cordoba", "America/Argentina/Cordoba"),
-                    ("America/Argentina/Jujuy", "America/Argentina/Jujuy"),
-                    ("America/Argentina/La_Rioja", "America/Argentina/La_Rioja"),
-                    ("America/Argentina/Mendoza", "America/Argentina/Mendoza"),
-                    (
-                        "America/Argentina/Rio_Gallegos",
-                        "America/Argentina/Rio_Gallegos",
-                    ),
-                    ("America/Argentina/Salta", "America/Argentina/Salta"),
-                    ("America/Argentina/San_Juan", "America/Argentina/San_Juan"),
-                    ("America/Argentina/San_Luis", "America/Argentina/San_Luis"),
-                    ("America/Argentina/Tucuman", "America/Argentina/Tucuman"),
-                    ("America/Argentina/Ushuaia", "America/Argentina/Ushuaia"),
-                    ("America/Aruba", "America/Aruba"),
-                    ("America/Asuncion", "America/Asuncion"),
-                    ("America/Atikokan", "America/Atikokan"),
-                    ("America/Atka", "America/Atka"),
-                    ("America/Bahia", "America/Bahia"),
-                    ("America/Bahia_Banderas", "America/Bahia_Banderas"),
-                    ("America/Barbados", "America/Barbados"),
-                    ("America/Belem", "America/Belem"),
-                    ("America/Belize", "America/Belize"),
-                    ("America/Blanc-Sablon", "America/Blanc-Sablon"),
-                    ("America/Boa_Vista", "America/Boa_Vista"),
-                    ("America/Bogota", "America/Bogota"),
-                    ("America/Boise", "America/Boise"),
-                    ("America/Buenos_Aires", "America/Buenos_Aires"),
-                    ("America/Cambridge_Bay", "America/Cambridge_Bay"),
-                    ("America/Campo_Grande", "America/Campo_Grande"),
-                    ("America/Cancun", "America/Cancun"),
-                    ("America/Caracas", "America/Caracas"),
-                    ("America/Catamarca", "America/Catamarca"),
-                    ("America/Cayenne", "America/Cayenne"),
-                    ("America/Cayman", "America/Cayman"),
-                    ("America/Chicago", "America/Chicago"),
-                    ("America/Chihuahua", "America/Chihuahua"),
-                    ("America/Ciudad_Juarez", "America/Ciudad_Juarez"),
-                    ("America/Coral_Harbour", "America/Coral_Harbour"),
-                    ("America/Cordoba", "America/Cordoba"),
-                    ("America/Costa_Rica", "America/Costa_Rica"),
-                    ("America/Creston", "America/Creston"),
-                    ("America/Cuiaba", "America/Cuiaba"),
-                    ("America/Curacao", "America/Curacao"),
-                    ("America/Danmarkshavn", "America/Danmarkshavn"),
-                    ("America/Dawson", "America/Dawson"),
-                    ("America/Dawson_Creek", "America/Dawson_Creek"),
-                    ("America/Denver", "America/Denver"),
-                    ("America/Detroit", "America/Detroit"),
-                    ("America/Dominica", "America/Dominica"),
-                    ("America/Edmonton", "America/Edmonton"),
-                    ("America/Eirunepe", "America/Eirunepe"),
-                    ("America/El_Salvador", "America/El_Salvador"),
-                    ("America/Ensenada", "America/Ensenada"),
-                    ("America/Fort_Nelson", "America/Fort_Nelson"),
-                    ("America/Fort_Wayne", "America/Fort_Wayne"),
-                    ("America/Fortaleza", "America/Fortaleza"),
-                    ("America/Glace_Bay", "America/Glace_Bay"),
-                    ("America/Godthab", "America/Godthab"),
-                    ("America/Goose_Bay", "America/Goose_Bay"),
-                    ("America/Grand_Turk", "America/Grand_Turk"),
-                    ("America/Grenada", "America/Grenada"),
-                    ("America/Guadeloupe", "America/Guadeloupe"),
-                    ("America/Guatemala", "America/Guatemala"),
-                    ("America/Guayaquil", "America/Guayaquil"),
-                    ("America/Guyana", "America/Guyana"),
-                    ("America/Halifax", "America/Halifax"),
-                    ("America/Havana", "America/Havana"),
-                    ("America/Hermosillo", "America/Hermosillo"),
-                    ("America/Indiana/Indianapolis", "America/Indiana/Indianapolis"),
-                    ("America/Indiana/Knox", "America/Indiana/Knox"),
-                    ("America/Indiana/Marengo", "America/Indiana/Marengo"),
-                    ("America/Indiana/Petersburg", "America/Indiana/Petersburg"),
-                    ("America/Indiana/Tell_City", "America/Indiana/Tell_City"),
-                    ("America/Indiana/Vevay", "America/Indiana/Vevay"),
-                    ("America/Indiana/Vincennes", "America/Indiana/Vincennes"),
-                    ("America/Indiana/Winamac", "America/Indiana/Winamac"),
-                    ("America/Indianapolis", "America/Indianapolis"),
-                    ("America/Inuvik", "America/Inuvik"),
-                    ("America/Iqaluit", "America/Iqaluit"),
-                    ("America/Jamaica", "America/Jamaica"),
-                    ("America/Jujuy", "America/Jujuy"),
-                    ("America/Juneau", "America/Juneau"),
-                    ("America/Kentucky/Louisville", "America/Kentucky/Louisville"),
-                    ("America/Kentucky/Monticello", "America/Kentucky/Monticello"),
-                    ("America/Knox_IN", "America/Knox_IN"),
-                    ("America/Kralendijk", "America/Kralendijk"),
-                    ("America/La_Paz", "America/La_Paz"),
-                    ("America/Lima", "America/Lima"),
-                    ("America/Los_Angeles", "America/Los_Angeles"),
-                    ("America/Louisville", "America/Louisville"),
-                    ("America/Lower_Princes", "America/Lower_Princes"),
-                    ("America/Maceio", "America/Maceio"),
-                    ("America/Managua", "America/Managua"),
-                    ("America/Manaus", "America/Manaus"),
-                    ("America/Marigot", "America/Marigot"),
-                    ("America/Martinique", "America/Martinique"),
-                    ("America/Matamoros", "America/Matamoros"),
-                    ("America/Mazatlan", "America/Mazatlan"),
-                    ("America/Mendoza", "America/Mendoza"),
-                    ("America/Menominee", "America/Menominee"),
-                    ("America/Merida", "America/Merida"),
-                    ("America/Metlakatla", "America/Metlakatla"),
-                    ("America/Mexico_City", "America/Mexico_City"),
-                    ("America/Miquelon", "America/Miquelon"),
-                    ("America/Moncton", "America/Moncton"),
-                    ("America/Monterrey", "America/Monterrey"),
-                    ("America/Montevideo", "America/Montevideo"),
-                    ("America/Montreal", "America/Montreal"),
-                    ("America/Montserrat", "America/Montserrat"),
-                    ("America/Nassau", "America/Nassau"),
-                    ("America/New_York", "America/New_York"),
-                    ("America/Nipigon", "America/Nipigon"),
-                    ("America/Nome", "America/Nome"),
-                    ("America/Noronha", "America/Noronha"),
-                    ("America/North_Dakota/Beulah", "America/North_Dakota/Beulah"),
-                    ("America/North_Dakota/Center", "America/North_Dakota/Center"),
-                    (
-                        "America/North_Dakota/New_Salem",
-                        "America/North_Dakota/New_Salem",
-                    ),
-                    ("America/Nuuk", "America/Nuuk"),
-                    ("America/Ojinaga", "America/Ojinaga"),
-                    ("America/Panama", "America/Panama"),
-                    ("America/Pangnirtung", "America/Pangnirtung"),
-                    ("America/Paramaribo", "America/Paramaribo"),
-                    ("America/Phoenix", "America/Phoenix"),
-                    ("America/Port-au-Prince", "America/Port-au-Prince"),
-                    ("America/Port_of_Spain", "America/Port_of_Spain"),
-                    ("America/Porto_Acre", "America/Porto_Acre"),
-                    ("America/Porto_Velho", "America/Porto_Velho"),
-                    ("America/Puerto_Rico", "America/Puerto_Rico"),
-                    ("America/Punta_Arenas", "America/Punta_Arenas"),
-                    ("America/Rainy_River", "America/Rainy_River"),
-                    ("America/Rankin_Inlet", "America/Rankin_Inlet"),
-                    ("America/Recife", "America/Recife"),
-                    ("America/Regina", "America/Regina"),
-                    ("America/Resolute", "America/Resolute"),
-                    ("America/Rio_Branco", "America/Rio_Branco"),
-                    ("America/Rosario", "America/Rosario"),
-                    ("America/Santa_Isabel", "America/Santa_Isabel"),
-                    ("America/Santarem", "America/Santarem"),
-                    ("America/Santiago", "America/Santiago"),
-                    ("America/Santo_Domingo", "America/Santo_Domingo"),
-                    ("America/Sao_Paulo", "America/Sao_Paulo"),
-                    ("America/Scoresbysund", "America/Scoresbysund"),
-                    ("America/Shiprock", "America/Shiprock"),
-                    ("America/Sitka", "America/Sitka"),
-                    ("America/St_Barthelemy", "America/St_Barthelemy"),
-                    ("America/St_Johns", "America/St_Johns"),
-                    ("America/St_Kitts", "America/St_Kitts"),
-                    ("America/St_Lucia", "America/St_Lucia"),
-                    ("America/St_Thomas", "America/St_Thomas"),
-                    ("America/St_Vincent", "America/St_Vincent"),
-                    ("America/Swift_Current", "America/Swift_Current"),
-                    ("America/Tegucigalpa", "America/Tegucigalpa"),
-                    ("America/Thule", "America/Thule"),
-                    ("America/Thunder_Bay", "America/Thunder_Bay"),
-                    ("America/Tijuana", "America/Tijuana"),
-                    ("America/Toronto", "America/Toronto"),
-                    ("America/Tortola", "America/Tortola"),
-                    ("America/Vancouver", "America/Vancouver"),
-                    ("America/Virgin", "America/Virgin"),
-                    ("America/Whitehorse", "America/Whitehorse"),
-                    ("America/Winnipeg", "America/Winnipeg"),
-                    ("America/Yakutat", "America/Yakutat"),
-                    ("America/Yellowknife", "America/Yellowknife"),
-                    ("Antarctica/Casey", "Antarctica/Casey"),
-                    ("Antarctica/Davis", "Antarctica/Davis"),
-                    ("Antarctica/DumontDUrville", "Antarctica/DumontDUrville"),
-                    ("Antarctica/Macquarie", "Antarctica/Macquarie"),
-                    ("Antarctica/Mawson", "Antarctica/Mawson"),
-                    ("Antarctica/McMurdo", "Antarctica/McMurdo"),
-                    ("Antarctica/Palmer", "Antarctica/Palmer"),
-                    ("Antarctica/Rothera", "Antarctica/Rothera"),
-                    ("Antarctica/South_Pole", "Antarctica/South_Pole"),
-                    ("Antarctica/Syowa", "Antarctica/Syowa"),
-                    ("Antarctica/Troll", "Antarctica/Troll"),
-                    ("Antarctica/Vostok", "Antarctica/Vostok"),
-                    ("Arctic/Longyearbyen", "Arctic/Longyearbyen"),
-                    ("Asia/Aden", "Asia/Aden"),
-                    ("Asia/Almaty", "Asia/Almaty"),
-                    ("Asia/Amman", "Asia/Amman"),
-                    ("Asia/Anadyr", "Asia/Anadyr"),
-                    ("Asia/Aqtau", "Asia/Aqtau"),
-                    ("Asia/Aqtobe", "Asia/Aqtobe"),
-                    ("Asia/Ashgabat", "Asia/Ashgabat"),
-                    ("Asia/Ashkhabad", "Asia/Ashkhabad"),
-                    ("Asia/Atyrau", "Asia/Atyrau"),
-                    ("Asia/Baghdad", "Asia/Baghdad"),
-                    ("Asia/Bahrain", "Asia/Bahrain"),
-                    ("Asia/Baku", "Asia/Baku"),
-                    ("Asia/Bangkok", "Asia/Bangkok"),
-                    ("Asia/Barnaul", "Asia/Barnaul"),
-                    ("Asia/Beirut", "Asia/Beirut"),
-                    ("Asia/Bishkek", "Asia/Bishkek"),
-                    ("Asia/Brunei", "Asia/Brunei"),
-                    ("Asia/Calcutta", "Asia/Calcutta"),
-                    ("Asia/Chita", "Asia/Chita"),
-                    ("Asia/Choibalsan", "Asia/Choibalsan"),
-                    ("Asia/Chongqing", "Asia/Chongqing"),
-                    ("Asia/Chungking", "Asia/Chungking"),
-                    ("Asia/Colombo", "Asia/Colombo"),
-                    ("Asia/Dacca", "Asia/Dacca"),
-                    ("Asia/Damascus", "Asia/Damascus"),
-                    ("Asia/Dhaka", "Asia/Dhaka"),
-                    ("Asia/Dili", "Asia/Dili"),
-                    ("Asia/Dubai", "Asia/Dubai"),
-                    ("Asia/Dushanbe", "Asia/Dushanbe"),
-                    ("Asia/Famagusta", "Asia/Famagusta"),
-                    ("Asia/Gaza", "Asia/Gaza"),
-                    ("Asia/Harbin", "Asia/Harbin"),
-                    ("Asia/Hebron", "Asia/Hebron"),
-                    ("Asia/Ho_Chi_Minh", "Asia/Ho_Chi_Minh"),
-                    ("Asia/Hong_Kong", "Asia/Hong_Kong"),
-                    ("Asia/Hovd", "Asia/Hovd"),
-                    ("Asia/Irkutsk", "Asia/Irkutsk"),
-                    ("Asia/Istanbul", "Asia/Istanbul"),
-                    ("Asia/Jakarta", "Asia/Jakarta"),
-                    ("Asia/Jayapura", "Asia/Jayapura"),
-                    ("Asia/Jerusalem", "Asia/Jerusalem"),
-                    ("Asia/Kabul", "Asia/Kabul"),
-                    ("Asia/Kamchatka", "Asia/Kamchatka"),
-                    ("Asia/Karachi", "Asia/Karachi"),
-                    ("Asia/Kashgar", "Asia/Kashgar"),
-                    ("Asia/Kathmandu", "Asia/Kathmandu"),
-                    ("Asia/Katmandu", "Asia/Katmandu"),
-                    ("Asia/Khandyga", "Asia/Khandyga"),
-                    ("Asia/Kolkata", "Asia/Kolkata"),
-                    ("Asia/Krasnoyarsk", "Asia/Krasnoyarsk"),
-                    ("Asia/Kuala_Lumpur", "Asia/Kuala_Lumpur"),
-                    ("Asia/Kuching", "Asia/Kuching"),
-                    ("Asia/Kuwait", "Asia/Kuwait"),
-                    ("Asia/Macao", "Asia/Macao"),
-                    ("Asia/Macau", "Asia/Macau"),
-                    ("Asia/Magadan", "Asia/Magadan"),
-                    ("Asia/Makassar", "Asia/Makassar"),
-                    ("Asia/Manila", "Asia/Manila"),
-                    ("Asia/Muscat", "Asia/Muscat"),
-                    ("Asia/Nicosia", "Asia/Nicosia"),
-                    ("Asia/Novokuznetsk", "Asia/Novokuznetsk"),
-                    ("Asia/Novosibirsk", "Asia/Novosibirsk"),
-                    ("Asia/Omsk", "Asia/Omsk"),
-                    ("Asia/Oral", "Asia/Oral"),
-                    ("Asia/Phnom_Penh", "Asia/Phnom_Penh"),
-                    ("Asia/Pontianak", "Asia/Pontianak"),
-                    ("Asia/Pyongyang", "Asia/Pyongyang"),
-                    ("Asia/Qatar", "Asia/Qatar"),
-                    ("Asia/Qostanay", "Asia/Qostanay"),
-                    ("Asia/Qyzylorda", "Asia/Qyzylorda"),
-                    ("Asia/Rangoon", "Asia/Rangoon"),
-                    ("Asia/Riyadh", "Asia/Riyadh"),
-                    ("Asia/Saigon", "Asia/Saigon"),
-                    ("Asia/Sakhalin", "Asia/Sakhalin"),
-                    ("Asia/Samarkand", "Asia/Samarkand"),
-                    ("Asia/Seoul", "Asia/Seoul"),
-                    ("Asia/Shanghai", "Asia/Shanghai"),
-                    ("Asia/Singapore", "Asia/Singapore"),
-                    ("Asia/Srednekolymsk", "Asia/Srednekolymsk"),
-                    ("Asia/Taipei", "Asia/Taipei"),
-                    ("Asia/Tashkent", "Asia/Tashkent"),
-                    ("Asia/Tbilisi", "Asia/Tbilisi"),
-                    ("Asia/Tehran", "Asia/Tehran"),
-                    ("Asia/Tel_Aviv", "Asia/Tel_Aviv"),
-                    ("Asia/Thimbu", "Asia/Thimbu"),
-                    ("Asia/Thimphu", "Asia/Thimphu"),
-                    ("Asia/Tokyo", "Asia/Tokyo"),
-                    ("Asia/Tomsk", "Asia/Tomsk"),
-                    ("Asia/Ujung_Pandang", "Asia/Ujung_Pandang"),
-                    ("Asia/Ulaanbaatar", "Asia/Ulaanbaatar"),
-                    ("Asia/Ulan_Bator", "Asia/Ulan_Bator"),
-                    ("Asia/Urumqi", "Asia/Urumqi"),
-                    ("Asia/Ust-Nera", "Asia/Ust-Nera"),
-                    ("Asia/Vientiane", "Asia/Vientiane"),
-                    ("Asia/Vladivostok", "Asia/Vladivostok"),
-                    ("Asia/Yakutsk", "Asia/Yakutsk"),
-                    ("Asia/Yangon", "Asia/Yangon"),
-                    ("Asia/Yekaterinburg", "Asia/Yekaterinburg"),
-                    ("Asia/Yerevan", "Asia/Yerevan"),
-                    ("Atlantic/Azores", "Atlantic/Azores"),
-                    ("Atlantic/Bermuda", "Atlantic/Bermuda"),
-                    ("Atlantic/Canary", "Atlantic/Canary"),
-                    ("Atlantic/Cape_Verde", "Atlantic/Cape_Verde"),
-                    ("Atlantic/Faeroe", "Atlantic/Faeroe"),
-                    ("Atlantic/Faroe", "Atlantic/Faroe"),
-                    ("Atlantic/Jan_Mayen", "Atlantic/Jan_Mayen"),
-                    ("Atlantic/Madeira", "Atlantic/Madeira"),
-                    ("Atlantic/Reykjavik", "Atlantic/Reykjavik"),
-                    ("Atlantic/South_Georgia", "Atlantic/South_Georgia"),
-                    ("Atlantic/St_Helena", "Atlantic/St_Helena"),
-                    ("Atlantic/Stanley", "Atlantic/Stanley"),
-                    ("Australia/ACT", "Australia/ACT"),
-                    ("Australia/Adelaide", "Australia/Adelaide"),
-                    ("Australia/Brisbane", "Australia/Brisbane"),
-                    ("Australia/Broken_Hill", "Australia/Broken_Hill"),
-                    ("Australia/Canberra", "Australia/Canberra"),
-                    ("Australia/Currie", "Australia/Currie"),
-                    ("Australia/Darwin", "Australia/Darwin"),
-                    ("Australia/Eucla", "Australia/Eucla"),
-                    ("Australia/Hobart", "Australia/Hobart"),
-                    ("Australia/LHI", "Australia/LHI"),
-                    ("Australia/Lindeman", "Australia/Lindeman"),
-                    ("Australia/Lord_Howe", "Australia/Lord_Howe"),
-                    ("Australia/Melbourne", "Australia/Melbourne"),
-                    ("Australia/NSW", "Australia/NSW"),
-                    ("Australia/North", "Australia/North"),
-                    ("Australia/Perth", "Australia/Perth"),
-                    ("Australia/Queensland", "Australia/Queensland"),
-                    ("Australia/South", "Australia/South"),
-                    ("Australia/Sydney", "Australia/Sydney"),
-                    ("Australia/Tasmania", "Australia/Tasmania"),
-                    ("Australia/Victoria", "Australia/Victoria"),
-                    ("Australia/West", "Australia/West"),
-                    ("Australia/Yancowinna", "Australia/Yancowinna"),
-                    ("Brazil/Acre", "Brazil/Acre"),
-                    ("Brazil/DeNoronha", "Brazil/DeNoronha"),
-                    ("Brazil/East", "Brazil/East"),
-                    ("Brazil/West", "Brazil/West"),
-                    ("CET", "CET"),
-                    ("CST6CDT", "CST6CDT"),
-                    ("Canada/Atlantic", "Canada/Atlantic"),
-                    ("Canada/Central", "Canada/Central"),
-                    ("Canada/Eastern", "Canada/Eastern"),
-                    ("Canada/Mountain", "Canada/Mountain"),
-                    ("Canada/Newfoundland", "Canada/Newfoundland"),
-                    ("Canada/Pacific", "Canada/Pacific"),
-                    ("Canada/Saskatchewan", "Canada/Saskatchewan"),
-                    ("Canada/Yukon", "Canada/Yukon"),
-                    ("Chile/Continental", "Chile/Continental"),
-                    ("Chile/EasterIsland", "Chile/EasterIsland"),
-                    ("Cuba", "Cuba"),
-                    ("EET", "EET"),
-                    ("EST", "EST"),
-                    ("EST5EDT", "EST5EDT"),
-                    ("Egypt", "Egypt"),
-                    ("Eire", "Eire"),
-                    ("Etc/GMT", "Etc/GMT"),
-                    ("Etc/GMT+0", "Etc/GMT+0"),
-                    ("Etc/GMT+1", "Etc/GMT+1"),
-                    ("Etc/GMT+10", "Etc/GMT+10"),
-                    ("Etc/GMT+11", "Etc/GMT+11"),
-                    ("Etc/GMT+12", "Etc/GMT+12"),
-                    ("Etc/GMT+2", "Etc/GMT+2"),
-                    ("Etc/GMT+3", "Etc/GMT+3"),
-                    ("Etc/GMT+4", "Etc/GMT+4"),
-                    ("Etc/GMT+5", "Etc/GMT+5"),
-                    ("Etc/GMT+6", "Etc/GMT+6"),
-                    ("Etc/GMT+7", "Etc/GMT+7"),
-                    ("Etc/GMT+8", "Etc/GMT+8"),
-                    ("Etc/GMT+9", "Etc/GMT+9"),
-                    ("Etc/GMT-0", "Etc/GMT-0"),
-                    ("Etc/GMT-1", "Etc/GMT-1"),
-                    ("Etc/GMT-10", "Etc/GMT-10"),
-                    ("Etc/GMT-11", "Etc/GMT-11"),
-                    ("Etc/GMT-12", "Etc/GMT-12"),
-                    ("Etc/GMT-13", "Etc/GMT-13"),
-                    ("Etc/GMT-14", "Etc/GMT-14"),
-                    ("Etc/GMT-2", "Etc/GMT-2"),
-                    ("Etc/GMT-3", "Etc/GMT-3"),
-                    ("Etc/GMT-4", "Etc/GMT-4"),
-                    ("Etc/GMT-5", "Etc/GMT-5"),
-                    ("Etc/GMT-6", "Etc/GMT-6"),
-                    ("Etc/GMT-7", "Etc/GMT-7"),
-                    ("Etc/GMT-8", "Etc/GMT-8"),
-                    ("Etc/GMT-9", "Etc/GMT-9"),
-                    ("Etc/GMT0", "Etc/GMT0"),
-                    ("Etc/Greenwich", "Etc/Greenwich"),
-                    ("Etc/UCT", "Etc/UCT"),
-                    ("Etc/UTC", "Etc/UTC"),
-                    ("Etc/Universal", "Etc/Universal"),
-                    ("Etc/Zulu", "Etc/Zulu"),
-                    ("Europe/Amsterdam", "Europe/Amsterdam"),
-                    ("Europe/Andorra", "Europe/Andorra"),
-                    ("Europe/Astrakhan", "Europe/Astrakhan"),
-                    ("Europe/Athens", "Europe/Athens"),
-                    ("Europe/Belfast", "Europe/Belfast"),
-                    ("Europe/Belgrade", "Europe/Belgrade"),
-                    ("Europe/Berlin", "Europe/Berlin"),
-                    ("Europe/Bratislava", "Europe/Bratislava"),
-                    ("Europe/Brussels", "Europe/Brussels"),
-                    ("Europe/Bucharest", "Europe/Bucharest"),
-                    ("Europe/Budapest", "Europe/Budapest"),
-                    ("Europe/Busingen", "Europe/Busingen"),
-                    ("Europe/Chisinau", "Europe/Chisinau"),
-                    ("Europe/Copenhagen", "Europe/Copenhagen"),
-                    ("Europe/Dublin", "Europe/Dublin"),
-                    ("Europe/Gibraltar", "Europe/Gibraltar"),
-                    ("Europe/Guernsey", "Europe/Guernsey"),
-                    ("Europe/Helsinki", "Europe/Helsinki"),
-                    ("Europe/Isle_of_Man", "Europe/Isle_of_Man"),
-                    ("Europe/Istanbul", "Europe/Istanbul"),
-                    ("Europe/Jersey", "Europe/Jersey"),
-                    ("Europe/Kaliningrad", "Europe/Kaliningrad"),
-                    ("Europe/Kiev", "Europe/Kiev"),
-                    ("Europe/Kirov", "Europe/Kirov"),
-                    ("Europe/Kyiv", "Europe/Kyiv"),
-                    ("Europe/Lisbon", "Europe/Lisbon"),
-                    ("Europe/Ljubljana", "Europe/Ljubljana"),
-                    ("Europe/London", "Europe/London"),
-                    ("Europe/Luxembourg", "Europe/Luxembourg"),
-                    ("Europe/Madrid", "Europe/Madrid"),
-                    ("Europe/Malta", "Europe/Malta"),
-                    ("Europe/Mariehamn", "Europe/Mariehamn"),
-                    ("Europe/Minsk", "Europe/Minsk"),
-                    ("Europe/Monaco", "Europe/Monaco"),
-                    ("Europe/Moscow", "Europe/Moscow"),
-                    ("Europe/Nicosia", "Europe/Nicosia"),
-                    ("Europe/Oslo", "Europe/Oslo"),
-                    ("Europe/Paris", "Europe/Paris"),
-                    ("Europe/Podgorica", "Europe/Podgorica"),
-                    ("Europe/Prague", "Europe/Prague"),
-                    ("Europe/Riga", "Europe/Riga"),
-                    ("Europe/Rome", "Europe/Rome"),
-                    ("Europe/Samara", "Europe/Samara"),
-                    ("Europe/San_Marino", "Europe/San_Marino"),
-                    ("Europe/Sarajevo", "Europe/Sarajevo"),
-                    ("Europe/Saratov", "Europe/Saratov"),
-                    ("Europe/Simferopol", "Europe/Simferopol"),
-                    ("Europe/Skopje", "Europe/Skopje"),
-                    ("Europe/Sofia", "Europe/Sofia"),
-                    ("Europe/Stockholm", "Europe/Stockholm"),
-                    ("Europe/Tallinn", "Europe/Tallinn"),
-                    ("Europe/Tirane", "Europe/Tirane"),
-                    ("Europe/Tiraspol", "Europe/Tiraspol"),
-                    ("Europe/Ulyanovsk", "Europe/Ulyanovsk"),
-                    ("Europe/Uzhgorod", "Europe/Uzhgorod"),
-                    ("Europe/Vaduz", "Europe/Vaduz"),
-                    ("Europe/Vatican", "Europe/Vatican"),
-                    ("Europe/Vienna", "Europe/Vienna"),
-                    ("Europe/Vilnius", "Europe/Vilnius"),
-                    ("Europe/Volgograd", "Europe/Volgograd"),
-                    ("Europe/Warsaw", "Europe/Warsaw"),
-                    ("Europe/Zagreb", "Europe/Zagreb"),
-                    ("Europe/Zaporozhye", "Europe/Zaporozhye"),
-                    ("Europe/Zurich", "Europe/Zurich"),
-                    ("Factory", "Factory"),
-                    ("GB", "GB"),
-                    ("GB-Eire", "GB-Eire"),
-                    ("GMT", "GMT"),
-                    ("GMT+0", "GMT+0"),
-                    ("GMT-0", "GMT-0"),
-                    ("GMT0", "GMT0"),
-                    ("Greenwich", "Greenwich"),
-                    ("HST", "HST"),
-                    ("Hongkong", "Hongkong"),
-                    ("Iceland", "Iceland"),
-                    ("Indian/Antananarivo", "Indian/Antananarivo"),
-                    ("Indian/Chagos", "Indian/Chagos"),
-                    ("Indian/Christmas", "Indian/Christmas"),
-                    ("Indian/Cocos", "Indian/Cocos"),
-                    ("Indian/Comoro", "Indian/Comoro"),
-                    ("Indian/Kerguelen", "Indian/Kerguelen"),
-                    ("Indian/Mahe", "Indian/Mahe"),
-                    ("Indian/Maldives", "Indian/Maldives"),
-                    ("Indian/Mauritius", "Indian/Mauritius"),
-                    ("Indian/Mayotte", "Indian/Mayotte"),
-                    ("Indian/Reunion", "Indian/Reunion"),
-                    ("Iran", "Iran"),
-                    ("Israel", "Israel"),
-                    ("Jamaica", "Jamaica"),
-                    ("Japan", "Japan"),
-                    ("Kwajalein", "Kwajalein"),
-                    ("Libya", "Libya"),
-                    ("MET", "MET"),
-                    ("MST", "MST"),
-                    ("MST7MDT", "MST7MDT"),
-                    ("Mexico/BajaNorte", "Mexico/BajaNorte"),
-                    ("Mexico/BajaSur", "Mexico/BajaSur"),
-                    ("Mexico/General", "Mexico/General"),
-                    ("NZ", "NZ"),
-                    ("NZ-CHAT", "NZ-CHAT"),
-                    ("Navajo", "Navajo"),
-                    ("PRC", "PRC"),
-                    ("PST8PDT", "PST8PDT"),
-                    ("Pacific/Apia", "Pacific/Apia"),
-                    ("Pacific/Auckland", "Pacific/Auckland"),
-                    ("Pacific/Bougainville", "Pacific/Bougainville"),
-                    ("Pacific/Chatham", "Pacific/Chatham"),
-                    ("Pacific/Chuuk", "Pacific/Chuuk"),
-                    ("Pacific/Easter", "Pacific/Easter"),
-                    ("Pacific/Efate", "Pacific/Efate"),
-                    ("Pacific/Enderbury", "Pacific/Enderbury"),
-                    ("Pacific/Fakaofo", "Pacific/Fakaofo"),
-                    ("Pacific/Fiji", "Pacific/Fiji"),
-                    ("Pacific/Funafuti", "Pacific/Funafuti"),
-                    ("Pacific/Galapagos", "Pacific/Galapagos"),
-                    ("Pacific/Gambier", "Pacific/Gambier"),
-                    ("Pacific/Guadalcanal", "Pacific/Guadalcanal"),
-                    ("Pacific/Guam", "Pacific/Guam"),
-                    ("Pacific/Honolulu", "Pacific/Honolulu"),
-                    ("Pacific/Johnston", "Pacific/Johnston"),
-                    ("Pacific/Kanton", "Pacific/Kanton"),
-                    ("Pacific/Kiritimati", "Pacific/Kiritimati"),
-                    ("Pacific/Kosrae", "Pacific/Kosrae"),
-                    ("Pacific/Kwajalein", "Pacific/Kwajalein"),
-                    ("Pacific/Majuro", "Pacific/Majuro"),
-                    ("Pacific/Marquesas", "Pacific/Marquesas"),
-                    ("Pacific/Midway", "Pacific/Midway"),
-                    ("Pacific/Nauru", "Pacific/Nauru"),
-                    ("Pacific/Niue", "Pacific/Niue"),
-                    ("Pacific/Norfolk", "Pacific/Norfolk"),
-                    ("Pacific/Noumea", "Pacific/Noumea"),
-                    ("Pacific/Pago_Pago", "Pacific/Pago_Pago"),
-                    ("Pacific/Palau", "Pacific/Palau"),
-                    ("Pacific/Pitcairn", "Pacific/Pitcairn"),
-                    ("Pacific/Pohnpei", "Pacific/Pohnpei"),
-                    ("Pacific/Ponape", "Pacific/Ponape"),
-                    ("Pacific/Port_Moresby", "Pacific/Port_Moresby"),
-                    ("Pacific/Rarotonga", "Pacific/Rarotonga"),
-                    ("Pacific/Saipan", "Pacific/Saipan"),
-                    ("Pacific/Samoa", "Pacific/Samoa"),
-                    ("Pacific/Tahiti", "Pacific/Tahiti"),
-                    ("Pacific/Tarawa", "Pacific/Tarawa"),
-                    ("Pacific/Tongatapu", "Pacific/Tongatapu"),
-                    ("Pacific/Truk", "Pacific/Truk"),
-                    ("Pacific/Wake", "Pacific/Wake"),
-                    ("Pacific/Wallis", "Pacific/Wallis"),
-                    ("Pacific/Yap", "Pacific/Yap"),
-                    ("Poland", "Poland"),
-                    ("Portugal", "Portugal"),
-                    ("ROC", "ROC"),
-                    ("ROK", "ROK"),
-                    ("Singapore", "Singapore"),
-                    ("Turkey", "Turkey"),
-                    ("UCT", "UCT"),
-                    ("US/Alaska", "US/Alaska"),
-                    ("US/Aleutian", "US/Aleutian"),
-                    ("US/Arizona", "US/Arizona"),
-                    ("US/Central", "US/Central"),
-                    ("US/East-Indiana", "US/East-Indiana"),
-                    ("US/Eastern", "US/Eastern"),
-                    ("US/Hawaii", "US/Hawaii"),
-                    ("US/Indiana-Starke", "US/Indiana-Starke"),
-                    ("US/Michigan", "US/Michigan"),
-                    ("US/Mountain", "US/Mountain"),
-                    ("US/Pacific", "US/Pacific"),
-                    ("US/Samoa", "US/Samoa"),
-                    ("UTC", "UTC"),
-                    ("Universal", "Universal"),
-                    ("W-SU", "W-SU"),
-                    ("WET", "WET"),
-                    ("Zulu", "Zulu"),
-                    ("localtime", "localtime"),
-                ],
-                max_length=255,
-                null=True,
-            ),
-        ),
-    ]

api/tacticalrmm/agents/migrations/0059_alter_agenthistory_id.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.10 on 2024-02-19 05:57
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("agents", "0058_alter_agent_time_zone"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="agenthistory",
-            name="id",
-            field=models.BigAutoField(primary_key=True, serialize=False),
-        ),
-    ]

api/tacticalrmm/agents/migrations/0060_agenthistory_collector_all_output_and_more.py

@@ -1,36 +0,0 @@
-# Generated by Django 4.2.16 on 2024-10-05 20:39
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("core", "0047_alter_coresettings_notify_on_warning_alerts"),
-        ("agents", "0059_alter_agenthistory_id"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="agenthistory",
-            name="collector_all_output",
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name="agenthistory",
-            name="custom_field",
-            field=models.ForeignKey(
-                blank=True,
-                null=True,
-                on_delete=django.db.models.deletion.SET_NULL,
-                related_name="history",
-                to="core.customfield",
-            ),
-        ),
-        migrations.AddField(
-            model_name="agenthistory",
-            name="save_to_agent_note",
-            field=models.BooleanField(default=False),
-        ),
-    ]

api/tacticalrmm/agents/models.py

@@ -1,5 +1,4 @@
 import asyncio
-import logging
 import re
 from collections import Counter
 from contextlib import suppress
@@ -8,6 +7,7 @@ from typing import TYPE_CHECKING, Any, Dict, List, Optional, Sequence, Union, ca
 import msgpack
 import nats
 import validators
+from asgiref.sync import sync_to_async
 from django.conf import settings
 from django.contrib.postgres.fields import ArrayField
 from django.core.cache import cache
@@ -20,7 +20,7 @@ from packaging.version import Version as LooseVersion
 from agents.utils import get_agent_url
 from checks.models import CheckResult
 from core.models import TZ_CHOICES
-from core.utils import _b64_to_hex, get_core_settings, send_command_with_mesh
+from core.utils import get_core_settings, send_command_with_mesh
 from logs.models import BaseAuditModel, DebugLog, PendingAction
 from tacticalrmm.constants import (
     AGENT_STATUS_OFFLINE,
@@ -40,7 +40,7 @@ from tacticalrmm.constants import (
     PAAction,
     PAStatus,
 )
-from tacticalrmm.helpers import has_script_actions, has_webhook, setup_nats_options
+from tacticalrmm.helpers import setup_nats_options
 from tacticalrmm.models import PermissionQuerySet
 
 if TYPE_CHECKING:
@@ -54,8 +54,6 @@ if TYPE_CHECKING:
 # type helpers
 Disk = Union[Dict[str, Any], str]
 
-logger = logging.getLogger("trmm")
-
 
 class Agent(BaseAuditModel):
     class Meta:
@@ -126,27 +124,6 @@ class Agent(BaseAuditModel):
     def __str__(self) -> str:
         return self.hostname
 
-    def save(self, *args, **kwargs):
-        # prevent recursion since calling set_alert_template() also calls save()
-        if not hasattr(self, "_processing_set_alert_template"):
-            self._processing_set_alert_template = False
-
-        if self.pk and not self._processing_set_alert_template:
-            orig = Agent.objects.get(pk=self.pk)
-            mon_type_changed = self.monitoring_type != orig.monitoring_type
-            site_changed = self.site_id != orig.site_id
-            policy_changed = self.policy != orig.policy
-            block_inherit = (
-                self.block_policy_inheritance != orig.block_policy_inheritance
-            )
-
-            if mon_type_changed or site_changed or policy_changed or block_inherit:
-                self._processing_set_alert_template = True
-                self.set_alert_template()
-                self._processing_set_alert_template = False
-
-        super().save(*args, **kwargs)
-
     @property
     def client(self) -> "Client":
         return self.site.client
@@ -303,20 +280,7 @@ class Agent(BaseAuditModel):
         try:
             cpus = self.wmi_detail["cpu"]
             for cpu in cpus:
-                name = [x["Name"] for x in cpu if "Name" in x][0]
-                lp, nc = "", ""
-                with suppress(Exception):
-                    lp = [
-                        x["NumberOfLogicalProcessors"]
-                        for x in cpu
-                        if "NumberOfCores" in x
-                    ][0]
-                    nc = [x["NumberOfCores"] for x in cpu if "NumberOfCores" in x][0]
-                if lp and nc:
-                    cpu_string = f"{name}, {nc}C/{lp}T"
-                else:
-                    cpu_string = name
-                ret.append(cpu_string)
+                ret.append([x["Name"] for x in cpu if "Name" in x][0])
             return ret
         except:
             return ["unknown cpu model"]
@@ -447,20 +411,13 @@ class Agent(BaseAuditModel):
     @property
     def serial_number(self) -> str:
         if self.is_posix:
-            try:
-                return self.wmi_detail["serialnumber"]
-            except:
-                return ""
+            return ""
 
         try:
             return self.wmi_detail["bios"][0][0]["SerialNumber"]
         except:
             return ""
 
-    @property
-    def hex_mesh_node_id(self) -> str:
-        return _b64_to_hex(self.mesh_node_id)
-
     @classmethod
     def online_agents(cls, min_version: str = "") -> "List[Agent]":
         if min_version:
@@ -548,32 +505,24 @@ class Agent(BaseAuditModel):
         )
 
         return {
-            "agent_policy": (
-                self.policy
-                if self.policy and not self.policy.is_agent_excluded(self)
-                else None
-            ),
-            "site_policy": (
-                site_policy
-                if (site_policy and not site_policy.is_agent_excluded(self))
-                and not self.block_policy_inheritance
-                else None
-            ),
-            "client_policy": (
-                client_policy
-                if (client_policy and not client_policy.is_agent_excluded(self))
-                and not self.block_policy_inheritance
-                and not self.site.block_policy_inheritance
-                else None
-            ),
-            "default_policy": (
-                default_policy
-                if (default_policy and not default_policy.is_agent_excluded(self))
-                and not self.block_policy_inheritance
-                and not self.site.block_policy_inheritance
-                and not self.client.block_policy_inheritance
-                else None
-            ),
+            "agent_policy": self.policy
+            if self.policy and not self.policy.is_agent_excluded(self)
+            else None,
+            "site_policy": site_policy
+            if (site_policy and not site_policy.is_agent_excluded(self))
+            and not self.block_policy_inheritance
+            else None,
+            "client_policy": client_policy
+            if (client_policy and not client_policy.is_agent_excluded(self))
+            and not self.block_policy_inheritance
+            and not self.site.block_policy_inheritance
+            else None,
+            "default_policy": default_policy
+            if (default_policy and not default_policy.is_agent_excluded(self))
+            and not self.block_policy_inheritance
+            and not self.site.block_policy_inheritance
+            and not self.client.block_policy_inheritance
+            else None,
         }
 
     def check_run_interval(self) -> int:
@@ -607,7 +556,6 @@ class Agent(BaseAuditModel):
             run_as_user = True
 
         parsed_args = script.parse_script_args(self, script.shell, args)
-        parsed_env_vars = script.parse_script_env_vars(self, script.shell, env_vars)
 
         data = {
             "func": "runscriptfull" if full else "runscript",
@@ -618,9 +566,7 @@ class Agent(BaseAuditModel):
                 "shell": script.shell,
             },
             "run_as_user": run_as_user,
-            "env_vars": parsed_env_vars,
-            "nushell_enable_config": settings.NUSHELL_ENABLE_CONFIG,
-            "deno_default_permissions": settings.DENO_DEFAULT_PERMISSIONS,
+            "env_vars": env_vars,
         }
 
         if history_pk != 0:
@@ -851,6 +797,9 @@ class Agent(BaseAuditModel):
             cache.set(cache_key, tasks, 600)
             return tasks
 
+    def _do_nats_debug(self, agent: "Agent", message: str) -> None:
+        DebugLog.error(agent=agent, log_type=DebugLogType.AGENT_ISSUES, message=message)
+
     async def nats_cmd(
         self, data: Dict[Any, Any], timeout: int = 30, wait: bool = True
     ) -> Any:
@@ -872,7 +821,9 @@ class Agent(BaseAuditModel):
                     ret = msgpack.loads(msg.data)
                 except Exception as e:
                     ret = str(e)
-                    logger.error(e)
+                    await sync_to_async(self._do_nats_debug, thread_sensitive=False)(
+                        agent=self, message=ret
+                    )
 
             await nc.close()
             return ret
@@ -955,22 +906,18 @@ class Agent(BaseAuditModel):
     def should_create_alert(
         self, alert_template: "Optional[AlertTemplate]" = None
     ) -> bool:
-        has_agent_notification = (
+        return bool(
             self.overdue_dashboard_alert
             or self.overdue_email_alert
             or self.overdue_text_alert
-        )
-        has_alert_template_notification = alert_template and (
-            alert_template.agent_always_alert
-            or alert_template.agent_always_email
-            or alert_template.agent_always_text
-        )
-
-        return bool(
-            has_agent_notification
-            or has_alert_template_notification
-            or has_webhook(alert_template, "agent")
-            or has_script_actions(alert_template, "agent")
+            or (
+                alert_template
+                and (
+                    alert_template.agent_always_alert
+                    or alert_template.agent_always_email
+                    or alert_template.agent_always_text
+                )
+            )
         )
 
     def send_outage_email(self) -> None:
@@ -1099,7 +1046,6 @@ class AgentCustomField(models.Model):
 class AgentHistory(models.Model):
     objects = PermissionQuerySet.as_manager()
 
-    id = models.BigAutoField(primary_key=True)
     agent = models.ForeignKey(
         Agent,
         related_name="history",
@@ -1122,15 +1068,6 @@ class AgentHistory(models.Model):
         on_delete=models.SET_NULL,
     )
     script_results = models.JSONField(null=True, blank=True)
-    custom_field = models.ForeignKey(
-        "core.CustomField",
-        null=True,
-        blank=True,
-        related_name="history",
-        on_delete=models.SET_NULL,
-    )
-    collector_all_output = models.BooleanField(default=False)
-    save_to_agent_note = models.BooleanField(default=False)
 
     def __str__(self) -> str:
         return f"{self.agent.hostname} - {self.type}"

api/tacticalrmm/agents/permissions.py

@@ -47,6 +47,13 @@ class UpdateAgentPerms(permissions.BasePermission):
         return _has_perm(r, "can_update_agents")
 
 
+class PingAgentPerms(permissions.BasePermission):
+    def has_permission(self, r, view) -> bool:
+        return _has_perm(r, "can_ping_agents") and _has_perm_on_agent(
+            r.user, view.kwargs["agent_id"]
+        )
+
+
 class ManageProcPerms(permissions.BasePermission):
     def has_permission(self, r, view) -> bool:
         return _has_perm(r, "can_manage_procs") and _has_perm_on_agent(

api/tacticalrmm/agents/serializers.py

@@ -1,6 +1,7 @@
+import pytz
 from rest_framework import serializers
 
-from tacticalrmm.constants import AGENT_STATUS_ONLINE, ALL_TIMEZONES
+from tacticalrmm.constants import AGENT_STATUS_ONLINE
 from winupdate.serializers import WinUpdatePolicySerializer
 
 from .models import Agent, AgentCustomField, AgentHistory, Note
@@ -70,7 +71,7 @@ class AgentSerializer(serializers.ModelSerializer):
         return policies
 
     def get_all_timezones(self, obj):
-        return ALL_TIMEZONES
+        return pytz.all_timezones
 
     class Meta:
         model = Agent

api/tacticalrmm/agents/tasks.py

@@ -175,7 +175,7 @@ def run_script_email_results_task(
         return
 
     CORE = get_core_settings()
-    subject = f"{agent.client.name}, {agent.site.name}, {agent.hostname} {script.name} Results"
+    subject = f"{agent.hostname} {script.name} Results"
     exec_time = "{:.4f}".format(r["execution_time"])
     body = (
         subject

api/tacticalrmm/agents/tests/test_agent_save.py

@@ -1,61 +0,0 @@
-from unittest.mock import patch
-
-from model_bakery import baker
-
-from agents.models import Agent
-from tacticalrmm.constants import AgentMonType
-from tacticalrmm.test import TacticalTestCase
-
-
-class AgentSaveTestCase(TacticalTestCase):
-    def setUp(self):
-        self.client1 = baker.make("clients.Client")
-        self.client2 = baker.make("clients.Client")
-        self.site1 = baker.make("clients.Site", client=self.client1)
-        self.site2 = baker.make("clients.Site", client=self.client2)
-        self.site3 = baker.make("clients.Site", client=self.client2)
-        self.agent = baker.make(
-            "agents.Agent",
-            site=self.site1,
-            monitoring_type=AgentMonType.SERVER,
-        )
-
-    @patch.object(Agent, "set_alert_template")
-    def test_set_alert_template_called_on_mon_type_change(
-        self, mock_set_alert_template
-    ):
-        self.agent.monitoring_type = AgentMonType.WORKSTATION
-        self.agent.save()
-        mock_set_alert_template.assert_called_once()
-
-    @patch.object(Agent, "set_alert_template")
-    def test_set_alert_template_called_on_site_change(self, mock_set_alert_template):
-        self.agent.site = self.site2
-        self.agent.save()
-        mock_set_alert_template.assert_called_once()
-
-    @patch.object(Agent, "set_alert_template")
-    def test_set_alert_template_called_on_site_and_montype_change(
-        self, mock_set_alert_template
-    ):
-        print(f"before: {self.agent.monitoring_type} site: {self.agent.site_id}")
-        self.agent.site = self.site3
-        self.agent.monitoring_type = AgentMonType.WORKSTATION
-        self.agent.save()
-        mock_set_alert_template.assert_called_once()
-        print(f"after: {self.agent.monitoring_type} site: {self.agent.site_id}")
-
-    @patch.object(Agent, "set_alert_template")
-    def test_set_alert_template_not_called_without_changes(
-        self, mock_set_alert_template
-    ):
-        self.agent.save()
-        mock_set_alert_template.assert_not_called()
-
-    @patch.object(Agent, "set_alert_template")
-    def test_set_alert_template_not_called_on_non_relevant_field_change(
-        self, mock_set_alert_template
-    ):
-        self.agent.hostname = "abc123"
-        self.agent.save()
-        mock_set_alert_template.assert_not_called()

api/tacticalrmm/agents/tests/test_agents.py

@@ -2,7 +2,7 @@ import json
 import os
 from itertools import cycle
 from typing import TYPE_CHECKING
-from unittest.mock import PropertyMock, patch
+from unittest.mock import patch
 from zoneinfo import ZoneInfo
 
 from django.conf import settings
@@ -768,67 +768,6 @@ class TestAgentViews(TacticalTestCase):
 
         self.assertEqual(Note.objects.get(agent=self.agent).note, "ok")
 
-        # test run on server
-        with patch("core.utils.run_server_script") as mock_run_server_script:
-            mock_run_server_script.return_value = ("output", "error", 1.23456789, 0)
-            data = {
-                "script": script.pk,
-                "output": "wait",
-                "args": ["arg1", "arg2"],
-                "timeout": 15,
-                "run_as_user": False,
-                "env_vars": ["key1=val1", "key2=val2"],
-                "run_on_server": True,
-            }
-
-            r = self.client.post(url, data, format="json")
-            self.assertEqual(r.status_code, 200)
-            hist = AgentHistory.objects.filter(agent=self.agent, script=script).last()
-            if not hist:
-                raise AgentHistory.DoesNotExist
-
-            mock_run_server_script.assert_called_with(
-                body=script.script_body,
-                args=script.parse_script_args(self.agent, script.shell, data["args"]),
-                env_vars=script.parse_script_env_vars(
-                    self.agent, script.shell, data["env_vars"]
-                ),
-                shell=script.shell,
-                timeout=18,
-            )
-
-            expected_ret = {
-                "stdout": "output",
-                "stderr": "error",
-                "execution_time": "1.2346",
-                "retcode": 0,
-            }
-
-            self.assertEqual(r.data, expected_ret)
-
-            hist.refresh_from_db()
-            expected_script_results = {**expected_ret, "id": hist.pk}
-            self.assertEqual(hist.script_results, expected_script_results)
-
-            # test run on server with server scripts disabled
-            with patch(
-                "core.models.CoreSettings.server_scripts_enabled",
-                new_callable=PropertyMock,
-            ) as server_scripts_enabled:
-                server_scripts_enabled.return_value = False
-
-                data = {
-                    "script": script.pk,
-                    "output": "wait",
-                    "args": ["arg1", "arg2"],
-                    "timeout": 15,
-                    "run_as_user": False,
-                    "env_vars": ["key1=val1", "key2=val2"],
-                    "run_on_server": True,
-                }
-                r = self.client.post(url, data, format="json")
-                self.assertEqual(r.status_code, 400)
-
     def test_get_notes(self):
         url = f"{base_url}/notes/"
 
@@ -1081,6 +1020,7 @@ class TestAgentPermissions(TacticalTestCase):
             {"method": "post", "action": "recover", "role": "can_recover_agents"},
             {"method": "post", "action": "reboot", "role": "can_reboot_agents"},
             {"method": "patch", "action": "reboot", "role": "can_reboot_agents"},
+            {"method": "get", "action": "ping", "role": "can_ping_agents"},
             {"method": "get", "action": "meshcentral", "role": "can_use_mesh"},
             {"method": "post", "action": "meshcentral/recover", "role": "can_use_mesh"},
             {"method": "get", "action": "processes", "role": "can_manage_procs"},

api/tacticalrmm/agents/urls.py

@@ -15,7 +15,6 @@ urlpatterns = [
     path("<agent:agent_id>/wmi/", views.WMI.as_view()),
     path("<agent:agent_id>/recover/", views.recover),
     path("<agent:agent_id>/reboot/", views.Reboot.as_view()),
-    path("<agent:agent_id>/shutdown/", views.Shutdown.as_view()),
     path("<agent:agent_id>/ping/", views.ping),
     # alias for checks get view
     path("<agent:agent_id>/checks/", GetAddChecks.as_view()),

api/tacticalrmm/agents/views.py

@@ -21,7 +21,6 @@ from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
-from core.tasks import sync_mesh_perms_task
 from core.utils import (
     get_core_settings,
     get_mesh_ws_url,
@@ -66,6 +65,7 @@ from .permissions import (
     InstallAgentPerms,
     ManageProcPerms,
     MeshPerms,
+    PingAgentPerms,
     RebootAgentPerms,
     RecoverAgentPerms,
     RunBulkPerms,
@@ -259,7 +259,6 @@ class GetUpdateDeleteAgent(APIView):
                     serializer.is_valid(raise_exception=True)
                     serializer.save()
 
-        sync_mesh_perms_task.delay()
         return Response("The agent was updated successfully")
 
     # uninstall agent
@@ -285,7 +284,6 @@ class GetUpdateDeleteAgent(APIView):
                 message=f"Unable to remove agent {name} from meshcentral database: {e}",
                 log_type=DebugLogType.AGENT_ISSUES,
             )
-        sync_mesh_perms_task.delay()
         return Response(f"{name} will now be uninstalled.")
 
 
@@ -328,13 +326,13 @@ class AgentMeshCentral(APIView):
         agent = get_object_or_404(Agent, agent_id=agent_id)
         core = get_core_settings()
 
-        user = (
-            request.user.mesh_user_id
-            if core.sync_mesh_with_trmm
-            else f"user//{core.mesh_api_superuser}"
-        )
-        token = get_login_token(key=core.mesh_token, user=user)
-        token_param = f"login={token}&"
+        if not core.mesh_disable_auto_login:
+            token = get_login_token(
+                key=core.mesh_token, user=f"user//{core.mesh_username}"
+            )
+            token_param = f"login={token}&"
+        else:
+            token_param = ""
 
         control = f"{core.mesh_site}/?{token_param}gotonode={agent.mesh_node_id}&viewmode=11&hide=31"
         terminal = f"{core.mesh_site}/?{token_param}gotonode={agent.mesh_node_id}&viewmode=12&hide=31"
@@ -404,7 +402,7 @@ def update_agents(request):
 
 
 @api_view(["GET"])
-@permission_classes([IsAuthenticated, AgentPerms])
+@permission_classes([IsAuthenticated, PingAgentPerms])
 def ping(request, agent_id):
     agent = get_object_or_404(Agent, agent_id=agent_id)
     status = AGENT_STATUS_OFFLINE
@@ -494,19 +492,6 @@ def send_raw_cmd(request, agent_id):
     return Response(r)
 
 
-class Shutdown(APIView):
-    permission_classes = [IsAuthenticated, RebootAgentPerms]
-
-    # shutdown
-    def post(self, request, agent_id):
-        agent = get_object_or_404(Agent, agent_id=agent_id)
-        r = asyncio.run(agent.nats_cmd({"func": "shutdown"}, timeout=10))
-        if r != "ok":
-            return notify_error("Unable to contact the agent")
-
-        return Response("ok")
-
-
 class Reboot(APIView):
     permission_classes = [IsAuthenticated, RebootAgentPerms]
 
@@ -585,13 +570,6 @@ def install_agent(request):
     from agents.utils import get_agent_url
     from core.utils import token_is_valid
 
-    insecure = getattr(settings, "TRMM_INSECURE", False)
-
-    if insecure and request.data["installMethod"] in {"exe", "powershell"}:
-        return notify_error(
-            "Not available in insecure mode. Please use the 'Manual' method."
-        )
-
     # TODO rework this ghetto validation hack
     # https://github.com/amidaware/tacticalrmm/issues/1461
     try:
@@ -694,9 +672,6 @@ def install_agent(request):
             if int(request.data["power"]):
                 cmd.append("--power")
 
-            if insecure:
-                cmd.append("--insecure")
-
             resp["cmd"] = " ".join(str(i) for i in cmd)
         else:
             install_flags.insert(0, f"sudo ./{inno}")
@@ -705,8 +680,6 @@ def install_agent(request):
             resp["cmd"] = (
                 dl + f" && chmod +x {inno} && " + " ".join(str(i) for i in cmd)
             )
-            if insecure:
-                resp["cmd"] += " --insecure"
 
         resp["url"] = download_url
 
@@ -768,10 +741,6 @@ def run_script(request, agent_id):
     run_as_user: bool = request.data["run_as_user"]
     env_vars: list[str] = request.data["env_vars"]
     req_timeout = int(request.data["timeout"]) + 3
-    run_on_server: bool | None = request.data.get("run_on_server")
-
-    if run_on_server and not get_core_settings().server_scripts_enabled:
-        return notify_error("This feature is disabled.")
 
     AuditLog.audit_script_run(
         username=request.user.username,
@@ -788,29 +757,6 @@ def run_script(request, agent_id):
     )
     history_pk = hist.pk
 
-    if run_on_server:
-        from core.utils import run_server_script
-
-        r = run_server_script(
-            body=script.script_body,
-            args=script.parse_script_args(agent, script.shell, args),
-            env_vars=script.parse_script_env_vars(agent, script.shell, env_vars),
-            shell=script.shell,
-            timeout=req_timeout,
-        )
-
-        ret = {
-            "stdout": r[0],
-            "stderr": r[1],
-            "execution_time": "{:.4f}".format(r[2]),
-            "retcode": r[3],
-        }
-
-        hist.script_results = {**ret, "id": history_pk}
-        hist.save(update_fields=["script_results"])
-
-        return Response(ret)
-
     if output == "wait":
         r = agent.run_script(
             scriptpk=script.pk,
@@ -1014,8 +960,6 @@ def bulk(request):
         debug_info={"ip": request._client_ip},
     )
 
-    ht = "Check the History tab on the agent to view the results."
-
     if request.data["mode"] == "command":
         if request.data["shell"] == "custom" and request.data["custom_shell"]:
             shell = request.data["custom_shell"]
@@ -1030,21 +974,11 @@ def bulk(request):
             username=request.user.username[:50],
             run_as_user=request.data["run_as_user"],
         )
-        return Response(f"Command will now be run on {len(agents)} agents. {ht}")
+        return Response(f"Command will now be run on {len(agents)} agents")
 
     elif request.data["mode"] == "script":
         script = get_object_or_404(Script, pk=request.data["script"])
 
-        # prevent API from breaking for those who haven't updated payload
-        try:
-            custom_field_pk = request.data["custom_field"]
-            collector_all_output = request.data["collector_all_output"]
-            save_to_agent_note = request.data["save_to_agent_note"]
-        except KeyError:
-            custom_field_pk = None
-            collector_all_output = False
-            save_to_agent_note = False
-
         bulk_script_task.delay(
             script_pk=script.pk,
             agent_pks=agents,
@@ -1053,12 +987,9 @@ def bulk(request):
             username=request.user.username[:50],
             run_as_user=request.data["run_as_user"],
             env_vars=request.data["env_vars"],
-            custom_field_pk=custom_field_pk,
-            collector_all_output=collector_all_output,
-            save_to_agent_note=save_to_agent_note,
         )
 
-        return Response(f"{script.name} will now be run on {len(agents)} agents. {ht}")
+        return Response(f"{script.name} will now be run on {len(agents)} agents")
 
     elif request.data["mode"] == "patch":
         if request.data["patchMode"] == "install":

api/tacticalrmm/alerts/migrations/0014_alerttemplate_action_rest_alerttemplate_action_type_and_more.py

@@ -1,55 +0,0 @@
-# Generated by Django 4.2.13 on 2024-06-28 20:21
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("core", "0045_coresettings_enable_server_scripts_and_more"),
-        ("alerts", "0013_alerttemplate_action_env_vars_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="alerttemplate",
-            name="action_rest",
-            field=models.ForeignKey(
-                blank=True,
-                null=True,
-                on_delete=django.db.models.deletion.SET_NULL,
-                related_name="url_action_alert_template",
-                to="core.urlaction",
-            ),
-        ),
-        migrations.AddField(
-            model_name="alerttemplate",
-            name="action_type",
-            field=models.CharField(
-                choices=[("script", "Script"), ("server", "Server"), ("rest", "Rest")],
-                default="script",
-                max_length=10,
-            ),
-        ),
-        migrations.AddField(
-            model_name="alerttemplate",
-            name="resolved_action_rest",
-            field=models.ForeignKey(
-                blank=True,
-                null=True,
-                on_delete=django.db.models.deletion.SET_NULL,
-                related_name="resolved_url_action_alert_template",
-                to="core.urlaction",
-            ),
-        ),
-        migrations.AddField(
-            model_name="alerttemplate",
-            name="resolved_action_type",
-            field=models.CharField(
-                choices=[("script", "Script"), ("server", "Server"), ("rest", "Rest")],
-                default="script",
-                max_length=10,
-            ),
-        ),
-    ]

api/tacticalrmm/alerts/models.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import re
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union, cast
 
 from django.contrib.postgres.fields import ArrayField
@@ -7,20 +8,16 @@ from django.db import models
 from django.db.models.fields import BooleanField, PositiveIntegerField
 from django.utils import timezone as djangotime
 
-from core.utils import run_server_script, run_url_rest_action
 from logs.models import BaseAuditModel, DebugLog
 from tacticalrmm.constants import (
     AgentHistoryType,
     AgentMonType,
     AlertSeverity,
-    AlertTemplateActionType,
     AlertType,
     CheckType,
     DebugLogType,
 )
-from tacticalrmm.logger import logger
 from tacticalrmm.models import PermissionQuerySet
-from tacticalrmm.utils import RE_DB_VALUE, get_db_value
 
 if TYPE_CHECKING:
     from agents.models import Agent
@@ -98,15 +95,6 @@ class Alert(models.Model):
     def client(self) -> "Client":
         return self.agent.client
 
-    @property
-    def get_result(self):
-        if self.alert_type == AlertType.CHECK:
-            return self.assigned_check.checkresults.get(agent=self.agent)
-        elif self.alert_type == AlertType.TASK:
-            return self.assigned_task.taskresults.get(agent=self.agent)
-
-        return None
-
     def resolve(self) -> None:
         self.resolved = True
         self.resolved_on = djangotime.now()
@@ -118,9 +106,6 @@ class Alert(models.Model):
     def create_or_return_availability_alert(
         cls, agent: Agent, skip_create: bool = False
     ) -> Optional[Alert]:
-        if agent.maintenance_mode:
-            return None
-
         if not cls.objects.filter(
             agent=agent, alert_type=AlertType.AVAILABILITY, resolved=False
         ).exists():
@@ -133,7 +118,7 @@ class Alert(models.Model):
                     agent=agent,
                     alert_type=AlertType.AVAILABILITY,
                     severity=AlertSeverity.ERROR,
-                    message=f"{agent.hostname} in {agent.client.name}, {agent.site.name} is overdue.",
+                    message=f"{agent.hostname} in {agent.client.name}\\{agent.site.name} is overdue.",
                     hidden=True,
                 ),
             )
@@ -169,9 +154,6 @@ class Alert(models.Model):
         alert_severity: Optional[str] = None,
         skip_create: bool = False,
     ) -> "Optional[Alert]":
-        if agent.maintenance_mode:
-            return None
-
         # need to pass agent if the check is a policy
         if not cls.objects.filter(
             assigned_check=check,
@@ -187,17 +169,15 @@ class Alert(models.Model):
                     assigned_check=check,
                     agent=agent,
                     alert_type=AlertType.CHECK,
-                    severity=(
-                        check.alert_severity
-                        if check.check_type
-                        not in {
-                            CheckType.MEMORY,
-                            CheckType.CPU_LOAD,
-                            CheckType.DISK_SPACE,
-                            CheckType.SCRIPT,
-                        }
-                        else alert_severity
-                    ),
+                    severity=check.alert_severity
+                    if check.check_type
+                    not in {
+                        CheckType.MEMORY,
+                        CheckType.CPU_LOAD,
+                        CheckType.DISK_SPACE,
+                        CheckType.SCRIPT,
+                    }
+                    else alert_severity,
                     message=f"{agent.hostname} has a {check.check_type} check: {check.readable_desc} that failed.",
                     hidden=True,
                 ),
@@ -236,9 +216,6 @@ class Alert(models.Model):
         agent: "Agent",
         skip_create: bool = False,
     ) -> "Optional[Alert]":
-        if agent.maintenance_mode:
-            return None
-
         if not cls.objects.filter(
             assigned_task=task,
             agent=agent,
@@ -293,9 +270,7 @@ class Alert(models.Model):
         from agents.models import Agent, AgentHistory
         from autotasks.models import TaskResult
         from checks.models import CheckResult
-        from core.models import CoreSettings
 
-        core = CoreSettings.objects.first()
         # set variables
         dashboard_severities = None
         email_severities = None
@@ -306,7 +281,7 @@ class Alert(models.Model):
         alert_interval = None
         email_task = None
         text_task = None
-        should_run_script_or_webhook = False
+        run_script_action = None
 
         # check what the instance passed is
         if isinstance(instance, Agent):
@@ -332,7 +307,7 @@ class Alert(models.Model):
                 always_email = alert_template.agent_always_email
                 always_text = alert_template.agent_always_text
                 alert_interval = alert_template.agent_periodic_alert_days
-                should_run_script_or_webhook = alert_template.agent_script_actions
+                run_script_action = alert_template.agent_script_actions
 
         elif isinstance(instance, CheckResult):
             from checks.tasks import (
@@ -383,7 +358,7 @@ class Alert(models.Model):
                 always_email = alert_template.check_always_email
                 always_text = alert_template.check_always_text
                 alert_interval = alert_template.check_periodic_alert_days
-                should_run_script_or_webhook = alert_template.check_script_actions
+                run_script_action = alert_template.check_script_actions
 
         elif isinstance(instance, TaskResult):
             from autotasks.tasks import handle_task_email_alert, handle_task_sms_alert
@@ -417,7 +392,7 @@ class Alert(models.Model):
                 always_email = alert_template.task_always_email
                 always_text = alert_template.task_always_text
                 alert_interval = alert_template.task_periodic_alert_days
-                should_run_script_or_webhook = alert_template.task_script_actions
+                run_script_action = alert_template.task_script_actions
 
         else:
             return
@@ -445,23 +420,12 @@ class Alert(models.Model):
                 alert.hidden = False
                 alert.save(update_fields=["hidden"])
 
-        # TODO rework this
-        if alert.severity == AlertSeverity.INFO and not core.notify_on_info_alerts:
-            email_alert = False
-            always_email = False
-
-        elif (
-            alert.severity == AlertSeverity.WARNING
-            and not core.notify_on_warning_alerts
-        ):
-            email_alert = False
-            always_email = False
-
         # send email if enabled
         if email_alert or always_email:
             # check if alert template is set and specific severities are configured
-            if not alert_template or (
-                alert_template
+            if (
+                not alert_template
+                or alert_template
                 and email_severities
                 and alert.severity in email_severities
             ):
@@ -470,89 +434,41 @@ class Alert(models.Model):
                     alert_interval=alert_interval,
                 )
 
-        # TODO rework this
-        if alert.severity == AlertSeverity.INFO and not core.notify_on_info_alerts:
-            text_alert = False
-            always_text = False
-        elif (
-            alert.severity == AlertSeverity.WARNING
-            and not core.notify_on_warning_alerts
-        ):
-            text_alert = False
-            always_text = False
-
         # send text if enabled
         if text_alert or always_text:
             # check if alert template is set and specific severities are configured
-            if not alert_template or (
-                alert_template and text_severities and alert.severity in text_severities
+            if (
+                not alert_template
+                or alert_template
+                and text_severities
+                and alert.severity in text_severities
             ):
                 text_task.delay(pk=alert.pk, alert_interval=alert_interval)
 
-        # check if any scripts/webhooks should be run
-        if alert_template and not alert.action_run and should_run_script_or_webhook:
-            if (
-                alert_template.action_type == AlertTemplateActionType.SCRIPT
-                and alert_template.action
-            ):
-                hist = AgentHistory.objects.create(
-                    agent=agent,
-                    type=AgentHistoryType.SCRIPT_RUN,
-                    script=alert_template.action,
-                    username="alert-action-failure",
-                )
-                r = agent.run_script(
-                    scriptpk=alert_template.action.pk,
-                    args=alert.parse_script_args(alert_template.action_args),
-                    timeout=alert_template.action_timeout,
-                    wait=True,
-                    history_pk=hist.pk,
-                    full=True,
-                    run_on_any=True,
-                    run_as_user=False,
-                    env_vars=alert.parse_script_args(alert_template.action_env_vars),
-                )
-            elif (
-                alert_template.action_type == AlertTemplateActionType.SERVER
-                and alert_template.action
-            ):
-                stdout, stderr, execution_time, retcode = run_server_script(
-                    body=alert_template.action.script_body,
-                    args=alert.parse_script_args(alert_template.action_args),
-                    timeout=alert_template.action_timeout,
-                    env_vars=alert.parse_script_args(alert_template.action_env_vars),
-                    shell=alert_template.action.shell,
-                )
-
-                r = {
-                    "retcode": retcode,
-                    "stdout": stdout,
-                    "stderr": stderr,
-                    "execution_time": execution_time,
-                }
-
-            elif alert_template.action_type == AlertTemplateActionType.REST:
-                if (
-                    alert.severity == AlertSeverity.INFO
-                    and not core.notify_on_info_alerts
-                    or alert.severity == AlertSeverity.WARNING
-                    and not core.notify_on_warning_alerts
-                ):
-                    return
-                else:
-                    output, status = run_url_rest_action(
-                        action_id=alert_template.action_rest.id, instance=alert
-                    )
-                    logger.debug(f"{output=} {status=}")
-
-                    r = {
-                        "stdout": output,
-                        "stderr": "",
-                        "execution_time": 0,
-                        "retcode": status,
-                    }
-            else:
-                return
+        # check if any scripts should be run
+        if (
+            alert_template
+            and alert_template.action
+            and run_script_action
+            and not alert.action_run
+        ):
+            hist = AgentHistory.objects.create(
+                agent=agent,
+                type=AgentHistoryType.SCRIPT_RUN,
+                script=alert_template.action,
+                username="alert-action-failure",
+            )
+            r = agent.run_script(
+                scriptpk=alert_template.action.pk,
+                args=alert.parse_script_args(alert_template.action_args),
+                timeout=alert_template.action_timeout,
+                wait=True,
+                history_pk=hist.pk,
+                full=True,
+                run_on_any=True,
+                run_as_user=False,
+                env_vars=alert_template.action_env_vars,
+            )
 
             # command was successful
             if isinstance(r, dict):
@@ -563,17 +479,11 @@ class Alert(models.Model):
                 alert.action_run = djangotime.now()
                 alert.save()
             else:
-                if alert_template.action_type == AlertTemplateActionType.SCRIPT:
-                    DebugLog.error(
-                        agent=agent,
-                        log_type=DebugLogType.SCRIPTING,
-                        message=f"Failure action: {alert_template.action.name} failed to run on any agent for {agent.hostname}({agent.pk}) failure alert",
-                    )
-                else:
-                    DebugLog.error(
-                        log_type=DebugLogType.SCRIPTING,
-                        message=f"Failure action: {alert_template.action.name} failed to run on server for failure alert",
-                    )
+                DebugLog.error(
+                    agent=agent,
+                    log_type=DebugLogType.SCRIPTING,
+                    message=f"Failure action: {alert_template.action.name} failed to run on any agent for {agent.hostname}({agent.pk}) failure alert",
+                )
 
     @classmethod
     def handle_alert_resolve(
@@ -582,18 +492,13 @@ class Alert(models.Model):
         from agents.models import Agent, AgentHistory
         from autotasks.models import TaskResult
         from checks.models import CheckResult
-        from core.models import CoreSettings
-
-        core = CoreSettings.objects.first()
 
         # set variables
-        email_severities = None
-        text_severities = None
         email_on_resolved = False
         text_on_resolved = False
         resolved_email_task = None
         resolved_text_task = None
-        should_run_script_or_webhook = False
+        run_script_action = None
 
         # check what the instance passed is
         if isinstance(instance, Agent):
@@ -609,9 +514,7 @@ class Alert(models.Model):
             if alert_template:
                 email_on_resolved = alert_template.agent_email_on_resolved
                 text_on_resolved = alert_template.agent_text_on_resolved
-                should_run_script_or_webhook = alert_template.agent_script_actions
-                email_severities = [AlertSeverity.ERROR]
-                text_severities = [AlertSeverity.ERROR]
+                run_script_action = alert_template.agent_script_actions
 
             if agent.overdue_email_alert:
                 email_on_resolved = True
@@ -634,15 +537,7 @@ class Alert(models.Model):
             if alert_template:
                 email_on_resolved = alert_template.check_email_on_resolved
                 text_on_resolved = alert_template.check_text_on_resolved
-                should_run_script_or_webhook = alert_template.check_script_actions
-                email_severities = alert_template.check_email_alert_severity or [
-                    AlertSeverity.ERROR,
-                    AlertSeverity.WARNING,
-                ]
-                text_severities = alert_template.check_text_alert_severity or [
-                    AlertSeverity.ERROR,
-                    AlertSeverity.WARNING,
-                ]
+                run_script_action = alert_template.check_script_actions
 
         elif isinstance(instance, TaskResult):
             from autotasks.tasks import (
@@ -660,15 +555,7 @@ class Alert(models.Model):
             if alert_template:
                 email_on_resolved = alert_template.task_email_on_resolved
                 text_on_resolved = alert_template.task_text_on_resolved
-                should_run_script_or_webhook = alert_template.task_script_actions
-                email_severities = alert_template.task_email_alert_severity or [
-                    AlertSeverity.ERROR,
-                    AlertSeverity.WARNING,
-                ]
-                text_severities = alert_template.task_text_alert_severity or [
-                    AlertSeverity.ERROR,
-                    AlertSeverity.WARNING,
-                ]
+                run_script_action = alert_template.task_script_actions
 
         else:
             return
@@ -683,103 +570,36 @@ class Alert(models.Model):
 
         # check if a resolved email notification should be send
         if email_on_resolved and not alert.resolved_email_sent:
-            if alert.severity == AlertSeverity.INFO and not core.notify_on_info_alerts:
-                pass
-
-            elif (
-                alert.severity == AlertSeverity.WARNING
-                and not core.notify_on_warning_alerts
-            ):
-                pass
-            elif email_severities and alert.severity not in email_severities:
-                pass
-            else:
-                resolved_email_task.delay(pk=alert.pk)
+            resolved_email_task.delay(pk=alert.pk)
 
         # check if resolved text should be sent
         if text_on_resolved and not alert.resolved_sms_sent:
-            if alert.severity == AlertSeverity.INFO and not core.notify_on_info_alerts:
-                pass
+            resolved_text_task.delay(pk=alert.pk)
 
-            elif (
-                alert.severity == AlertSeverity.WARNING
-                and not core.notify_on_warning_alerts
-            ):
-                pass
-            elif text_severities and alert.severity not in text_severities:
-                pass
-            else:
-                resolved_text_task.delay(pk=alert.pk)
-
-        # check if resolved script/webhook should be run
+        # check if resolved script should be run
         if (
             alert_template
+            and alert_template.resolved_action
+            and run_script_action
             and not alert.resolved_action_run
-            and should_run_script_or_webhook
         ):
-            if (
-                alert_template.resolved_action_type == AlertTemplateActionType.SCRIPT
-                and alert_template.resolved_action
-            ):
-                hist = AgentHistory.objects.create(
-                    agent=agent,
-                    type=AgentHistoryType.SCRIPT_RUN,
-                    script=alert_template.resolved_action,
-                    username="alert-action-resolved",
-                )
-                r = agent.run_script(
-                    scriptpk=alert_template.resolved_action.pk,
-                    args=alert.parse_script_args(alert_template.resolved_action_args),
-                    timeout=alert_template.resolved_action_timeout,
-                    wait=True,
-                    history_pk=hist.pk,
-                    full=True,
-                    run_on_any=True,
-                    run_as_user=False,
-                    env_vars=alert_template.resolved_action_env_vars,
-                )
-            elif (
-                alert_template.resolved_action_type == AlertTemplateActionType.SERVER
-                and alert_template.resolved_action
-            ):
-                stdout, stderr, execution_time, retcode = run_server_script(
-                    body=alert_template.resolved_action.script_body,
-                    args=alert.parse_script_args(alert_template.resolved_action_args),
-                    timeout=alert_template.resolved_action_timeout,
-                    env_vars=alert.parse_script_args(
-                        alert_template.resolved_action_env_vars
-                    ),
-                    shell=alert_template.resolved_action.shell,
-                )
-                r = {
-                    "stdout": stdout,
-                    "stderr": stderr,
-                    "execution_time": execution_time,
-                    "retcode": retcode,
-                }
-
-            elif alert_template.action_type == AlertTemplateActionType.REST:
-                if (
-                    alert.severity == AlertSeverity.INFO
-                    and not core.notify_on_info_alerts
-                    or alert.severity == AlertSeverity.WARNING
-                    and not core.notify_on_warning_alerts
-                ):
-                    return
-                else:
-                    output, status = run_url_rest_action(
-                        action_id=alert_template.resolved_action_rest.id, instance=alert
-                    )
-                    logger.debug(f"{output=} {status=}")
-
-                    r = {
-                        "stdout": output,
-                        "stderr": "",
-                        "execution_time": 0,
-                        "retcode": status,
-                    }
-            else:
-                return
+            hist = AgentHistory.objects.create(
+                agent=agent,
+                type=AgentHistoryType.SCRIPT_RUN,
+                script=alert_template.action,
+                username="alert-action-resolved",
+            )
+            r = agent.run_script(
+                scriptpk=alert_template.resolved_action.pk,
+                args=alert.parse_script_args(alert_template.resolved_action_args),
+                timeout=alert_template.resolved_action_timeout,
+                wait=True,
+                history_pk=hist.pk,
+                full=True,
+                run_on_any=True,
+                run_as_user=False,
+                env_vars=alert_template.resolved_action_env_vars,
+            )
 
             # command was successful
             if isinstance(r, dict):
@@ -792,36 +612,41 @@ class Alert(models.Model):
                 alert.resolved_action_run = djangotime.now()
                 alert.save()
             else:
-                if (
-                    alert_template.resolved_action_type
-                    == AlertTemplateActionType.SCRIPT
-                ):
-                    DebugLog.error(
-                        agent=agent,
-                        log_type=DebugLogType.SCRIPTING,
-                        message=f"Resolved action: {alert_template.action.name} failed to run on any agent for {agent.hostname}({agent.pk}) resolved alert",
-                    )
-                else:
-                    DebugLog.error(
-                        log_type=DebugLogType.SCRIPTING,
-                        message=f"Resolved action: {alert_template.action.name} failed to run on server for resolved alert",
-                    )
+                DebugLog.error(
+                    agent=agent,
+                    log_type=DebugLogType.SCRIPTING,
+                    message=f"Resolved action: {alert_template.action.name} failed to run on any agent for {agent.hostname}({agent.pk}) resolved alert",
+                )
 
     def parse_script_args(self, args: List[str]) -> List[str]:
         if not args:
             return []
 
         temp_args = []
+        # pattern to match for injection
+        pattern = re.compile(".*\\{\\{alert\\.(.*)\\}\\}.*")
 
         for arg in args:
-            temp_arg = arg
-            for string, model, prop in RE_DB_VALUE.findall(arg):
-                value = get_db_value(string=f"{model}.{prop}", instance=self)
+            match = pattern.match(arg)
+            if match:
+                name = match.group(1)
 
-                if value is not None:
-                    temp_arg = temp_arg.replace(string, f"'{str(value)}'")
+                # check if attr exists and isn't a function
+                if hasattr(self, name) and not callable(getattr(self, name)):
+                    value = f"'{getattr(self, name)}'"
+                else:
+                    continue
 
-            temp_args.append(temp_arg)
+                try:
+                    temp_args.append(re.sub("\\{\\{.*\\}\\}", value, arg))
+                except re.error:
+                    temp_args.append(re.sub("\\{\\{.*\\}\\}", re.escape(value), arg))
+                except Exception as e:
+                    DebugLog.error(log_type=DebugLogType.SCRIPTING, message=str(e))
+                    continue
+
+            else:
+                temp_args.append(arg)
 
         return temp_args
 
@@ -830,11 +655,6 @@ class AlertTemplate(BaseAuditModel):
     name = models.CharField(max_length=100)
     is_active = models.BooleanField(default=True)
 
-    action_type = models.CharField(
-        max_length=10,
-        choices=AlertTemplateActionType.choices,
-        default=AlertTemplateActionType.SCRIPT,
-    )
     action = models.ForeignKey(
         "scripts.Script",
         related_name="alert_template",
@@ -842,13 +662,6 @@ class AlertTemplate(BaseAuditModel):
         null=True,
         on_delete=models.SET_NULL,
     )
-    action_rest = models.ForeignKey(
-        "core.URLAction",
-        related_name="url_action_alert_template",
-        blank=True,
-        null=True,
-        on_delete=models.SET_NULL,
-    )
     action_args = ArrayField(
         models.CharField(max_length=255, null=True, blank=True),
         null=True,
@@ -862,11 +675,6 @@ class AlertTemplate(BaseAuditModel):
         default=list,
     )
     action_timeout = models.PositiveIntegerField(default=15)
-    resolved_action_type = models.CharField(
-        max_length=10,
-        choices=AlertTemplateActionType.choices,
-        default=AlertTemplateActionType.SCRIPT,
-    )
     resolved_action = models.ForeignKey(
         "scripts.Script",
         related_name="resolved_alert_template",
@@ -874,13 +682,6 @@ class AlertTemplate(BaseAuditModel):
         null=True,
         on_delete=models.SET_NULL,
     )
-    resolved_action_rest = models.ForeignKey(
-        "core.URLAction",
-        related_name="resolved_url_action_alert_template",
-        blank=True,
-        null=True,
-        on_delete=models.SET_NULL,
-    )
     resolved_action_args = ArrayField(
         models.CharField(max_length=255, null=True, blank=True),
         null=True,
@@ -919,8 +720,7 @@ class AlertTemplate(BaseAuditModel):
     agent_always_text = BooleanField(null=True, blank=True, default=None)
     agent_always_alert = BooleanField(null=True, blank=True, default=None)
     agent_periodic_alert_days = PositiveIntegerField(blank=True, null=True, default=0)
-    # fmt: off
-    agent_script_actions = BooleanField(null=True, blank=True, default=True)  # should be renamed because also deals with webhooks
+    agent_script_actions = BooleanField(null=True, blank=True, default=True)
 
     # check alert settings
     check_email_alert_severity = ArrayField(
@@ -944,8 +744,7 @@ class AlertTemplate(BaseAuditModel):
     check_always_text = BooleanField(null=True, blank=True, default=None)
     check_always_alert = BooleanField(null=True, blank=True, default=None)
     check_periodic_alert_days = PositiveIntegerField(blank=True, null=True, default=0)
-    # fmt: off
-    check_script_actions = BooleanField(null=True, blank=True, default=True)  # should be renamed because also deals with webhooks
+    check_script_actions = BooleanField(null=True, blank=True, default=True)
 
     # task alert settings
     task_email_alert_severity = ArrayField(
@@ -969,8 +768,7 @@ class AlertTemplate(BaseAuditModel):
     task_always_text = BooleanField(null=True, blank=True, default=None)
     task_always_alert = BooleanField(null=True, blank=True, default=None)
     task_periodic_alert_days = PositiveIntegerField(blank=True, null=True, default=0)
-    # fmt: off
-    task_script_actions = BooleanField(null=True, blank=True, default=True)  # should be renamed because also deals with webhooks
+    task_script_actions = BooleanField(null=True, blank=True, default=True)
 
     # exclusion settings
     exclude_workstations = BooleanField(null=True, blank=True, default=False)

api/tacticalrmm/alerts/permissions.py

@@ -3,7 +3,6 @@ from typing import TYPE_CHECKING
 from django.shortcuts import get_object_or_404
 from rest_framework import permissions
 
-from tacticalrmm.constants import AlertTemplateActionType
 from tacticalrmm.permissions import _has_perm, _has_perm_on_agent
 
 if TYPE_CHECKING:
@@ -54,17 +53,4 @@ class AlertTemplatePerms(permissions.BasePermission):
         if r.method == "GET":
             return _has_perm(r, "can_list_alerttemplates")
 
-        if r.method in ("POST", "PUT", "PATCH"):
-            # ensure only users with explicit run server script perms can add/modify alert templates
-            # while also still requiring the manage alert template perm
-            if isinstance(r.data, dict):
-                if (
-                    r.data.get("action_type") == AlertTemplateActionType.SERVER
-                    or r.data.get("resolved_action_type")
-                    == AlertTemplateActionType.SERVER
-                ):
-                    return _has_perm(r, "can_run_server_scripts") and _has_perm(
-                        r, "can_manage_alerttemplates"
-                    )
-
         return _has_perm(r, "can_manage_alerttemplates")

api/tacticalrmm/alerts/serializers.py

@@ -3,7 +3,6 @@ from rest_framework.serializers import ModelSerializer, ReadOnlyField
 
 from automation.serializers import PolicySerializer
 from clients.serializers import ClientMinimumSerializer, SiteMinimumSerializer
-from tacticalrmm.constants import AlertTemplateActionType
 
 from .models import Alert, AlertTemplate
 
@@ -26,29 +25,14 @@ class AlertTemplateSerializer(ModelSerializer):
     task_settings = ReadOnlyField(source="has_task_settings")
     core_settings = ReadOnlyField(source="has_core_settings")
     default_template = ReadOnlyField(source="is_default_template")
-    action_name = SerializerMethodField()
-    resolved_action_name = SerializerMethodField()
+    action_name = ReadOnlyField(source="action.name")
+    resolved_action_name = ReadOnlyField(source="resolved_action.name")
     applied_count = SerializerMethodField()
 
     class Meta:
         model = AlertTemplate
         fields = "__all__"
 
-    def get_action_name(self, obj):
-        if obj.action_type == AlertTemplateActionType.REST and obj.action_rest:
-            return obj.action_rest.name
-
-        return obj.action.name if obj.action else ""
-
-    def get_resolved_action_name(self, obj):
-        if (
-            obj.resolved_action_type == AlertTemplateActionType.REST
-            and obj.resolved_action_rest
-        ):
-            return obj.resolved_action_rest.name
-
-        return obj.resolved_action.name if obj.resolved_action else ""
-
     def get_applied_count(self, instance):
         return (
             instance.policies.count()

api/tacticalrmm/alerts/tests.py

@@ -1,21 +1,16 @@
-from datetime import timedelta
+from datetime import datetime, timedelta
 from itertools import cycle
 from unittest.mock import patch
 
+from django.conf import settings
+from django.utils import timezone as djangotime
+from model_bakery import baker, seq
+
 from alerts.tasks import cache_agents_alert_template
 from autotasks.models import TaskResult
 from core.tasks import cache_db_fields_task, resolve_alerts_task
 from core.utils import get_core_settings
-from django.conf import settings
-from django.utils import timezone as djangotime
-from model_bakery import baker, seq
-from tacticalrmm.constants import (
-    AgentMonType,
-    AlertSeverity,
-    AlertType,
-    CheckStatus,
-    URLActionType,
-)
+from tacticalrmm.constants import AgentMonType, AlertSeverity, AlertType, CheckStatus
 from tacticalrmm.test import TacticalTestCase
 
 from .models import Alert, AlertTemplate
@@ -33,7 +28,6 @@ class TestAlertsViews(TacticalTestCase):
         self.authenticate()
         self.setup_coresettings()
 
-    """
     def test_get_alerts(self):
         url = "/alerts/"
 
@@ -45,14 +39,14 @@ class TestAlertsViews(TacticalTestCase):
         alerts = baker.make(
             "alerts.Alert",
             agent=agent,
-            alert_time=seq(djangotime.now(), timedelta(days=15)),
+            alert_time=seq(datetime.now(), timedelta(days=15)),
             severity=AlertSeverity.WARNING,
             _quantity=3,
         )
         baker.make(
             "alerts.Alert",
             assigned_check=check,
-            alert_time=seq(djangotime.now(), timedelta(days=15)),
+            alert_time=seq(datetime.now(), timedelta(days=15)),
             severity=AlertSeverity.ERROR,
             _quantity=7,
         )
@@ -61,7 +55,7 @@ class TestAlertsViews(TacticalTestCase):
             assigned_task=task,
             snoozed=True,
             snooze_until=djangotime.now(),
-            alert_time=seq(djangotime.now(), timedelta(days=15)),
+            alert_time=seq(datetime.now(), timedelta(days=15)),
             _quantity=2,
         )
         baker.make(
@@ -69,7 +63,7 @@ class TestAlertsViews(TacticalTestCase):
             agent=agent,
             resolved=True,
             resolved_on=djangotime.now(),
-            alert_time=seq(djangotime.now(), timedelta(days=15)),
+            alert_time=seq(datetime.now(), timedelta(days=15)),
             _quantity=9,
         )
 
@@ -126,14 +120,13 @@ class TestAlertsViews(TacticalTestCase):
             self.assertEqual(len(resp.data), req["count"])
 
         self.check_not_authenticated("patch", url)
-    """
 
     def test_add_alert(self):
         url = "/alerts/"
 
         agent = baker.make_recipe("agents.agent")
         data = {
-            "alert_time": djangotime.now(),
+            "alert_time": datetime.now(),
             "agent": agent.id,
             "severity": "warning",
             "alert_type": "availability",
@@ -282,32 +275,12 @@ class TestAlertsViews(TacticalTestCase):
         resp = self.client.get("/alerts/templates/500/", format="json")
         self.assertEqual(resp.status_code, 404)
 
-        agent_script = baker.make("scripts.Script")
-        server_script = baker.make("scripts.Script")
-        webhook = baker.make("core.URLAction", action_type=URLActionType.REST)
+        alert_template = baker.make("alerts.AlertTemplate")
+        url = f"/alerts/templates/{alert_template.pk}/"
 
-        alert_template_agent_script = baker.make(
-            "alerts.AlertTemplate", action=agent_script
-        )
-        url = f"/alerts/templates/{alert_template_agent_script.pk}/"
         resp = self.client.get(url, format="json")
-        serializer = AlertTemplateSerializer(alert_template_agent_script)
-        self.assertEqual(resp.status_code, 200)
-        self.assertEqual(resp.data, serializer.data)
+        serializer = AlertTemplateSerializer(alert_template)
 
-        alert_template_server_script = baker.make(
-            "alerts.AlertTemplate", action=server_script
-        )
-        url = f"/alerts/templates/{alert_template_server_script.pk}/"
-        resp = self.client.get(url, format="json")
-        serializer = AlertTemplateSerializer(alert_template_server_script)
-        self.assertEqual(resp.status_code, 200)
-        self.assertEqual(resp.data, serializer.data)
-
-        alert_template_webhook = baker.make("alerts.AlertTemplate", action_rest=webhook)
-        url = f"/alerts/templates/{alert_template_webhook.pk}/"
-        resp = self.client.get(url, format="json")
-        serializer = AlertTemplateSerializer(alert_template_webhook)
         self.assertEqual(resp.status_code, 200)
         self.assertEqual(resp.data, serializer.data)
 
@@ -390,7 +363,7 @@ class TestAlertTasks(TacticalTestCase):
         not_snoozed = baker.make(
             "alerts.Alert",
             snoozed=True,
-            snooze_until=seq(djangotime.now(), timedelta(days=15)),
+            snooze_until=seq(datetime.now(), timedelta(days=15)),
             _quantity=5,
         )
 
@@ -398,7 +371,7 @@ class TestAlertTasks(TacticalTestCase):
         snoozed = baker.make(
             "alerts.Alert",
             snoozed=True,
-            snooze_until=seq(djangotime.now(), timedelta(days=-15)),
+            snooze_until=seq(datetime.now(), timedelta(days=-15)),
             _quantity=5,
         )
 
@@ -1454,8 +1427,6 @@ class TestAlertTasks(TacticalTestCase):
             "run_as_user": False,
             "env_vars": ["hello=world", "foo=bar"],
             "id": AgentHistory.objects.last().pk,  # type: ignore
-            "nushell_enable_config": settings.NUSHELL_ENABLE_CONFIG,
-            "deno_default_permissions": settings.DENO_DEFAULT_PERMISSIONS,
         }
 
         nats_cmd.assert_called_with(data, timeout=30, wait=True)
@@ -1487,8 +1458,6 @@ class TestAlertTasks(TacticalTestCase):
             "run_as_user": False,
             "env_vars": ["resolved=action", "env=vars"],
             "id": AgentHistory.objects.last().pk,  # type: ignore
-            "nushell_enable_config": settings.NUSHELL_ENABLE_CONFIG,
-            "deno_default_permissions": settings.DENO_DEFAULT_PERMISSIONS,
         }
 
         nats_cmd.assert_called_with(data, timeout=35, wait=True)

api/tacticalrmm/alerts/views.py

@@ -26,12 +26,12 @@ class GetAddAlerts(APIView):
         # top 10 alerts for dashboard icon
         if "top" in request.data.keys():
             alerts = (
-                Alert.objects.filter_by_role(request.user)  # type: ignore
+                Alert.objects.filter_by_role(request.user)
                 .filter(resolved=False, snoozed=False, hidden=False)
                 .order_by("alert_time")[: int(request.data["top"])]
             )
             count = (
-                Alert.objects.filter_by_role(request.user)  # type: ignore
+                Alert.objects.filter_by_role(request.user)
                 .filter(resolved=False, snoozed=False, hidden=False)
                 .count()
             )

api/tacticalrmm/apiv3/utils.py

@@ -22,12 +22,4 @@ def get_agent_config() -> AgentCheckInConfig:
             *getattr(settings, "CHECKIN_SYNCMESH", (800, 1200))
         ),
         limit_data=getattr(settings, "LIMIT_DATA", False),
-        install_nushell=getattr(settings, "INSTALL_NUSHELL", False),
-        install_nushell_version=getattr(settings, "INSTALL_NUSHELL_VERSION", ""),
-        install_nushell_url=getattr(settings, "INSTALL_NUSHELL_URL", ""),
-        nushell_enable_config=getattr(settings, "NUSHELL_ENABLE_CONFIG", False),
-        install_deno=getattr(settings, "INSTALL_DENO", False),
-        install_deno_version=getattr(settings, "INSTALL_DENO_VERSION", ""),
-        install_deno_url=getattr(settings, "INSTALL_DENO_URL", ""),
-        deno_default_permissions=getattr(settings, "DENO_DEFAULT_PERMISSIONS", ""),
     )

api/tacticalrmm/apiv3/views.py

@@ -12,16 +12,14 @@ from rest_framework.response import Response
 from rest_framework.views import APIView
 
 from accounts.models import User
-from agents.models import Agent, AgentHistory, Note
+from agents.models import Agent, AgentHistory
 from agents.serializers import AgentHistorySerializer
-from alerts.tasks import cache_agents_alert_template
 from apiv3.utils import get_agent_config
 from autotasks.models import AutomatedTask, TaskResult
 from autotasks.serializers import TaskGOGetSerializer, TaskResultSerializer
 from checks.constants import CHECK_DEFER, CHECK_RESULT_DEFER
 from checks.models import Check, CheckResult
 from checks.serializers import CheckRunnerGetSerializer
-from core.tasks import sync_mesh_perms_task
 from core.utils import (
     download_mesh_agent,
     get_core_settings,
@@ -33,14 +31,11 @@ from logs.models import DebugLog, PendingAction
 from software.models import InstalledSoftware
 from tacticalrmm.constants import (
     AGENT_DEFER,
-    TRMM_MAX_REQUEST_SIZE,
-    AgentHistoryType,
     AgentMonType,
     AgentPlat,
     AuditActionType,
     AuditObjType,
     CheckStatus,
-    CustomFieldModel,
     DebugLogType,
     GoArch,
     MeshAgentIdent,
@@ -343,12 +338,6 @@ class TaskRunner(APIView):
             AutomatedTask.objects.select_related("custom_field"), pk=pk
         )
 
-        content_length = request.META.get("CONTENT_LENGTH")
-        if content_length and int(content_length) > TRMM_MAX_REQUEST_SIZE:
-            request.data["stdout"] = ""
-            request.data["stderr"] = "Content truncated due to excessive request size."
-            request.data["retcode"] = 1
-
         # get task result or create if doesn't exist
         try:
             task_result = (
@@ -367,7 +356,7 @@ class TaskRunner(APIView):
 
         AgentHistory.objects.create(
             agent=agent,
-            type=AgentHistoryType.TASK_RUN,
+            type=AuditActionType.TASK_RUN,
             command=task.name,
             script_results=request.data,
         )
@@ -437,8 +426,8 @@ class MeshExe(APIView):
 
         try:
             return download_mesh_agent(dl_url)
-        except Exception as e:
-            return notify_error(f"Unable to download mesh agent: {e}")
+        except:
+            return notify_error("Unable to download mesh agent exe")
 
 
 class NewAgent(APIView):
@@ -492,8 +481,6 @@ class NewAgent(APIView):
         )
 
         ret = {"pk": agent.pk, "token": token.key}
-        sync_mesh_perms_task.delay()
-        cache_agents_alert_template.delay()
         return Response(ret)
 
 
@@ -572,49 +559,12 @@ class AgentHistoryResult(APIView):
     permission_classes = [IsAuthenticated]
 
     def patch(self, request, agentid, pk):
-        content_length = request.META.get("CONTENT_LENGTH")
-        if content_length and int(content_length) > TRMM_MAX_REQUEST_SIZE:
-
-            request.data["script_results"]["stdout"] = ""
-            request.data["script_results"][
-                "stderr"
-            ] = "Content truncated due to excessive request size."
-            request.data["script_results"]["retcode"] = 1
-
         hist = get_object_or_404(
-            AgentHistory.objects.select_related("custom_field").filter(
-                agent__agent_id=agentid
-            ),
-            pk=pk,
+            AgentHistory.objects.filter(agent__agent_id=agentid), pk=pk
         )
         s = AgentHistorySerializer(instance=hist, data=request.data, partial=True)
         s.is_valid(raise_exception=True)
         s.save()
-
-        if hist.custom_field:
-            if hist.custom_field.model == CustomFieldModel.AGENT:
-                field = hist.custom_field.get_or_create_field_value(hist.agent)
-            elif hist.custom_field.model == CustomFieldModel.CLIENT:
-                field = hist.custom_field.get_or_create_field_value(hist.agent.client)
-            elif hist.custom_field.model == CustomFieldModel.SITE:
-                field = hist.custom_field.get_or_create_field_value(hist.agent.site)
-
-            r = request.data["script_results"]["stdout"]
-            value = (
-                r.strip()
-                if hist.collector_all_output
-                else r.strip().split("\n")[-1].strip()
-            )
-
-            field.save_to_field(value)
-
-        if hist.save_to_agent_note:
-            Note.objects.create(
-                agent=hist.agent,
-                user=request.user,
-                note=request.data["script_results"]["stdout"],
-            )
-
         return Response("ok")
 
 

api/tacticalrmm/automation/models.py

@@ -47,7 +47,7 @@ class Policy(BaseAuditModel):
         old_policy: Optional[Policy] = (
             type(self).objects.get(pk=self.pk) if self.pk else None
         )
-        super().save(old_model=old_policy, *args, **kwargs)
+        super(Policy, self).save(old_model=old_policy, *args, **kwargs)
 
         # check if alert template was changes and cache on agents
         if old_policy:
@@ -68,7 +68,10 @@ class Policy(BaseAuditModel):
         cache.delete_many_pattern("site_server_*")
         cache.delete_many_pattern("agent_*")
 
-        super().delete(*args, **kwargs)
+        super(Policy, self).delete(
+            *args,
+            **kwargs,
+        )
 
     def __str__(self) -> str:
         return self.name

api/tacticalrmm/automation/tests.py

@@ -126,7 +126,7 @@ class TestPolicyViews(TacticalTestCase):
         resp = self.client.put(url, data, format="json")
         self.assertEqual(resp.status_code, 200)
 
-        cache_alert_template.assert_called_once()
+        cache_alert_template.called_once()
 
         self.check_not_authenticated("put", url)
 

api/tacticalrmm/autotasks/management/commands/remove_orphaned_tasks.py

@@ -7,4 +7,10 @@ class Command(BaseCommand):
     help = "Checks for orphaned tasks on all agents and removes them"
 
     def handle(self, *args, **kwargs):
-        remove_orphaned_win_tasks()
+        remove_orphaned_win_tasks.s()
+
+        self.stdout.write(
+            self.style.SUCCESS(
+                "The task has been initiated. Check the Debug Log in the UI for progress."
+            )
+        )

api/tacticalrmm/autotasks/migrations/0039_alter_automatedtask_task_type.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.7 on 2023-11-23 04:39
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('autotasks', '0038_add_missing_env_vars'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='automatedtask',
-            name='task_type',
-            field=models.CharField(choices=[('daily', 'Daily'), ('weekly', 'Weekly'), ('monthly', 'Monthly'), ('monthlydow', 'Monthly Day of Week'), ('checkfailure', 'On Check Failure'), ('manual', 'Manual'), ('runonce', 'Run Once'), ('onboarding', 'Onboarding'), ('scheduled', 'Scheduled')], default='manual', max_length=100),
-        ),
-    ]

api/tacticalrmm/autotasks/migrations/0040_alter_taskresult_id.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.10 on 2024-02-19 05:57
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("autotasks", "0039_alter_automatedtask_task_type"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="taskresult",
-            name="id",
-            field=models.BigAutoField(primary_key=True, serialize=False),
-        ),
-    ]

api/tacticalrmm/autotasks/models.py

@@ -1,9 +1,9 @@
 import asyncio
-import logging
 import random
 import string
 from contextlib import suppress
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
+from zoneinfo import ZoneInfo
 
 from django.core.cache import cache
 from django.core.validators import MaxValueValidator, MinValueValidator
@@ -14,11 +14,12 @@ from django.db.utils import DatabaseError
 from django.utils import timezone as djangotime
 
 from core.utils import get_core_settings
-from logs.models import BaseAuditModel
+from logs.models import BaseAuditModel, DebugLog
 from tacticalrmm.constants import (
     FIELDS_TRIGGER_TASK_UPDATE_AGENT,
     POLICY_TASK_FIELDS_TO_COPY,
     AlertSeverity,
+    DebugLogType,
     TaskStatus,
     TaskSyncStatus,
     TaskType,
@@ -30,7 +31,6 @@ if TYPE_CHECKING:
     from agents.models import Agent
     from checks.models import Check
 
-from tacticalrmm.helpers import has_script_actions, has_webhook
 from tacticalrmm.models import PermissionQuerySet
 from tacticalrmm.utils import (
     bitdays_to_string,
@@ -46,9 +46,6 @@ def generate_task_name() -> str:
     return "TacticalRMM_" + "".join(random.choice(chars) for i in range(35))
 
 
-logger = logging.getLogger("trmm")
-
-
 class AutomatedTask(BaseAuditModel):
     objects = PermissionQuerySet.as_manager()
 
@@ -152,7 +149,7 @@ class AutomatedTask(BaseAuditModel):
 
         # get old task if exists
         old_task = AutomatedTask.objects.get(pk=self.pk) if self.pk else None
-        super().save(old_model=old_task, *args, **kwargs)
+        super(AutomatedTask, self).save(old_model=old_task, *args, **kwargs)
 
         # check if fields were updated that require a sync to the agent and set status to notsynced
         if old_task:
@@ -175,7 +172,10 @@ class AutomatedTask(BaseAuditModel):
             cache.delete_many_pattern("site_*_tasks")
             cache.delete_many_pattern("agent_*_tasks")
 
-        super().delete(*args, **kwargs)
+        super(AutomatedTask, self).delete(
+            *args,
+            **kwargs,
+        )
 
     @property
     def schedule(self) -> Optional[str]:
@@ -209,9 +209,6 @@ class AutomatedTask(BaseAuditModel):
             weeks = bitweeks_to_string(self.monthly_weeks_of_month)
             days = bitdays_to_string(self.run_time_bit_weekdays)
             return f"Runs on {months} on {weeks} on {days} at {run_time_nice}"
-        elif self.task_type == TaskType.ONBOARDING:
-            return "Onboarding: Runs once on task creation."
-        return None
 
     @property
     def fields_that_trigger_task_update_on_agent(self) -> List[str]:
@@ -239,56 +236,64 @@ class AutomatedTask(BaseAuditModel):
         task.save()
 
     # agent version >= 1.8.0
-    def generate_nats_task_payload(self) -> Dict[str, Any]:
+    def generate_nats_task_payload(
+        self, agent: "Optional[Agent]" = None, editing: bool = False
+    ) -> Dict[str, Any]:
         task = {
             "pk": self.pk,
             "type": "rmm",
             "name": self.win_task_name,
-            "overwrite_task": True,
+            "overwrite_task": editing,
             "enabled": self.enabled,
-            "trigger": (
-                self.task_type
-                if self.task_type != TaskType.CHECK_FAILURE
-                else TaskType.MANUAL
-            ),
+            "trigger": self.task_type
+            if self.task_type != TaskType.CHECK_FAILURE
+            else TaskType.MANUAL,
             "multiple_instances": self.task_instance_policy or 0,
-            "delete_expired_task_after": (
-                self.remove_if_not_scheduled if self.expire_date else False
-            ),
-            "start_when_available": (
-                self.run_asap_after_missed
-                if self.task_type != TaskType.RUN_ONCE
-                else True
-            ),
+            "delete_expired_task_after": self.remove_if_not_scheduled
+            if self.expire_date
+            else False,
+            "start_when_available": self.run_asap_after_missed
+            if self.task_type != TaskType.RUN_ONCE
+            else True,
         }
 
         if self.task_type in (
+            TaskType.RUN_ONCE,
             TaskType.DAILY,
             TaskType.WEEKLY,
             TaskType.MONTHLY,
             TaskType.MONTHLY_DOW,
-            TaskType.RUN_ONCE,
         ):
-            if not self.run_time_date:
-                self.run_time_date = djangotime.now()
+            # set runonce task in future if creating and run_asap_after_missed is set
+            if (
+                not editing
+                and self.task_type == TaskType.RUN_ONCE
+                and self.run_asap_after_missed
+                and agent
+                and self.run_time_date.replace(tzinfo=ZoneInfo(agent.timezone))
+                < djangotime.now().astimezone(ZoneInfo(agent.timezone))
+            ):
+                self.run_time_date = (
+                    djangotime.now() + djangotime.timedelta(minutes=5)
+                ).astimezone(ZoneInfo(agent.timezone))
 
-            task["start_year"] = self.run_time_date.year
-            task["start_month"] = self.run_time_date.month
-            task["start_day"] = self.run_time_date.day
-            task["start_hour"] = self.run_time_date.hour
-            task["start_min"] = self.run_time_date.minute
+            task["start_year"] = int(self.run_time_date.strftime("%Y"))
+            task["start_month"] = int(self.run_time_date.strftime("%-m"))
+            task["start_day"] = int(self.run_time_date.strftime("%-d"))
+            task["start_hour"] = int(self.run_time_date.strftime("%-H"))
+            task["start_min"] = int(self.run_time_date.strftime("%-M"))
 
             if self.expire_date:
-                task["expire_year"] = self.expire_date.year
-                task["expire_month"] = self.expire_date.month
-                task["expire_day"] = self.expire_date.day
-                task["expire_hour"] = self.expire_date.hour
-                task["expire_min"] = self.expire_date.minute
+                task["expire_year"] = int(self.expire_date.strftime("%Y"))
+                task["expire_month"] = int(self.expire_date.strftime("%-m"))
+                task["expire_day"] = int(self.expire_date.strftime("%-d"))
+                task["expire_hour"] = int(self.expire_date.strftime("%-H"))
+                task["expire_min"] = int(self.expire_date.strftime("%-M"))
 
             if self.random_task_delay:
                 task["random_delay"] = convert_to_iso_duration(self.random_task_delay)
 
-            if self.task_repetition_interval and self.task_repetition_duration:
+            if self.task_repetition_interval:
                 task["repetition_interval"] = convert_to_iso_duration(
                     self.task_repetition_interval
                 )
@@ -336,24 +341,27 @@ class AutomatedTask(BaseAuditModel):
 
         nats_data = {
             "func": "schedtask",
-            "schedtaskpayload": self.generate_nats_task_payload(),
+            "schedtaskpayload": self.generate_nats_task_payload(agent),
         }
-        logger.debug(nats_data)
 
-        r = asyncio.run(task_result.agent.nats_cmd(nats_data, timeout=10))
+        r = asyncio.run(task_result.agent.nats_cmd(nats_data, timeout=5))
 
         if r != "ok":
             task_result.sync_status = TaskSyncStatus.INITIAL
             task_result.save(update_fields=["sync_status"])
-            logger.error(
-                f"Unable to create scheduled task {self.name} on {task_result.agent.hostname}: {r}"
+            DebugLog.warning(
+                agent=agent,
+                log_type=DebugLogType.AGENT_ISSUES,
+                message=f"Unable to create scheduled task {self.name} on {task_result.agent.hostname}. It will be created when the agent checks in.",
             )
             return "timeout"
         else:
             task_result.sync_status = TaskSyncStatus.SYNCED
             task_result.save(update_fields=["sync_status"])
-            logger.info(
-                f"{task_result.agent.hostname} task {self.name} was successfully created."
+            DebugLog.info(
+                agent=agent,
+                log_type=DebugLogType.AGENT_ISSUES,
+                message=f"{task_result.agent.hostname} task {self.name} was successfully created",
             )
 
         return "ok"
@@ -372,24 +380,27 @@ class AutomatedTask(BaseAuditModel):
 
         nats_data = {
             "func": "schedtask",
-            "schedtaskpayload": self.generate_nats_task_payload(),
+            "schedtaskpayload": self.generate_nats_task_payload(editing=True),
         }
-        logger.debug(nats_data)
 
-        r = asyncio.run(task_result.agent.nats_cmd(nats_data, timeout=10))
+        r = asyncio.run(task_result.agent.nats_cmd(nats_data, timeout=5))
 
         if r != "ok":
             task_result.sync_status = TaskSyncStatus.NOT_SYNCED
             task_result.save(update_fields=["sync_status"])
-            logger.error(
-                f"Unable to modify scheduled task {self.name} on {task_result.agent.hostname}: {r}"
+            DebugLog.warning(
+                agent=agent,
+                log_type=DebugLogType.AGENT_ISSUES,
+                message=f"Unable to modify scheduled task {self.name} on {task_result.agent.hostname}({task_result.agent.agent_id}). It will try again on next agent checkin",
             )
             return "timeout"
         else:
             task_result.sync_status = TaskSyncStatus.SYNCED
             task_result.save(update_fields=["sync_status"])
-            logger.info(
-                f"{task_result.agent.hostname} task {self.name} was successfully modified."
+            DebugLog.info(
+                agent=agent,
+                log_type=DebugLogType.AGENT_ISSUES,
+                message=f"{task_result.agent.hostname} task {self.name} was successfully modified",
             )
 
         return "ok"
@@ -418,13 +429,20 @@ class AutomatedTask(BaseAuditModel):
             with suppress(DatabaseError):
                 task_result.save(update_fields=["sync_status"])
 
-            logger.error(
-                f"Unable to delete task {self.name} on {task_result.agent.hostname}: {r}"
+            DebugLog.warning(
+                agent=agent,
+                log_type=DebugLogType.AGENT_ISSUES,
+                message=f"{task_result.agent.hostname} task {self.name} will be deleted on next checkin",
             )
             return "timeout"
         else:
             self.delete()
-            logger.info(f"{task_result.agent.hostname} task {self.name} was deleted.")
+            DebugLog.info(
+                agent=agent,
+                log_type=DebugLogType.AGENT_ISSUES,
+                message=f"{task_result.agent.hostname}({task_result.agent.agent_id}) task {self.name} was deleted",
+            )
+
         return "ok"
 
     def run_win_task(self, agent: "Optional[Agent]" = None) -> str:
@@ -447,19 +465,18 @@ class AutomatedTask(BaseAuditModel):
         return "ok"
 
     def should_create_alert(self, alert_template=None):
-        has_autotask_notification = (
-            self.dashboard_alert or self.email_alert or self.text_alert
-        )
-        has_alert_template_notification = alert_template and (
-            alert_template.task_always_alert
-            or alert_template.task_always_email
-            or alert_template.task_always_text
-        )
         return (
-            has_autotask_notification
-            or has_alert_template_notification
-            or has_webhook(alert_template, "task")
-            or has_script_actions(alert_template, "task")
+            self.dashboard_alert
+            or self.email_alert
+            or self.text_alert
+            or (
+                alert_template
+                and (
+                    alert_template.task_always_alert
+                    or alert_template.task_always_email
+                    or alert_template.task_always_text
+                )
+            )
         )
 
 
@@ -469,7 +486,6 @@ class TaskResult(models.Model):
 
     objects = PermissionQuerySet.as_manager()
 
-    id = models.BigAutoField(primary_key=True)
     agent = models.ForeignKey(
         "agents.Agent",
         related_name="taskresults",

api/tacticalrmm/autotasks/serializers.py

@@ -2,7 +2,6 @@ from datetime import datetime
 
 from django.utils import timezone as djangotime
 from rest_framework import serializers
-from django.conf import settings
 
 from scripts.models import Script
 from tacticalrmm.constants import TaskType
@@ -253,13 +252,7 @@ class TaskGOGetSerializer(serializers.ModelSerializer):
                         "shell": script.shell,
                         "timeout": action["timeout"],
                         "run_as_user": script.run_as_user,
-                        "env_vars": Script.parse_script_env_vars(
-                            agent=agent,
-                            shell=script.shell,
-                            env_vars=env_vars,
-                        ),
-                        "nushell_enable_config": settings.NUSHELL_ENABLE_CONFIG,
-                        "deno_default_permissions": settings.DENO_DEFAULT_PERMISSIONS,
+                        "env_vars": env_vars,
                     }
                 )
         if actions_to_remove:

api/tacticalrmm/autotasks/tests.py

@@ -417,7 +417,7 @@ class TestAutoTaskCeleryTasks(TacticalTestCase):
                     "pk": task1.pk,
                     "type": "rmm",
                     "name": task1.win_task_name,
-                    "overwrite_task": True,
+                    "overwrite_task": False,
                     "enabled": True,
                     "trigger": "daily",
                     "multiple_instances": 1,
@@ -431,7 +431,7 @@ class TestAutoTaskCeleryTasks(TacticalTestCase):
                     "day_interval": 1,
                 },
             },
-            timeout=10,
+            timeout=5,
         )
         nats_cmd.reset_mock()
         self.assertEqual(
@@ -470,7 +470,7 @@ class TestAutoTaskCeleryTasks(TacticalTestCase):
                     "pk": task1.pk,
                     "type": "rmm",
                     "name": task1.win_task_name,
-                    "overwrite_task": True,
+                    "overwrite_task": False,
                     "enabled": True,
                     "trigger": "weekly",
                     "multiple_instances": 2,
@@ -490,7 +490,7 @@ class TestAutoTaskCeleryTasks(TacticalTestCase):
                     "days_of_week": 127,
                 },
             },
-            timeout=10,
+            timeout=5,
         )
         nats_cmd.reset_mock()
 
@@ -518,7 +518,7 @@ class TestAutoTaskCeleryTasks(TacticalTestCase):
                     "pk": task1.pk,
                     "type": "rmm",
                     "name": task1.win_task_name,
-                    "overwrite_task": True,
+                    "overwrite_task": False,
                     "enabled": True,
                     "trigger": "monthly",
                     "multiple_instances": 1,
@@ -538,7 +538,7 @@ class TestAutoTaskCeleryTasks(TacticalTestCase):
                     "months_of_year": 1024,
                 },
             },
-            timeout=10,
+            timeout=5,
         )
         nats_cmd.reset_mock()
 
@@ -562,7 +562,7 @@ class TestAutoTaskCeleryTasks(TacticalTestCase):
                     "pk": task1.pk,
                     "type": "rmm",
                     "name": task1.win_task_name,
-                    "overwrite_task": True,
+                    "overwrite_task": False,
                     "enabled": True,
                     "trigger": "monthlydow",
                     "multiple_instances": 1,
@@ -578,7 +578,7 @@ class TestAutoTaskCeleryTasks(TacticalTestCase):
                     "weeks_of_month": 3,
                 },
             },
-            timeout=10,
+            timeout=5,
         )
         nats_cmd.reset_mock()
 
@@ -600,7 +600,7 @@ class TestAutoTaskCeleryTasks(TacticalTestCase):
                     "pk": task1.pk,
                     "type": "rmm",
                     "name": task1.win_task_name,
-                    "overwrite_task": True,
+                    "overwrite_task": False,
                     "enabled": True,
                     "trigger": "runonce",
                     "multiple_instances": 1,
@@ -613,10 +613,39 @@ class TestAutoTaskCeleryTasks(TacticalTestCase):
                     "start_min": int(task1.run_time_date.strftime("%-M")),
                 },
             },
-            timeout=10,
+            timeout=5,
         )
         nats_cmd.reset_mock()
 
+        # test runonce with date in the past
+        task1 = baker.make(
+            "autotasks.AutomatedTask",
+            agent=agent,
+            name="test task 3",
+            task_type=TaskType.RUN_ONCE,
+            run_asap_after_missed=True,
+            run_time_date=djangotime.datetime(2018, 6, 1, 23, 23, 23),
+        )
+        nats_cmd.return_value = "ok"
+        create_win_task_schedule(pk=task1.pk)
+        nats_cmd.assert_called()
+
+        # check if task is scheduled for at most 5min in the future
+        _, args, _ = nats_cmd.mock_calls[0]
+
+        current_minute = int(djangotime.now().strftime("%-M"))
+
+        if current_minute >= 55 and current_minute < 60:
+            self.assertLess(
+                args[0]["schedtaskpayload"]["start_min"],
+                int(djangotime.now().strftime("%-M")),
+            )
+        else:
+            self.assertGreater(
+                args[0]["schedtaskpayload"]["start_min"],
+                int(djangotime.now().strftime("%-M")),
+            )
+
         # test checkfailure task
         nats_cmd.reset_mock()
         check = baker.make_recipe("checks.diskspace_check", agent=agent)
@@ -636,7 +665,7 @@ class TestAutoTaskCeleryTasks(TacticalTestCase):
                     "pk": task1.pk,
                     "type": "rmm",
                     "name": task1.win_task_name,
-                    "overwrite_task": True,
+                    "overwrite_task": False,
                     "enabled": True,
                     "trigger": "manual",
                     "multiple_instances": 1,
@@ -644,7 +673,7 @@ class TestAutoTaskCeleryTasks(TacticalTestCase):
                     "start_when_available": False,
                 },
             },
-            timeout=10,
+            timeout=5,
         )
         nats_cmd.reset_mock()
 
@@ -663,7 +692,7 @@ class TestAutoTaskCeleryTasks(TacticalTestCase):
                     "pk": task1.pk,
                     "type": "rmm",
                     "name": task1.win_task_name,
-                    "overwrite_task": True,
+                    "overwrite_task": False,
                     "enabled": True,
                     "trigger": "manual",
                     "multiple_instances": 1,
@@ -671,7 +700,7 @@ class TestAutoTaskCeleryTasks(TacticalTestCase):
                     "start_when_available": False,
                 },
             },
-            timeout=10,
+            timeout=5,
         )
 
 

api/tacticalrmm/autotasks/views.py

@@ -1,5 +1,4 @@
 from django.shortcuts import get_object_or_404
-from packaging import version as pyver
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
@@ -7,8 +6,6 @@ from rest_framework.views import APIView
 
 from agents.models import Agent
 from automation.models import Policy
-from tacticalrmm.constants import TaskType
-from tacticalrmm.helpers import notify_error
 from tacticalrmm.permissions import _has_perm_on_agent
 
 from .models import AutomatedTask
@@ -43,11 +40,6 @@ class GetAddAutoTasks(APIView):
             if not _has_perm_on_agent(request.user, agent.agent_id):
                 raise PermissionDenied()
 
-            if data["task_type"] == TaskType.ONBOARDING and pyver.parse(
-                agent.version
-            ) < pyver.parse("2.6.0"):
-                return notify_error("Onboarding tasks require agent >= 2.6.0")
-
             data["agent"] = agent.pk
 
         serializer = TaskSerializer(data=data)

api/tacticalrmm/beta/v1/agent/filter.py

@@ -1,37 +0,0 @@
-import django_filters
-from agents.models import Agent
-
-
-class AgentFilter(django_filters.FilterSet):
-    last_seen_range = django_filters.DateTimeFromToRangeFilter(field_name="last_seen")
-    total_ram_range = django_filters.NumericRangeFilter(field_name="total_ram")
-    patches_last_installed_range = django_filters.DateTimeFromToRangeFilter(
-        field_name="patches_last_installed"
-    )
-
-    client_id = django_filters.NumberFilter(method="client_id_filter")
-
-    class Meta:
-        model = Agent
-        fields = [
-            "id",
-            "hostname",
-            "agent_id",
-            "operating_system",
-            "plat",
-            "monitoring_type",
-            "needs_reboot",
-            "logged_in_username",
-            "last_logged_in_user",
-            "alert_template",
-            "site",
-            "policy",
-            "last_seen_range",
-            "total_ram_range",
-            "patches_last_installed_range",
-        ]
-
-    def client_id_filter(self, queryset, name, value):
-        if value:
-            return queryset.filter(site__client__id=value)
-        return queryset

api/tacticalrmm/beta/v1/agent/views.py

@@ -1,40 +0,0 @@
-from rest_framework import viewsets
-from rest_framework.permissions import IsAuthenticated
-from django_filters.rest_framework import DjangoFilterBackend
-from rest_framework.filters import SearchFilter, OrderingFilter
-from rest_framework.request import Request
-from rest_framework.serializers import BaseSerializer
-
-from agents.models import Agent
-from agents.permissions import AgentPerms
-from beta.v1.agent.filter import AgentFilter
-from beta.v1.pagination import StandardResultsSetPagination
-from ..serializers import DetailAgentSerializer, ListAgentSerializer
-
-
-class AgentViewSet(viewsets.ModelViewSet):
-    permission_classes = [IsAuthenticated, AgentPerms]
-    queryset = Agent.objects.all()
-    pagination_class = StandardResultsSetPagination
-    http_method_names = ["get", "put"]
-    filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
-    filterset_class = AgentFilter
-    search_fields = ["hostname", "services"]
-    ordering_fields = ["id"]
-    ordering = ["id"]
-
-    def check_permissions(self, request: Request) -> None:
-        if "agent_id" in request.query_params:
-            self.kwargs["agent_id"] = request.query_params["agent_id"]
-        super().check_permissions(request)
-
-    def get_permissions(self):
-        if self.request.method == "POST":
-            self.permission_classes = [IsAuthenticated]
-        return super().get_permissions()
-
-    def get_serializer_class(self) -> type[BaseSerializer]:
-        if self.kwargs:
-            if self.kwargs["pk"]:
-                return DetailAgentSerializer
-        return ListAgentSerializer

api/tacticalrmm/beta/v1/client/views.py

@@ -1,13 +0,0 @@
-from rest_framework import viewsets
-from rest_framework.permissions import IsAuthenticated
-
-from clients.models import Client
-from clients.permissions import ClientsPerms
-from ..serializers import ClientSerializer
-
-
-class ClientViewSet(viewsets.ModelViewSet):
-    permission_classes = [IsAuthenticated, ClientsPerms]
-    queryset = Client.objects.all()
-    serializer_class = ClientSerializer
-    http_method_names = ["get", "put"]

api/tacticalrmm/beta/v1/pagination.py

@@ -1,7 +0,0 @@
-from rest_framework.pagination import PageNumberPagination
-
-
-class StandardResultsSetPagination(PageNumberPagination):
-    page_size = 100
-    page_size_query_param = "page_size"
-    max_page_size = 1000

api/tacticalrmm/beta/v1/serializers.py

@@ -1,73 +0,0 @@
-from rest_framework import serializers
-
-from agents.models import Agent
-from clients.models import Client, Site
-
-
-class ListAgentSerializer(serializers.ModelSerializer[Agent]):
-    class Meta:
-        model = Agent
-        fields = "__all__"
-
-
-class DetailAgentSerializer(serializers.ModelSerializer[Agent]):
-    status = serializers.ReadOnlyField()
-
-    class Meta:
-        model = Agent
-        fields = (
-            "version",
-            "operating_system",
-            "plat",
-            "goarch",
-            "hostname",
-            "agent_id",
-            "last_seen",
-            "services",
-            "public_ip",
-            "total_ram",
-            "disks",
-            "boot_time",
-            "logged_in_username",
-            "last_logged_in_user",
-            "monitoring_type",
-            "description",
-            "mesh_node_id",
-            "overdue_email_alert",
-            "overdue_text_alert",
-            "overdue_dashboard_alert",
-            "offline_time",
-            "overdue_time",
-            "check_interval",
-            "needs_reboot",
-            "choco_installed",
-            "wmi_detail",
-            "patches_last_installed",
-            "time_zone",
-            "maintenance_mode",
-            "block_policy_inheritance",
-            "alert_template",
-            "site",
-            "policy",
-            "status",
-            "checks",
-            "pending_actions_count",
-            "cpu_model",
-            "graphics",
-            "local_ips",
-            "make_model",
-            "physical_disks",
-            "serial_number",
-        )
-
-
-class ClientSerializer(serializers.ModelSerializer[Client]):
-    class Meta:
-        model = Client
-        fields = "__all__"
-
-
-class SiteSerializer(serializers.ModelSerializer[Site]):
-    class Meta:
-        model = Site
-        fields = "__all__"

api/tacticalrmm/beta/v1/site/views.py

@@ -1,21 +0,0 @@
-from rest_framework import viewsets
-from rest_framework.permissions import IsAuthenticated
-from django_filters.rest_framework import DjangoFilterBackend
-from rest_framework.filters import SearchFilter, OrderingFilter
-
-from clients.models import Site
-from clients.permissions import SitesPerms
-from beta.v1.pagination import StandardResultsSetPagination
-from ..serializers import SiteSerializer
-
-
-class SiteViewSet(viewsets.ModelViewSet):
-    permission_classes = [IsAuthenticated, SitesPerms]
-    queryset = Site.objects.all()
-    serializer_class = SiteSerializer
-    pagination_class = StandardResultsSetPagination
-    http_method_names = ["get", "put"]
-    filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
-    search_fields = ["name"]
-    ordering_fields = ["id"]
-    ordering = ["id"]

api/tacticalrmm/beta/v1/urls.py

@@ -1,12 +0,0 @@
-from rest_framework import routers
-from .agent import views as agent
-from .client import views as client
-from .site import views as site
-
-router = routers.DefaultRouter()
-
-router.register("agent", agent.AgentViewSet, basename="agent")
-router.register("client", client.ClientViewSet, basename="client")
-router.register("site", site.SiteViewSet, basename="site")
-
-urlpatterns = router.urls

api/tacticalrmm/checks/migrations/0032_alter_checkhistory_id_alter_checkresult_id.py

@@ -1,23 +0,0 @@
-# Generated by Django 4.2.10 on 2024-02-19 05:57
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("checks", "0031_check_env_vars"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="checkhistory",
-            name="id",
-            field=models.BigAutoField(primary_key=True, serialize=False),
-        ),
-        migrations.AlterField(
-            model_name="checkresult",
-            name="id",
-            field=models.BigAutoField(primary_key=True, serialize=False),
-        ),
-    ]

api/tacticalrmm/checks/models.py

@@ -19,7 +19,6 @@ from tacticalrmm.constants import (
     EvtLogNames,
     EvtLogTypes,
 )
-from tacticalrmm.helpers import has_script_actions, has_webhook
 from tacticalrmm.models import PermissionQuerySet
 
 if TYPE_CHECKING:
@@ -169,7 +168,10 @@ class Check(BaseAuditModel):
         elif self.agent:
             cache.delete(f"agent_{self.agent.agent_id}_checks")
 
-        super().save(*args, **kwargs)
+        super(Check, self).save(
+            *args,
+            **kwargs,
+        )
 
     def delete(self, *args, **kwargs):
         # if check is a policy check clear cache on everything
@@ -181,7 +183,10 @@ class Check(BaseAuditModel):
         elif self.agent:
             cache.delete(f"agent_{self.agent.agent_id}_checks")
 
-        super().delete(*args, **kwargs)
+        super(Check, self).delete(
+            *args,
+            **kwargs,
+        )
 
     @property
     def readable_desc(self):
@@ -231,19 +236,18 @@ class Check(BaseAuditModel):
         check.save()
 
     def should_create_alert(self, alert_template=None):
-        has_check_notifications = (
-            self.dashboard_alert or self.email_alert or self.text_alert
-        )
-        has_alert_template_notification = alert_template and (
-            alert_template.check_always_alert
-            or alert_template.check_always_email
-            or alert_template.check_always_text
-        )
         return (
-            has_check_notifications
-            or has_alert_template_notification
-            or has_webhook(alert_template, "check")
-            or has_script_actions(alert_template, "check")
+            self.dashboard_alert
+            or self.email_alert
+            or self.text_alert
+            or (
+                alert_template
+                and (
+                    alert_template.check_always_alert
+                    or alert_template.check_always_email
+                    or alert_template.check_always_text
+                )
+            )
         )
 
     def add_check_history(
@@ -286,7 +290,6 @@ class CheckResult(models.Model):
     class Meta:
         unique_together = (("agent", "assigned_check"),)
 
-    id = models.BigAutoField(primary_key=True)
     agent = models.ForeignKey(
         "agents.Agent",
         related_name="checkresults",
@@ -335,7 +338,10 @@ class CheckResult(models.Model):
         ):
             self.alert_severity = AlertSeverity.WARNING
 
-        super().save(*args, **kwargs)
+        super(CheckResult, self).save(
+            *args,
+            **kwargs,
+        )
 
     @property
     def history_info(self):
@@ -365,11 +371,9 @@ class CheckResult(models.Model):
             if len(self.history) > 15:
                 self.history = self.history[-15:]
 
-            update_fields.extend(["history", "more_info"])
+            update_fields.extend(["history"])
 
             avg = int(mean(self.history))
-            txt = "Memory Usage" if check.check_type == CheckType.MEMORY else "CPU Load"
-            self.more_info = f"Average {txt}: {avg}%"
 
             if check.error_threshold and avg > check.error_threshold:
                 self.status = CheckStatus.FAILING
@@ -669,7 +673,6 @@ class CheckResult(models.Model):
 class CheckHistory(models.Model):
     objects = PermissionQuerySet.as_manager()
 
-    id = models.BigAutoField(primary_key=True)
     check_id = models.PositiveIntegerField(default=0)
     agent_id = models.CharField(max_length=200, null=True, blank=True)
     x = models.DateTimeField(auto_now_add=True)

api/tacticalrmm/checks/serializers.py

@@ -172,13 +172,8 @@ class CheckRunnerGetSerializer(serializers.ModelSerializer):
         if obj.check_type != CheckType.SCRIPT:
             return []
 
-        agent = self.context["agent"] if "agent" in self.context.keys() else obj.agent
-
-        return Script.parse_script_env_vars(
-            agent=agent,
-            shell=obj.script.shell,
-            env_vars=obj.env_vars,
-        )
+        # check's env_vars override the script's env vars
+        return obj.env_vars or obj.script.env_vars
 
     class Meta:
         model = Check

api/tacticalrmm/checks/tasks.py

@@ -8,7 +8,6 @@ from alerts.models import Alert
 from checks.models import CheckResult
 from tacticalrmm.celery import app
 from tacticalrmm.helpers import rand_range
-from tacticalrmm.logger import logger
 
 
 @app.task
@@ -121,9 +120,9 @@ def handle_resolved_check_email_alert_task(pk: int) -> str:
 def prune_check_history(older_than_days: int) -> str:
     from .models import CheckHistory
 
-    c, _ = CheckHistory.objects.filter(
-        x__lt=djangotime.now() - djangotime.timedelta(days=older_than_days)
+    CheckHistory.objects.filter(
+        x__lt=djangotime.make_aware(dt.datetime.today())
+        - djangotime.timedelta(days=older_than_days)
     ).delete()
-    logger.info(f"Pruned {c} check history objects")
 
     return "ok"

api/tacticalrmm/checks/tests.py

@@ -172,31 +172,6 @@ class TestCheckViews(TacticalTestCase):
 
         self.check_not_authenticated("post", url)
 
-    def test_reset_all_checks_status(self):
-        # setup data
-        agent = baker.make_recipe("agents.agent")
-        check = baker.make_recipe("checks.diskspace_check", agent=agent)
-        baker.make("checks.CheckResult", assigned_check=check, agent=agent)
-        baker.make(
-            "checks.CheckHistory",
-            check_id=check.id,
-            agent_id=agent.agent_id,
-            _quantity=30,
-        )
-        baker.make(
-            "checks.CheckHistory",
-            check_id=check.id,
-            agent_id=agent.agent_id,
-            _quantity=30,
-        )
-
-        url = f"{base_url}/{agent.agent_id}/resetall/"
-
-        resp = self.client.post(url)
-        self.assertEqual(resp.status_code, 200)
-
-        self.check_not_authenticated("post", url)
-
     def test_add_memory_check(self):
         url = f"{base_url}/"
         agent = baker.make_recipe("agents.agent")

api/tacticalrmm/checks/urls.py

@@ -6,7 +6,6 @@ urlpatterns = [
     path("", views.GetAddChecks.as_view()),
     path("<int:pk>/", views.GetUpdateDeleteCheck.as_view()),
     path("<int:pk>/reset/", views.ResetCheck.as_view()),
-    path("<agent:agent_id>/resetall/", views.ResetAllChecksStatus.as_view()),
     path("<agent:agent_id>/run/", views.run_checks),
     path("<int:pk>/history/", views.GetCheckHistory.as_view()),
     path("<str:target>/<int:pk>/csbulkrun/", views.bulk_run_checks),

api/tacticalrmm/checks/views.py

@@ -1,7 +1,7 @@
 import asyncio
 from datetime import datetime as dt
 
-from django.db.models import Prefetch, Q
+from django.db.models import Q
 from django.shortcuts import get_object_or_404
 from django.utils import timezone as djangotime
 from rest_framework.decorators import api_view, permission_classes
@@ -13,7 +13,7 @@ from rest_framework.views import APIView
 from agents.models import Agent
 from alerts.models import Alert
 from automation.models import Policy
-from tacticalrmm.constants import AGENT_DEFER, CheckStatus, CheckType
+from tacticalrmm.constants import CheckStatus, CheckType
 from tacticalrmm.exceptions import NatsDown
 from tacticalrmm.helpers import notify_error
 from tacticalrmm.nats_utils import abulk_nats_command
@@ -122,54 +122,15 @@ class ResetCheck(APIView):
         result.save()
 
         # resolve any alerts that are open
-        if alert := Alert.create_or_return_check_alert(
+        alert = Alert.create_or_return_check_alert(
             result.assigned_check, agent=result.agent, skip_create=True
-        ):
+        )
+        if alert:
             alert.resolve()
 
         return Response("The check status was reset")
 
 
-class ResetAllChecksStatus(APIView):
-    permission_classes = [IsAuthenticated, ChecksPerms]
-
-    def post(self, request, agent_id):
-        agent = get_object_or_404(
-            Agent.objects.defer(*AGENT_DEFER)
-            .select_related(
-                "policy",
-                "policy__alert_template",
-                "alert_template",
-            )
-            .prefetch_related(
-                Prefetch(
-                    "checkresults",
-                    queryset=CheckResult.objects.select_related("assigned_check"),
-                ),
-                "agentchecks",
-            ),
-            agent_id=agent_id,
-        )
-
-        if not _has_perm_on_agent(request.user, agent.agent_id):
-            raise PermissionDenied()
-
-        for check in agent.get_checks_with_policies():
-            try:
-                result = check.check_result
-                result.status = CheckStatus.PASSING
-                result.save()
-                if alert := Alert.create_or_return_check_alert(
-                    result.assigned_check, agent=agent, skip_create=True
-                ):
-                    alert.resolve()
-            except:
-                # check hasn't run yet, no check result entry
-                continue
-
-        return Response("All checks status were reset")
-
-
 class GetCheckHistory(APIView):
     permission_classes = [IsAuthenticated, ChecksPerms]
 

api/tacticalrmm/clients/models.py

@@ -49,7 +49,11 @@ class Client(BaseAuditModel):
 
         # get old client if exists
         old_client = Client.objects.get(pk=self.pk) if self.pk else None
-        super().save(old_model=old_client, *args, **kwargs)
+        super(Client, self).save(
+            old_model=old_client,
+            *args,
+            **kwargs,
+        )
 
         # check if polcies have changed and initiate task to reapply policies if so
         if old_client and (
@@ -125,7 +129,11 @@ class Site(BaseAuditModel):
 
         # get old client if exists
         old_site = Site.objects.get(pk=self.pk) if self.pk else None
-        super().save(old_model=old_site, *args, **kwargs)
+        super(Site, self).save(
+            old_model=old_site,
+            *args,
+            **kwargs,
+        )
 
         # check if polcies have changed and initiate task to reapply policies if so
         if old_site:
@@ -133,7 +141,6 @@ class Site(BaseAuditModel):
                 old_site.alert_template != self.alert_template
                 or old_site.workstation_policy != self.workstation_policy
                 or old_site.server_policy != self.server_policy
-                or old_site.client != self.client
             ):
                 cache_agents_alert_template.delay()
 

api/tacticalrmm/clients/tests.py

@@ -88,7 +88,6 @@ class TestClientViews(TacticalTestCase):
             "client": {"name": "Setup Client"},
             "site": {"name": "Setup  Site"},
             "timezone": "America/Los_Angeles",
-            "companyname": "TestCo Inc.",
             "initialsetup": True,
         }
         r = self.client.post(url, payload, format="json")

api/tacticalrmm/clients/views.py

@@ -3,7 +3,6 @@ import re
 import uuid
 from contextlib import suppress
 
-from django.conf import settings
 from django.db.models import Count, Exists, OuterRef, Prefetch, prefetch_related_objects
 from django.shortcuts import get_object_or_404
 from django.utils import timezone as djangotime
@@ -92,8 +91,7 @@ class GetAddClients(APIView):
         if "initialsetup" in request.data.keys():
             core = get_core_settings()
             core.default_time_zone = request.data["timezone"]
-            core.mesh_company_name = request.data["companyname"]
-            core.save(update_fields=["default_time_zone", "mesh_company_name"])
+            core.save(update_fields=["default_time_zone"])
 
         # save custom fields
         if "custom_fields" in request.data.keys():
@@ -290,9 +288,6 @@ class AgentDeployment(APIView):
         return Response(DeploymentSerializer(deps, many=True).data)
 
     def post(self, request):
-        if getattr(settings, "TRMM_INSECURE", False):
-            return notify_error("Not available in insecure mode")
-
         from accounts.models import User
 
         site = get_object_or_404(Site, pk=request.data["site"])
@@ -348,9 +343,6 @@ class GenerateAgent(APIView):
     permission_classes = (AllowAny,)
 
     def get(self, request, uid):
-        if getattr(settings, "TRMM_INSECURE", False):
-            return notify_error("Not available in insecure mode")
-
         from tacticalrmm.utils import generate_winagent_exe
 
         try:

api/tacticalrmm/core/agent_linux.sh

@@ -12,19 +12,6 @@ if [ "${HAS_SYSTEMD}" != 'systemd' ]; then
     exit 1
 fi
 
-if [[ $DISPLAY ]]; then
-    echo "ERROR: Display detected. Installer only supports running headless, i.e from ssh."
-    echo "If you cannot ssh in then please run 'sudo systemctl isolate multi-user.target' to switch to a non-graphical user session and run the installer again."
-    echo "If you are already running headless, then you are probably running with X forwarding which is setting DISPLAY, if so then simply run"
-    echo "unset DISPLAY"
-    echo "to unset the variable and then try running the installer again"
-    exit 1
-fi
-
-DEBUG=0
-INSECURE=0
-NOMESH=0
-
 agentDL='agentDLChange'
 meshDL='meshDLChange'
 
@@ -41,7 +28,6 @@ agentBin="${agentBinPath}/${binName}"
 agentConf='/etc/tacticalagent'
 agentSvcName='tacticalagent.service'
 agentSysD="/etc/systemd/system/${agentSvcName}"
-agentDir='/opt/tacticalagent'
 meshDir='/opt/tacticalmesh'
 meshSystemBin="${meshDir}/meshagent"
 meshSvcName='meshagent.service'
@@ -66,20 +52,16 @@ RemoveOldAgent() {
     if [ -f "${agentSysD}" ]; then
         systemctl disable ${agentSvcName}
         systemctl stop ${agentSvcName}
-        rm -f "${agentSysD}"
+        rm -f ${agentSysD}
         systemctl daemon-reload
     fi
 
     if [ -f "${agentConf}" ]; then
-        rm -f "${agentConf}"
+        rm -f ${agentConf}
     fi
 
     if [ -f "${agentBin}" ]; then
-        rm -f "${agentBin}"
-    fi
-
-    if [ -d "${agentDir}" ]; then
-        rm -rf "${agentDir}"
+        rm -f ${agentBin}
     fi
 }
 
@@ -137,26 +119,11 @@ Uninstall() {
     RemoveOldAgent
 }
 
-if [ $# -ne 0 ] && [[ $1 =~ ^(uninstall|-uninstall|--uninstall)$ ]]; then
+if [ $# -ne 0 ] && [ $1 == 'uninstall' ]; then
     Uninstall
-    # Remove the current script
-    rm "$0"
     exit 0
 fi
 
-while [[ "$#" -gt 0 ]]; do
-    case $1 in
-    -debug | --debug | debug) DEBUG=1 ;;
-    -insecure | --insecure | insecure) INSECURE=1 ;;
-    -nomesh | --nomesh | nomesh) NOMESH=1 ;;
-    *)
-        echo "ERROR: Unknown parameter: $1"
-        exit 1
-        ;;
-    esac
-    shift
-done
-
 RemoveOldAgent
 
 echo "Downloading tactical agent..."
@@ -169,7 +136,7 @@ chmod +x ${agentBin}
 
 MESH_NODE_ID=""
 
-if [[ $NOMESH -eq 1 ]]; then
+if [ $# -ne 0 ] && [ $1 == '--nomesh' ]; then
     echo "Skipping mesh install"
 else
     if [ -f "${meshSystemBin}" ]; then
@@ -187,22 +154,18 @@ if [ ! -d "${agentBinPath}" ]; then
     mkdir -p ${agentBinPath}
 fi
 
-INSTALL_CMD="${agentBin} -m install -api ${apiURL} -client-id ${clientID} -site-id ${siteID} -agent-type ${agentType} -auth ${token}"
+if [ $# -ne 0 ] && [ $1 == '--debug' ]; then
+    INSTALL_CMD="${agentBin} -m install -api ${apiURL} -client-id ${clientID} -site-id ${siteID} -agent-type ${agentType} -auth ${token} -log debug"
+else
+    INSTALL_CMD="${agentBin} -m install -api ${apiURL} -client-id ${clientID} -site-id ${siteID} -agent-type ${agentType} -auth ${token}"
+fi
 
 if [ "${MESH_NODE_ID}" != '' ]; then
-    INSTALL_CMD+=" --meshnodeid ${MESH_NODE_ID}"
-fi
-
-if [[ $DEBUG -eq 1 ]]; then
-    INSTALL_CMD+=" --log debug"
-fi
-
-if [[ $INSECURE -eq 1 ]]; then
-    INSTALL_CMD+=" --insecure"
+    INSTALL_CMD+=" -meshnodeid ${MESH_NODE_ID}"
 fi
 
 if [ "${proxy}" != '' ]; then
-    INSTALL_CMD+=" --proxy ${proxy}"
+    INSTALL_CMD+=" -proxy ${proxy}"
 fi
 
 eval ${INSTALL_CMD}

api/tacticalrmm/core/consumers.py

@@ -1,38 +1,15 @@
 import asyncio
-import fcntl
-import os
-import pty
-import select
-import signal
-import struct
-import subprocess
-import termios
-import threading
-import uuid
 from contextlib import suppress
 
 from channels.db import database_sync_to_async
-from channels.generic.websocket import AsyncJsonWebsocketConsumer, JsonWebsocketConsumer
+from channels.generic.websocket import AsyncJsonWebsocketConsumer
 from django.contrib.auth.models import AnonymousUser
 from django.db.models import F
 from django.utils import timezone as djangotime
 
 from agents.models import Agent
-from core.models import CoreSettings
 from tacticalrmm.constants import AgentMonType
 from tacticalrmm.helpers import days_until_cert_expires
-from tacticalrmm.logger import logger
-
-
-def _has_perm(user, perm: str) -> bool:
-    if user.is_superuser or (user.role and getattr(user.role, "is_superuser")):
-        return True
-
-    # make sure non-superusers with empty roles aren't permitted
-    elif not user.role:
-        return False
-
-    return user.role and getattr(user.role, perm)
 
 
 class DashInfo(AsyncJsonWebsocketConsumer):
@@ -41,11 +18,6 @@ class DashInfo(AsyncJsonWebsocketConsumer):
 
         if isinstance(self.user, AnonymousUser):
             await self.close()
-            return
-
-        if self.user.block_dashboard_login:
-            await self.close()
-            return
 
         await self.accept()
         self.connected = True
@@ -90,15 +62,13 @@ class DashInfo(AsyncJsonWebsocketConsumer):
             )
             .count()
         )
+
         return {
-            "action": "dashboard.agentcount",
-            "data": {
-                "total_server_offline_count": offline_server_agents_count,
-                "total_workstation_offline_count": offline_workstation_agents_count,
-                "total_server_count": total_server_agents_count,
-                "total_workstation_count": total_workstation_agents_count,
-                "days_until_cert_expires": days_until_cert_expires(),
-            },
+            "total_server_offline_count": offline_server_agents_count,
+            "total_workstation_offline_count": offline_workstation_agents_count,
+            "total_server_count": total_server_agents_count,
+            "total_workstation_count": total_workstation_agents_count,
+            "days_until_cert_expires": days_until_cert_expires(),
         }
 
     async def send_dash_info(self):
@@ -106,137 +76,3 @@ class DashInfo(AsyncJsonWebsocketConsumer):
             c = await self.get_dashboard_info()
             await self.send_json(c)
             await asyncio.sleep(30)
-
-
-class TerminalConsumer(JsonWebsocketConsumer):
-    child_pid = None
-    fd = None
-    shell = None
-    command = ["/bin/bash"]
-    user = None
-    subprocess = None
-    authorized = False
-    connected = False
-
-    def run_command(self):
-        master_fd, slave_fd = pty.openpty()
-
-        self.fd = master_fd
-        env = os.environ.copy()
-        env["TERM"] = "xterm"
-
-        with subprocess.Popen(  # pylint: disable=subprocess-popen-preexec-fn
-            self.command,
-            stdin=slave_fd,
-            stdout=slave_fd,
-            stderr=slave_fd,
-            preexec_fn=os.setsid,
-            env=env,
-            cwd=os.getenv("HOME", os.getcwd()),
-        ) as proc:
-            self.subprocess = proc
-            self.child_pid = proc.pid
-            proc.wait()
-
-            # Subprocess has finished, close the websocket
-            # happens when process exits, either via user exiting using exit() or by error
-            self.subprocess = None
-            self.child_pid = None
-            if self.connected:
-                self.connected = False
-                self.close(4030)
-
-    def connect(self):
-        if "user" not in self.scope:
-            self.close(4401)
-            return
-
-        self.user = self.scope["user"]
-
-        if isinstance(self.user, AnonymousUser):
-            self.close()
-            return
-
-        if not self.user.is_authenticated:
-            self.close(4401)
-            return
-
-        core: CoreSettings = CoreSettings.objects.first()  # type: ignore
-        if not core.web_terminal_enabled:
-            self.close(4401)
-            return
-
-        if self.user.block_dashboard_login or not _has_perm(
-            self.user, "can_use_webterm"
-        ):
-            self.close(4401)
-            return
-
-        if self.child_pid is not None:
-            return
-
-        self.connected = True
-        self.authorized = True
-        self.accept()
-
-        # Daemonize the thread so it automatically dies when the main thread exits
-        thread = threading.Thread(target=self.run_command, daemon=True)
-        thread.start()
-
-        thread = threading.Thread(target=self.read_from_pty, daemon=True)
-        thread.start()
-
-    def read_from_pty(self):
-        while True:
-            select.select([self.fd], [], [])
-            output = os.read(self.fd, 1024)
-            if not output:
-                break
-            message = output.decode(errors="ignore")
-            self.send_json(
-                {
-                    "action": "trmmcli.output",
-                    "data": {"output": message, "messageId": str(uuid.uuid4())},
-                }
-            )
-
-    def resize(self, row, col, xpix=0, ypix=0):
-        winsize = struct.pack("HHHH", row, col, xpix, ypix)
-        fcntl.ioctl(self.fd, termios.TIOCSWINSZ, winsize)
-
-    def write_to_pty(self, message):
-        os.write(self.fd, message.encode())
-
-    def kill_pty(self):
-        if self.subprocess is not None:
-            try:
-                os.killpg(os.getpgid(self.child_pid), signal.SIGKILL)
-            except Exception as e:
-                logger.error(f"Failed to kill process group: {str(e)}")
-            finally:
-                self.subprocess = None
-                self.child_pid = None
-
-    def disconnect(self, code):
-        self.connected = False
-        self.kill_pty()
-
-    def receive_json(self, data):
-        if not self.authorized:
-            return
-
-        action = data.get("action", None)
-
-        if not action:
-            return
-
-        if action == "trmmcli.resize":
-            self.resize(data["data"]["rows"], data["data"]["cols"])
-        elif action == "trmmcli.input":
-            message = data["data"]["input"]
-            self.write_to_pty(message)
-        elif action == "trmmcli.disconnect":
-            self.kill_pty()
-            self.send_json(
-                {"action": "trmmcli.output", "data": {"output": "Terminal killed!"}}
-            )

api/tacticalrmm/core/management/commands/check_mesh.py

@@ -27,7 +27,7 @@ class Command(BaseCommand):
         self._warning("Mesh device group:", core.mesh_device_group)
 
         try:
-            token = get_auth_token(core.mesh_api_superuser, core.mesh_token)
+            token = get_auth_token(core.mesh_username, core.mesh_token)
         except Exception as e:
             self._error("Error getting auth token:")
             self._error(str(e))

api/tacticalrmm/core/management/commands/clear_redis_celery_locks.py

@@ -5,7 +5,6 @@ from tacticalrmm.constants import (
     AGENT_OUTAGES_LOCK,
     ORPHANED_WIN_TASK_LOCK,
     RESOLVE_ALERTS_LOCK,
-    SYNC_MESH_PERMS_TASK_LOCK,
     SYNC_SCHED_TASK_LOCK,
 )
 
@@ -19,6 +18,5 @@ class Command(BaseCommand):
             ORPHANED_WIN_TASK_LOCK,
             RESOLVE_ALERTS_LOCK,
             SYNC_SCHED_TASK_LOCK,
-            SYNC_MESH_PERMS_TASK_LOCK,
         ):
             cache.delete(key)

api/tacticalrmm/core/management/commands/create_gunicorn_conf.py

@@ -1,70 +0,0 @@
-import multiprocessing
-
-from django.conf import settings
-from django.core.management.base import BaseCommand
-
-
-class Command(BaseCommand):
-    help = "Generate conf for gunicorn"
-
-    def handle(self, *args, **kwargs):
-        self.stdout.write("Creating gunicorn conf...")
-
-        cpu_count = multiprocessing.cpu_count()
-
-        # worker processes
-        workers = getattr(settings, "TRMM_GUNICORN_WORKERS", cpu_count * 2 + 1)
-        threads = getattr(settings, "TRMM_GUNICORN_THREADS", cpu_count * 2)
-        worker_class = getattr(settings, "TRMM_GUNICORN_WORKER_CLASS", "gthread")
-        max_requests = getattr(settings, "TRMM_GUNICORN_MAX_REQUESTS", 50)
-        max_requests_jitter = getattr(settings, "TRMM_GUNICORN_MAX_REQUESTS_JITTER", 8)
-        worker_connections = getattr(settings, "TRMM_GUNICORN_WORKER_CONNS", 1000)
-        timeout = getattr(settings, "TRMM_GUNICORN_TIMEOUT", 300)
-        graceful_timeout = getattr(settings, "TRMM_GUNICORN_GRACEFUL_TIMEOUT", 300)
-
-        # socket
-        backlog = getattr(settings, "TRMM_GUNICORN_BACKLOG", 2048)
-        if getattr(settings, "DOCKER_BUILD", False):
-            bind = "0.0.0.0:8080"
-        else:
-            bind = f"unix:{settings.BASE_DIR / 'tacticalrmm.sock'}"
-
-        # security
-        limit_request_line = getattr(settings, "TRMM_GUNICORN_LIMIT_REQUEST_LINE", 0)
-        limit_request_fields = getattr(
-            settings, "TRMM_GUNICORN_LIMIT_REQUEST_FIELDS", 500
-        )
-        limit_request_field_size = getattr(
-            settings, "TRMM_GUNICORN_LIMIT_REQUEST_FIELD_SIZE", 0
-        )
-
-        # server
-        preload_app = getattr(settings, "TRMM_GUNICORN_PRELOAD_APP", True)
-
-        # log
-        loglevel = getattr(settings, "TRMM_GUNICORN_LOGLEVEL", "info")
-
-        cfg = [
-            f"bind = '{bind}'",
-            f"workers = {workers}",
-            f"threads = {threads}",
-            f"worker_class = '{worker_class}'",
-            f"backlog = {backlog}",
-            f"worker_connections = {worker_connections}",
-            f"timeout = {timeout}",
-            f"graceful_timeout = {graceful_timeout}",
-            f"limit_request_line = {limit_request_line}",
-            f"limit_request_fields = {limit_request_fields}",
-            f"limit_request_field_size = {limit_request_field_size}",
-            f"max_requests = {max_requests}",
-            f"max_requests_jitter = {max_requests_jitter}",
-            f"loglevel = '{loglevel}'",
-            f"chdir = '{settings.BASE_DIR}'",
-            f"preload_app = {preload_app}",
-        ]
-
-        with open(settings.BASE_DIR / "gunicorn_config.py", "w") as fp:
-            for line in cfg:
-                fp.write(line + "\n")
-
-        self.stdout.write("Created gunicorn conf")

api/tacticalrmm/core/management/commands/create_natsapi_conf.py

@@ -4,7 +4,7 @@ import os
 from django.conf import settings
 from django.core.management.base import BaseCommand
 
-from tacticalrmm.helpers import get_nats_url
+from tacticalrmm.helpers import get_nats_ports
 
 
 class Command(BaseCommand):
@@ -20,9 +20,10 @@ class Command(BaseCommand):
         else:
             ssl = "disable"
 
+        nats_std_port, _ = get_nats_ports()
         config = {
             "key": settings.SECRET_KEY,
-            "natsurl": get_nats_url(),
+            "natsurl": f"tls://{settings.ALLOWED_HOSTS[0]}:{nats_std_port}",
             "user": db["USER"],
             "pass": db["PASSWORD"],
             "host": db["HOST"],

api/tacticalrmm/core/management/commands/create_uwsgi_conf.py

@@ -1,10 +1,7 @@
 import configparser
-import math
-import multiprocessing
 import os
 from pathlib import Path
 
-import psutil
 from django.conf import settings
 from django.core.management.base import BaseCommand
 
@@ -15,27 +12,6 @@ class Command(BaseCommand):
     def handle(self, *args, **kwargs):
         self.stdout.write("Creating uwsgi conf...")
 
-        try:
-            cpu_count = multiprocessing.cpu_count()
-            worker_initial = 3 if cpu_count == 1 else 4
-        except:
-            worker_initial = 4
-
-        try:
-            ram = math.ceil(psutil.virtual_memory().total / (1024**3))
-            if ram <= 2:
-                max_requests = 15
-                max_workers = 6
-            elif ram <= 4:
-                max_requests = 75
-                max_workers = 20
-            else:
-                max_requests = 100
-                max_workers = 40
-        except:
-            max_requests = 50
-            max_workers = 10
-
         config = configparser.ConfigParser()
 
         if getattr(settings, "DOCKER_BUILD", False):
@@ -59,18 +35,15 @@ class Command(BaseCommand):
             "buffer-size": str(getattr(settings, "UWSGI_BUFFER_SIZE", 65535)),
             "vacuum": str(getattr(settings, "UWSGI_VACUUM", True)).lower(),
             "die-on-term": str(getattr(settings, "UWSGI_DIE_ON_TERM", True)).lower(),
-            "max-requests": str(getattr(settings, "UWSGI_MAX_REQUESTS", max_requests)),
+            "max-requests": str(getattr(settings, "UWSGI_MAX_REQUESTS", 500)),
             "disable-logging": str(
                 getattr(settings, "UWSGI_DISABLE_LOGGING", True)
             ).lower(),
-            "worker-reload-mercy": str(getattr(settings, "UWSGI_RELOAD_MERCY", 30)),
             "cheaper-algo": "busyness",
             "cheaper": str(getattr(settings, "UWSGI_CHEAPER", 4)),
-            "cheaper-initial": str(
-                getattr(settings, "UWSGI_CHEAPER_INITIAL", worker_initial)
-            ),
-            "workers": str(getattr(settings, "UWSGI_MAX_WORKERS", max_workers)),
-            "cheaper-step": str(getattr(settings, "UWSGI_CHEAPER_STEP", 1)),
+            "cheaper-initial": str(getattr(settings, "UWSGI_CHEAPER_INITIAL", 4)),
+            "workers": str(getattr(settings, "UWSGI_MAX_WORKERS", 40)),
+            "cheaper-step": str(getattr(settings, "UWSGI_CHEAPER_STEP", 2)),
             "cheaper-overload": str(getattr(settings, "UWSGI_CHEAPER_OVERLOAD", 3)),
             "cheaper-busyness-min": str(getattr(settings, "UWSGI_BUSYNESS_MIN", 5)),
             "cheaper-busyness-max": str(getattr(settings, "UWSGI_BUSYNESS_MAX", 10)),

api/tacticalrmm/core/management/commands/get_config.py

@@ -3,8 +3,7 @@ from urllib.parse import urlparse
 from django.conf import settings
 from django.core.management.base import BaseCommand
 
-from tacticalrmm.util_settings import get_backend_url, get_root_domain, get_webdomain
-from tacticalrmm.utils import get_certs
+from tacticalrmm.helpers import get_webdomain
 
 
 class Command(BaseCommand):
@@ -17,8 +16,6 @@ class Command(BaseCommand):
         match kwargs["name"]:
             case "api":
                 self.stdout.write(settings.ALLOWED_HOSTS[0])
-            case "rootdomain":
-                self.stdout.write(get_root_domain(settings.ALLOWED_HOSTS[0]))
             case "version":
                 self.stdout.write(settings.TRMM_VERSION)
             case "webversion":
@@ -29,16 +26,8 @@ class Command(BaseCommand):
                 self.stdout.write(settings.NATS_SERVER_VER)
             case "frontend":
                 self.stdout.write(settings.CORS_ORIGIN_WHITELIST[0])
-            case "backend_url":
-                self.stdout.write(
-                    get_backend_url(
-                        settings.ALLOWED_HOSTS[0],
-                        settings.TRMM_PROTO,
-                        settings.TRMM_BACKEND_PORT,
-                    )
-                )
             case "webdomain":
-                self.stdout.write(get_webdomain(settings.CORS_ORIGIN_WHITELIST[0]))
+                self.stdout.write(get_webdomain())
             case "djangoadmin":
                 url = f"https://{settings.ALLOWED_HOSTS[0]}/{settings.ADMIN_URL}"
                 self.stdout.write(url)
@@ -70,9 +59,3 @@ class Command(BaseCommand):
                     obj = core.mesh_token
 
                 self.stdout.write(obj)
-            case "certfile" | "keyfile":
-                crt, key = get_certs()
-                if kwargs["name"] == "certfile":
-                    self.stdout.write(crt)
-                elif kwargs["name"] == "keyfile":
-                    self.stdout.write(key)

api/tacticalrmm/core/management/commands/get_mesh_exe_url.py

@@ -5,14 +5,13 @@ import websockets
 from django.core.management.base import BaseCommand
 
 from core.utils import get_mesh_ws_url
-from tacticalrmm.constants import TRMM_WS_MAX_SIZE
 
 
 class Command(BaseCommand):
     help = "Sets up initial mesh central configuration"
 
     async def websocket_call(self, uri):
-        async with websockets.connect(uri, max_size=TRMM_WS_MAX_SIZE) as websocket:
+        async with websockets.connect(uri) as websocket:
             # Get Invitation Link
             await websocket.send(
                 json.dumps(

api/tacticalrmm/core/management/commands/get_mesh_login_url.py

@@ -1,19 +0,0 @@
-from django.core.management.base import BaseCommand
-from meshctrl.utils import get_login_token
-
-from core.utils import get_core_settings
-
-
-class Command(BaseCommand):
-    help = "generate a url to login to mesh as the superuser"
-
-    def handle(self, *args, **kwargs):
-
-        core = get_core_settings()
-
-        token = get_login_token(key=core.mesh_token, user=f"user//{core.mesh_username}")
-        token_param = f"login={token}&"
-
-        control = f"{core.mesh_site}/?{token_param}"
-
-        self.stdout.write(self.style.SUCCESS(control))

api/tacticalrmm/core/management/commands/initial_mesh_setup.py

@@ -6,14 +6,13 @@ from django.conf import settings
 from django.core.management.base import BaseCommand
 
 from core.utils import get_core_settings, get_mesh_ws_url
-from tacticalrmm.constants import TRMM_WS_MAX_SIZE
 
 
 class Command(BaseCommand):
     help = "Sets up initial mesh central configuration"
 
     async def websocket_call(self, uri):
-        async with websockets.connect(uri, max_size=TRMM_WS_MAX_SIZE) as websocket:
+        async with websockets.connect(uri) as websocket:
             # Get Device groups to see if it exists
             await websocket.send(json.dumps({"action": "meshes"}))
 

api/tacticalrmm/core/management/commands/post_update_tasks.py

@@ -6,8 +6,6 @@ from accounts.models import User
 from agents.models import Agent
 from autotasks.models import AutomatedTask
 from checks.models import Check, CheckHistory
-from core.models import CoreSettings
-from core.tasks import remove_orphaned_history_results, sync_mesh_perms_task
 from scripts.models import Script
 from tacticalrmm.constants import AGENT_DEFER, ScriptType
 
@@ -56,22 +54,4 @@ class Command(BaseCommand):
 
                 agent.save(update_fields=["goarch"])
 
-        self.stdout.write(
-            self.style.SUCCESS("Checking for orphaned history results...")
-        )
-        count = remove_orphaned_history_results()
-        if count:
-            self.stdout.write(
-                self.style.SUCCESS(f"Removed {count} orphaned history results.")
-            )
-
-        core = CoreSettings.objects.first()
-        if core.sync_mesh_with_trmm:
-            self.stdout.write(
-                self.style.SUCCESS(
-                    "Syncing trmm users/permissions with meshcentral, this might take a long time...please wait..."
-                )
-            )
-            sync_mesh_perms_task()
-
         self.stdout.write("Post update tasks finished")

api/tacticalrmm/core/management/commands/pre_update_tasks.py

@@ -11,7 +11,4 @@ class Command(BaseCommand):
         self.stdout.write(self.style.WARNING("Cleaning the cache"))
         clear_entire_cache()
         self.stdout.write(self.style.SUCCESS("Cache was cleared!"))
-        try:
-            call_command("fix_dupe_agent_customfields")
-        except:
-            pass
+        call_command("fix_dupe_agent_customfields")

api/tacticalrmm/core/management/commands/run_all_tasks.py

@@ -8,7 +8,6 @@ from core.tasks import (
     core_maintenance_tasks,
     resolve_alerts_task,
     resolve_pending_actions,
-    sync_mesh_perms_task,
     sync_scheduled_tasks,
 )
 from winupdate.tasks import auto_approve_updates_task, check_agent_update_schedule_task
@@ -29,4 +28,3 @@ class Command(BaseCommand):
         remove_orphaned_win_tasks.delay()
         auto_approve_updates_task.delay()
         check_agent_update_schedule_task.delay()
-        sync_mesh_perms_task.delay()

api/tacticalrmm/core/management/commands/server_maint_mode.py

@@ -1,50 +0,0 @@
-import json
-import os
-
-from django.core.management.base import BaseCommand
-
-from agents.models import Agent
-
-
-class Command(BaseCommand):
-    help = "Toggle server maintenance mode, preserving existing state"
-
-    def add_arguments(self, parser):
-        parser.add_argument("--enable", action="store_true")
-        parser.add_argument("--disable", action="store_true")
-        parser.add_argument("--force-enable", action="store_true")
-        parser.add_argument("--force-disable", action="store_true")
-
-    def handle(self, *args, **kwargs):
-        enable = kwargs["enable"]
-        disable = kwargs["disable"]
-        force_enable = kwargs["force_enable"]
-        force_disable = kwargs["force_disable"]
-
-        home_dir = os.path.expanduser("~")
-        fp = os.path.join(home_dir, "agents_maint_mode.json")
-
-        if enable:
-            current = list(
-                Agent.objects.filter(maintenance_mode=True).values_list("id", flat=True)
-            )
-
-            with open(fp, "w") as f:
-                json.dump(current, f)
-
-            Agent.objects.update(maintenance_mode=True)
-
-        elif disable:
-            with open(fp, "r") as f:
-                state = json.load(f)
-
-            Agent.objects.exclude(pk__in=state).update(maintenance_mode=False)
-
-        elif force_enable:
-            Agent.objects.update(maintenance_mode=True)
-
-        elif force_disable:
-            if os.path.exists(fp):
-                os.remove(fp)
-
-            Agent.objects.update(maintenance_mode=False)

api/tacticalrmm/core/management/commands/sync_mesh_with_trmm.py

@@ -1,15 +0,0 @@
-from django.core.management.base import BaseCommand
-
-from core.tasks import sync_mesh_perms_task
-
-
-class Command(BaseCommand):
-    help = "Sync mesh users/perms with trmm users/perms"
-
-    def handle(self, *args, **kwargs):
-        self.stdout.write(
-            self.style.SUCCESS(
-                "Syncing trmm users/permissions with meshcentral, this might take a long time...please wait..."
-            )
-        )
-        sync_mesh_perms_task()

api/tacticalrmm/core/mesh_utils.py

@@ -1,183 +0,0 @@
-import asyncio
-import json
-import re
-import secrets
-import string
-import traceback
-from typing import TYPE_CHECKING, Any
-
-import websockets
-
-from accounts.utils import is_superuser
-from tacticalrmm.constants import TRMM_WS_MAX_SIZE
-from tacticalrmm.logger import logger
-
-if TYPE_CHECKING:
-    from accounts.models import User
-
-
-def build_mesh_display_name(
-    *, first_name: str | None, last_name: str | None, company_name: str | None
-) -> str:
-    ret = ""
-    if first_name:
-        ret += first_name
-
-    if last_name:
-        ret += f" {last_name}"
-
-    if ret and company_name:
-        ret += f" - {company_name}"
-    elif company_name:
-        ret += company_name
-
-    return ret
-
-
-def has_mesh_perms(*, user: "User") -> bool:
-    if user.is_superuser or is_superuser(user):
-        return True
-
-    return user.role and getattr(user.role, "can_use_mesh")
-
-
-def make_mesh_password() -> str:
-    alpha = string.ascii_letters + string.digits
-    nonalpha = "!@#$"
-    passwd = [secrets.choice(alpha) for _ in range(29)] + [secrets.choice(nonalpha)]
-    secrets.SystemRandom().shuffle(passwd)
-    return "".join(passwd)
-
-
-def transform_trmm(obj):
-    ret = []
-    try:
-        for node in obj:
-            node_id = node["node_id"]
-            user_ids = [link["_id"] for link in node["links"]]
-            ret.append({"node_id": node_id, "user_ids": user_ids})
-    except Exception:
-        logger.debug(traceback.format_exc)
-    return ret
-
-
-def transform_mesh(obj):
-    pattern = re.compile(r".*___\d+")
-    ret = []
-    try:
-        for _, nodes in obj.items():
-            for node in nodes:
-                node_id = node["_id"]
-                try:
-                    user_ids = [
-                        user_id
-                        for user_id in node["links"].keys()
-                        if pattern.match(user_id)
-                    ]
-                except KeyError:
-                    # will trigger on initial sync cuz no mesh users yet
-                    # also triggers for invalid agents after sync
-                    pass
-                else:
-                    ret.append({"node_id": node_id, "user_ids": user_ids})
-
-    except Exception:
-        logger.debug(traceback.format_exc)
-    return ret
-
-
-class MeshSync:
-    def __init__(self, uri: str):
-        self.uri = uri
-        self.mesh_users = self.get_trmm_mesh_users()  # full list
-
-    def mesh_action(
-        self, *, payload: dict[str, Any], wait=True
-    ) -> dict[str, Any] | None:
-        async def _do(payload):
-            async with websockets.connect(self.uri, max_size=TRMM_WS_MAX_SIZE) as ws:
-                await ws.send(json.dumps(payload))
-                if wait:
-                    while 1:
-                        try:
-                            message = await asyncio.wait_for(ws.recv(), 120)
-                            r = json.loads(message)
-                            if r["action"] == payload["action"]:
-                                return r
-                        except asyncio.TimeoutError:
-                            logger.error("Timeout reached.")
-                            return None
-                else:
-                    return None
-
-        payload["responseid"] = "meshctrl"
-        logger.debug(payload)
-
-        return asyncio.run(_do(payload))
-
-    def get_unique_mesh_users(
-        self, trmm_agents_list: list[dict[str, Any]]
-    ) -> list[str]:
-        userids = [i["links"] for i in trmm_agents_list]
-        all_ids = [item["_id"] for sublist in userids for item in sublist]
-        return list(set(all_ids))
-
-    def get_trmm_mesh_users(self):
-        payload = {"action": "users"}
-        ret = {
-            i["_id"]: i
-            for i in self.mesh_action(payload=payload, wait=True)["users"]
-            if re.search(r".*___\d+", i["_id"])
-        }
-        return ret
-
-    def add_users_to_node(self, *, node_id: str, user_ids: list[str]):
-
-        payload = {
-            "action": "adddeviceuser",
-            "nodeid": node_id,
-            "usernames": [s.replace("user//", "") for s in user_ids],
-            "rights": 4088024,
-            "remove": False,
-        }
-        self.mesh_action(payload=payload, wait=False)
-
-    def delete_users_from_node(self, *, node_id: str, user_ids: list[str]):
-        payload = {
-            "action": "adddeviceuser",
-            "nodeid": node_id,
-            "userids": user_ids,
-            "rights": 0,
-            "remove": True,
-        }
-        self.mesh_action(payload=payload, wait=False)
-
-    def update_mesh_displayname(self, *, user_info: dict[str, Any]) -> None:
-        payload = {
-            "action": "edituser",
-            "id": user_info["_id"],
-            "realname": user_info["full_name"],
-        }
-        self.mesh_action(payload=payload, wait=False)
-
-    def add_user_to_mesh(self, *, user_info: dict[str, Any]) -> None:
-        payload = {
-            "action": "adduser",
-            "username": user_info["username"],
-            "email": user_info["email"],
-            "pass": make_mesh_password(),
-            "resetNextLogin": False,
-            "randomPassword": False,
-            "removeEvents": False,
-            "emailVerified": True,
-        }
-        self.mesh_action(payload=payload, wait=False)
-        if user_info["full_name"]:
-            self.update_mesh_displayname(user_info=user_info)
-
-    def delete_user_from_mesh(self, *, mesh_user_id: str) -> None:
-        payload = {
-            "action": "deleteuser",
-            "userid": mesh_user_id,
-        }
-        self.mesh_action(payload=payload, wait=False)

api/tacticalrmm/core/migrations/0038_alter_coresettings_default_time_zone.py

@@ -1,632 +0,0 @@
-# Generated by Django 4.2.7 on 2023-11-09 19:56
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("core", "0037_coresettings_open_ai_model_and_more"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="coresettings",
-            name="default_time_zone",
-            field=models.CharField(
-                choices=[
-                    ("Africa/Abidjan", "Africa/Abidjan"),
-                    ("Africa/Accra", "Africa/Accra"),
-                    ("Africa/Addis_Ababa", "Africa/Addis_Ababa"),
-                    ("Africa/Algiers", "Africa/Algiers"),
-                    ("Africa/Asmara", "Africa/Asmara"),
-                    ("Africa/Asmera", "Africa/Asmera"),
-                    ("Africa/Bamako", "Africa/Bamako"),
-                    ("Africa/Bangui", "Africa/Bangui"),
-                    ("Africa/Banjul", "Africa/Banjul"),
-                    ("Africa/Bissau", "Africa/Bissau"),
-                    ("Africa/Blantyre", "Africa/Blantyre"),
-                    ("Africa/Brazzaville", "Africa/Brazzaville"),
-                    ("Africa/Bujumbura", "Africa/Bujumbura"),
-                    ("Africa/Cairo", "Africa/Cairo"),
-                    ("Africa/Casablanca", "Africa/Casablanca"),
-                    ("Africa/Ceuta", "Africa/Ceuta"),
-                    ("Africa/Conakry", "Africa/Conakry"),
-                    ("Africa/Dakar", "Africa/Dakar"),
-                    ("Africa/Dar_es_Salaam", "Africa/Dar_es_Salaam"),
-                    ("Africa/Djibouti", "Africa/Djibouti"),
-                    ("Africa/Douala", "Africa/Douala"),
-                    ("Africa/El_Aaiun", "Africa/El_Aaiun"),
-                    ("Africa/Freetown", "Africa/Freetown"),
-                    ("Africa/Gaborone", "Africa/Gaborone"),
-                    ("Africa/Harare", "Africa/Harare"),
-                    ("Africa/Johannesburg", "Africa/Johannesburg"),
-                    ("Africa/Juba", "Africa/Juba"),
-                    ("Africa/Kampala", "Africa/Kampala"),
-                    ("Africa/Khartoum", "Africa/Khartoum"),
-                    ("Africa/Kigali", "Africa/Kigali"),
-                    ("Africa/Kinshasa", "Africa/Kinshasa"),
-                    ("Africa/Lagos", "Africa/Lagos"),
-                    ("Africa/Libreville", "Africa/Libreville"),
-                    ("Africa/Lome", "Africa/Lome"),
-                    ("Africa/Luanda", "Africa/Luanda"),
-                    ("Africa/Lubumbashi", "Africa/Lubumbashi"),
-                    ("Africa/Lusaka", "Africa/Lusaka"),
-                    ("Africa/Malabo", "Africa/Malabo"),
-                    ("Africa/Maputo", "Africa/Maputo"),
-                    ("Africa/Maseru", "Africa/Maseru"),
-                    ("Africa/Mbabane", "Africa/Mbabane"),
-                    ("Africa/Mogadishu", "Africa/Mogadishu"),
-                    ("Africa/Monrovia", "Africa/Monrovia"),
-                    ("Africa/Nairobi", "Africa/Nairobi"),
-                    ("Africa/Ndjamena", "Africa/Ndjamena"),
-                    ("Africa/Niamey", "Africa/Niamey"),
-                    ("Africa/Nouakchott", "Africa/Nouakchott"),
-                    ("Africa/Ouagadougou", "Africa/Ouagadougou"),
-                    ("Africa/Porto-Novo", "Africa/Porto-Novo"),
-                    ("Africa/Sao_Tome", "Africa/Sao_Tome"),
-                    ("Africa/Timbuktu", "Africa/Timbuktu"),
-                    ("Africa/Tripoli", "Africa/Tripoli"),
-                    ("Africa/Tunis", "Africa/Tunis"),
-                    ("Africa/Windhoek", "Africa/Windhoek"),
-                    ("America/Adak", "America/Adak"),
-                    ("America/Anchorage", "America/Anchorage"),
-                    ("America/Anguilla", "America/Anguilla"),
-                    ("America/Antigua", "America/Antigua"),
-                    ("America/Araguaina", "America/Araguaina"),
-                    (
-                        "America/Argentina/Buenos_Aires",
-                        "America/Argentina/Buenos_Aires",
-                    ),
-                    ("America/Argentina/Catamarca", "America/Argentina/Catamarca"),
-                    (
-                        "America/Argentina/ComodRivadavia",
-                        "America/Argentina/ComodRivadavia",
-                    ),
-                    ("America/Argentina/Cordoba", "America/Argentina/Cordoba"),
-                    ("America/Argentina/Jujuy", "America/Argentina/Jujuy"),
-                    ("America/Argentina/La_Rioja", "America/Argentina/La_Rioja"),
-                    ("America/Argentina/Mendoza", "America/Argentina/Mendoza"),
-                    (
-                        "America/Argentina/Rio_Gallegos",
-                        "America/Argentina/Rio_Gallegos",
-                    ),
-                    ("America/Argentina/Salta", "America/Argentina/Salta"),
-                    ("America/Argentina/San_Juan", "America/Argentina/San_Juan"),
-                    ("America/Argentina/San_Luis", "America/Argentina/San_Luis"),
-                    ("America/Argentina/Tucuman", "America/Argentina/Tucuman"),
-                    ("America/Argentina/Ushuaia", "America/Argentina/Ushuaia"),
-                    ("America/Aruba", "America/Aruba"),
-                    ("America/Asuncion", "America/Asuncion"),
-                    ("America/Atikokan", "America/Atikokan"),
-                    ("America/Atka", "America/Atka"),
-                    ("America/Bahia", "America/Bahia"),
-                    ("America/Bahia_Banderas", "America/Bahia_Banderas"),
-                    ("America/Barbados", "America/Barbados"),
-                    ("America/Belem", "America/Belem"),
-                    ("America/Belize", "America/Belize"),
-                    ("America/Blanc-Sablon", "America/Blanc-Sablon"),
-                    ("America/Boa_Vista", "America/Boa_Vista"),
-                    ("America/Bogota", "America/Bogota"),
-                    ("America/Boise", "America/Boise"),
-                    ("America/Buenos_Aires", "America/Buenos_Aires"),
-                    ("America/Cambridge_Bay", "America/Cambridge_Bay"),
-                    ("America/Campo_Grande", "America/Campo_Grande"),
-                    ("America/Cancun", "America/Cancun"),
-                    ("America/Caracas", "America/Caracas"),
-                    ("America/Catamarca", "America/Catamarca"),
-                    ("America/Cayenne", "America/Cayenne"),
-                    ("America/Cayman", "America/Cayman"),
-                    ("America/Chicago", "America/Chicago"),
-                    ("America/Chihuahua", "America/Chihuahua"),
-                    ("America/Ciudad_Juarez", "America/Ciudad_Juarez"),
-                    ("America/Coral_Harbour", "America/Coral_Harbour"),
-                    ("America/Cordoba", "America/Cordoba"),
-                    ("America/Costa_Rica", "America/Costa_Rica"),
-                    ("America/Creston", "America/Creston"),
-                    ("America/Cuiaba", "America/Cuiaba"),
-                    ("America/Curacao", "America/Curacao"),
-                    ("America/Danmarkshavn", "America/Danmarkshavn"),
-                    ("America/Dawson", "America/Dawson"),
-                    ("America/Dawson_Creek", "America/Dawson_Creek"),
-                    ("America/Denver", "America/Denver"),
-                    ("America/Detroit", "America/Detroit"),
-                    ("America/Dominica", "America/Dominica"),
-                    ("America/Edmonton", "America/Edmonton"),
-                    ("America/Eirunepe", "America/Eirunepe"),
-                    ("America/El_Salvador", "America/El_Salvador"),
-                    ("America/Ensenada", "America/Ensenada"),
-                    ("America/Fort_Nelson", "America/Fort_Nelson"),
-                    ("America/Fort_Wayne", "America/Fort_Wayne"),
-                    ("America/Fortaleza", "America/Fortaleza"),
-                    ("America/Glace_Bay", "America/Glace_Bay"),
-                    ("America/Godthab", "America/Godthab"),
-                    ("America/Goose_Bay", "America/Goose_Bay"),
-                    ("America/Grand_Turk", "America/Grand_Turk"),
-                    ("America/Grenada", "America/Grenada"),
-                    ("America/Guadeloupe", "America/Guadeloupe"),
-                    ("America/Guatemala", "America/Guatemala"),
-                    ("America/Guayaquil", "America/Guayaquil"),
-                    ("America/Guyana", "America/Guyana"),
-                    ("America/Halifax", "America/Halifax"),
-                    ("America/Havana", "America/Havana"),
-                    ("America/Hermosillo", "America/Hermosillo"),
-                    ("America/Indiana/Indianapolis", "America/Indiana/Indianapolis"),
-                    ("America/Indiana/Knox", "America/Indiana/Knox"),
-                    ("America/Indiana/Marengo", "America/Indiana/Marengo"),
-                    ("America/Indiana/Petersburg", "America/Indiana/Petersburg"),
-                    ("America/Indiana/Tell_City", "America/Indiana/Tell_City"),
-                    ("America/Indiana/Vevay", "America/Indiana/Vevay"),
-                    ("America/Indiana/Vincennes", "America/Indiana/Vincennes"),
-                    ("America/Indiana/Winamac", "America/Indiana/Winamac"),
-                    ("America/Indianapolis", "America/Indianapolis"),
-                    ("America/Inuvik", "America/Inuvik"),
-                    ("America/Iqaluit", "America/Iqaluit"),
-                    ("America/Jamaica", "America/Jamaica"),
-                    ("America/Jujuy", "America/Jujuy"),
-                    ("America/Juneau", "America/Juneau"),
-                    ("America/Kentucky/Louisville", "America/Kentucky/Louisville"),
-                    ("America/Kentucky/Monticello", "America/Kentucky/Monticello"),
-                    ("America/Knox_IN", "America/Knox_IN"),
-                    ("America/Kralendijk", "America/Kralendijk"),
-                    ("America/La_Paz", "America/La_Paz"),
-                    ("America/Lima", "America/Lima"),
-                    ("America/Los_Angeles", "America/Los_Angeles"),
-                    ("America/Louisville", "America/Louisville"),
-                    ("America/Lower_Princes", "America/Lower_Princes"),
-                    ("America/Maceio", "America/Maceio"),
-                    ("America/Managua", "America/Managua"),
-                    ("America/Manaus", "America/Manaus"),
-                    ("America/Marigot", "America/Marigot"),
-                    ("America/Martinique", "America/Martinique"),
-                    ("America/Matamoros", "America/Matamoros"),
-                    ("America/Mazatlan", "America/Mazatlan"),
-                    ("America/Mendoza", "America/Mendoza"),
-                    ("America/Menominee", "America/Menominee"),
-                    ("America/Merida", "America/Merida"),
-                    ("America/Metlakatla", "America/Metlakatla"),
-                    ("America/Mexico_City", "America/Mexico_City"),
-                    ("America/Miquelon", "America/Miquelon"),
-                    ("America/Moncton", "America/Moncton"),
-                    ("America/Monterrey", "America/Monterrey"),
-                    ("America/Montevideo", "America/Montevideo"),
-                    ("America/Montreal", "America/Montreal"),
-                    ("America/Montserrat", "America/Montserrat"),
-                    ("America/Nassau", "America/Nassau"),
-                    ("America/New_York", "America/New_York"),
-                    ("America/Nipigon", "America/Nipigon"),
-                    ("America/Nome", "America/Nome"),
-                    ("America/Noronha", "America/Noronha"),
-                    ("America/North_Dakota/Beulah", "America/North_Dakota/Beulah"),
-                    ("America/North_Dakota/Center", "America/North_Dakota/Center"),
-                    (
-                        "America/North_Dakota/New_Salem",
-                        "America/North_Dakota/New_Salem",
-                    ),
-                    ("America/Nuuk", "America/Nuuk"),
-                    ("America/Ojinaga", "America/Ojinaga"),
-                    ("America/Panama", "America/Panama"),
-                    ("America/Pangnirtung", "America/Pangnirtung"),
-                    ("America/Paramaribo", "America/Paramaribo"),
-                    ("America/Phoenix", "America/Phoenix"),
-                    ("America/Port-au-Prince", "America/Port-au-Prince"),
-                    ("America/Port_of_Spain", "America/Port_of_Spain"),
-                    ("America/Porto_Acre", "America/Porto_Acre"),
-                    ("America/Porto_Velho", "America/Porto_Velho"),
-                    ("America/Puerto_Rico", "America/Puerto_Rico"),
-                    ("America/Punta_Arenas", "America/Punta_Arenas"),
-                    ("America/Rainy_River", "America/Rainy_River"),
-                    ("America/Rankin_Inlet", "America/Rankin_Inlet"),
-                    ("America/Recife", "America/Recife"),
-                    ("America/Regina", "America/Regina"),
-                    ("America/Resolute", "America/Resolute"),
-                    ("America/Rio_Branco", "America/Rio_Branco"),
-                    ("America/Rosario", "America/Rosario"),
-                    ("America/Santa_Isabel", "America/Santa_Isabel"),
-                    ("America/Santarem", "America/Santarem"),
-                    ("America/Santiago", "America/Santiago"),
-                    ("America/Santo_Domingo", "America/Santo_Domingo"),
-                    ("America/Sao_Paulo", "America/Sao_Paulo"),
-                    ("America/Scoresbysund", "America/Scoresbysund"),
-                    ("America/Shiprock", "America/Shiprock"),
-                    ("America/Sitka", "America/Sitka"),
-                    ("America/St_Barthelemy", "America/St_Barthelemy"),
-                    ("America/St_Johns", "America/St_Johns"),
-                    ("America/St_Kitts", "America/St_Kitts"),
-                    ("America/St_Lucia", "America/St_Lucia"),
-                    ("America/St_Thomas", "America/St_Thomas"),
-                    ("America/St_Vincent", "America/St_Vincent"),
-                    ("America/Swift_Current", "America/Swift_Current"),
-                    ("America/Tegucigalpa", "America/Tegucigalpa"),
-                    ("America/Thule", "America/Thule"),
-                    ("America/Thunder_Bay", "America/Thunder_Bay"),
-                    ("America/Tijuana", "America/Tijuana"),
-                    ("America/Toronto", "America/Toronto"),
-                    ("America/Tortola", "America/Tortola"),
-                    ("America/Vancouver", "America/Vancouver"),
-                    ("America/Virgin", "America/Virgin"),
-                    ("America/Whitehorse", "America/Whitehorse"),
-                    ("America/Winnipeg", "America/Winnipeg"),
-                    ("America/Yakutat", "America/Yakutat"),
-                    ("America/Yellowknife", "America/Yellowknife"),
-                    ("Antarctica/Casey", "Antarctica/Casey"),
-                    ("Antarctica/Davis", "Antarctica/Davis"),
-                    ("Antarctica/DumontDUrville", "Antarctica/DumontDUrville"),
-                    ("Antarctica/Macquarie", "Antarctica/Macquarie"),
-                    ("Antarctica/Mawson", "Antarctica/Mawson"),
-                    ("Antarctica/McMurdo", "Antarctica/McMurdo"),
-                    ("Antarctica/Palmer", "Antarctica/Palmer"),
-                    ("Antarctica/Rothera", "Antarctica/Rothera"),
-                    ("Antarctica/South_Pole", "Antarctica/South_Pole"),
-                    ("Antarctica/Syowa", "Antarctica/Syowa"),
-                    ("Antarctica/Troll", "Antarctica/Troll"),
-                    ("Antarctica/Vostok", "Antarctica/Vostok"),
-                    ("Arctic/Longyearbyen", "Arctic/Longyearbyen"),
-                    ("Asia/Aden", "Asia/Aden"),
-                    ("Asia/Almaty", "Asia/Almaty"),
-                    ("Asia/Amman", "Asia/Amman"),
-                    ("Asia/Anadyr", "Asia/Anadyr"),
-                    ("Asia/Aqtau", "Asia/Aqtau"),
-                    ("Asia/Aqtobe", "Asia/Aqtobe"),
-                    ("Asia/Ashgabat", "Asia/Ashgabat"),
-                    ("Asia/Ashkhabad", "Asia/Ashkhabad"),
-                    ("Asia/Atyrau", "Asia/Atyrau"),
-                    ("Asia/Baghdad", "Asia/Baghdad"),
-                    ("Asia/Bahrain", "Asia/Bahrain"),
-                    ("Asia/Baku", "Asia/Baku"),
-                    ("Asia/Bangkok", "Asia/Bangkok"),
-                    ("Asia/Barnaul", "Asia/Barnaul"),
-                    ("Asia/Beirut", "Asia/Beirut"),
-                    ("Asia/Bishkek", "Asia/Bishkek"),
-                    ("Asia/Brunei", "Asia/Brunei"),
-                    ("Asia/Calcutta", "Asia/Calcutta"),
-                    ("Asia/Chita", "Asia/Chita"),
-                    ("Asia/Choibalsan", "Asia/Choibalsan"),
-                    ("Asia/Chongqing", "Asia/Chongqing"),
-                    ("Asia/Chungking", "Asia/Chungking"),
-                    ("Asia/Colombo", "Asia/Colombo"),
-                    ("Asia/Dacca", "Asia/Dacca"),
-                    ("Asia/Damascus", "Asia/Damascus"),
-                    ("Asia/Dhaka", "Asia/Dhaka"),
-                    ("Asia/Dili", "Asia/Dili"),
-                    ("Asia/Dubai", "Asia/Dubai"),
-                    ("Asia/Dushanbe", "Asia/Dushanbe"),
-                    ("Asia/Famagusta", "Asia/Famagusta"),
-                    ("Asia/Gaza", "Asia/Gaza"),
-                    ("Asia/Harbin", "Asia/Harbin"),
-                    ("Asia/Hebron", "Asia/Hebron"),
-                    ("Asia/Ho_Chi_Minh", "Asia/Ho_Chi_Minh"),
-                    ("Asia/Hong_Kong", "Asia/Hong_Kong"),
-                    ("Asia/Hovd", "Asia/Hovd"),
-                    ("Asia/Irkutsk", "Asia/Irkutsk"),
-                    ("Asia/Istanbul", "Asia/Istanbul"),
-                    ("Asia/Jakarta", "Asia/Jakarta"),
-                    ("Asia/Jayapura", "Asia/Jayapura"),
-                    ("Asia/Jerusalem", "Asia/Jerusalem"),
-                    ("Asia/Kabul", "Asia/Kabul"),
-                    ("Asia/Kamchatka", "Asia/Kamchatka"),
-                    ("Asia/Karachi", "Asia/Karachi"),
-                    ("Asia/Kashgar", "Asia/Kashgar"),
-                    ("Asia/Kathmandu", "Asia/Kathmandu"),
-                    ("Asia/Katmandu", "Asia/Katmandu"),
-                    ("Asia/Khandyga", "Asia/Khandyga"),
-                    ("Asia/Kolkata", "Asia/Kolkata"),
-                    ("Asia/Krasnoyarsk", "Asia/Krasnoyarsk"),
-                    ("Asia/Kuala_Lumpur", "Asia/Kuala_Lumpur"),
-                    ("Asia/Kuching", "Asia/Kuching"),
-                    ("Asia/Kuwait", "Asia/Kuwait"),
-                    ("Asia/Macao", "Asia/Macao"),
-                    ("Asia/Macau", "Asia/Macau"),
-                    ("Asia/Magadan", "Asia/Magadan"),
-                    ("Asia/Makassar", "Asia/Makassar"),
-                    ("Asia/Manila", "Asia/Manila"),
-                    ("Asia/Muscat", "Asia/Muscat"),
-                    ("Asia/Nicosia", "Asia/Nicosia"),
-                    ("Asia/Novokuznetsk", "Asia/Novokuznetsk"),
-                    ("Asia/Novosibirsk", "Asia/Novosibirsk"),
-                    ("Asia/Omsk", "Asia/Omsk"),
-                    ("Asia/Oral", "Asia/Oral"),
-                    ("Asia/Phnom_Penh", "Asia/Phnom_Penh"),
-                    ("Asia/Pontianak", "Asia/Pontianak"),
-                    ("Asia/Pyongyang", "Asia/Pyongyang"),
-                    ("Asia/Qatar", "Asia/Qatar"),
-                    ("Asia/Qostanay", "Asia/Qostanay"),
-                    ("Asia/Qyzylorda", "Asia/Qyzylorda"),
-                    ("Asia/Rangoon", "Asia/Rangoon"),
-                    ("Asia/Riyadh", "Asia/Riyadh"),
-                    ("Asia/Saigon", "Asia/Saigon"),
-                    ("Asia/Sakhalin", "Asia/Sakhalin"),
-                    ("Asia/Samarkand", "Asia/Samarkand"),
-                    ("Asia/Seoul", "Asia/Seoul"),
-                    ("Asia/Shanghai", "Asia/Shanghai"),
-                    ("Asia/Singapore", "Asia/Singapore"),
-                    ("Asia/Srednekolymsk", "Asia/Srednekolymsk"),
-                    ("Asia/Taipei", "Asia/Taipei"),
-                    ("Asia/Tashkent", "Asia/Tashkent"),
-                    ("Asia/Tbilisi", "Asia/Tbilisi"),
-                    ("Asia/Tehran", "Asia/Tehran"),
-                    ("Asia/Tel_Aviv", "Asia/Tel_Aviv"),
-                    ("Asia/Thimbu", "Asia/Thimbu"),
-                    ("Asia/Thimphu", "Asia/Thimphu"),
-                    ("Asia/Tokyo", "Asia/Tokyo"),
-                    ("Asia/Tomsk", "Asia/Tomsk"),
-                    ("Asia/Ujung_Pandang", "Asia/Ujung_Pandang"),
-                    ("Asia/Ulaanbaatar", "Asia/Ulaanbaatar"),
-                    ("Asia/Ulan_Bator", "Asia/Ulan_Bator"),
-                    ("Asia/Urumqi", "Asia/Urumqi"),
-                    ("Asia/Ust-Nera", "Asia/Ust-Nera"),
-                    ("Asia/Vientiane", "Asia/Vientiane"),
-                    ("Asia/Vladivostok", "Asia/Vladivostok"),
-                    ("Asia/Yakutsk", "Asia/Yakutsk"),
-                    ("Asia/Yangon", "Asia/Yangon"),
-                    ("Asia/Yekaterinburg", "Asia/Yekaterinburg"),
-                    ("Asia/Yerevan", "Asia/Yerevan"),
-                    ("Atlantic/Azores", "Atlantic/Azores"),
-                    ("Atlantic/Bermuda", "Atlantic/Bermuda"),
-                    ("Atlantic/Canary", "Atlantic/Canary"),
-                    ("Atlantic/Cape_Verde", "Atlantic/Cape_Verde"),
-                    ("Atlantic/Faeroe", "Atlantic/Faeroe"),
-                    ("Atlantic/Faroe", "Atlantic/Faroe"),
-                    ("Atlantic/Jan_Mayen", "Atlantic/Jan_Mayen"),
-                    ("Atlantic/Madeira", "Atlantic/Madeira"),
-                    ("Atlantic/Reykjavik", "Atlantic/Reykjavik"),
-                    ("Atlantic/South_Georgia", "Atlantic/South_Georgia"),
-                    ("Atlantic/St_Helena", "Atlantic/St_Helena"),
-                    ("Atlantic/Stanley", "Atlantic/Stanley"),
-                    ("Australia/ACT", "Australia/ACT"),
-                    ("Australia/Adelaide", "Australia/Adelaide"),
-                    ("Australia/Brisbane", "Australia/Brisbane"),
-                    ("Australia/Broken_Hill", "Australia/Broken_Hill"),
-                    ("Australia/Canberra", "Australia/Canberra"),
-                    ("Australia/Currie", "Australia/Currie"),
-                    ("Australia/Darwin", "Australia/Darwin"),
-                    ("Australia/Eucla", "Australia/Eucla"),
-                    ("Australia/Hobart", "Australia/Hobart"),
-                    ("Australia/LHI", "Australia/LHI"),
-                    ("Australia/Lindeman", "Australia/Lindeman"),
-                    ("Australia/Lord_Howe", "Australia/Lord_Howe"),
-                    ("Australia/Melbourne", "Australia/Melbourne"),
-                    ("Australia/NSW", "Australia/NSW"),
-                    ("Australia/North", "Australia/North"),
-                    ("Australia/Perth", "Australia/Perth"),
-                    ("Australia/Queensland", "Australia/Queensland"),
-                    ("Australia/South", "Australia/South"),
-                    ("Australia/Sydney", "Australia/Sydney"),
-                    ("Australia/Tasmania", "Australia/Tasmania"),
-                    ("Australia/Victoria", "Australia/Victoria"),
-                    ("Australia/West", "Australia/West"),
-                    ("Australia/Yancowinna", "Australia/Yancowinna"),
-                    ("Brazil/Acre", "Brazil/Acre"),
-                    ("Brazil/DeNoronha", "Brazil/DeNoronha"),
-                    ("Brazil/East", "Brazil/East"),
-                    ("Brazil/West", "Brazil/West"),
-                    ("CET", "CET"),
-                    ("CST6CDT", "CST6CDT"),
-                    ("Canada/Atlantic", "Canada/Atlantic"),
-                    ("Canada/Central", "Canada/Central"),
-                    ("Canada/Eastern", "Canada/Eastern"),
-                    ("Canada/Mountain", "Canada/Mountain"),
-                    ("Canada/Newfoundland", "Canada/Newfoundland"),
-                    ("Canada/Pacific", "Canada/Pacific"),
-                    ("Canada/Saskatchewan", "Canada/Saskatchewan"),
-                    ("Canada/Yukon", "Canada/Yukon"),
-                    ("Chile/Continental", "Chile/Continental"),
-                    ("Chile/EasterIsland", "Chile/EasterIsland"),
-                    ("Cuba", "Cuba"),
-                    ("EET", "EET"),
-                    ("EST", "EST"),
-                    ("EST5EDT", "EST5EDT"),
-                    ("Egypt", "Egypt"),
-                    ("Eire", "Eire"),
-                    ("Etc/GMT", "Etc/GMT"),
-                    ("Etc/GMT+0", "Etc/GMT+0"),
-                    ("Etc/GMT+1", "Etc/GMT+1"),
-                    ("Etc/GMT+10", "Etc/GMT+10"),
-                    ("Etc/GMT+11", "Etc/GMT+11"),
-                    ("Etc/GMT+12", "Etc/GMT+12"),
-                    ("Etc/GMT+2", "Etc/GMT+2"),
-                    ("Etc/GMT+3", "Etc/GMT+3"),
-                    ("Etc/GMT+4", "Etc/GMT+4"),
-                    ("Etc/GMT+5", "Etc/GMT+5"),
-                    ("Etc/GMT+6", "Etc/GMT+6"),
-                    ("Etc/GMT+7", "Etc/GMT+7"),
-                    ("Etc/GMT+8", "Etc/GMT+8"),
-                    ("Etc/GMT+9", "Etc/GMT+9"),
-                    ("Etc/GMT-0", "Etc/GMT-0"),
-                    ("Etc/GMT-1", "Etc/GMT-1"),
-                    ("Etc/GMT-10", "Etc/GMT-10"),
-                    ("Etc/GMT-11", "Etc/GMT-11"),
-                    ("Etc/GMT-12", "Etc/GMT-12"),
-                    ("Etc/GMT-13", "Etc/GMT-13"),
-                    ("Etc/GMT-14", "Etc/GMT-14"),
-                    ("Etc/GMT-2", "Etc/GMT-2"),
-                    ("Etc/GMT-3", "Etc/GMT-3"),
-                    ("Etc/GMT-4", "Etc/GMT-4"),
-                    ("Etc/GMT-5", "Etc/GMT-5"),
-                    ("Etc/GMT-6", "Etc/GMT-6"),
-                    ("Etc/GMT-7", "Etc/GMT-7"),
-                    ("Etc/GMT-8", "Etc/GMT-8"),
-                    ("Etc/GMT-9", "Etc/GMT-9"),
-                    ("Etc/GMT0", "Etc/GMT0"),
-                    ("Etc/Greenwich", "Etc/Greenwich"),
-                    ("Etc/UCT", "Etc/UCT"),
-                    ("Etc/UTC", "Etc/UTC"),
-                    ("Etc/Universal", "Etc/Universal"),
-                    ("Etc/Zulu", "Etc/Zulu"),
-                    ("Europe/Amsterdam", "Europe/Amsterdam"),
-                    ("Europe/Andorra", "Europe/Andorra"),
-                    ("Europe/Astrakhan", "Europe/Astrakhan"),
-                    ("Europe/Athens", "Europe/Athens"),
-                    ("Europe/Belfast", "Europe/Belfast"),
-                    ("Europe/Belgrade", "Europe/Belgrade"),
-                    ("Europe/Berlin", "Europe/Berlin"),
-                    ("Europe/Bratislava", "Europe/Bratislava"),
-                    ("Europe/Brussels", "Europe/Brussels"),
-                    ("Europe/Bucharest", "Europe/Bucharest"),
-                    ("Europe/Budapest", "Europe/Budapest"),
-                    ("Europe/Busingen", "Europe/Busingen"),
-                    ("Europe/Chisinau", "Europe/Chisinau"),
-                    ("Europe/Copenhagen", "Europe/Copenhagen"),
-                    ("Europe/Dublin", "Europe/Dublin"),
-                    ("Europe/Gibraltar", "Europe/Gibraltar"),
-                    ("Europe/Guernsey", "Europe/Guernsey"),
-                    ("Europe/Helsinki", "Europe/Helsinki"),
-                    ("Europe/Isle_of_Man", "Europe/Isle_of_Man"),
-                    ("Europe/Istanbul", "Europe/Istanbul"),
-                    ("Europe/Jersey", "Europe/Jersey"),
-                    ("Europe/Kaliningrad", "Europe/Kaliningrad"),
-                    ("Europe/Kiev", "Europe/Kiev"),
-                    ("Europe/Kirov", "Europe/Kirov"),
-                    ("Europe/Kyiv", "Europe/Kyiv"),
-                    ("Europe/Lisbon", "Europe/Lisbon"),
-                    ("Europe/Ljubljana", "Europe/Ljubljana"),
-                    ("Europe/London", "Europe/London"),
-                    ("Europe/Luxembourg", "Europe/Luxembourg"),
-                    ("Europe/Madrid", "Europe/Madrid"),
-                    ("Europe/Malta", "Europe/Malta"),
-                    ("Europe/Mariehamn", "Europe/Mariehamn"),
-                    ("Europe/Minsk", "Europe/Minsk"),
-                    ("Europe/Monaco", "Europe/Monaco"),
-                    ("Europe/Moscow", "Europe/Moscow"),
-                    ("Europe/Nicosia", "Europe/Nicosia"),
-                    ("Europe/Oslo", "Europe/Oslo"),
-                    ("Europe/Paris", "Europe/Paris"),
-                    ("Europe/Podgorica", "Europe/Podgorica"),
-                    ("Europe/Prague", "Europe/Prague"),
-                    ("Europe/Riga", "Europe/Riga"),
-                    ("Europe/Rome", "Europe/Rome"),
-                    ("Europe/Samara", "Europe/Samara"),
-                    ("Europe/San_Marino", "Europe/San_Marino"),
-                    ("Europe/Sarajevo", "Europe/Sarajevo"),
-                    ("Europe/Saratov", "Europe/Saratov"),
-                    ("Europe/Simferopol", "Europe/Simferopol"),
-                    ("Europe/Skopje", "Europe/Skopje"),
-                    ("Europe/Sofia", "Europe/Sofia"),
-                    ("Europe/Stockholm", "Europe/Stockholm"),
-                    ("Europe/Tallinn", "Europe/Tallinn"),
-                    ("Europe/Tirane", "Europe/Tirane"),
-                    ("Europe/Tiraspol", "Europe/Tiraspol"),
-                    ("Europe/Ulyanovsk", "Europe/Ulyanovsk"),
-                    ("Europe/Uzhgorod", "Europe/Uzhgorod"),
-                    ("Europe/Vaduz", "Europe/Vaduz"),
-                    ("Europe/Vatican", "Europe/Vatican"),
-                    ("Europe/Vienna", "Europe/Vienna"),
-                    ("Europe/Vilnius", "Europe/Vilnius"),
-                    ("Europe/Volgograd", "Europe/Volgograd"),
-                    ("Europe/Warsaw", "Europe/Warsaw"),
-                    ("Europe/Zagreb", "Europe/Zagreb"),
-                    ("Europe/Zaporozhye", "Europe/Zaporozhye"),
-                    ("Europe/Zurich", "Europe/Zurich"),
-                    ("Factory", "Factory"),
-                    ("GB", "GB"),
-                    ("GB-Eire", "GB-Eire"),
-                    ("GMT", "GMT"),
-                    ("GMT+0", "GMT+0"),
-                    ("GMT-0", "GMT-0"),
-                    ("GMT0", "GMT0"),
-                    ("Greenwich", "Greenwich"),
-                    ("HST", "HST"),
-                    ("Hongkong", "Hongkong"),
-                    ("Iceland", "Iceland"),
-                    ("Indian/Antananarivo", "Indian/Antananarivo"),
-                    ("Indian/Chagos", "Indian/Chagos"),
-                    ("Indian/Christmas", "Indian/Christmas"),
-                    ("Indian/Cocos", "Indian/Cocos"),
-                    ("Indian/Comoro", "Indian/Comoro"),
-                    ("Indian/Kerguelen", "Indian/Kerguelen"),
-                    ("Indian/Mahe", "Indian/Mahe"),
-                    ("Indian/Maldives", "Indian/Maldives"),
-                    ("Indian/Mauritius", "Indian/Mauritius"),
-                    ("Indian/Mayotte", "Indian/Mayotte"),
-                    ("Indian/Reunion", "Indian/Reunion"),
-                    ("Iran", "Iran"),
-                    ("Israel", "Israel"),
-                    ("Jamaica", "Jamaica"),
-                    ("Japan", "Japan"),
-                    ("Kwajalein", "Kwajalein"),
-                    ("Libya", "Libya"),
-                    ("MET", "MET"),
-                    ("MST", "MST"),
-                    ("MST7MDT", "MST7MDT"),
-                    ("Mexico/BajaNorte", "Mexico/BajaNorte"),
-                    ("Mexico/BajaSur", "Mexico/BajaSur"),
-                    ("Mexico/General", "Mexico/General"),
-                    ("NZ", "NZ"),
-                    ("NZ-CHAT", "NZ-CHAT"),
-                    ("Navajo", "Navajo"),
-                    ("PRC", "PRC"),
-                    ("PST8PDT", "PST8PDT"),
-                    ("Pacific/Apia", "Pacific/Apia"),
-                    ("Pacific/Auckland", "Pacific/Auckland"),
-                    ("Pacific/Bougainville", "Pacific/Bougainville"),
-                    ("Pacific/Chatham", "Pacific/Chatham"),
-                    ("Pacific/Chuuk", "Pacific/Chuuk"),
-                    ("Pacific/Easter", "Pacific/Easter"),
-                    ("Pacific/Efate", "Pacific/Efate"),
-                    ("Pacific/Enderbury", "Pacific/Enderbury"),
-                    ("Pacific/Fakaofo", "Pacific/Fakaofo"),
-                    ("Pacific/Fiji", "Pacific/Fiji"),
-                    ("Pacific/Funafuti", "Pacific/Funafuti"),
-                    ("Pacific/Galapagos", "Pacific/Galapagos"),
-                    ("Pacific/Gambier", "Pacific/Gambier"),
-                    ("Pacific/Guadalcanal", "Pacific/Guadalcanal"),
-                    ("Pacific/Guam", "Pacific/Guam"),
-                    ("Pacific/Honolulu", "Pacific/Honolulu"),
-                    ("Pacific/Johnston", "Pacific/Johnston"),
-                    ("Pacific/Kanton", "Pacific/Kanton"),
-                    ("Pacific/Kiritimati", "Pacific/Kiritimati"),
-                    ("Pacific/Kosrae", "Pacific/Kosrae"),
-                    ("Pacific/Kwajalein", "Pacific/Kwajalein"),
-                    ("Pacific/Majuro", "Pacific/Majuro"),
-                    ("Pacific/Marquesas", "Pacific/Marquesas"),
-                    ("Pacific/Midway", "Pacific/Midway"),
-                    ("Pacific/Nauru", "Pacific/Nauru"),
-                    ("Pacific/Niue", "Pacific/Niue"),
-                    ("Pacific/Norfolk", "Pacific/Norfolk"),
-                    ("Pacific/Noumea", "Pacific/Noumea"),
-                    ("Pacific/Pago_Pago", "Pacific/Pago_Pago"),
-                    ("Pacific/Palau", "Pacific/Palau"),
-                    ("Pacific/Pitcairn", "Pacific/Pitcairn"),
-                    ("Pacific/Pohnpei", "Pacific/Pohnpei"),
-                    ("Pacific/Ponape", "Pacific/Ponape"),
-                    ("Pacific/Port_Moresby", "Pacific/Port_Moresby"),
-                    ("Pacific/Rarotonga", "Pacific/Rarotonga"),
-                    ("Pacific/Saipan", "Pacific/Saipan"),
-                    ("Pacific/Samoa", "Pacific/Samoa"),
-                    ("Pacific/Tahiti", "Pacific/Tahiti"),
-                    ("Pacific/Tarawa", "Pacific/Tarawa"),
-                    ("Pacific/Tongatapu", "Pacific/Tongatapu"),
-                    ("Pacific/Truk", "Pacific/Truk"),
-                    ("Pacific/Wake", "Pacific/Wake"),
-                    ("Pacific/Wallis", "Pacific/Wallis"),
-                    ("Pacific/Yap", "Pacific/Yap"),
-                    ("Poland", "Poland"),
-                    ("Portugal", "Portugal"),
-                    ("ROC", "ROC"),
-                    ("ROK", "ROK"),
-                    ("Singapore", "Singapore"),
-                    ("Turkey", "Turkey"),
-                    ("UCT", "UCT"),
-                    ("US/Alaska", "US/Alaska"),
-                    ("US/Aleutian", "US/Aleutian"),
-                    ("US/Arizona", "US/Arizona"),
-                    ("US/Central", "US/Central"),
-                    ("US/East-Indiana", "US/East-Indiana"),
-                    ("US/Eastern", "US/Eastern"),
-                    ("US/Hawaii", "US/Hawaii"),
-                    ("US/Indiana-Starke", "US/Indiana-Starke"),
-                    ("US/Michigan", "US/Michigan"),
-                    ("US/Mountain", "US/Mountain"),
-                    ("US/Pacific", "US/Pacific"),
-                    ("US/Samoa", "US/Samoa"),
-                    ("UTC", "UTC"),
-                    ("Universal", "Universal"),
-                    ("W-SU", "W-SU"),
-                    ("WET", "WET"),
-                    ("Zulu", "Zulu"),
-                    ("localtime", "localtime"),
-                ],
-                default="America/Los_Angeles",
-                max_length=255,
-            ),
-        ),
-    ]

api/tacticalrmm/core/migrations/0039_coresettings_smtp_from_name.py

@@ -1,17 +0,0 @@
-# Generated by Django 4.2.9 on 2024-01-26 00:31
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("core", "0038_alter_coresettings_default_time_zone"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="coresettings",
-            name="smtp_from_name",
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-    ]

api/tacticalrmm/core/migrations/0040_customfield_hide_in_summary.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.9 on 2024-01-28 02:50
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("core", "0039_coresettings_smtp_from_name"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="customfield",
-            name="hide_in_summary",
-            field=models.BooleanField(default=False),
-        ),
-    ]

api/tacticalrmm/core/migrations/0041_auto_20240128_0301.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.9 on 2024-01-28 03:01
-
-from django.db import migrations
-
-
-def update_hide_in_summary(apps, schema_editor):
-    CustomField = apps.get_model("core", "CustomField")
-    for field in CustomField.objects.filter(hide_in_ui=True):
-        field.hide_in_summary = True
-        field.save(update_fields=["hide_in_summary"])
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("core", "0040_customfield_hide_in_summary"),
-    ]
-
-    operations = [migrations.RunPython(update_hide_in_summary)]

api/tacticalrmm/core/migrations/0042_coresettings_mesh_company_name.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.10 on 2024-02-20 02:51
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("core", "0041_auto_20240128_0301"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="coresettings",
-            name="mesh_company_name",
-            field=models.CharField(blank=True, max_length=255, null=True),
-        ),
-    ]

api/tacticalrmm/core/migrations/0043_coresettings_sync_mesh_with_trmm.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.10 on 2024-02-23 19:01
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("core", "0042_coresettings_mesh_company_name"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="coresettings",
-            name="sync_mesh_with_trmm",
-            field=models.BooleanField(default=True),
-        ),
-    ]

api/tacticalrmm/core/migrations/0044_remove_coresettings_mesh_disable_auto_login.py

@@ -1,17 +0,0 @@
-# Generated by Django 4.2.11 on 2024-03-12 05:23
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("core", "0043_coresettings_sync_mesh_with_trmm"),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name="coresettings",
-            name="mesh_disable_auto_login",
-        ),
-    ]

api/tacticalrmm/core/migrations/0045_coresettings_enable_server_scripts_and_more.py

@@ -1,65 +0,0 @@
-# Generated by Django 4.2.13 on 2024-06-28 20:21
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("core", "0044_remove_coresettings_mesh_disable_auto_login"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="coresettings",
-            name="enable_server_scripts",
-            field=models.BooleanField(default=True),
-        ),
-        migrations.AddField(
-            model_name="coresettings",
-            name="enable_server_webterminal",
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name="urlaction",
-            name="action_type",
-            field=models.CharField(
-                choices=[("web", "Web"), ("rest", "Rest")], default="web", max_length=10
-            ),
-        ),
-        migrations.AddField(
-            model_name="urlaction",
-            name="rest_body",
-            field=models.TextField(blank=True, default="", null=True),
-        ),
-        migrations.AddField(
-            model_name="urlaction",
-            name="rest_headers",
-            field=models.TextField(blank=True, default="", null=True),
-        ),
-        migrations.AddField(
-            model_name="urlaction",
-            name="rest_method",
-            field=models.CharField(
-                choices=[
-                    ("get", "Get"),
-                    ("post", "Post"),
-                    ("put", "Put"),
-                    ("delete", "Delete"),
-                    ("patch", "Patch"),
-                ],
-                default="post",
-                max_length=10,
-            ),
-        ),
-        migrations.AlterField(
-            model_name="urlaction",
-            name="desc",
-            field=models.TextField(blank=True, null=True),
-        ),
-        migrations.AlterField(
-            model_name="urlaction",
-            name="name",
-            field=models.CharField(max_length=255),
-        ),
-    ]

api/tacticalrmm/core/migrations/0046_coresettings_notify_on_info_alerts_and_more.py

@@ -1,23 +0,0 @@
-# Generated by Django 4.2.13 on 2024-07-05 19:17
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("core", "0045_coresettings_enable_server_scripts_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="coresettings",
-            name="notify_on_info_alerts",
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name="coresettings",
-            name="notify_on_warning_alerts",
-            field=models.BooleanField(default=False),
-        ),
-    ]