From 00b66a732976e4811e032ae2de321d881757ca33 Mon Sep 17 00:00:00 2001
From: Shubham Jambhale <shubham.jambhale@arista.com>
Date: Wed, 10 Dec 2025 03:09:50 +0530
Subject: [PATCH 1/2] ngfw-15450 root sertificate funxtionality implementation

---
 .../settings/administration/Certificates.vue  | 58 ++++++++++++++++++-
 untangle-vue-ui/source/src/store/config.js    |  4 +-
 untangle-vue-ui/source/src/util/util.js       | 27 +++++++++
 3 files changed, 84 insertions(+), 5 deletions(-)

diff --git a/untangle-vue-ui/source/src/components/settings/administration/Certificates.vue b/untangle-vue-ui/source/src/components/settings/administration/Certificates.vue
index 07a038425..51fa13c39 100644
--- a/untangle-vue-ui/source/src/components/settings/administration/Certificates.vue
+++ b/untangle-vue-ui/source/src/components/settings/administration/Certificates.vue
@@ -1,9 +1,17 @@
 <template>
   <settings-certificates
-    :certificates-information="certificatesInformation"
+    :settings="commonSettings"
     @certificate-generator="certificteGenerator"
     @download-root-certificate="downloadRootCertificate"
-  />
+    @delete-certificate="deleteCertificate"
+    @set-root-certificate="setRootCertificate"
+  >
+    <template #actions="{ newSettings, isDirty, validate }">
+      <u-btn :min-width="null" :disabled="!isDirty" @click="onSaveSettings(newSettings, validate)">{{
+        $t('save')
+      }}</u-btn>
+    </template>
+  </settings-certificates>
 </template>
 
 <script>
@@ -23,6 +31,9 @@
        */
       certificatesInformation: ({ $store }) => $store.getters['config/certificatesInformation'],
       rootCertificates: ({ $store }) => $store.getters['config/rootCertificates'],
