bump dev

package.json

@@ -1,6 +1,6 @@
 {
   "name": "web",
-  "version": "0.100.10-dev",
+  "version": "0.101.8-dev",
   "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.3",
+    "@quasar/extras": "1.15.6",
     "apexcharts": "3.35.5",
     "axios": "0.27.2",
-    "dotenv": "16.0.2",
+    "dotenv": "16.0.3",
     "qrcode.vue": "3.3.3",
-    "quasar": "2.8.4",
-    "vue": "3.2.39",
+    "quasar": "2.10.2",
+    "vue": "3.2.45",
     "vue3-ace-editor": "2.2.2",
     "vue3-apexcharts": "1.4.1",
     "vuedraggable": "4.1.0",
-    "vue-router": "4.1.5",
-    "vuex": "4.0.2"
+    "vue-router": "4.1.6",
+    "vuex": "4.1.0"
   },
   "devDependencies": {
     "@quasar/cli": "^1.3.2",
-    "@intlify/vite-plugin-vue-i18n": "^6.0.1",
-    "@quasar/app-vite": "^1.1.2",
-    "@types/node": "^18.7.18",
-    "@typescript-eslint/eslint-plugin": "^5.38.0",
-    "@typescript-eslint/parser": "^5.38.0",
-    "autoprefixer": "^10.4.11",
-    "eslint": "^8.21.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-vue": "^8.5.0",
-    "prettier": "^2.7.1",
-    "typescript": "^4.8.3"
+    "@intlify/vite-plugin-vue-i18n": "^6.0.3",
+    "@quasar/app-vite": "^1.1.3",
+    "@types/node": "^18.11.10",
+    "@typescript-eslint/eslint-plugin": "^5.45.0",
+    "@typescript-eslint/parser": "^5.45.0",
+    "autoprefixer": "10.4.13",
+    "eslint": "8.28.0",
+    "eslint-config-prettier": "8.5.0",
+    "eslint-plugin-vue": "8.7.1",
+    "prettier": "2.8.0",
+    "typescript": "4.9.3"
   }
 }

src/components/agents/WinUpdateTab.vue

