Compare commits
	
		
			56 Commits
		
	
	
		
			v0.100.6-d
			...
			v0.101.13
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					b7a91563b0 | ||
| 
						 | 
					75296ed8ee | ||
| 
						 | 
					09bee45b2f | ||
| 
						 | 
					3573c48872 | ||
| 
						 | 
					784841c221 | ||
| 
						 | 
					ed788a1861 | ||
| 
						 | 
					ab19afca16 | ||
| 
						 | 
					bd6b08505a | ||
| 
						 | 
					acd64f25f2 | ||
| 
						 | 
					087be2c232 | ||
| 
						 | 
					91a3272843 | ||
| 
						 | 
					6e64f0a11b | ||
| 
						 | 
					8f34f76a1d | ||
| 
						 | 
					f24c6a7a80 | ||
| 
						 | 
					d87861c212 | ||
| 
						 | 
					5f56e7017b | ||
| 
						 | 
					9c033c1c90 | ||
| 
						 | 
					ba14ed348e | ||
| 
						 | 
					99490bf859 | ||
| 
						 | 
					7e25db6622 | ||
| 
						 | 
					78636c436f | ||
| 
						 | 
					72cdeeaa6a | ||
| 
						 | 
					d37122386f | ||
| 
						 | 
					17d960fca9 | ||
| 
						 | 
					d2e0b8ad9b | ||
| 
						 | 
					1eca4d605b | ||
| 
						 | 
					776c27ec26 | ||
| 
						 | 
					41c61ce152 | ||
| 
						 | 
					8e9de8b6b6 | ||
| 
						 | 
					4cf5f7a3cb | ||
| 
						 | 
					9729492d1c | ||
| 
						 | 
					52ee98f6f8 | ||
| 
						 | 
					d6da8b4a96 | ||
| 
						 | 
					9264cf4044 | ||
| 
						 | 
					3a45c2a309 | ||
| 
						 | 
					59de35c698 | ||
| 
						 | 
					d270b877c9 | ||
| 
						 | 
					5b8ac2c809 | ||
| 
						 | 
					83d0ff1c0a | ||
| 
						 | 
					8a6ec6ceab | ||
| 
						 | 
					93dbc74e33 | ||
| 
						 | 
					5f2add48a9 | ||
| 
						 | 
					b7369875af | ||
| 
						 | 
					2eb6580fed | ||
| 
						 | 
					fd8b2a1d98 | ||
| 
						 | 
					9f85fbb330 | ||
| 
						 | 
					ee9715a4cf | ||
| 
						 | 
					76f330fb9c | ||
| 
						 | 
					f518043d8d | ||
| 
						 | 
					e67c1ff331 | ||
| 
						 | 
					137a5648ce | ||
| 
						 | 
					cc2335558d | ||
| 
						 | 
					a944bc50d1 | ||
| 
						 | 
					a8a171ba2c | ||
| 
						 | 
					24a63f477e | ||
| 
						 | 
					ddeb6293a1 | 
							
								
								
									
										7
									
								
								.devcontainer/.env.example
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								.devcontainer/.env.example
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,7 @@
 | 
			
		||||
COMPOSE_PROJECT_NAME=trmm
 | 
			
		||||
IMAGE_REPO=tacticalrmm/
 | 
			
		||||
VERSION=latest
 | 
			
		||||
 | 
			
		||||
# DEV SETTINGS
 | 
			
		||||
APP_PORT=443
 | 
			
		||||
DOCKER_NETWORK=172.21.0.0/24
 | 
			
		||||
							
								
								
									
										26
									
								
								.devcontainer/docker-compose.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								.devcontainer/docker-compose.yml
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,26 @@
 | 
			
		||||
version: '3.4'
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  app-dev:
 | 
			
		||||
    container_name: trmm-app-dev
 | 
			
		||||
    image: node:16-alpine
 | 
			
		||||
    restart: always
 | 
			
		||||
    command: /bin/sh -c "npm install --cache ~/.npm && npm run serve"
 | 
			
		||||
    user: 1000:1000
 | 
			
		||||
    working_dir: /workspace/web
 | 
			
		||||
    volumes:
 | 
			
		||||
      - ..:/workspace:cached
 | 
			
		||||
    ports:
 | 
			
		||||
      - "8080:443"
 | 
			
		||||
    networks:
 | 
			
		||||
      dev:
 | 
			
		||||
        aliases:
 | 
			
		||||
          - tactical-frontend
 | 
			
		||||
 | 
			
		||||
networks:
 | 
			
		||||
  dev:
 | 
			
		||||
    driver: bridge
 | 
			
		||||
    ipam:
 | 
			
		||||
      driver: default
 | 
			
		||||
      config:
 | 
			
		||||
        - subnet: ${DOCKER_NETWORK}
 | 
			
		||||
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -33,3 +33,4 @@ yarn-error.log*
 | 
			
		||||
*.sln
 | 
			
		||||
 | 
			
		||||
.env
 | 
			
		||||
/public/env-config.js
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								.vscode/extensions.json
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.vscode/extensions.json
									
									
									
									
										vendored
									
									
								
							@@ -5,7 +5,7 @@
 | 
			
		||||
    "esbenp.prettier-vscode",
 | 
			
		||||
    "editorconfig.editorconfig",
 | 
			
		||||
    "vue.volar",
 | 
			
		||||
    "wayou.vscode-todo-highlight",
 | 
			
		||||
    "wayou.vscode-todo-highlight"
 | 
			
		||||
  ],
 | 
			
		||||
  "unwantedRecommendations": [
 | 
			
		||||
    "octref.vetur",
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								.vscode/settings.json
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.vscode/settings.json
									
									
									
									
										vendored
									
									
								
							@@ -4,7 +4,7 @@
 | 
			
		||||
  "editor.formatOnSave": true,
 | 
			
		||||
  "[vue][javascript][typescript][javascriptreact]": {
 | 
			
		||||
    "editor.defaultFormatter": "esbenp.prettier-vscode",
 | 
			
		||||
    "editor.codeActionsOnSave": ["source.fixAll.eslint"],
 | 
			
		||||
    "editor.codeActionsOnSave": ["source.fixAll.eslint"]
 | 
			
		||||
  },
 | 
			
		||||
  "eslint.validate": ["javascript", "javascriptreact", "typescript", "vue"],
 | 
			
		||||
  "typescript.tsdk": "node_modules/typescript/lib",
 | 
			
		||||
@@ -15,7 +15,7 @@
 | 
			
		||||
      "**/node_modules/": true,
 | 
			
		||||
      "/node_modules/**": true,
 | 
			
		||||
      "**/env/": true,
 | 
			
		||||
      "/env/**": true,
 | 
			
		||||
      "/env/**": true
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										36
									
								
								index.html
									
									
									
									
									
								
							
							
						
						
									
										36
									
								
								index.html
									
									
									
									
									
								
							@@ -1,24 +1,22 @@
 | 
			
		||||
<!DOCTYPE html>
 | 
			
		||||
<html>
 | 
			
		||||
  <head>
 | 
			
		||||
    <title><%= productName %></title>
 | 
			
		||||
 | 
			
		||||
<head>
 | 
			
		||||
  <title>
 | 
			
		||||
    <%= productName %>
 | 
			
		||||
  </title>
 | 
			
		||||
 | 
			
		||||
  <meta charset="utf-8" />
 | 
			
		||||
  <meta name="robots" content="noindex" />
 | 
			
		||||
  <meta name="description" content="<%= productDescription %>" />
 | 
			
		||||
  <meta name="format-detection" content="telephone=no" />
 | 
			
		||||
  <meta name="msapplication-tap-highlight" content="no" />
 | 
			
		||||
  <meta name="viewport"
 | 
			
		||||
    content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>" />
 | 
			
		||||
  <link rel="icon" type="image/ico" href="favicon.ico" />
 | 
			
		||||
  <script src="/env-config.js"></script>
 | 
			
		||||
</head>
 | 
			
		||||
 | 
			
		||||
<body>
 | 
			
		||||
  <!-- quasar:entry-point -->
 | 
			
		||||
</body>
 | 
			
		||||
    <meta charset="utf-8" />
 | 
			
		||||
    <meta name="robots" content="noindex" />
 | 
			
		||||
    <meta name="description" content="<%= productDescription %>" />
 | 
			
		||||
    <meta name="format-detection" content="telephone=no" />
 | 
			
		||||
    <meta name="msapplication-tap-highlight" content="no" />
 | 
			
		||||
    <meta
 | 
			
		||||
      name="viewport"
 | 
			
		||||
      content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>"
 | 
			
		||||
    />
 | 
			
		||||
    <link rel="icon" type="image/ico" href="favicon.ico" />
 | 
			
		||||
    <script src="/env-config.js"></script>
 | 
			
		||||
  </head>
 | 
			
		||||
 | 
			
		||||
  <body>
 | 
			
		||||
    <!-- quasar:entry-point -->
 | 
			
		||||
  </body>
 | 
			
		||||
</html>
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2637
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										2637
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										42
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										42
									
								
								package.json
									
									
									
									
									
								
							@@ -1,6 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
  "name": "web",
 | 
			
		||||
  "version": "0.100.6-dev",
 | 
			
		||||
  "version": "0.101.13",
 | 
			
		||||
  "private": true,
 | 
			
		||||
  "productName": "Tactical RMM",
 | 
			
		||||
  "scripts": {
 | 
			
		||||
@@ -10,31 +10,31 @@
 | 
			
		||||
    "format": "prettier --write \"**/*.{js,ts,vue,,html,md,json}\" --ignore-path .gitignore"
 | 
			
		||||
  },
 | 
			
		||||
  "dependencies": {
 | 
			
		||||
    "@quasar/extras": "1.15.0",
 | 
			
		||||
    "apexcharts": "3.35.4",
 | 
			
		||||
    "@quasar/extras": "1.15.9",
 | 
			
		||||
    "apexcharts": "3.36.3",
 | 
			
		||||
    "axios": "0.27.2",
 | 
			
		||||
    "dotenv": "16.0.1",
 | 
			
		||||
    "dotenv": "16.0.3",
 | 
			
		||||
    "qrcode.vue": "3.3.3",
 | 
			
		||||
    "quasar": "2.7.5",
 | 
			
		||||
    "vue": "3.2.37",
 | 
			
		||||
    "quasar": "2.11.5",
 | 
			
		||||
    "vue": "3.2.45",
 | 
			
		||||
    "vue3-ace-editor": "2.2.2",
 | 
			
		||||
    "vue3-apexcharts": "1.4.1",
 | 
			
		||||
    "vuedraggable": "4.1.0",
 | 
			
		||||
    "vue-router": "4.1.2",
 | 
			
		||||
    "vuex": "4.0.2"
 | 
			
		||||
    "vue-router": "4.1.6",
 | 
			
		||||
    "vuex": "4.1.0"
 | 
			
		||||
  },
 | 
			
		||||
  "devDependencies": {
 | 
			
		||||
    "@quasar/cli": "^1.3.2",
 | 
			
		||||
    "@intlify/vite-plugin-vue-i18n": "^5.0.1",
 | 
			
		||||
    "@quasar/app-vite": "^1.0.5",
 | 
			
		||||
    "@types/node": "^18.6.1",
 | 
			
		||||
    "@typescript-eslint/eslint-plugin": "^5.30.5",
 | 
			
		||||
    "@typescript-eslint/parser": "^5.30.5",
 | 
			
		||||
    "autoprefixer": "^10.4.7",
 | 
			
		||||
    "eslint": "^8.20.0",
 | 
			
		||||
    "eslint-config-prettier": "^8.5.0",
 | 
			
		||||
    "eslint-plugin-vue": "^8.5.0",
 | 
			
		||||
    "prettier": "^2.7.1",
 | 
			
		||||
    "typescript": "^4.7.4"
 | 
			
		||||
    "@quasar/cli": "^1.4.0",
 | 
			
		||||
    "@intlify/vite-plugin-vue-i18n": "^6.0.3",
 | 
			
		||||
    "@quasar/app-vite": "^1.2.0",
 | 
			
		||||
    "@types/node": "^18.11.18",
 | 
			
		||||
    "@typescript-eslint/eslint-plugin": "^5.48.2",
 | 
			
		||||
    "@typescript-eslint/parser": "^5.48.2",
 | 
			
		||||
    "autoprefixer": "10.4.13",
 | 
			
		||||
    "eslint": "8.32.0",
 | 
			
		||||
    "eslint-config-prettier": "8.6.0",
 | 
			
		||||
    "eslint-plugin-vue": "8.7.1",
 | 
			
		||||
    "prettier": "2.8.3",
 | 
			
		||||
    "typescript": "4.9.4"
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
}
 | 
			
		||||
@@ -4,18 +4,18 @@
 | 
			
		||||
module.exports = {
 | 
			
		||||
  plugins: [
 | 
			
		||||
    // https://github.com/postcss/autoprefixer
 | 
			
		||||
    require('autoprefixer')({
 | 
			
		||||
    require("autoprefixer")({
 | 
			
		||||
      overrideBrowserslist: [
 | 
			
		||||
        'last 4 Chrome versions',
 | 
			
		||||
        'last 4 Firefox versions',
 | 
			
		||||
        'last 4 Edge versions',
 | 
			
		||||
        'last 4 Safari versions',
 | 
			
		||||
        'last 4 Android versions',
 | 
			
		||||
        'last 4 ChromeAndroid versions',
 | 
			
		||||
        'last 4 FirefoxAndroid versions',
 | 
			
		||||
        'last 4 iOS versions'
 | 
			
		||||
      ]
 | 
			
		||||
    })
 | 
			
		||||
        "last 4 Chrome versions",
 | 
			
		||||
        "last 4 Firefox versions",
 | 
			
		||||
        "last 4 Edge versions",
 | 
			
		||||
        "last 4 Safari versions",
 | 
			
		||||
        "last 4 Android versions",
 | 
			
		||||
        "last 4 ChromeAndroid versions",
 | 
			
		||||
        "last 4 FirefoxAndroid versions",
 | 
			
		||||
        "last 4 iOS versions",
 | 
			
		||||
      ],
 | 
			
		||||
    }),
 | 
			
		||||
 | 
			
		||||
    // https://github.com/elchininet/postcss-rtlcss
 | 
			
		||||
    // If you want to support RTL css, then
 | 
			
		||||
@@ -23,5 +23,5 @@ module.exports = {
 | 
			
		||||
    // 2. optionally set quasar.config.js > framework > lang to an RTL language
 | 
			
		||||
    // 3. uncomment the following line:
 | 
			
		||||
    // require('postcss-rtlcss')
 | 
			
		||||
  ]
 | 
			
		||||
}
 | 
			
		||||
  ],
 | 
			
		||||
};
 | 
			
		||||
 
 | 
			
		||||
