From 9457bf2bc5a12f9eed28d14d8352bc38d0f82985 Mon Sep 17 00:00:00 2001
From: wh1te909 <7434746+wh1te909@users.noreply.github.com>
Date: Sun, 6 Oct 2024 05:59:51 +0000
Subject: [PATCH] hide global keystore content and add perms closes
 amidaware/tacticalrmm#1984

---
 src/components/accounts/RolesForm.vue                | 10 ++++++++++
 src/components/modals/coresettings/KeyStoreForm.vue  | 11 ++++++++++-
 src/components/modals/coresettings/KeyStoreTable.vue | 12 +++++++++++-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/components/accounts/RolesForm.vue b/src/components/accounts/RolesForm.vue
index d0c57f0e..31ae11b4 100644
--- a/src/components/accounts/RolesForm.vue
+++ b/src/components/accounts/RolesForm.vue
@@ -151,6 +151,14 @@
                 v-model="localRole.can_edit_core_settings"
                 label="Edit Global Settings"
               />
+              <q-checkbox
+                v-model="localRole.can_view_global_keystore"
+                label="View Global Key Store"
+              />
+              <q-checkbox
+                v-model="localRole.can_edit_global_keystore"
+                label="Edit Global Key Store"
+              />
               <q-checkbox
                 v-model="localRole.can_do_server_maint"
                 label="Do Server Maintenance"
@@ -477,6 +485,8 @@ export default {
           // settings perms
           can_view_core_settings: false,
           can_edit_core_settings: false,
+          can_view_global_keystore: false,
+          can_edit_global_keystore: false,
           can_do_server_maint: false,
           can_code_sign: false,
           can_run_urlactions: false,
diff --git a/src/components/modals/coresettings/KeyStoreForm.vue b/src/components/modals/coresettings/KeyStoreForm.vue
index 14f378e8..7c5ac4b4 100644
--- a/src/components/modals/coresettings/KeyStoreForm.vue
+++ b/src/components/modals/coresettings/KeyStoreForm.vue
@@ -27,8 +27,16 @@
             outlined
             dense
             v-model="localKey.value"
+            :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>
         </q-card-section>
 
         <q-card-actions align="right">
@@ -50,6 +58,7 @@ export default {
   props: { globalKey: Object },
   data() {
     return {
+      isPwd: true,
       localKey: {
         name: "",
         value: "",
diff --git a/src/components/modals/coresettings/KeyStoreTable.vue b/src/components/modals/coresettings/KeyStoreTable.vue
index 08f5789d..c18ac8f2 100644
--- a/src/components/modals/coresettings/KeyStoreTable.vue
+++ b/src/components/modals/coresettings/KeyStoreTable.vue
@@ -3,6 +3,15 @@
     <div class="row">
       <div class="text-subtitle2">Global Key Store</div>
       <q-space />
+      <q-btn
+        size="sm"
+        color="grey-5"
+        text-color="black"
+        class="q-mr-sm"
+        :label="isPwd ? 'Show values' : 'Hide values'"
+        :icon="isPwd ? 'visibility_off' : 'visibility'"
+        @click="isPwd = !isPwd"
+      />
       <q-btn
         size="sm"
         color="grey-5"
@@ -61,7 +70,7 @@
           </q-td>
           <!-- value -->
           <q-td>
-            {{ props.row.value }}
+            {{ isPwd ? "****" : props.row.value }}
           </q-td>
         </q-tr>
       </template>
@@ -79,6 +88,7 @@ export default {
   data() {
     return {
       keystore: [],
+      isPwd: true,
       pagination: {
         rowsPerPage: 0,
         sortBy: "name",