@@ -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({

src/components/checks/ScriptCheck.vue

@@ -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,7 +146,7 @@ export default {
     const { dialogRef, onDialogHide, onDialogOK } = useDialogPluginComponent();
 
     // setup script dropdown
-    const { script, scriptOptions, defaultTimeout, defaultArgs } =
+    const { script, scriptOptions, defaultTimeout, defaultArgs, defaultEnvVars } =
       useScriptDropdown(props.check ? props.check.script : undefined, {
         onMount: true,
       });
@@ -145,6 +159,7 @@ export default {
           ...props.parent,
           script,
           script_args: defaultArgs,
+          env_vars: defaultEnvVars,
           timeout: defaultTimeout,
           check_type: "script",
           fails_b4_alert: 1,
@@ -163,6 +178,7 @@ export default {
       failOptions,
       scriptOptions,
       severityOptions,
+      envVarsLabel,
 
       // methods
       submit,

src/components/core/APIKeysTable.vue

@@ -208,7 +208,7 @@ export default {
     }
 
     // component lifecycle hooks
-    onMounted(getAPIKeys());
+    onMounted(getAPIKeys);
     return {
       // reactive data
       keys,

src/components/modals/agents/AgentDownload.vue

@@ -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>
@@ -86,12 +89,12 @@
       <p class="text-italic">
         Note: the auth token above will be valid for {{ info.expires }} hours.
       </p>
-      <q-btn
+      <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>

src/components/modals/agents/BulkAction.vue

@@ -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>
@@ -208,7 +220,7 @@ import { runBulkAction } from "@/api/agents";
 import { notifySuccess } from "@/utils/notify";
 import { cmdPlaceholder } from "@/composables/agents";
 import { removeExtraOptionCategories } from "@/utils/format";
-import { runAsUserToolTip } from "@/constants/constants";
+import { envVarsLabel, runAsUserToolTip } from "@/constants/constants";
 
 // ui imports
 import TacticalDropdown from "@/components/ui/TacticalDropdown.vue";
@@ -284,6 +296,7 @@ export default {
       scriptOptions,
       defaultTimeout,
       defaultArgs,
+      defaultEnvVars,
       getScriptOptions,
     } = useScriptDropdown();
     const { agents, agentOptions, getAgentOptions } = useAgentDropdown();
@@ -307,6 +320,7 @@ export default {
       script,
       timeout: defaultTimeout,
       args: defaultArgs,
+      env_vars: defaultEnvVars,
       run_as_user: false,
     });
     const loading = ref(false);
@@ -404,6 +418,7 @@ export default {
       targetOptions,
       patchModeOptions,
       runAsUserToolTip,
+      envVarsLabel,
 
       //computed
       modalTitle,

src/components/modals/agents/RunScript.vue

@@ -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"
@@ -178,7 +190,7 @@ import { useScriptDropdown } from "@/composables/scripts";
 import { useCustomFieldDropdown } from "@/composables/core";
 import { runScript } from "@/api/agents";
 import { notifySuccess } from "@/utils/notify";
-import { runAsUserToolTip } from "@/constants/constants";
+import { envVarsLabel, runAsUserToolTip } from "@/constants/constants";
 import {
   formatScriptSyntax,
   removeExtraOptionCategories,
@@ -209,7 +221,7 @@ export default {
     const { dialogRef, onDialogHide } = useDialogPluginComponent();
 
     // setup dropdowns
-    const { script, scriptOptions, defaultTimeout, defaultArgs, syntax, link } =
+    const { script, scriptOptions, defaultTimeout, defaultArgs, defaultEnvVars, syntax, link } =
       useScriptDropdown(props.script, {
         onMount: true,
         filterByPlatform: props.agent.plat,
@@ -225,6 +237,7 @@ export default {
       save_all_output: false,
       script,
       args: defaultArgs,
+      env_vars: defaultEnvVars,
       timeout: defaultTimeout,
       run_as_user: false,
     });
@@ -281,6 +294,7 @@ export default {
       // non-reactive data
       outputOptions,
       runAsUserToolTip,
+      envVarsLabel,
 
       //methods
       formatScriptSyntax,

src/components/modals/alerts/AlertTemplateForm.vue

@@ -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() {

src/components/scripts/ScriptFormModal.vue

@@ -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
@@ -137,7 +148,7 @@
                 '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. Not supported on Windows Server.
+                returned.
               </q-tooltip>
             </q-checkbox>
             <q-input
@@ -229,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",
@@ -266,6 +278,7 @@ export default {
           args: [],
           script_body: "",
           run_as_user: false,
+          env_vars: [],
         });
 
     if (props.clone) script.value.name = `(Copy) ${script.value.name}`;
@@ -363,6 +376,7 @@ export default {
       // non-reactive data
       shellOptions,
       agentPlatformOptions,
+      envVarsLabel,
 
       //computed
       title,

src/components/scripts/ScriptManager.vue

@@ -867,7 +867,7 @@ export default {
     }
 
     // component life cycle hooks
-    onMounted(getScripts());
+    onMounted(getScripts);
 
     return {
       // reactive data

src/components/scripts/ScriptUploadModal.vue

@@ -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"

src/components/scripts/TestScriptModal.vue

@@ -45,6 +45,7 @@ export default {
         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);

src/components/tasks/AutomatedTaskForm.vue

@@ -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,7 +836,7 @@ export default {
     const { dialogRef, onDialogHide, onDialogOK } = useDialogPluginComponent();
 
     // setup dropdowns
-    const { script, scriptOptions, defaultTimeout, defaultArgs } =
+    const { script, scriptOptions, defaultTimeout, defaultArgs, defaultEnvVars } =
       useScriptDropdown(undefined, {
         onMount: true,
       });
@@ -914,6 +933,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 +947,7 @@ export default {
       // clear fields after add
       script.value = null;
       defaultArgs.value = [];
+      defaultEnvVars.value = [];
       defaultTimeout.value = 30;
       command.value = "";
     }
@@ -1089,6 +1110,7 @@ export default {
       script,
       defaultTimeout,
       defaultArgs,
+      defaultEnvVars,
       actionType,
       command,
       shell,
@@ -1116,6 +1138,7 @@ export default {
       monthOptions,
       taskTypeOptions,
       taskInstancePolicyOptions,
+      envVarsLabel,
 
       // methods
       submit,

src/composables/accounts.js

@@ -31,7 +31,7 @@ export function useUserDropdown(onMount = false) {
   }
 
   if (onMount) {
-    onMounted(getUserOptions());
+    onMounted(getUserOptions);
   }
 
   return {

src/composables/scripts.js

@@ -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,
 

src/constants/constants.ts

@@ -1,15 +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";
 
-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. Not supported on Windows Server.";
+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 {
-  GOARCH_AMD64,
-  GOARCH_i386,
-  GOARCH_ARM64,
-  GOARCH_ARM32,
-  runAsUserToolTip,
-};
+export const envVarsLabel = 
+  "Environment vars (press Enter after typing each key=value pair)"

src/layouts/MainLayout.vue

@@ -14,6 +14,22 @@
           @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
@@ -167,6 +183,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
@@ -259,6 +276,8 @@ export default {
       user,
       needRefresh,
       darkMode,
+      hosted,
+      tokenExpired,
 
       // methods
       showUserPreferences,

src/mixins/mixins.js

@@ -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,
             });
           }
         });

src/store/index.js

@@ -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);

src/utils/format.js

@@ -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,