@@ -12,6 +12,25 @@ export async function fetchUsers(params = {}) {
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export async function resetPass(pass) {
 | 
			
		||||
  const payload = { password: pass };
 | 
			
		||||
  try {
 | 
			
		||||
    const { data } = await axios.put(`${baseUrl}/resetpw/`, payload);
 | 
			
		||||
    return data;
 | 
			
		||||
  } catch (e) {
 | 
			
		||||
    console.error(e);
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export async function resetTwoFactor() {
 | 
			
		||||
  try {
 | 
			
		||||
    const { data } = await axios.put(`${baseUrl}/reset2fa/`);
 | 
			
		||||
    return data;
 | 
			
		||||
  } catch (e) {
 | 
			
		||||
    console.error(e);
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// role api function
 | 
			
		||||
export async function fetchRoles(params = {}) {
 | 
			
		||||
  try {
 | 
			
		||||
 
 | 
			
		||||
@@ -196,6 +196,14 @@
 | 
			
		||||
            >
 | 
			
		||||
              <q-tooltip>Linux</q-tooltip>
 | 
			
		||||
            </q-icon>
 | 
			
		||||
            <q-icon
 | 
			
		||||
              v-else-if="props.row.plat === 'darwin'"
 | 
			
		||||
              name="mdi-apple"
 | 
			
		||||
              size="sm"
 | 
			
		||||
              color="primary"
 | 
			
		||||
            >
 | 
			
		||||
              <q-tooltip>macOS</q-tooltip>
 | 
			
		||||
            </q-icon>
 | 
			
		||||
          </q-td>
 | 
			
		||||
 | 
			
		||||
          <q-td key="checks-status" :props="props">
 | 
			
		||||
@@ -356,6 +364,27 @@ export default {
 | 
			
		||||
  },
 | 
			
		||||
  methods: {
 | 
			
		||||
    filterTable(rows, terms, cols, cellValue) {
 | 
			
		||||
      const hiddenFields = [
 | 
			
		||||
        "version",
 | 
			
		||||
        "operating_system",
 | 
			
		||||
        "public_ip",
 | 
			
		||||
        "cpu_model",
 | 
			
		||||
        "graphics",
 | 
			
		||||
        "local_ips",
 | 
			
		||||
        "make_model",
 | 
			
		||||
        "physical_disks",
 | 
			
		||||
      ];
 | 
			
		||||
 | 
			
		||||
      // quasar filter only does visible columns so this is a hack to add hidden columns we want to filter
 | 
			
		||||
      for (const elem of hiddenFields) {
 | 
			
		||||
        if (!cols.find((o) => o.name === elem)) {
 | 
			
		||||
          cols.push({
 | 
			
		||||
            name: elem,
 | 
			
		||||
            field: elem,
 | 
			
		||||
          });
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      const lowerTerms = terms ? terms.toLowerCase() : "";
 | 
			
		||||
      let advancedFilter = false;
 | 
			
		||||
      let availability = null;
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										75
									
								
								src/components/accounts/ResetPass.vue
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										75
									
								
								src/components/accounts/ResetPass.vue
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,75 @@
 | 
			
		||||
<template>
 | 
			
		||||
  <q-dialog ref="dialogRef" @hide="onDialogHide">
 | 
			
		||||
    <q-card class="q-dialog-plugin" style="width: 60vw">
 | 
			
		||||
      <q-card-section class="row">
 | 
			
		||||
        <div class="col-3">New password:</div>
 | 
			
		||||
        <div class="col-9">
 | 
			
		||||
          <q-input
 | 
			
		||||
            outlined
 | 
			
		||||
            dense
 | 
			
		||||
            v-model="pass"
 | 
			
		||||
            :type="isPwd ? 'password' : 'text'"
 | 
			
		||||
            :rules="[(val) => !!val || '*Required']"
 | 
			
		||||
          >
 | 
			
		||||
            <template v-slot:append>
 | 
			
		||||
              <q-icon
 | 
			
		||||
                :name="isPwd ? 'visibility_off' : 'visibility'"
 | 
			
		||||
                class="cursor-pointer"
 | 
			
		||||
                @click="isPwd = !isPwd"
 | 
			
		||||
              />
 | 
			
		||||
            </template>
 | 
			
		||||
          </q-input>
 | 
			
		||||
        </div>
 | 
			
		||||
        <div class="col-3">Confirm password:</div>
 | 
			
		||||
        <div class="col-9">
 | 
			
		||||
          <q-input
 | 
			
		||||
            outlined
 | 
			
		||||
            dense
 | 
			
		||||
            v-model="pass2"
 | 
			
		||||
            :type="isPwd ? 'password' : 'text'"
 | 
			
		||||
            :rules="[(val) => val === pass || 'Passwords do not match']"
 | 
			
		||||
          >
 | 
			
		||||
            <template v-slot:append>
 | 
			
		||||
              <q-icon
 | 
			
		||||
                :name="isPwd ? 'visibility_off' : 'visibility'"
 | 
			
		||||
                class="cursor-pointer"
 | 
			
		||||
                @click="isPwd = !isPwd"
 | 
			
		||||
              />
 | 
			
		||||
            </template>
 | 
			
		||||
          </q-input>
 | 
			
		||||
        </div>
 | 
			
		||||
      </q-card-section>
 | 
			
		||||
      <q-card-actions align="right">
 | 
			
		||||
        <q-btn
 | 
			
		||||
          color="primary"
 | 
			
		||||
          label="Reset"
 | 
			
		||||
          @click="onOKClick"
 | 
			
		||||
          :disable="!pass || pass !== pass2"
 | 
			
		||||
        />
 | 
			
		||||
        <q-btn color="negative" label="Cancel" @click="onDialogCancel" />
 | 
			
		||||
      </q-card-actions>
 | 
			
		||||
    </q-card>
 | 
			
		||||
  </q-dialog>
 | 
			
		||||
</template>
 | 
			
		||||
 | 
			
		||||
<script setup>
 | 
			
		||||
import { ref } from "vue";
 | 
			
		||||
import { useDialogPluginComponent } from "quasar";
 | 
			
		||||
import { resetPass } from "@/api/accounts";
 | 
			
		||||
import { notifySuccess } from "@/utils/notify";
 | 
			
		||||
 | 
			
		||||
const pass = ref("");
 | 
			
		||||
const pass2 = ref("");
 | 
			
		||||
const isPwd = ref(true);
 | 
			
		||||
 | 
			
		||||
defineEmits([...useDialogPluginComponent.emits]);
 | 
			
		||||
 | 
			
		||||
const { dialogRef, onDialogHide, onDialogOK, onDialogCancel } =
 | 
			
		||||
  useDialogPluginComponent();
 | 
			
		||||
 | 
			
		||||
async function onOKClick() {
 | 
			
		||||
  const ret = await resetPass(pass.value);
 | 
			
		||||
  notifySuccess(ret);
 | 
			
		||||
  onDialogOK();
 | 
			
		||||
}
 | 
			
		||||
</script>
 | 
			
		||||
@@ -310,9 +310,10 @@ export default {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    function showUpdateDetails(update) {
 | 
			
		||||
      const color = $q.dark.isActive ? "white" : "";
 | 
			
		||||
      let support_urls = "";
 | 
			
		||||
      update.more_info_urls.forEach((u) => {
 | 
			
		||||
        support_urls += `<a href='${u}' target='_blank'>${u}</a><br/>`;
 | 
			
		||||
        support_urls += `<a style='color: ${color}' href='${u}' target='_blank'>${u}</a><br/>`;
 | 
			
		||||
      });
 | 
			
		||||
      let cats = update.categories.join(", ");
 | 
			
		||||
      $q.dialog({
 | 
			
		||||
 
 | 
			
		||||
@@ -7,6 +7,17 @@
 | 
			
		||||
          <q-badge color="primary" class="q-ml-sm text-caption">{{
 | 
			
		||||
            v
 | 
			
		||||
          }}</q-badge>
 | 
			
		||||
          <q-btn
 | 
			
		||||
            v-if="!!v"
 | 
			
		||||
            size="sm"
 | 
			
		||||
            class="q-ml-xs"
 | 
			
		||||
            flat
 | 
			
		||||
            round
 | 
			
		||||
            icon="content_copy"
 | 
			
		||||
            @click="copyValueToClip(v)"
 | 
			
		||||
          >
 | 
			
		||||
            <q-tooltip>Copy to Clipboard</q-tooltip>
 | 
			
		||||
          </q-btn>
 | 
			
		||||
        </div>
 | 
			
		||||
      </div>
 | 
			
		||||
      <q-separator v-if="info.length > 1" />
 | 
			
		||||
@@ -15,6 +26,8 @@
 | 
			
		||||
</template>
 | 
			
		||||
 | 
			
		||||
<script>
 | 
			
		||||
import { copyToClipboard } from "quasar";
 | 
			
		||||
import { notifySuccess } from "@/utils/notify";
 | 
			
		||||
// composition imports
 | 
			
		||||
import { computed } from "vue";
 | 
			
		||||
import { useStore } from "vuex";
 | 
			
		||||
@@ -28,9 +41,16 @@ export default {
 | 
			
		||||
    const store = useStore();
 | 
			
		||||
    const tabHeight = computed(() => store.state.tabHeight);
 | 
			
		||||
 | 
			
		||||
    function copyValueToClip(val) {
 | 
			
		||||
      copyToClipboard(val).then(() => {
 | 
			
		||||
        notifySuccess("Copied to clipboard");
 | 
			
		||||
      });
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    return {
 | 
			
		||||
      tabHeight,
 | 
			
		||||
      uid,
 | 
			
		||||
      copyValueToClip,
 | 
			
		||||
    };
 | 
			
		||||
  },
 | 
			
		||||
};
 | 
			
		||||
 
 | 
			
		||||
@@ -39,6 +39,19 @@
 | 
			
		||||
            new-value-mode="add"
 | 
			
		||||
          />
 | 
			
		||||
        </q-card-section>
 | 
			
		||||
        <q-card-section>
 | 
			
		||||
          <q-select
 | 
			
		||||
            dense
 | 
			
		||||
            :label="envVarsLabel"
 | 
			
		||||
            filled
 | 
			
		||||
            v-model="state.env_vars"
 | 
			
		||||
            use-input
 | 
			
		||||
            use-chips
 | 
			
		||||
            multiple
 | 
			
		||||
            hide-dropdown-icon
 | 
			
		||||
            new-value-mode="add"
 | 
			
		||||
          />
 | 
			
		||||
        </q-card-section>
 | 
			
		||||
        <q-card-section>
 | 
			
		||||
          <tactical-dropdown
 | 
			
		||||
            label="Informational return codes (press Enter after typing each code)"
 | 
			
		||||
@@ -115,6 +128,7 @@ import { useDialogPluginComponent } from "quasar";
 | 
			
		||||
import { useCheckModal } from "@/composables/checks";
 | 
			
		||||
import { useScriptDropdown } from "@/composables/scripts";
 | 
			
		||||
import { validateRetcode } from "@/utils/validation";
 | 
			
		||||
import { envVarsLabel } from "@/constants/constants";
 | 
			
		||||
 | 
			
		||||
// ui imports
 | 
			
		||||
import TacticalDropdown from "@/components/ui/TacticalDropdown.vue";
 | 
			
		||||
@@ -132,10 +146,15 @@ export default {
 | 
			
		||||
    const { dialogRef, onDialogHide, onDialogOK } = useDialogPluginComponent();
 | 
			
		||||
 | 
			
		||||
    // setup script dropdown
 | 
			
		||||
    const { script, scriptOptions, defaultTimeout, defaultArgs } =
 | 
			
		||||
      useScriptDropdown(props.check ? props.check.script : undefined, {
 | 
			
		||||
        onMount: true,
 | 
			
		||||
      });
 | 
			
		||||
    const {
 | 
			
		||||
      script,
 | 
			
		||||
      scriptOptions,
 | 
			
		||||
      defaultTimeout,
 | 
			
		||||
      defaultArgs,
 | 
			
		||||
      defaultEnvVars,
 | 
			
		||||
    } = useScriptDropdown(props.check ? props.check.script : undefined, {
 | 
			
		||||
      onMount: true,
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    // check logic
 | 
			
		||||
    const { state, loading, submit, failOptions, severityOptions } =
 | 
			
		||||
@@ -145,6 +164,7 @@ export default {
 | 
			
		||||
          ...props.parent,
 | 
			
		||||
          script,
 | 
			
		||||
          script_args: defaultArgs,
 | 
			
		||||
          env_vars: defaultEnvVars,
 | 
			
		||||
          timeout: defaultTimeout,
 | 
			
		||||
          check_type: "script",
 | 
			
		||||
          fails_b4_alert: 1,
 | 
			
		||||
@@ -163,6 +183,7 @@ export default {
 | 
			
		||||
      failOptions,
 | 
			
		||||
      scriptOptions,
 | 
			
		||||
      severityOptions,
 | 
			
		||||
      envVarsLabel,
 | 
			
		||||
 | 
			
		||||
      // methods
 | 
			
		||||
      submit,
 | 
			
		||||
 
 | 
			
		||||
@@ -122,7 +122,7 @@ export default {
 | 
			
		||||
 | 
			
		||||
      try {
 | 
			
		||||
        const result = props.APIKey
 | 
			
		||||
          ? await editAPIKey(data)
 | 
			
		||||
          ? await editAPIKey(data.id, data)
 | 
			
		||||
          : await saveAPIKey(data);
 | 
			
		||||
        onDialogOK();
 | 
			
		||||
        notifySuccess(result);
 | 
			
		||||
 
 | 
			
		||||
@@ -208,7 +208,7 @@ export default {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // component lifecycle hooks
 | 
			
		||||
    onMounted(getAPIKeys());
 | 
			
		||||
    onMounted(getAPIKeys);
 | 
			
		||||
    return {
 | 
			
		||||
      // reactive data
 | 
			
		||||
      keys,
 | 
			
		||||
 
 | 
			
		||||
@@ -10,10 +10,13 @@
 | 
			
		||||
      </q-card-actions>
 | 
			
		||||
    </q-card-section>
 | 
			
		||||
    <q-card-section>
 | 
			
		||||
      <p class="text-subtitle1">
 | 
			
		||||
      <p v-if="info.plat === 'windows'" class="text-subtitle1">
 | 
			
		||||
        Download the agent then run the following command from an elevated
 | 
			
		||||
        command prompt on the device you want to add.
 | 
			
		||||
      </p>
 | 
			
		||||
      <p v-else-if="info.plat === 'darwin'" class="text-subtitle1">
 | 
			
		||||
        Run the following command from a terminal
 | 
			
		||||
      </p>
 | 
			
		||||
      <p>
 | 
			
		||||
        <q-field outlined :color="$q.dark.isActive ? 'white' : 'black'">
 | 
			
		||||
          <code>{{ info.data.cmd }}</code>
 | 
			
		||||
@@ -37,7 +40,7 @@
 | 
			
		||||
          </q-badge>
 | 
			
		||||
          <span>Do not popup any message boxes during install</span>
 | 
			
		||||
        </div>
 | 
			
		||||
        <div class="q-pa-xs q-gutter-xs">
 | 
			
		||||
        <div v-if="info.plat === 'windows'" class="q-pa-xs q-gutter-xs">
 | 
			
		||||
          <q-badge class="text-caption q-mr-xs" color="grey" text-color="black">
 | 
			
		||||
            <code
 | 
			
		||||
              >-local-mesh "C:\\<some folder or
 | 
			
		||||
@@ -46,7 +49,7 @@
 | 
			
		||||
          </q-badge>
 | 
			
		||||
          <span> To skip downloading the Mesh Agent during the install.</span>
 | 
			
		||||
        </div>
 | 
			
		||||
        <div class="q-pa-xs q-gutter-xs">
 | 
			
		||||
        <div v-if="info.plat === 'windows'" class="q-pa-xs q-gutter-xs">
 | 
			
		||||
          <q-badge class="text-caption q-mr-xs" color="grey" text-color="black">
 | 
			
		||||
            <code
 | 
			
		||||
              >-meshdir "C:\Program Files\Your Company Name\Mesh Agent"</code
 | 
			
		||||
@@ -63,7 +66,7 @@
 | 
			
		||||
          </q-badge>
 | 
			
		||||
          <span>Don't install the mesh agent</span>
 | 
			
		||||
        </div>
 | 
			
		||||
        <div class="q-pa-xs q-gutter-xs">
 | 
			
		||||
        <div v-if="info.plat === 'windows'" class="q-pa-xs q-gutter-xs">
 | 
			
		||||
          <q-badge class="text-caption q-mr-xs" color="grey" text-color="black">
 | 
			
		||||
            <code>-cert "C:\\<some folder or path>\\ca.pem"</code>
 | 
			
		||||
          </q-badge>
 | 
			
		||||
@@ -87,11 +90,12 @@
 | 
			
		||||
        Note: the auth token above will be valid for {{ info.expires }} hours.
 | 
			
		||||
      </p>
 | 
			
		||||
      <q-btn
 | 
			
		||||
        v-if="info.plat === 'windows'"
 | 
			
		||||
        type="a"
 | 
			
		||||
        :href="info.data.url"
 | 
			
		||||
        color="primary"
 | 
			
		||||
        label="Download Agent"
 | 
			
		||||
      />
 | 
			
		||||
      ></q-btn>
 | 
			
		||||
    </q-card-section>
 | 
			
		||||
  </q-card>
 | 
			
		||||
</template>
 | 
			
		||||
 
 | 
			
		||||
@@ -102,6 +102,18 @@
 | 
			
		||||
            new-value-mode="add"
 | 
			
		||||
          />
 | 
			
		||||
        </q-card-section>
 | 
			
		||||
        <q-card-section v-if="mode === 'script'" class="q-pt-none">
 | 
			
		||||
          <tactical-dropdown
 | 
			
		||||
            v-model="state.env_vars"
 | 
			
		||||
            :label="envVarsLabel"
 | 
			
		||||
            filled
 | 
			
		||||
            use-input
 | 
			
		||||
            multiple
 | 
			
		||||
            hide-dropdown-icon
 | 
			
		||||
            input-debounce="0"
 | 
			
		||||
            new-value-mode="add"
 | 
			
		||||
          />
 | 
			
		||||
        </q-card-section>
 | 
			
		||||
 | 
			
		||||
        <q-card-section v-if="mode === 'command'">
 | 
			
		||||
          <p>Shell</p>
 | 
			
		||||
@@ -135,6 +147,11 @@
 | 
			
		||||
            :rules="[(val) => !!val || '*Required']"
 | 
			
		||||
          />
 | 
			
		||||
        </q-card-section>
 | 
			
		||||
        <q-card-section v-if="supportsRunAsUser()" class="q-pt-none">
 | 
			
		||||
          <q-checkbox v-model="state.run_as_user" label="Run As User">
 | 
			
		||||
            <q-tooltip>{{ runAsUserToolTip }}</q-tooltip>
 | 
			
		||||
          </q-checkbox>
 | 
			
		||||
        </q-card-section>
 | 
			
		||||
 | 
			
		||||
        <q-card-section v-if="mode === 'script' || mode === 'command'">
 | 
			
		||||
          <q-input
 | 
			
		||||
@@ -203,6 +220,7 @@ import { runBulkAction } from "@/api/agents";
 | 
			
		||||
import { notifySuccess } from "@/utils/notify";
 | 
			
		||||
import { cmdPlaceholder } from "@/composables/agents";
 | 
			
		||||
import { removeExtraOptionCategories } from "@/utils/format";
 | 
			
		||||
import { envVarsLabel, runAsUserToolTip } from "@/constants/constants";
 | 
			
		||||
 | 
			
		||||
// ui imports
 | 
			
		||||
import TacticalDropdown from "@/components/ui/TacticalDropdown.vue";
 | 
			
		||||
@@ -217,6 +235,7 @@ const monTypeOptions = [
 | 
			
		||||
const osTypeOptions = [
 | 
			
		||||
  { label: "Windows", value: "windows" },
 | 
			
		||||
  { label: "Linux", value: "linux" },
 | 
			
		||||
  { label: "macOS", value: "darwin" },
 | 
			
		||||
  { label: "All", value: "all" },
 | 
			
		||||
];
 | 
			
		||||
 | 
			
		||||
@@ -277,6 +296,7 @@ export default {
 | 
			
		||||
      scriptOptions,
 | 
			
		||||
      defaultTimeout,
 | 
			
		||||
      defaultArgs,
 | 
			
		||||
      defaultEnvVars,
 | 
			
		||||
      getScriptOptions,
 | 
			
		||||
    } = useScriptDropdown();
 | 
			
		||||
    const { agents, agentOptions, getAgentOptions } = useAgentDropdown();
 | 
			
		||||
@@ -300,6 +320,8 @@ export default {
 | 
			
		||||
      script,
 | 
			
		||||
      timeout: defaultTimeout,
 | 
			
		||||
      args: defaultArgs,
 | 
			
		||||
      env_vars: defaultEnvVars,
 | 
			
		||||
      run_as_user: false,
 | 
			
		||||
    });
 | 
			
		||||
    const loading = ref(false);
 | 
			
		||||
 | 
			
		||||
@@ -316,6 +338,7 @@ export default {
 | 
			
		||||
      () => state.value.osType,
 | 
			
		||||
      (newValue) => {
 | 
			
		||||
        state.value.custom_shell = null;
 | 
			
		||||
        state.value.run_as_user = false;
 | 
			
		||||
 | 
			
		||||
        if (newValue === "windows") {
 | 
			
		||||
          state.value.shell = "cmd";
 | 
			
		||||
@@ -337,6 +360,13 @@ export default {
 | 
			
		||||
      loading.value = false;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    const supportsRunAsUser = () => {
 | 
			
		||||
      const modes = ["script", "command"];
 | 
			
		||||
      return (
 | 
			
		||||
        state.value.osType === "windows" && modes.includes(state.value.mode)
 | 
			
		||||
      );
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    // set modal title and caption
 | 
			
		||||
    const modalTitle = computed(() => {
 | 
			
		||||
      return props.mode === "command"
 | 
			
		||||
@@ -387,6 +417,8 @@ export default {
 | 
			
		||||
      osTypeOptions,
 | 
			
		||||
      targetOptions,
 | 
			
		||||
      patchModeOptions,
 | 
			
		||||
      runAsUserToolTip,
 | 
			
		||||
      envVarsLabel,
 | 
			
		||||
 | 
			
		||||
      //computed
 | 
			
		||||
      modalTitle,
 | 
			
		||||
@@ -394,6 +426,7 @@ export default {
 | 
			
		||||
      //methods
 | 
			
		||||
      submit,
 | 
			
		||||
      cmdPlaceholder,
 | 
			
		||||
      supportsRunAsUser,
 | 
			
		||||
 | 
			
		||||
      // quasar dialog plugin
 | 
			
		||||
      dialogRef,
 | 
			
		||||
 
 | 
			
		||||
@@ -465,8 +465,51 @@ export default {
 | 
			
		||||
      });
 | 
			
		||||
    },
 | 
			
		||||
    editAgent() {
 | 
			
		||||
      delete this.agent.all_timezones;
 | 
			
		||||
      delete this.agent.timezone;
 | 
			
		||||
      // TODO we need to fix the serializer to not send this stuff
 | 
			
		||||
      const toRemove = [
 | 
			
		||||
        "created_by",
 | 
			
		||||
        "created_time",
 | 
			
		||||
        "modified_by",
 | 
			
		||||
        "modified_time",
 | 
			
		||||
        "all_timezones",
 | 
			
		||||
        "timezone",
 | 
			
		||||
        "wmi_detail",
 | 
			
		||||
        "services",
 | 
			
		||||
        "status",
 | 
			
		||||
        "cpu_model",
 | 
			
		||||
        "local_ips",
 | 
			
		||||
        "make_model",
 | 
			
		||||
        "physical_disks",
 | 
			
		||||
        "graphics",
 | 
			
		||||
        "checks",
 | 
			
		||||
        "patches_last_installed",
 | 
			
		||||
        "last_seen",
 | 
			
		||||
        "applied_policies",
 | 
			
		||||
        "effective_patch_policy",
 | 
			
		||||
        "version",
 | 
			
		||||
        "operating_system",
 | 
			
		||||
        "plat",
 | 
			
		||||
        "goarch",
 | 
			
		||||
        "hostname",
 | 
			
		||||
        "public_ip",
 | 
			
		||||
        "total_ram",
 | 
			
		||||
        "disks",
 | 
			
		||||
        "boot_time",
 | 
			
		||||
        "logged_in_username",
 | 
			
		||||
        "last_logged_in_user",
 | 
			
		||||
        "needs_reboot",
 | 
			
		||||
        "choco_installed",
 | 
			
		||||
        "policy",
 | 
			
		||||
        "mesh_node_id",
 | 
			
		||||
        "block_policy_inheritance",
 | 
			
		||||
        "maintenance_mode",
 | 
			
		||||
        "alert_template",
 | 
			
		||||
        "client",
 | 
			
		||||
        "site_name",
 | 
			
		||||
      ];
 | 
			
		||||
      for (const elem of toRemove) {
 | 
			
		||||
        delete this.agent[elem];
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      // only send the timezone data if it has changed
 | 
			
		||||
      // this way django will keep the db column as null and inherit from the global setting
 | 
			
		||||
@@ -503,7 +546,7 @@ export default {
 | 
			
		||||
        else if (day === 0) result += "Sun, ";
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      return result.trimRight(",");
 | 
			
		||||
      return result.trimEnd(",");
 | 
			
		||||
    },
 | 
			
		||||
  },
 | 
			
		||||
  mounted() {
 | 
			
		||||
 
 | 
			
		||||
@@ -52,6 +52,15 @@
 | 
			
		||||
                goarch = GOARCH_AMD64;
 | 
			
		||||
              "
 | 
			
		||||
            />
 | 
			
		||||
            <q-radio
 | 
			
		||||
              v-model="agentOS"
 | 
			
		||||
              val="darwin"
 | 
			
		||||
              label="macOS"
 | 
			
		||||
              @update:model-value="
 | 
			
		||||
                installMethod = 'mac';
 | 
			
		||||
                goarch = GOARCH_AMD64;
 | 
			
		||||
              "
 | 
			
		||||
            />
 | 
			
		||||
          </div>
 | 
			
		||||
        </q-card-section>
 | 
			
		||||
        <q-card-section>
 | 
			
		||||
@@ -105,37 +114,37 @@
 | 
			
		||||
              v-model="goarch"
 | 
			
		||||
              :val="GOARCH_AMD64"
 | 
			
		||||
              label="64 bit"
 | 
			
		||||
              v-show="agentOS === 'windows'"
 | 
			
		||||
            />
 | 
			
		||||
            <q-radio
 | 
			
		||||
              v-model="goarch"
 | 
			
		||||
              :val="GOARCH_i386"
 | 
			
		||||
              label="32 bit"
 | 
			
		||||
              v-show="agentOS === 'windows'"
 | 
			
		||||
              v-show="agentOS === 'windows' || agentOS === 'linux'"
 | 
			
		||||
            />
 | 
			
		||||
            <q-radio
 | 
			
		||||
              v-model="goarch"
 | 
			
		||||
              :val="GOARCH_AMD64"
 | 
			
		||||
              label="64 bit"
 | 
			
		||||
              v-show="agentOS !== 'windows'"
 | 
			
		||||
              label="Intel 64 bit"
 | 
			
		||||
              v-show="agentOS === 'darwin'"
 | 
			
		||||
            />
 | 
			
		||||
            <q-radio
 | 
			
		||||
              v-model="goarch"
 | 
			
		||||
              :val="GOARCH_i386"
 | 
			
		||||
              label="32 bit"
 | 
			
		||||
              v-show="agentOS !== 'windows'"
 | 
			
		||||
              v-show="agentOS !== 'darwin'"
 | 
			
		||||
            />
 | 
			
		||||
            <q-radio
 | 
			
		||||
              v-model="goarch"
 | 
			
		||||
              :val="GOARCH_ARM64"
 | 
			
		||||
              label="ARM 64 bit"
 | 
			
		||||
              v-show="agentOS !== 'windows'"
 | 
			
		||||
              v-show="agentOS === 'linux'"
 | 
			
		||||
            />
 | 
			
		||||
            <q-radio
 | 
			
		||||
              v-model="goarch"
 | 
			
		||||
              :val="GOARCH_ARM64"
 | 
			
		||||
              label="Apple Silicon (M1, M2)"
 | 
			
		||||
              v-show="agentOS === 'darwin'"
 | 
			
		||||
            />
 | 
			
		||||
            <q-radio
 | 
			
		||||
              v-model="goarch"
 | 
			
		||||
              :val="GOARCH_ARM32"
 | 
			
		||||
              label="ARM 32 bit (Rasp Pi)"
 | 
			
		||||
              v-show="agentOS !== 'windows'"
 | 
			
		||||
              v-show="agentOS === 'linux'"
 | 
			
		||||
            />
 | 
			
		||||
          </div>
 | 
			
		||||
        </q-card-section>
 | 
			
		||||
@@ -266,12 +275,13 @@ export default {
 | 
			
		||||
        plat: this.agentOS,
 | 
			
		||||
      };
 | 
			
		||||
 | 
			
		||||
      if (this.installMethod === "manual") {
 | 
			
		||||
      if (this.installMethod === "manual" || this.installMethod === "mac") {
 | 
			
		||||
        this.$axios.post("/agents/installer/", data).then((r) => {
 | 
			
		||||
          this.info = {
 | 
			
		||||
            expires: this.expires,
 | 
			
		||||
            data: r.data,
 | 
			
		||||
            goarch: this.goarch,
 | 
			
		||||
            plat: this.agentOS,
 | 
			
		||||
          };
 | 
			
		||||
          this.showAgentDownload = true;
 | 
			
		||||
        });
 | 
			
		||||
@@ -343,6 +353,9 @@ export default {
 | 
			
		||||
        case "bash":
 | 
			
		||||
          text = "Download linux install script";
 | 
			
		||||
          break;
 | 
			
		||||
        case "mac":
 | 
			
		||||
          text = "Show installation instructions";
 | 
			
		||||
          break;
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      return text;
 | 
			
		||||
 
 | 
			
		||||
@@ -77,6 +77,18 @@
 | 
			
		||||
            new-value-mode="add"
 | 
			
		||||
          />
 | 
			
		||||
        </q-card-section>
 | 
			
		||||
        <q-card-section>
 | 
			
		||||
          <tactical-dropdown
 | 
			
		||||
            v-model="state.env_vars"
 | 
			
		||||
            :label="envVarsLabel"
 | 
			
		||||
            filled
 | 
			
		||||
            use-input
 | 
			
		||||
            multiple
 | 
			
		||||
            hide-dropdown-icon
 | 
			
		||||
            input-debounce="0"
 | 
			
		||||
            new-value-mode="add"
 | 
			
		||||
          />
 | 
			
		||||
        </q-card-section>
 | 
			
		||||
        <q-card-section>
 | 
			
		||||
          <q-option-group
 | 
			
		||||
            v-model="state.output"
 | 
			
		||||
@@ -128,6 +140,11 @@
 | 
			
		||||
          />
 | 
			
		||||
          <q-checkbox v-model="state.save_all_output" label="Save all output" />
 | 
			
		||||
        </q-card-section>
 | 
			
		||||
        <q-card-section v-if="agent.plat === 'windows'">
 | 
			
		||||
          <q-checkbox v-model="state.run_as_user" label="Run As User">
 | 
			
		||||
            <q-tooltip>{{ runAsUserToolTip }}</q-tooltip>
 | 
			
		||||
          </q-checkbox>
 | 
			
		||||
        </q-card-section>
 | 
			
		||||
        <q-card-section>
 | 
			
		||||
          <q-input
 | 
			
		||||
            v-model.number="state.timeout"
 | 
			
		||||
@@ -173,6 +190,7 @@ import { useScriptDropdown } from "@/composables/scripts";
 | 
			
		||||
import { useCustomFieldDropdown } from "@/composables/core";
 | 
			
		||||
import { runScript } from "@/api/agents";
 | 
			
		||||
import { notifySuccess } from "@/utils/notify";
 | 
			
		||||
import { envVarsLabel, runAsUserToolTip } from "@/constants/constants";
 | 
			
		||||
import {
 | 
			
		||||
  formatScriptSyntax,
 | 
			
		||||
  removeExtraOptionCategories,
 | 
			
		||||
@@ -203,11 +221,18 @@ export default {
 | 
			
		||||
    const { dialogRef, onDialogHide } = useDialogPluginComponent();
 | 
			
		||||
 | 
			
		||||
    // setup dropdowns
 | 
			
		||||
    const { script, scriptOptions, defaultTimeout, defaultArgs, syntax, link } =
 | 
			
		||||
      useScriptDropdown(props.script, {
 | 
			
		||||
        onMount: true,
 | 
			
		||||
        filterByPlatform: props.agent.plat,
 | 
			
		||||
      });
 | 
			
		||||
    const {
 | 
			
		||||
      script,
 | 
			
		||||
      scriptOptions,
 | 
			
		||||
      defaultTimeout,
 | 
			
		||||
      defaultArgs,
 | 
			
		||||
      defaultEnvVars,
 | 
			
		||||
      syntax,
 | 
			
		||||
      link,
 | 
			
		||||
    } = useScriptDropdown(props.script, {
 | 
			
		||||
      onMount: true,
 | 
			
		||||
      filterByPlatform: props.agent.plat,
 | 
			
		||||
    });
 | 
			
		||||
    const { customFieldOptions } = useCustomFieldDropdown({ onMount: true });
 | 
			
		||||
 | 
			
		||||
    // main run script functionaity
 | 
			
		||||
@@ -219,7 +244,9 @@ export default {
 | 
			
		||||
      save_all_output: false,
 | 
			
		||||
      script,
 | 
			
		||||
      args: defaultArgs,
 | 
			
		||||
      env_vars: defaultEnvVars,
 | 
			
		||||
      timeout: defaultTimeout,
 | 
			
		||||
      run_as_user: false,
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    const ret = ref(null);
 | 
			
		||||
@@ -273,6 +300,8 @@ export default {
 | 
			
		||||
 | 
			
		||||
      // non-reactive data
 | 
			
		||||
      outputOptions,
 | 
			
		||||
      runAsUserToolTip,
 | 
			
		||||
      envVarsLabel,
 | 
			
		||||
 | 
			
		||||
      //methods
 | 
			
		||||
      formatScriptSyntax,
 | 
			
		||||
 
 | 
			
		||||
@@ -51,6 +51,11 @@
 | 
			
		||||
            />
 | 
			
		||||
          </div>
 | 
			
		||||
        </q-card-section>
 | 
			
		||||
        <q-card-section v-if="agent.plat === 'windows'">
 | 
			
		||||
          <q-checkbox v-model="state.run_as_user" label="Run As User">
 | 
			
		||||
            <q-tooltip>{{ runAsUserToolTip }}</q-tooltip>
 | 
			
		||||
          </q-checkbox>
 | 
			
		||||
        </q-card-section>
 | 
			
		||||
        <q-card-section v-if="state.shell === 'custom'">
 | 
			
		||||
          <q-input
 | 
			
		||||
            v-model="state.custom_shell"
 | 
			
		||||
@@ -117,6 +122,7 @@ import { ref } from "vue";
 | 
			
		||||
import { useDialogPluginComponent } from "quasar";
 | 
			
		||||
import { sendAgentCommand } from "@/api/agents";
 | 
			
		||||
import { cmdPlaceholder } from "@/composables/agents";
 | 
			
		||||
import { runAsUserToolTip } from "@/constants/constants";
 | 
			
		||||
 | 
			
		||||
export default {
 | 
			
		||||
  name: "SendCommand",
 | 
			
		||||
@@ -134,6 +140,7 @@ export default {
 | 
			
		||||
      cmd: null,
 | 
			
		||||
      timeout: 30,
 | 
			
		||||
      custom_shell: null,
 | 
			
		||||
      run_as_user: false,
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    const loading = ref(false);
 | 
			
		||||
@@ -156,6 +163,9 @@ export default {
 | 
			
		||||
      loading,
 | 
			
		||||
      ret,
 | 
			
		||||
 | 
			
		||||
      // non reactivete data
 | 
			
		||||
      runAsUserToolTip,
 | 
			
		||||
 | 
			
		||||
      // methods
 | 
			
		||||
      submit,
 | 
			
		||||
      cmdPlaceholder,
 | 
			
		||||
 
 | 
			
		||||
@@ -204,6 +204,20 @@
 | 
			
		||||
                new-value-mode="add"
 | 
			
		||||
              />
 | 
			
		||||
 | 
			
		||||
              <q-select
 | 
			
		||||
                class="q-mb-sm"
 | 
			
		||||
                dense
 | 
			
		||||
                label="Failure action environment vars (press Enter after typing each key=value pair)"
 | 
			
		||||
                filled
 | 
			
		||||
                v-model="template.action_env_vars"
 | 
			
		||||
                use-input
 | 
			
		||||
                use-chips
 | 
			
		||||
                multiple
 | 
			
		||||
                hide-dropdown-icon
 | 
			
		||||
                input-debounce="0"
 | 
			
		||||
                new-value-mode="add"
 | 
			
		||||
              />
 | 
			
		||||
 | 
			
		||||
              <q-input
 | 
			
		||||
                class="q-mb-sm"
 | 
			
		||||
                label="Failure action timeout (seconds)"
 | 
			
		||||
@@ -277,6 +291,20 @@
 | 
			
		||||
                new-value-mode="add"
 | 
			
		||||
              />
 | 
			
		||||
 | 
			
		||||
              <q-select
 | 
			
		||||
                class="q-mb-sm"
 | 
			
		||||
                dense
 | 
			
		||||
                label="Resolved action environment vars (press Enter after typing each key=value pair)"
 | 
			
		||||
                filled
 | 
			
		||||
                v-model="template.resolved_action_env_vars"
 | 
			
		||||
                use-input
 | 
			
		||||
                use-chips
 | 
			
		||||
                multiple
 | 
			
		||||
                hide-dropdown-icon
 | 
			
		||||
                input-debounce="0"
 | 
			
		||||
                new-value-mode="add"
 | 
			
		||||
              />
 | 
			
		||||
 | 
			
		||||
              <q-input
 | 
			
		||||
                class="q-mb-sm"
 | 
			
		||||
                label="Resolved action timeout (seconds)"
 | 
			
		||||
@@ -696,9 +724,11 @@ export default {
 | 
			
		||||
        is_active: true,
 | 
			
		||||
        action: null,
 | 
			
		||||
        action_args: [],
 | 
			
		||||
        action_env_vars: [],
 | 
			
		||||
        action_timeout: 15,
 | 
			
		||||
        resolved_action: null,
 | 
			
		||||
        resolved_action_args: [],
 | 
			
		||||
        resolved_action_env_vars: [],
 | 
			
		||||
        resolved_action_timeout: 15,
 | 
			
		||||
        email_recipients: [],
 | 
			
		||||
        email_from: "",
 | 
			
		||||
@@ -762,11 +792,13 @@ export default {
 | 
			
		||||
          (i) => i.value === this.template.action
 | 
			
		||||
        );
 | 
			
		||||
        this.template.action_args = script.args;
 | 
			
		||||
        this.template.action_env_vars = script.env_vars;
 | 
			
		||||
      } else if (type === "resolved") {
 | 
			
		||||
        const script = this.scriptOptions.find(
 | 
			
		||||
          (i) => i.value === this.template.resolved_action
 | 
			
		||||
        );
 | 
			
		||||
        this.template.resolved_action_args = script.args;
 | 
			
		||||
        this.template.resolved_action_env_vars = script.env_vars;
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    toggleAddEmail() {
 | 
			
		||||
 
 | 
			
		||||
@@ -118,6 +118,17 @@
 | 
			
		||||
              new-value-mode="add"
 | 
			
		||||
              :readonly="readonly"
 | 
			
		||||
            />
 | 
			
		||||
            <tactical-dropdown
 | 
			
		||||
              v-model="formScript.env_vars"
 | 
			
		||||
              :label="envVarsLabel"
 | 
			
		||||
              filled
 | 
			
		||||
              use-input
 | 
			
		||||
              multiple
 | 
			
		||||
              hide-dropdown-icon
 | 
			
		||||
              input-debounce="0"
 | 
			
		||||
              new-value-mode="add"
 | 
			
		||||
              :readonly="readonly"
 | 
			
		||||
            />
 | 
			
		||||
            <q-input
 | 
			
		||||
              type="number"
 | 
			
		||||
              filled
 | 
			
		||||
@@ -128,6 +139,18 @@
 | 
			
		||||
              :rules="[(val) => val >= 5 || 'Minimum is 5']"
 | 
			
		||||
              hide-bottom-space
 | 
			
		||||
            />
 | 
			
		||||
            <q-checkbox
 | 
			
		||||
              v-model="formScript.run_as_user"
 | 
			
		||||
              label="Run As User (Windows only)"
 | 
			
		||||
            >
 | 
			
		||||
              <q-tooltip
 | 
			
		||||
                >Setting this value on the script model will always override any
 | 
			
		||||
                'Run As User' checkboxes in the UI and force this script to
 | 
			
		||||
                always be run in the context of the logged in user. If no user
 | 
			
		||||
                is logged in, the script will not run and an error will be
 | 
			
		||||
                returned.
 | 
			
		||||
              </q-tooltip>
 | 
			
		||||
            </q-checkbox>
 | 
			
		||||
            <q-input
 | 
			
		||||
              label="Syntax"
 | 
			
		||||
              type="textarea"
 | 
			
		||||
@@ -217,6 +240,7 @@ import "ace-builds/src-noconflict/theme-tomorrow";
 | 
			
		||||
 | 
			
		||||
// static data
 | 
			
		||||
import { shellOptions } from "@/composables/scripts";
 | 
			
		||||
import { envVarsLabel } from "@/constants/constants";
 | 
			
		||||
 | 
			
		||||
export default {
 | 
			
		||||
  name: "ScriptFormModal",
 | 
			
		||||
@@ -253,6 +277,8 @@ export default {
 | 
			
		||||
          default_timeout: 90,
 | 
			
		||||
          args: [],
 | 
			
		||||
          script_body: "",
 | 
			
		||||
          run_as_user: false,
 | 
			
		||||
          env_vars: [],
 | 
			
		||||
        });
 | 
			
		||||
 | 
			
		||||
    if (props.clone) script.value.name = `(Copy) ${script.value.name}`;
 | 
			
		||||
@@ -350,6 +376,7 @@ export default {
 | 
			
		||||
      // non-reactive data
 | 
			
		||||
      shellOptions,
 | 
			
		||||
      agentPlatformOptions,
 | 
			
		||||
      envVarsLabel,
 | 
			
		||||
 | 
			
		||||
      //computed
 | 
			
		||||
      title,
 | 
			
		||||
 
 | 
			
		||||
@@ -867,7 +867,7 @@ export default {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // component life cycle hooks
 | 
			
		||||
    onMounted(getScripts());
 | 
			
		||||
    onMounted(getScripts);
 | 
			
		||||
 | 
			
		||||
    return {
 | 
			
		||||
      // reactive data
 | 
			
		||||
 
 | 
			
		||||
@@ -93,6 +93,20 @@
 | 
			
		||||
          />
 | 
			
		||||
        </q-card-section>
 | 
			
		||||
 | 
			
		||||
        <q-card-section>
 | 
			
		||||
          <tactical-dropdown
 | 
			
		||||
            v-model="script.env_vars"
 | 
			
		||||
            label="Environment Variables"
 | 
			
		||||
            placeholder="(press Enter after typing each key=value pair)"
 | 
			
		||||
            filled
 | 
			
		||||
            use-input
 | 
			
		||||
            multiple
 | 
			
		||||
            hide-dropdown-icon
 | 
			
		||||
            input-debounce="0"
 | 
			
		||||
            new-value-mode="add"
 | 
			
		||||
          />
 | 
			
		||||
        </q-card-section>
 | 
			
		||||
 | 
			
		||||
        <q-card-section>
 | 
			
		||||
          <q-input
 | 
			
		||||
            label="Default Timeout"
 | 
			
		||||
 
 | 
			
		||||
@@ -44,6 +44,8 @@ export default {
 | 
			
		||||
        timeout: props.script.default_timeout,
 | 
			
		||||
        args: props.script.args,
 | 
			
		||||
        shell: props.script.shell,
 | 
			
		||||
        run_as_user: props.script.run_as_user,
 | 
			
		||||
        env_vars: props.script.env_vars,
 | 
			
		||||
      };
 | 
			
		||||
      try {
 | 
			
		||||
        ret.value = await testScript(props.agent, data);
 | 
			
		||||
 
 | 
			
		||||
@@ -102,7 +102,7 @@
 | 
			
		||||
 | 
			
		||||
              <tactical-dropdown
 | 
			
		||||
                v-if="actionType === 'script'"
 | 
			
		||||
                class="col-4"
 | 
			
		||||
                class="col-3"
 | 
			
		||||
                label="Select script"
 | 
			
		||||
                v-model="script"
 | 
			
		||||
                :options="scriptOptions"
 | 
			
		||||
@@ -113,7 +113,7 @@
 | 
			
		||||
 | 
			
		||||
              <q-select
 | 
			
		||||
                v-if="actionType === 'script'"
 | 
			
		||||
                class="col-5"
 | 
			
		||||
                class="col-3"
 | 
			
		||||
                dense
 | 
			
		||||
                label="Script Arguments (press Enter after typing each argument)"
 | 
			
		||||
                filled
 | 
			
		||||
@@ -126,6 +126,21 @@
 | 
			
		||||
                new-value-mode="add"
 | 
			
		||||
              />
 | 
			
		||||
 | 
			
		||||
              <q-select
 | 
			
		||||
                v-if="actionType === 'script'"
 | 
			
		||||
                class="col-3"
 | 
			
		||||
                dense
 | 
			
		||||
                :label="envVarsLabel"
 | 
			
		||||
                filled
 | 
			
		||||
                v-model="defaultEnvVars"
 | 
			
		||||
                use-input
 | 
			
		||||
                use-chips
 | 
			
		||||
                multiple
 | 
			
		||||
                hide-dropdown-icon
 | 
			
		||||
                input-debounce="0"
 | 
			
		||||
                new-value-mode="add"
 | 
			
		||||
              />
 | 
			
		||||
 | 
			
		||||
              <q-input
 | 
			
		||||
                v-if="actionType === 'script'"
 | 
			
		||||
                class="col-2"
 | 
			
		||||
@@ -210,6 +225,9 @@
 | 
			
		||||
                    <q-item-label caption>
 | 
			
		||||
                      Arguments: {{ element.script_args }}
 | 
			
		||||
                    </q-item-label>
 | 
			
		||||
                    <q-item-label caption>
 | 
			
		||||
                      Env Vars: {{ element.env_vars }}
 | 
			
		||||
                    </q-item-label>
 | 
			
		||||
                    <q-item-label caption>
 | 
			
		||||
                      Timeout: {{ element.timeout }}
 | 
			
		||||
                    </q-item-label>
 | 
			
		||||
@@ -727,6 +745,7 @@ import { useCheckDropdown } from "@/composables/checks";
 | 
			
		||||
import { useCustomFieldDropdown } from "@/composables/core";
 | 
			
		||||
import { notifySuccess, notifyError } from "@/utils/notify";
 | 
			
		||||
import { validateTimePeriod } from "@/utils/validation";
 | 
			
		||||
import { envVarsLabel } from "@/constants/constants";
 | 
			
		||||
import {
 | 
			
		||||
  convertPeriodToSeconds,
 | 
			
		||||
  convertToBitArray,
 | 
			
		||||
@@ -817,10 +836,15 @@ export default {
 | 
			
		||||
    const { dialogRef, onDialogHide, onDialogOK } = useDialogPluginComponent();
 | 
			
		||||
 | 
			
		||||
    // setup dropdowns
 | 
			
		||||
    const { script, scriptOptions, defaultTimeout, defaultArgs } =
 | 
			
		||||
      useScriptDropdown(undefined, {
 | 
			
		||||
        onMount: true,
 | 
			
		||||
      });
 | 
			
		||||
    const {
 | 
			
		||||
      script,
 | 
			
		||||
      scriptOptions,
 | 
			
		||||
      defaultTimeout,
 | 
			
		||||
      defaultArgs,
 | 
			
		||||
      defaultEnvVars,
 | 
			
		||||
    } = useScriptDropdown(undefined, {
 | 
			
		||||
      onMount: true,
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    // set defaultTimeout to 30
 | 
			
		||||
    defaultTimeout.value = 30;
 | 
			
		||||
@@ -914,6 +938,7 @@ export default {
 | 
			
		||||
          script: script.value,
 | 
			
		||||
          timeout: defaultTimeout.value,
 | 
			
		||||
          script_args: defaultArgs.value,
 | 
			
		||||
          env_vars: defaultEnvVars.value,
 | 
			
		||||
        });
 | 
			
		||||
      } else if (actionType.value === "cmd") {
 | 
			
		||||
        task.value.actions.push({
 | 
			
		||||
@@ -927,6 +952,7 @@ export default {
 | 
			
		||||
      // clear fields after add
 | 
			
		||||
      script.value = null;
 | 
			
		||||
      defaultArgs.value = [];
 | 
			
		||||
      defaultEnvVars.value = [];
 | 
			
		||||
      defaultTimeout.value = 30;
 | 
			
		||||
      command.value = "";
 | 
			
		||||
    }
 | 
			
		||||
@@ -1089,6 +1115,7 @@ export default {
 | 
			
		||||
      script,
 | 
			
		||||
      defaultTimeout,
 | 
			
		||||
      defaultArgs,
 | 
			
		||||
      defaultEnvVars,
 | 
			
		||||
      actionType,
 | 
			
		||||
      command,
 | 
			
		||||
      shell,
 | 
			
		||||
@@ -1116,6 +1143,7 @@ export default {
 | 
			
		||||
      monthOptions,
 | 
			
		||||
      taskTypeOptions,
 | 
			
		||||
      taskInstancePolicyOptions,
 | 
			
		||||
      envVarsLabel,
 | 
			
		||||
 | 
			
		||||
      // methods
 | 
			
		||||
      submit,
 | 
			
		||||
 
 | 
			
		||||
@@ -31,7 +31,7 @@ export function useUserDropdown(onMount = false) {
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  if (onMount) {
 | 
			
		||||
    onMounted(getUserOptions());
 | 
			
		||||
    onMounted(getUserOptions);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  return {
 | 
			
		||||
 
 | 
			
		||||
@@ -37,4 +37,5 @@ export function cmdPlaceholder(shell) {
 | 
			
		||||
export const agentPlatformOptions = [
 | 
			
		||||
  { value: "windows", label: "Windows" },
 | 
			
		||||
  { value: "linux", label: "Linux" },
 | 
			
		||||
  { value: "darwin", label: "macOS" },
 | 
			
		||||
];
 | 
			
		||||
 
 | 
			
		||||
@@ -8,6 +8,7 @@ export function useScriptDropdown(setScript = null, { onMount = false } = {}) {
 | 
			
		||||
  const scriptOptions = ref([]);
 | 
			
		||||
  const defaultTimeout = ref(30);
 | 
			
		||||
  const defaultArgs = ref([]);
 | 
			
		||||
  const defaultEnvVars = ref([]);
 | 
			
		||||
  const script = ref(setScript);
 | 
			
		||||
  const syntax = ref("");
 | 
			
		||||
  const link = ref("");
 | 
			
		||||
@@ -29,6 +30,7 @@ export function useScriptDropdown(setScript = null, { onMount = false } = {}) {
 | 
			
		||||
      );
 | 
			
		||||
      defaultTimeout.value = tmpScript.timeout;
 | 
			
		||||
      defaultArgs.value = tmpScript.args;
 | 
			
		||||
      defaultEnvVars.value = tmpScript.env_vars;
 | 
			
		||||
      syntax.value = tmpScript.syntax;
 | 
			
		||||
      link.value =
 | 
			
		||||
        tmpScript.script_type === "builtin"
 | 
			
		||||
@@ -49,6 +51,7 @@ export function useScriptDropdown(setScript = null, { onMount = false } = {}) {
 | 
			
		||||
    scriptOptions,
 | 
			
		||||
    defaultTimeout,
 | 
			
		||||
    defaultArgs,
 | 
			
		||||
    defaultEnvVars,
 | 
			
		||||
    syntax,
 | 
			
		||||
    link,
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,10 @@
 | 
			
		||||
const GOARCH_AMD64 = "amd64";
 | 
			
		||||
const GOARCH_i386 = "386";
 | 
			
		||||
const GOARCH_ARM64 = "arm64";
 | 
			
		||||
const GOARCH_ARM32 = "arm";
 | 
			
		||||
export const GOARCH_AMD64 = "amd64";
 | 
			
		||||
export const GOARCH_i386 = "386";
 | 
			
		||||
export const GOARCH_ARM64 = "arm64";
 | 
			
		||||
export const GOARCH_ARM32 = "arm";
 | 
			
		||||
 | 
			
		||||
export { GOARCH_AMD64, GOARCH_i386, GOARCH_ARM64, GOARCH_ARM32 };
 | 
			
		||||
export const runAsUserToolTip =
 | 
			
		||||
  "Run in the context of the logged in user. If no user is logged in, the script will not run and an error will be returned.";
 | 
			
		||||
 | 
			
		||||
export const envVarsLabel =
 | 
			
		||||
  "Environment vars (press Enter after typing each key=value pair)";
 | 
			
		||||
 
 | 
			
		||||
@@ -14,6 +14,27 @@
 | 
			
		||||
          @click="$store.dispatch('reload')"
 | 
			
		||||
        />
 | 
			
		||||
      </q-banner>
 | 
			
		||||
      <q-banner
 | 
			
		||||
        v-if="!hosted && tokenExpired"
 | 
			
		||||
        inline-actions
 | 
			
		||||
        class="bg-yellow text-black text-center"
 | 
			
		||||
      >
 | 
			
		||||
        <q-icon size="xl" name="warning" />
 | 
			
		||||
        <span
 | 
			
		||||
          ><br />Your code signing token is no longer valid.<br /><br />
 | 
			
		||||
          If you have downgraded or cancelled your sponsorship, please delete
 | 
			
		||||
          your token from the Code Signing modal and refresh to get rid of this
 | 
			
		||||
          banner.<br /><br />
 | 
			
		||||
          For any issues or to renew your sponsorship please email
 | 
			
		||||
          support@amidaware.com<br /><br
 | 
			
		||||
        /></span>
 | 
			
		||||
        <q-btn
 | 
			
		||||
          color="dark"
 | 
			
		||||
          icon="refresh"
 | 
			
		||||
          label="Refresh"
 | 
			
		||||
          @click="$store.dispatch('reload')"
 | 
			
		||||
        />
 | 
			
		||||
      </q-banner>
 | 
			
		||||
      <q-toolbar>
 | 
			
		||||
        <q-btn
 | 
			
		||||
          dense
 | 
			
		||||
@@ -119,6 +140,32 @@
 | 
			
		||||
                <q-item-label>Preferences</q-item-label>
 | 
			
		||||
              </q-item-section>
 | 
			
		||||
            </q-item>
 | 
			
		||||
            <q-item clickable>
 | 
			
		||||
              <q-item-section>Account</q-item-section>
 | 
			
		||||
              <q-item-section side>
 | 
			
		||||
                <q-icon name="keyboard_arrow_right" />
 | 
			
		||||
              </q-item-section>
 | 
			
		||||
 | 
			
		||||
              <q-menu anchor="top end" self="top start">
 | 
			
		||||
                <q-list>
 | 
			
		||||
                  <q-item
 | 
			
		||||
                    clickable
 | 
			
		||||
                    v-ripple
 | 
			
		||||
                    @click="resetPassword"
 | 
			
		||||
                    v-close-popup
 | 
			
		||||
                  >
 | 
			
		||||
                    <q-item-section>
 | 
			
		||||
                      <q-item-label>Reset Password</q-item-label>
 | 
			
		||||
                    </q-item-section>
 | 
			
		||||
                  </q-item>
 | 
			
		||||
                  <q-item clickable v-ripple @click="reset2FA" v-close-popup>
 | 
			
		||||
                    <q-item-section>
 | 
			
		||||
                      <q-item-label>Reset 2FA</q-item-label>
 | 
			
		||||
                    </q-item-section>
 | 
			
		||||
                  </q-item>
 | 
			
		||||
                </q-list>
 | 
			
		||||
              </q-menu>
 | 
			
		||||
            </q-item>
 | 
			
		||||
            <q-item to="/expired" exact>
 | 
			
		||||
              <q-item-section>
 | 
			
		||||
                <q-item-label>Logout</q-item-label>
 | 
			
		||||
@@ -140,10 +187,13 @@ import { useQuasar } from "quasar";
 | 
			
		||||
import { useStore } from "vuex";
 | 
			
		||||
import axios from "axios";
 | 
			
		||||
import { getWSUrl } from "@/websocket/channels";
 | 
			
		||||
import { resetTwoFactor } from "@/api/accounts";
 | 
			
		||||
import { notifySuccess } from "@/utils/notify";
 | 
			
		||||
 | 
			
		||||
// ui imports
 | 
			
		||||
import AlertsIcon from "@/components/AlertsIcon.vue";
 | 
			
		||||
import UserPreferences from "@/components/modals/coresettings/UserPreferences.vue";
 | 
			
		||||
import ResetPass from "@/components/accounts/ResetPass.vue";
 | 
			
		||||
 | 
			
		||||
export default {
 | 
			
		||||
  name: "MainLayout",
 | 
			
		||||
@@ -167,6 +217,7 @@ export default {
 | 
			
		||||
    const needRefresh = computed(() => store.state.needrefresh);
 | 
			
		||||
    const user = computed(() => store.state.username);
 | 
			
		||||
    const hosted = computed(() => store.state.hosted);
 | 
			
		||||
    const tokenExpired = computed(() => store.state.tokenExpired);
 | 
			
		||||
 | 
			
		||||
    const latestReleaseURL = computed(() => {
 | 
			
		||||
      return latestTRMMVersion.value
 | 
			
		||||
@@ -180,6 +231,26 @@ export default {
 | 
			
		||||
      }).onOk(() => store.dispatch("getDashInfo"));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    function resetPassword() {
 | 
			
		||||
      $q.dialog({
 | 
			
		||||
        component: ResetPass,
 | 
			
		||||
      });
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    function reset2FA() {
 | 
			
		||||
      $q.dialog({
 | 
			
		||||
        title: "Reset 2FA",
 | 
			
		||||
        message: "Are you sure you would like to reset your 2FA token?",
 | 
			
		||||
        cancel: true,
 | 
			
		||||
        persistent: true,
 | 
			
		||||
      }).onOk(async () => {
 | 
			
		||||
        try {
 | 
			
		||||
          const ret = await resetTwoFactor();
 | 
			
		||||
          notifySuccess(ret, 3000);
 | 
			
		||||
        } catch {}
 | 
			
		||||
      });
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    const serverCount = ref(0);
 | 
			
		||||
    const serverOfflineCount = ref(0);
 | 
			
		||||
    const workstationCount = ref(0);
 | 
			
		||||
@@ -259,9 +330,13 @@ export default {
 | 
			
		||||
      user,
 | 
			
		||||
      needRefresh,
 | 
			
		||||
      darkMode,
 | 
			
		||||
      hosted,
 | 
			
		||||
      tokenExpired,
 | 
			
		||||
 | 
			
		||||
      // methods
 | 
			
		||||
      showUserPreferences,
 | 
			
		||||
      resetPassword,
 | 
			
		||||
      reset2FA,
 | 
			
		||||
      updateAvailable,
 | 
			
		||||
    };
 | 
			
		||||
  },
 | 
			
		||||
 
 | 
			
		||||
@@ -193,6 +193,7 @@ export default {
 | 
			
		||||
              value: script.id,
 | 
			
		||||
              timeout: script.default_timeout,
 | 
			
		||||
              args: script.args,
 | 
			
		||||
              env_vars: script.env_vars,
 | 
			
		||||
            });
 | 
			
		||||
          } else if (cat === "Unassigned" && !script.category) {
 | 
			
		||||
            tmp.push({
 | 
			
		||||
@@ -200,6 +201,7 @@ export default {
 | 
			
		||||
              value: script.id,
 | 
			
		||||
              timeout: script.default_timeout,
 | 
			
		||||
              args: script.args,
 | 
			
		||||
              env_vars: script.env_vars,
 | 
			
		||||
            });
 | 
			
		||||
          }
 | 
			
		||||
        });
 | 
			
		||||
 
 | 
			
		||||
@@ -17,6 +17,7 @@ export default function () {
 | 
			
		||||
        agentPlatform: "windows",
 | 
			
		||||
        agentTableLoading: false,
 | 
			
		||||
        needrefresh: false,
 | 
			
		||||
        tokenExpired: false,
 | 
			
		||||
        refreshSummaryTab: false,
 | 
			
		||||
        tableHeight: "300px",
 | 
			
		||||
        tabHeight: "300px",
 | 
			
		||||
@@ -83,6 +84,9 @@ export default function () {
 | 
			
		||||
      SET_REFRESH_NEEDED(state, action) {
 | 
			
		||||
        state.needrefresh = action;
 | 
			
		||||
      },
 | 
			
		||||
      SET_TOKEN_EXPIRED(state, action) {
 | 
			
		||||
        state.tokenExpired = action;
 | 
			
		||||
      },
 | 
			
		||||
      SET_SPLITTER(state, val) {
 | 
			
		||||
        // top toolbar is 50px. Filebar is 40px and agent filter tabs are 44px
 | 
			
		||||
        state.tableHeight = `${Screen.height - 50 - 40 - 78 - val}px`;
 | 
			
		||||
@@ -212,6 +216,7 @@ export default function () {
 | 
			
		||||
        context.commit("SET_URL_ACTION", data.url_action);
 | 
			
		||||
        context.commit("setShowCommunityScripts", data.show_community_scripts);
 | 
			
		||||
        context.commit("SET_HOSTED", data.hosted);
 | 
			
		||||
        context.commit("SET_TOKEN_EXPIRED", data.token_is_expired);
 | 
			
		||||
 | 
			
		||||
        if (data.date_format && data.date_format !== "")
 | 
			
		||||
          context.commit("setDateFormat", data.date_format);
 | 
			
		||||
 
 | 
			
		||||
@@ -68,6 +68,7 @@ export function formatScriptOptions(data) {
 | 
			
		||||
          value: script.id,
 | 
			
		||||
          timeout: script.default_timeout,
 | 
			
		||||
          args: script.args,
 | 
			
		||||
          env_vars: script.env_vars,
 | 
			
		||||
          filename: script.filename,
 | 
			
		||||
          syntax: script.syntax,
 | 
			
		||||
          script_type: script.script_type,
 | 
			
		||||
@@ -80,6 +81,7 @@ export function formatScriptOptions(data) {
 | 
			
		||||
          value: script.id,
 | 
			
		||||
          timeout: script.default_timeout,
 | 
			
		||||
          args: script.args,
 | 
			
		||||
          env_vars: script.env_vars,
 | 
			
		||||
          filename: script.filename,
 | 
			
		||||
          syntax: script.syntax,
 | 
			
		||||
          script_type: script.script_type,
 | 
			
		||||
@@ -285,7 +287,7 @@ export function formatDateInputField(isoDateString, noTimezone = false) {
 | 
			
		||||
  if (noTimezone) {
 | 
			
		||||
    isoDateString = isoDateString.replace("Z", "");
 | 
			
		||||
  }
 | 
			
		||||
  return date.formatDate(isoDateString, "YYYY-MM-DDTHH:mm:ss");
 | 
			
		||||
  return date.formatDate(isoDateString, "YYYY-MM-DDTHH:mm");
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// converts a local date string "YYYY-MM-DDTHH:mm:ss" to an iso date string with the local timezone
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user