fix: change cert err when ssl directives not exist

Close #105
This commit is contained in:
0xJacky 2023-04-24 00:03:28 +08:00
parent 4c722b9e64
commit 26938ae1bb
No known key found for this signature in database
GPG key ID: B6E4A6E4A561BAF0
7 changed files with 114 additions and 76 deletions

View file

@ -8,6 +8,12 @@ Yet another Nginx Web UI, developed by [0xJacky](https://jackyu.cn/) and [Hintay
[![Build and Publish](https://github.com/0xJacky/nginx-ui/actions/workflows/build.yml/badge.svg)](https://github.com/0xJacky/nginx-ui/actions/workflows/build.yml)
## Stargazers over time
[![Stargazers over time](https://starchart.cc/0xJacky/nginx-ui.svg)](https://starchart.cc/0xJacky/nginx-ui)
English | [简体中文](README-zh_CN.md) | [繁體中文](README-zh_TW.md)
<details>

View file

@ -1,7 +1,7 @@
{
"name": "nginx-ui-frontend-next",
"private": true,
"version": "1.8.2",
"version": "1.8.3",
"type": "commonjs",
"scripts": {
"dev": "vite",
@ -30,7 +30,7 @@
"vite-plugin-build-id": "^0.2.3",
"vue": "^3.2.47",
"vue-github-button": "https://github.com/0xJacky/vue-github-button",
"vue-router": "4",
"vue-router": "^4.1.6",
"vue3-ace-editor": "^2.2.2",
"vue3-apexcharts": "^1.4.1",
"vue3-gettext": "^2.5.0-alpha.1",
@ -49,6 +49,6 @@
"vite": "^4.2.1",
"vite-plugin-html": "^3.2.0",
"vite-svg-loader": "^4.0.0",
"vue-tsc": "^1.2.0"
"vue-tsc": "^1.4.2"
}
}

View file

@ -1 +1 @@
{"version":"1.8.2","build_id":100,"total_build":170}
{"version":"1.8.3","build_id":104,"total_build":174}

View file

@ -1,6 +1,6 @@
<script setup lang="tsx">
import {useGettext} from 'vue3-gettext'
import {h, ref} from 'vue'
import {ComputedRef, h, inject, ref} from 'vue'
import StdTable from '@/components/StdDataDisplay/StdTable.vue'
import cert from '@/api/cert'
import {customRender} from '@/components/StdDataDisplay/StdTableTransformer'
@ -11,6 +11,8 @@ const {$gettext} = useGettext()
const props = defineProps(['directivesMap'])
const current_server_directives: ComputedRef<any> | undefined = inject('current_server_directives')
const visible = ref(false)
const record: any = ref({})
@ -59,8 +61,22 @@ function onSelectedRecord(r: any) {
}
function ok() {
props.directivesMap['ssl_certificate'][0]['params'] = record.value.ssl_certificate_path
props.directivesMap['ssl_certificate_key'][0]['params'] = record.value.ssl_certificate_key_path
if (props.directivesMap['ssl_certificate']?.[0]) {
props.directivesMap['ssl_certificate'][0]['params'] = record.value.ssl_certificate_path
} else {
current_server_directives?.value.push({
directive: 'ssl_certificate',
params: record.value.ssl_certificate_path
})
}
if (props.directivesMap['ssl_certificate_key']?.[0]) {
props.directivesMap['ssl_certificate_key'][0]['params'] = record.value.ssl_certificate_key_path
} else {
current_server_directives?.value.push({
directive: 'ssl_certificate_key',
params: record.value.ssl_certificate_key_path
})
}
visible.value = false
}
</script>

View file

@ -1,7 +1,7 @@
<script setup lang="ts">
import DirectiveEditor from '@/views/domain/ngx_conf/directive/DirectiveEditor.vue'
import LocationEditor from '@/views/domain/ngx_conf/LocationEditor.vue'
import {computed, inject, onMounted, ref, watch} from 'vue'
import {computed, inject, onMounted, provide, ref, watch} from 'vue'
import {useRoute, useRouter} from 'vue-router'
import {useGettext} from 'vue3-gettext'
import Cert from '@/views/domain/cert/Cert.vue'
@ -108,6 +108,8 @@ const current_server_directives = computed(() => {
return props.ngx_config.servers?.[current_server_index.value]?.directives
})
provide('current_server_directives', current_server_directives)
const directivesMap = computed(() => {
const map = <any>{}

View file

@ -1 +1 @@
{"version":"1.8.2","build_id":100,"total_build":170}
{"version":"1.8.3","build_id":104,"total_build":174}

View file

@ -848,49 +848,49 @@
resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-4.1.0.tgz#b6a9d83cd91575f7ee15593f6444397f68751073"
integrity sha512-++9JOAFdcXI3lyer9UKUV4rfoQ3T1RN8yDqoCLar86s0xQct5yblxAE+yWgRnU5/0FOlVCpTZpYSBV/bGWrSrQ==
"@volar/language-core@1.3.0-alpha.0":
version "1.3.0-alpha.0"
resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-1.3.0-alpha.0.tgz#4924b4cbc37dbce5f3845c1d2b2811938223a980"
integrity sha512-W3uMzecHPcbwddPu4SJpUcPakRBK/y/BP+U0U6NiPpUX1tONLC4yCawt+QBJqtgJ+sfD6ztf5PyvPL3hQRqfOA==
"@volar/language-core@1.4.0":
version "1.4.0"
resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-1.4.0.tgz#cad7ed76b10575142885a7a7edd1176d93c48083"
integrity sha512-zZg771L/v4MCPwM1KJxvnQ3q3QgbGJtEytivqf+PsxPr0kQ7XtwB1J30dd+YSGN869pXXZ0V6vWdHkDpWC8F3A==
dependencies:
"@volar/source-map" "1.3.0-alpha.0"
"@volar/source-map" "1.4.0"
"@volar/source-map@1.3.0-alpha.0":
version "1.3.0-alpha.0"
resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-1.3.0-alpha.0.tgz#c45d51ecb9759604d29fb80211d2fc9765e5559c"
integrity sha512-jSdizxWFvDTvkPYZnO6ew3sBZUnS0abKCbuopkc0JrIlFbznWC/fPH3iPFIMS8/IIkRxq1Jh9VVG60SmtsdaMQ==
"@volar/source-map@1.4.0":
version "1.4.0"
resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-1.4.0.tgz#b9e6f21bd617cf73db5245352b25f260ca8a8062"
integrity sha512-gkV8ol9qtP7aMdgijc8a5Yoxxoo90TT55YCi9bsMbKxEUDsOAnlciFNlijR9Ebe42d67GV3w15/RzjveTRNGBw==
dependencies:
muggle-string "^0.2.2"
"@volar/typescript@1.3.0-alpha.0":
version "1.3.0-alpha.0"
resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-1.3.0-alpha.0.tgz#f79bbc9939016700812b18191c47eb035913c6c3"
integrity sha512-5UItyW2cdH2mBLu4RrECRNJRgtvvzKrSCn2y3v/D61QwIDkGx4aeil6x8RFuUL5TFtV6QvVHXnsOHxNgd+sCow==
"@volar/typescript@1.4.0":
version "1.4.0"
resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-1.4.0.tgz#11473a68b09d8e662f98c83ce64e0e614deb2ac9"
integrity sha512-r6OMHj/LeS86iQy3LEjjS+qpmHr9I7BiH8gAwp9WEJP76FHlMPi/EPDQxhf3VcMQ/w6Pi5aBczqI+I3akr9t4g==
dependencies:
"@volar/language-core" "1.3.0-alpha.0"
"@volar/language-core" "1.4.0"
"@volar/vue-language-core@1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@volar/vue-language-core/-/vue-language-core-1.2.0.tgz#a600aa93c6a4e89bf2b525b7e876b39e3afdfb9b"
integrity sha512-w7yEiaITh2WzKe6u8ZdeLKCUz43wdmY/OqAmsB/PGDvvhTcVhCJ6f0W/RprZL1IhqH8wALoWiwEh/Wer7ZviMQ==
"@volar/vue-language-core@1.4.2":
version "1.4.2"
resolved "https://registry.yarnpkg.com/@volar/vue-language-core/-/vue-language-core-1.4.2.tgz#dad9ebd126ffbb4b6252d8a89ac85d8d4c86bd4e"
integrity sha512-bDdFowfnyHI7udELEgUWukOh4l9jVTaxb9jZtj0GxUp0Mjj0u81d9+jE2UC3fFJpbndQLGFR6F+ffguHgmrj6Q==
dependencies:
"@volar/language-core" "1.3.0-alpha.0"
"@volar/source-map" "1.3.0-alpha.0"
"@vue/compiler-dom" "^3.2.47"
"@vue/compiler-sfc" "^3.2.47"
"@vue/reactivity" "^3.2.47"
"@vue/shared" "^3.2.47"
minimatch "^6.1.6"
"@volar/language-core" "1.4.0"
"@volar/source-map" "1.4.0"
"@vue/compiler-dom" "^3.2.0"
"@vue/compiler-sfc" "^3.2.0"
"@vue/reactivity" "^3.2.0"
"@vue/shared" "^3.2.0"
minimatch "^9.0.0"
muggle-string "^0.2.2"
vue-template-compiler "^2.7.14"
"@volar/vue-typescript@1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@volar/vue-typescript/-/vue-typescript-1.2.0.tgz#825dab4624a116d8be21efbf0c4a7bd6dec51d37"
integrity sha512-zjmRi9y3J1EkG+pfuHp8IbHmibihrKK485cfzsHjiuvJMGrpkWvlO5WVEk8oslMxxeGC5XwBFE9AOlvh378EPA==
"@volar/vue-typescript@1.4.2":
version "1.4.2"
resolved "https://registry.yarnpkg.com/@volar/vue-typescript/-/vue-typescript-1.4.2.tgz#360b80817edcc93d576fa2658bc3271471795ebb"
integrity sha512-A1m1cSvS0Pf7Sm9q0S/1riV4RQQeH2h5gGo0vR9fGK2SrAStvh4HuuxPOX4N9uMDbRsNMhC0ILXwtlvjQ/IXJA==
dependencies:
"@volar/typescript" "1.3.0-alpha.0"
"@volar/vue-language-core" "1.2.0"
"@volar/typescript" "1.4.0"
"@volar/vue-language-core" "1.4.2"
"@vue/babel-helper-vue-transform-on@^1.0.2":
version "1.0.2"
@ -940,7 +940,7 @@
"@vue/compiler-core" "3.2.37"
"@vue/shared" "3.2.37"
"@vue/compiler-dom@3.2.47", "@vue/compiler-dom@^3.2.47":
"@vue/compiler-dom@3.2.47", "@vue/compiler-dom@^3.2.0":
version "3.2.47"
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.47.tgz#a0b06caf7ef7056939e563dcaa9cbde30794f305"
integrity sha512-dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ==
@ -964,7 +964,7 @@
postcss "^8.1.10"
source-map "^0.6.1"
"@vue/compiler-sfc@3.2.47", "@vue/compiler-sfc@^3.2.20", "@vue/compiler-sfc@^3.2.47":
"@vue/compiler-sfc@3.2.47", "@vue/compiler-sfc@^3.2.0", "@vue/compiler-sfc@^3.2.20":
version "3.2.47"
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.47.tgz#1bdc36f6cdc1643f72e2c397eb1a398f5004ad3d"
integrity sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ==
@ -996,11 +996,6 @@
"@vue/compiler-dom" "3.2.47"
"@vue/shared" "3.2.47"
"@vue/devtools-api@^6.1.4":
version "6.2.1"
resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.2.1.tgz#6f2948ff002ec46df01420dfeff91de16c5b4092"
integrity sha512-OEgAMeQXvCoJ+1x8WyQuVZzFo0wcyCmUR3baRVLmKBo1LmYZWMlRiXlux5jd0fqVJu6PfDbOrZItVqUEzLobeQ==
"@vue/devtools-api@^6.4.5":
version "6.4.5"
resolved "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.4.5.tgz#d54e844c1adbb1e677c81c665ecef1a2b4bb8380"
@ -1035,7 +1030,7 @@
dependencies:
"@vue/shared" "3.2.37"
"@vue/reactivity@3.2.47", "@vue/reactivity@^3.2.47":
"@vue/reactivity@3.2.47", "@vue/reactivity@^3.2.0":
version "3.2.47"
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.47.tgz#1d6399074eadfc3ed35c727e2fd707d6881140b6"
integrity sha512-7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ==
@ -1097,7 +1092,7 @@
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.37.tgz#8e6adc3f2759af52f0e85863dfb0b711ecc5c702"
integrity sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==
"@vue/shared@3.2.47", "@vue/shared@^3.2.47":
"@vue/shared@3.2.47", "@vue/shared@^3.2.0":
version "3.2.47"
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.47.tgz#e597ef75086c6e896ff5478a6bfc0a7aa4bbd14c"
integrity sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ==
@ -2273,6 +2268,13 @@ lru-cache@^5.1.1:
dependencies:
yallist "^3.0.2"
lru-cache@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
dependencies:
yallist "^4.0.0"
magic-string@^0.25.7:
version "0.25.9"
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"
@ -2359,13 +2361,6 @@ minimatch@^5.0.1:
dependencies:
brace-expansion "^2.0.1"
minimatch@^6.1.6:
version "6.2.0"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-6.2.0.tgz#2b70fd13294178c69c04dfc05aebdb97a4e79e42"
integrity sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg==
dependencies:
brace-expansion "^2.0.1"
minimatch@^7.4.2:
version "7.4.6"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-7.4.6.tgz#845d6f254d8f4a5e4fd6baf44d5f10c8448365fb"
@ -2373,6 +2368,13 @@ minimatch@^7.4.2:
dependencies:
brace-expansion "^2.0.1"
minimatch@^9.0.0:
version "9.0.0"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.0.tgz#bfc8e88a1c40ffd40c172ddac3decb8451503b56"
integrity sha512-0jJj8AvgKqWN05mrwuqi8QYKx1WmYSUoKSxu5Qhs9prezTz10sxAHGNZe9J9cqIJzta8DWsleh2KaVaLl6Ru2w==
dependencies:
brace-expansion "^2.0.1"
ms@2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
@ -2875,10 +2877,10 @@ rimraf@^3.0.2:
dependencies:
glob "^7.1.3"
rollup@^3.18.0:
version "3.20.2"
resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.20.2.tgz#f798c600317f216de2e4ad9f4d9ab30a89b690ff"
integrity sha512-3zwkBQl7Ai7MFYQE0y1MeQ15+9jsi7XxfrqwTb/9EK8D9C9+//EBR4M+CuA1KODRaNbFez/lWxA5vhEGZp4MUg==
rollup@^3.20.2:
version "3.20.7"
resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.20.7.tgz#4f045dfb388abe08dd159f8cd286dcaca1e80b28"
integrity sha512-P7E2zezKSLhWnTz46XxjSmInrbOCiul1yf+kJccMxT56vxjHwCbDfoLbiqFgu+WQoo9ij2PkraYaBstgB2prBA==
optionalDependencies:
fsevents "~2.3.2"
@ -2928,6 +2930,13 @@ semver@^6.3.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
semver@^7.3.8:
version "7.5.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0"
integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==
dependencies:
lru-cache "^6.0.0"
shallow-equal@^1.0.0:
version "1.2.1"
resolved "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.2.1.tgz#4c16abfa56043aa20d050324efa68940b0da79da"
@ -3243,14 +3252,13 @@ vite@^4.0.4:
fsevents "~2.3.2"
vite@^4.2.1:
version "4.2.1"
resolved "https://registry.yarnpkg.com/vite/-/vite-4.2.1.tgz#6c2eb337b0dfd80a9ded5922163b94949d7fc254"
integrity sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg==
version "4.3.1"
resolved "https://registry.yarnpkg.com/vite/-/vite-4.3.1.tgz#9badb1377f995632cdcf05f32103414db6fbb95a"
integrity sha512-EPmfPLAI79Z/RofuMvkIS0Yr091T2ReUoXQqc5ppBX/sjFRhHKiPPF/R46cTdoci/XgeQpB23diiJxq5w30vdg==
dependencies:
esbuild "^0.17.5"
postcss "^8.4.21"
resolve "^1.22.1"
rollup "^3.18.0"
rollup "^3.20.2"
optionalDependencies:
fsevents "~2.3.2"
@ -3265,12 +3273,12 @@ vue-demi@*:
dependencies:
github-buttons "^2.22.0"
vue-router@4:
version "4.1.3"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.1.3.tgz#f8dc7931a2253cc5aa9b740f8b98969d08ca283c"
integrity sha512-XvK81bcYglKiayT7/vYAg/f36ExPC4t90R/HIpzrZ5x+17BOWptXLCrEPufGgZeuq68ww4ekSIMBZY1qdUdfjA==
vue-router@^4.1.6:
version "4.1.6"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.1.6.tgz#b70303737e12b4814578d21d68d21618469375a1"
integrity sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ==
dependencies:
"@vue/devtools-api" "^6.1.4"
"@vue/devtools-api" "^6.4.5"
vue-template-compiler@^2.7.14:
version "2.7.14"
@ -3280,13 +3288,14 @@ vue-template-compiler@^2.7.14:
de-indent "^1.0.2"
he "^1.2.0"
vue-tsc@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-1.2.0.tgz#2b64b960cc96208492541394423ace589a461be6"
integrity sha512-rIlzqdrhyPYyLG9zxsVRa+JEseeS9s8F2BbVVVWRRsTZvJO2BbhLEb2HW3MY+DFma0378tnIqs+vfTzbcQtRFw==
vue-tsc@^1.4.2:
version "1.4.2"
resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-1.4.2.tgz#fd3b83919c8c73418e8daac4ff2e404c497272f0"
integrity sha512-8VFjVekJuFtFG+N4rEimoR0OvNubhoTIMl2dlvbpyAD40LVPR1PN2SUc2qZPnWGGRsXZAVmFgiBHX0RB20HGyA==
dependencies:
"@volar/vue-language-core" "1.2.0"
"@volar/vue-typescript" "1.2.0"
"@volar/vue-language-core" "1.4.2"
"@volar/vue-typescript" "1.4.2"
semver "^7.3.8"
vue-types@^3.0.0:
version "3.0.2"
@ -3395,6 +3404,11 @@ yallist@^3.0.2:
resolved "https://registry.npmmirror.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
yallist@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
yaml@^1.10.0, yaml@^1.10.2:
version "1.10.2"
resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"