audit fix

Author: 0xJacky

frontend/src/api/domain.ts

@@ -13,11 +13,7 @@ class Domain extends Curd {
     get_template() {
         return http.get('template')
     }
-
-    cert_info(path: string) {
-        return http.get('cert_info?ssl_certificate_path=' + path)
-    }
-
+    
     add_auto_cert(domain: string) {
         return http.post('cert/' + domain)
     }

frontend/src/views/domain/DomainEdit.vue

@@ -24,6 +24,8 @@ const ngx_config = reactive({
     servers: []
 })
 
+const cert_info_map: any = reactive({})
+
 const auto_cert = ref(false)
 const enabled = ref(false)
 const configText = ref('')
@@ -33,13 +35,23 @@ const saving = ref(false)
 
 init()
 
+function handle_response(r: any) {
+
+    Object.keys(cert_info_map).forEach(v => {
+        delete cert_info_map[v]
+    })
+
+    configText.value = r.config
+    enabled.value = r.enabled
+    auto_cert.value = r.auto_cert
+    Object.assign(ngx_config, r.tokenized)
+    Object.assign(cert_info_map, r.cert_info)
+}
+
 function init() {
     if (name.value) {
         domain.get(name.value).then((r: any) => {
-            configText.value = r.config
-            enabled.value = r.enabled
-            auto_cert.value = r.auto_cert
-            Object.assign(ngx_config, r.tokenized)
+            handle_response(r)
         }).catch(r => {
             message.error(r.message ?? $gettext('Server error'))
         })
@@ -74,9 +86,8 @@ const save = async () => {
     }
 
     domain.save(name.value, {content: configText.value}).then(r => {
-        configText.value = r.config
-        enabled.value = r.enabled
-        Object.assign(ngx_config, r.tokenized)
+        handle_response(r)
+
         message.success($gettext('Saved successfully'))
 
     }).catch((e: any) => {
@@ -151,6 +162,7 @@ function on_change_enabled(checked: boolean) {
                     <ngx-config-editor
                         ref="ngx_config_editor"
                         :ngx_config="ngx_config"
+                        :cert_info="cert_info_map"
                         v-model:auto_cert="auto_cert"
                         :enabled="enabled"
                         @callback="save()"

frontend/src/views/domain/cert/Cert.vue

@@ -3,31 +3,18 @@ import CertInfo from '@/views/domain/cert/CertInfo.vue'
 import IssueCert from '@/views/domain/cert/IssueCert.vue'
 import {computed, ref} from 'vue'
 
-const props = defineProps(['directivesMap', 'current_server_directives', 'enabled'])
+const props = defineProps(['directivesMap', 'current_server_directives', 'enabled', 'cert_info'])
 
 const emit = defineEmits(['callback', 'update:enabled'])
 
-const info = ref(null)
-
-interface Info {
-    get(): void
-}
-
 function callback() {
-    const t: Info | null = info.value
-    t!.get()
     emit('callback')
 }
 
 const name = computed(() => {
     return props.directivesMap['server_name'][0].params.trim()
 })
 
-const ssl_certificate_path = computed(() => {
-    return props.directivesMap['ssl_certificate']?.[0].params.trim() ?? null
-})
-
-
 const enabled = computed({
     get() {
         return props.enabled
@@ -41,7 +28,8 @@ const enabled = computed({
 
 <template>
     <div>
-        <cert-info ref="info" :ssl_certificate_path="ssl_certificate_path" v-if="ssl_certificate_path"/>
+        <cert-info ref="info" :cert="props.cert_info"/>
+
         <issue-cert
             :current_server_directives="props.current_server_directives"
             :directives-map="props.directivesMap"

frontend/src/views/domain/cert/CertInfo.vue

@@ -4,29 +4,13 @@ import dayjs from 'dayjs'
 import {reactive, ref} from 'vue'
 import domain from '@/api/domain'
 
-const props = defineProps(['ssl_certificate_path'])
+const props = defineProps(['cert'])
 
-const ok = ref(false)
-const cert = reactive({issuer_name: '', subject_name: '', not_after: '', not_before: ''})
-
-get()
-
-function get() {
-    domain.cert_info(props.ssl_certificate_path).then((r: any) => {
-        Object.assign(cert, r)
-        ok.value = true
-    }).catch(() => {
-        ok.value = false
-    })
-}
-
-defineExpose({
-    get
-})
+const cert = props.cert
 </script>
 
 <template>
-    <div class="cert-info" v-if="ok">
+    <div class="cert-info" v-if="cert">
         <h2 v-translate>Certificate Status</h2>
         <p v-translate="{issuer: cert.issuer_name}">Intermediate Certification Authorities: %{issuer}</p>
         <p v-translate="{name: cert.subject_name}">Subject Name: %{name}</p>

frontend/src/views/domain/ngx_conf/NgxConfigEditor.vue

@@ -8,7 +8,7 @@ import Cert from '@/views/domain/cert/Cert.vue'
 
 const {$gettext} = useGettext()
 
-const props = defineProps(['ngx_config', 'auto_cert', 'enabled'])
+const props = defineProps(['ngx_config', 'auto_cert', 'enabled', 'cert_info'])
 
 const emit = defineEmits(['callback', 'update:auto_cert'])
 
@@ -143,6 +143,7 @@ const autoCertRef = computed({
                     <template v-if="current_support_ssl&&enabled">
                         <cert
                             v-if="current_support_ssl"
+                            :cert_info="props.cert_info[k]"
                             :current_server_directives="current_server_directives"
                             :directives-map="directivesMap"
                             v-model:enabled="autoCertRef"