dayjs().isAfter(props.cert?.not_before) && dayjs(
- {{ $gettext('Intermediate Certification Authorities: %{issuer}', { issuer: cert.issuer_name }) }}
+ {{ $gettext('Issuer: %{issuer}', { issuer: cert.issuer_name }) }}
{{ $gettext('Expired At: %{date}', { date: dayjs(cert.not_after).format('YYYY-MM-DD HH:mm:ss').toString() }) }}
diff --git a/app/src/views/domain/cert/IssueCert.vue b/app/src/views/domain/cert/IssueCert.vue
index 8fef5095..0ae48525 100644
--- a/app/src/views/domain/cert/IssueCert.vue
+++ b/app/src/views/domain/cert/IssueCert.vue
@@ -3,25 +3,17 @@ import ObtainCert from '@/views/domain/cert/components/ObtainCert.vue'
import type { NgxDirective } from '@/api/ngx'
export interface Props {
- enabled: boolean
configName: string
}
const props = defineProps()
-const emit = defineEmits(['update:enabled'])
-
const issuing_cert = ref(false)
const obtain_cert = ref()
const directivesMap = inject('directivesMap') as Ref>
-const enabled = computed({
- get() {
- return props.enabled
- },
- set(value) {
- emit('update:enabled', value)
- },
+const enabled = defineModel('enabled', {
+ default: () => false,
})
const no_server_name = computed(() => {
@@ -35,7 +27,9 @@ provide('no_server_name', no_server_name)
provide('props', props)
provide('issuing_cert', issuing_cert)
-watch(no_server_name, () => emit('update:enabled', false))
+watch(no_server_name, () => {
+ enabled.value = false
+})
const update = ref(0)
diff --git a/app/src/views/domain/cert/components/ChangeCert/ChangeCert.vue b/app/src/views/domain/cert/components/ChangeCert/ChangeCert.vue
index 49dd6f15..7beb1128 100644
--- a/app/src/views/domain/cert/components/ChangeCert/ChangeCert.vue
+++ b/app/src/views/domain/cert/components/ChangeCert/ChangeCert.vue
@@ -6,6 +6,8 @@ import cert from '@/api/cert'
import type { NgxDirective } from '@/api/ngx'
import certColumns from '@/views/certificate/CertificateList/certColumns'
+const emit = defineEmits(['change'])
+
const current_server_directives = inject('current_server_directives') as WritableComputedRef
const visible = ref(false)
@@ -34,6 +36,10 @@ async function ok() {
})
visible.value = false
+ emit('change', records.value)
+
+ records.value = []
+ selectedKeys.value = []
}
diff --git a/internal/cert/cert_info.go b/internal/cert/cert_info.go
index fbf7e254..75402ac7 100644
--- a/internal/cert/cert_info.go
+++ b/internal/cert/cert_info.go
@@ -17,21 +17,18 @@ type Info struct {
func GetCertInfo(sslCertificatePath string) (info *Info, err error) {
certData, err := os.ReadFile(sslCertificatePath)
-
if err != nil {
err = errors.Wrap(err, "error read certificate")
return
}
block, _ := pem.Decode(certData)
-
if block == nil || block.Type != "CERTIFICATE" {
err = errors.New("certificate decoding error")
return
}
cert, err := x509.ParseCertificate(block.Bytes)
-
if err != nil {
err = errors.Wrap(err, "certificate parsing error")
return
@@ -43,6 +40,5 @@ func GetCertInfo(sslCertificatePath string) (info *Info, err error) {
NotAfter: cert.NotAfter,
NotBefore: cert.NotBefore,
}
-
return
}