+      commonSettings() {
+        return { certificatesInformation: this.certificatesInformation, rootCertificates: this.rootCertificates }
+      },
     },
 
     created() {
@@ -35,7 +46,7 @@
        * @param {boolean} refetch - Whether to refetch the data from the server.
        */
       async loadCertificates(refetch) {
-        await this.$store.dispatch('config/getCertificatesInformation', refetch)
+        await this.$store.dispatch('config/getRootCertificateInformation', refetch)
         await this.$store.dispatch('config/getRootCertificateList', refetch)
       },
       /**
@@ -77,6 +88,47 @@
         }
       },
 
+      /**
+       * Sets the active root certificate.
+       * @param {string} payload.data.fileName - The name of the certificate file.
+       * @param {Function} payload.cb - Callback function to handle success or error.
+       */
+      async setRootCertificate({ data, cb }) {
+        try {
+          await Rpc.asyncData('rpc.UvmContext.certificateManager.setActiveRootCertificate', data.fileName)
+          await this.loadCertificates(true)
+          cb(null, true) // success
+        } catch (err) {
+          Util.handleException(err)
+          cb(err, false) // error
+        }
+      },
+
+      /**
+       * Deletes a certificate.
+       * @param {Object} payload.data - Data containing the certificate details.
+       * @param {string} payload.certMode - The mode of the certificate (e.g., 'ROOT').
+       * @param {Function} payload.cb - Callback function to handle success or error.
+       */
+      async deleteCertificate({ data, certMode, cb }) {
+        try {
+          const validation = this.canDeleteCertificate(data)
+
+          if (!validation.allowed) {
+            cb(validation.message, false)
+            return
+          }
+          await Rpc.asyncData('rpc.UvmContext.certificateManager.removeCertificate', certMode, data.fileName)
+          if (certMode === 'ROOT') {
+            await this.loadCertificates(true)
+          }
+          cb(null, true) // success
+        } catch (err) {
+          Util.handleException(err)
+          cb(err, false) // error
+        }
+      },
+
       /* Optional hook triggered on browser refresh.
        */
       onBrowserRefresh() {
diff --git a/untangle-vue-ui/source/src/store/config.js b/untangle-vue-ui/source/src/store/config.js
index 15d6c6c36..a598cbf94 100644
--- a/untangle-vue-ui/source/src/store/config.js
+++ b/untangle-vue-ui/source/src/store/config.js
@@ -57,7 +57,7 @@ const getters = {
   /* Retrieves the certificates information from the state. */
   certificatesInformation: state => state.certificatesInformation || {},
   /* Retrieves the list of root certificates from the state. */
-  rootCertificates: state => state.rootCertificates || [],
+  rootCertificates: state => state.rootCertificates?.list || [],
 }
 
 const mutations = {
@@ -420,7 +420,7 @@ const actions = {
 
   /* Get Certificate  */
 
-  async getCertificatesInformation({ state, commit }, refetch) {
+  async getRootCertificateInformation({ state, commit }, refetch) {
     if (state.certificatesInformation && !refetch) {
       return
     }
diff --git a/untangle-vue-ui/source/src/util/util.js b/untangle-vue-ui/source/src/util/util.js
index 19a1a2635..14a2eb1ee 100644
--- a/untangle-vue-ui/source/src/util/util.js
+++ b/untangle-vue-ui/source/src/util/util.js
@@ -571,6 +571,33 @@ const util = {
 
     return certSubject.join('')
   },
+
+  /**
+   * Determines if a certificate can be deleted based on certain conditions.
+   * A certificate cannot be deleted if it's the system's Apache certificate ('apache.pem')
+   * or if it is assigned to one or more services (HTTPS, SMTPS, IPsec, RADIUS).
+   *
+   * @param {object} data - The certificate data object.
+   * @param {string} data.fileName - The file name of the certificate.
+   * @returns {{allowed: boolean, message?: string}} An object indicating if deletion is allowed and an optional error message.
+   */
+  canDeleteCertificate(data) {
+    if (data.fileName === 'apache.pem') {
+      return {
+        allowed: false,
+        message: 'system_certificate_cannot_removed_error_message',
+      }
+    }
+
+    if (data.httpsServer || data.smtpsServer || data.ipsecServer || data.radiusServer) {
+      return {
+        allowed: false,
+        message: 'certificate_assigned_to_one_or_more_services_error_message',
+      }
+    }
+
+    return { allowed: true }
+  },
 }
 
 export default util

From d554f64fd95bf8401db7d00f02b0e26850bc761d Mon Sep 17 00:00:00 2001
From: Shubham Jambhale <shubham.jambhale@arista.com>
Date: Wed, 10 Dec 2025 12:03:47 +0530
Subject: [PATCH 2/2] ngfw-15450 Util declearation change and config store
 import changes in google

---
 .../components/settings/administration/Certificates.vue   | 2 +-
 .../src/components/settings/administration/Google.vue     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/untangle-vue-ui/source/src/components/settings/administration/Certificates.vue b/untangle-vue-ui/source/src/components/settings/administration/Certificates.vue
index 51fa13c39..8048c9503 100644
--- a/untangle-vue-ui/source/src/components/settings/administration/Certificates.vue
+++ b/untangle-vue-ui/source/src/components/settings/administration/Certificates.vue
@@ -112,7 +112,7 @@
        */
       async deleteCertificate({ data, certMode, cb }) {
         try {
-          const validation = this.canDeleteCertificate(data)
+          const validation = Util.canDeleteCertificate(data)
 
           if (!validation.allowed) {
             cb(validation.message, false)
diff --git a/untangle-vue-ui/source/src/components/settings/administration/Google.vue b/untangle-vue-ui/source/src/components/settings/administration/Google.vue
index fa1e23cd8..e899ee402 100644
--- a/untangle-vue-ui/source/src/components/settings/administration/Google.vue
+++ b/untangle-vue-ui/source/src/components/settings/administration/Google.vue
@@ -30,10 +30,10 @@
        * Retrieves Google settings from the Vuex store.
        * @returns {Object} Google settings object.
        */
-      googleSettings: ({ $store }) => $store.getters['settings/googleSettings'],
+      googleSettings: ({ $store }) => $store.getters['config/googleSettings'],
 
       /* Checks if Google Drive is connected from the Vuex store */
-      isGoogleDriveConnected: ({ $store }) => $store.getters['settings/isGoogleDriveConnected'],
+      isGoogleDriveConnected: ({ $store }) => $store.getters['config/isGoogleDriveConnected'],
 
       /**
        * Returns the current Google settings.
@@ -49,8 +49,8 @@
 
     /** Fetches initial admin and system settings. */
     created() {
-      this.$store.dispatch('settings/getGoogleSettings', false)
-      this.$store.dispatch('settings/getIsGoogleDriveConnected')
+      this.$store.dispatch('config/getGoogleSettings', false)
+      this.$store.dispatch('config/getIsGoogleDriveConnected')
       this.buildGoogleRefreshTask()
     },