V2.5.2 (#145)
* 移除自动DNS记录验证方式 * v2.5.2 (#13) 1、重写SSL证书申请逻辑,支持DNS记录验证方式 2、修复无法查看详情的bug 3、优化手动设置证书的逻辑 4、发送失败邮件添加错误提醒 5、补充详情接口的单元测试 Co-authored-by: jinnrry <jinnrry@users.noreply.github.com> Reviewed-on: http://192.168.123.5/jinnrry/PMail_Github/pulls/13 --------- Co-authored-by: jinnrry <jinnrry@users.noreply.github.com> Co-authored-by: jinnrry <i@jinnrry.com>
This commit is contained in:
20 files changed
+440
-371
No files matched your search
+4
-2
@@ -63,7 +63,8 @@ var lang = {
|
||||
"web_domain": "Web Domain",
|
||||
"dns_desc": "Please add the following information to your DNS records",
|
||||
"ssl_auto": "Automatically configure SSL certificates (recommended)",
|
||||
"wait_desc": "HTTP challenge mode completes in approximately 1 minute.",
|
||||
"wait_desc": "Please Wait.",
|
||||
"dns_challenge_wait": "DNS propagation and cache refreshes take a long time, and a wait of 10-30 minutes is possible here.",
|
||||
"ssl_challenge_type":"Challenge Type",
|
||||
"ssl_auto_http":"Http Request",
|
||||
"ssl_auto_dns":"DNS Records",
|
||||
@@ -176,7 +177,8 @@ var zhCN = {
|
||||
"ssl_challenge_type":"验证方式",
|
||||
"ssl_manuallyf": "手动配置SSL证书",
|
||||
"challenge_typ_desc": "如果PMail直接使用80端口,建议使用HTTP验证方式。",
|
||||
"wait_desc": "HTTP验证模式大约1分钟完成",
|
||||
"wait_desc": "请稍等",
|
||||
"dns_challenge_wait": "DNS传播和缓存刷新时间较长,此处可能等待10-30分钟",
|
||||
"ssl_key_path": "ssl key文件位置",
|
||||
"ssl_crt_path": "ssl crt文件位置",
|
||||
"group_settings": "分组",
|
||||
|
||||
@@ -40,6 +40,14 @@
|
||||
</el-tooltip>
|
||||
|
||||
</span>
|
||||
<span style="font-weight: 900;color: #FF0000;" v-if="scope.row.error != ''">
|
||||
<el-tooltip effect="dark"
|
||||
:content="scope.row.error"
|
||||
placement="top-start">
|
||||
!
|
||||
</el-tooltip>
|
||||
|
||||
</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
+56
-181
@@ -133,16 +133,17 @@
|
||||
<div class="form" width="600px">
|
||||
<el-form label-width="120px">
|
||||
<el-form-item :label="lang.type">
|
||||
<el-select :placeholder="lang.ssl_auto" v-model="sslSettings.type">
|
||||
<el-select :placeholder="lang.ssl_auto" v-model="sslSettings.type" :disabled="dnsChecking">
|
||||
<el-option :label="lang.ssl_auto" value="0" />
|
||||
<el-option :label="lang.ssl_manuallyf" value="1" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item :label="lang.ssl_challenge_type" v-if="sslSettings.type == '0'">
|
||||
<el-select :placeholder="lang.ssl_auto_http" v-model="sslSettings.challenge">
|
||||
<el-select :placeholder="lang.ssl_auto_http" v-model="sslSettings.challenge"
|
||||
:disabled="dnsChecking">
|
||||
<el-option :label="lang.ssl_auto_http" value="http" />
|
||||
<!-- <el-option :label="lang.ssl_auto_dns" value="dns" /> -->
|
||||
<el-option :label="lang.ssl_auto_dns" value="dns" />
|
||||
</el-select>
|
||||
|
||||
<el-tooltip class="box-item" effect="dark" :content="lang.challenge_typ_desc"
|
||||
@@ -151,153 +152,9 @@
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item :label="lang.oomain_service_provider"
|
||||
v-if="sslSettings.type == '0' && sslSettings.challenge == 'dns'">
|
||||
<el-select @change="provide_change" :placeholder="lang.oomain_service_provider"
|
||||
v-model="sslSettings.provider">
|
||||
<el-option label="acme-dns" value="acme-dns" />
|
||||
<el-option label="alidns" value="alidns" />
|
||||
<el-option label="allinkl" value="allinkl" />
|
||||
<el-option label="arvancloud" value="arvancloud" />
|
||||
<el-option label="azure" value="azure" />
|
||||
<el-option label="azuredns" value="azuredns" />
|
||||
<el-option label="auroradns" value="auroradns" />
|
||||
<el-option label="autodns" value="autodns" />
|
||||
<el-option label="bindman" value="bindman" />
|
||||
<el-option label="bluecat" value="bluecat" />
|
||||
<el-option label="brandit" value="brandit" />
|
||||
<el-option label="bunny" value="bunny" />
|
||||
<el-option label="checkdomain" value="checkdomain" />
|
||||
<el-option label="civo" value="civo" />
|
||||
<el-option label="clouddns" value="clouddns" />
|
||||
<el-option label="cloudflare" value="cloudflare" />
|
||||
<el-option label="cloudns" value="cloudns" />
|
||||
<el-option label="cloudru" value="cloudru" />
|
||||
<el-option label="cloudxns" value="cloudxns" />
|
||||
<el-option label="conoha" value="conoha" />
|
||||
<el-option label="constellix" value="constellix" />
|
||||
<el-option label="cpanel" value="cpanel" />
|
||||
<el-option label="derak" value="derak" />
|
||||
<el-option label="desec" value="desec" />
|
||||
<el-option label="designate" value="designate" />
|
||||
<el-option label="digitalocean" value="digitalocean" />
|
||||
<el-option label="dnshomede" value="dnshomede" />
|
||||
<el-option label="dnsimple" value="dnsimple" />
|
||||
<el-option label="dnsmadeeasy" value="dnsmadeeasy" />
|
||||
<el-option label="dnspod" value="dnspod" />
|
||||
<el-option label="dode" value="dode" />
|
||||
<el-option label="domeneshop" value="domeneshop" />
|
||||
<el-option label="domainnameshop" value="domainnameshop" />
|
||||
<el-option label="dreamhost" value="dreamhost" />
|
||||
<el-option label="duckdns" value="duckdns" />
|
||||
<el-option label="dyn" value="dyn" />
|
||||
<el-option label="dynu" value="dynu" />
|
||||
<el-option label="easydns" value="easydns" />
|
||||
<el-option label="edgedns" value="edgedns" />
|
||||
<el-option label="fastdns" value="fastdns" />
|
||||
<el-option label="efficientip" value="efficientip" />
|
||||
<el-option label="epik" value="epik" />
|
||||
<el-option label="exec" value="exec" />
|
||||
<el-option label="exoscale" value="exoscale" />
|
||||
<el-option label="freemyip" value="freemyip" />
|
||||
<el-option label="gandi" value="gandi" />
|
||||
<el-option label="gandiv5" value="gandiv5" />
|
||||
<el-option label="gcloud" value="gcloud" />
|
||||
<el-option label="gcore" value="gcore" />
|
||||
<el-option label="glesys" value="glesys" />
|
||||
<el-option label="godaddy" value="godaddy" />
|
||||
<el-option label="googledomains" value="googledomains" />
|
||||
<el-option label="hetzner" value="hetzner" />
|
||||
<el-option label="hostingde" value="hostingde" />
|
||||
<el-option label="hosttech" value="hosttech" />
|
||||
<el-option label="httpreq" value="httpreq" />
|
||||
<el-option label="hurricane" value="hurricane" />
|
||||
<el-option label="hyperone" value="hyperone" />
|
||||
<el-option label="ibmcloud" value="ibmcloud" />
|
||||
<el-option label="iij" value="iij" />
|
||||
<el-option label="iijdpf" value="iijdpf" />
|
||||
<el-option label="infoblox" value="infoblox" />
|
||||
<el-option label="infomaniak" value="infomaniak" />
|
||||
<el-option label="internetbs" value="internetbs" />
|
||||
<el-option label="inwx" value="inwx" />
|
||||
<el-option label="ionos" value="ionos" />
|
||||
<el-option label="ipv64" value="ipv64" />
|
||||
<el-option label="iwantmyname" value="iwantmyname" />
|
||||
<el-option label="joker" value="joker" />
|
||||
<el-option label="liara" value="liara" />
|
||||
<el-option label="lightsail" value="lightsail" />
|
||||
<el-option label="linode" value="linode" />
|
||||
<el-option label="linodev4" value="linodev4" />
|
||||
<el-option label="liquidweb" value="liquidweb" />
|
||||
<el-option label="loopia" value="loopia" />
|
||||
<el-option label="luadns" value="luadns" />
|
||||
<el-option label="mailinabox" value="mailinabox" />
|
||||
<el-option label="manual" value="manual" />
|
||||
<el-option label="metaname" value="metaname" />
|
||||
<el-option label="mydnsjp" value="mydnsjp" />
|
||||
<el-option label="mythicbeasts" value="mythicbeasts" />
|
||||
<el-option label="namecheap" value="namecheap" />
|
||||
<el-option label="namedotcom" value="namedotcom" />
|
||||
<el-option label="namesilo" value="namesilo" />
|
||||
<el-option label="nearlyfreespeech" value="nearlyfreespeech" />
|
||||
<el-option label="netcup" value="netcup" />
|
||||
<el-option label="netlify" value="netlify" />
|
||||
<el-option label="nicmanager" value="nicmanager" />
|
||||
<el-option label="nifcloud" value="nifcloud" />
|
||||
<el-option label="njalla" value="njalla" />
|
||||
<el-option label="nodion" value="nodion" />
|
||||
<el-option label="ns1" value="ns1" />
|
||||
<el-option label="oraclecloud" value="oraclecloud" />
|
||||
<el-option label="otc" value="otc" />
|
||||
<el-option label="ovh" value="ovh" />
|
||||
<el-option label="pdns" value="pdns" />
|
||||
<el-option label="plesk" value="plesk" />
|
||||
<el-option label="porkbun" value="porkbun" />
|
||||
<el-option label="rackspace" value="rackspace" />
|
||||
<el-option label="rcodezero" value="rcodezero" />
|
||||
<el-option label="regru" value="regru" />
|
||||
<el-option label="rfc2136" value="rfc2136" />
|
||||
<el-option label="rimuhosting" value="rimuhosting" />
|
||||
<el-option label="route53" value="route53" />
|
||||
<el-option label="safedns" value="safedns" />
|
||||
<el-option label="sakuracloud" value="sakuracloud" />
|
||||
<el-option label="scaleway" value="scaleway" />
|
||||
<el-option label="selectel" value="selectel" />
|
||||
<el-option label="servercow" value="servercow" />
|
||||
<el-option label="shellrent" value="shellrent" />
|
||||
<el-option label="simply" value="simply" />
|
||||
<el-option label="sonic" value="sonic" />
|
||||
<el-option label="stackpath" value="stackpath" />
|
||||
<el-option label="tencentcloud" value="tencentcloud" />
|
||||
<el-option label="transip" value="transip" />
|
||||
<el-option label="ultradns" value="ultradns" />
|
||||
<el-option label="variomedia" value="variomedia" />
|
||||
<el-option label="vegadns" value="vegadns" />
|
||||
<el-option label="vercel" value="vercel" />
|
||||
<el-option label="versio" value="versio" />
|
||||
<el-option label="vinyldns" value="vinyldns" />
|
||||
<el-option label="vkcloud" value="vkcloud" />
|
||||
<el-option label="vscale" value="vscale" />
|
||||
<el-option label="vultr" value="vultr" />
|
||||
<el-option label="webnames" value="webnames" />
|
||||
<el-option label="websupport" value="websupport" />
|
||||
<el-option label="wedos" value="wedos" />
|
||||
<el-option label="yandex" value="yandex" />
|
||||
<el-option label="yandex360" value="yandex360" />
|
||||
<el-option label="yandexcloud" value="yandexcloud" />
|
||||
<el-option label="zoneee" value="zoneee" />
|
||||
<el-option label="zonomi" value="zonomi" />
|
||||
</el-select>
|
||||
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item :label="item"
|
||||
v-if="sslSettings.paramsList.length != 0 && sslSettings.type == 0 && sslSettings.challenge == 'dns'"
|
||||
v-for="item in sslSettings.paramsList">
|
||||
<el-input style="width: 240px" :placeholder="item" v-model="dnsApiParams[item]" />
|
||||
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item :label="lang.ssl_key_path" v-if="sslSettings.type == '1'">
|
||||
<el-input placeholder="./config/ssl/private.key" v-model="sslSettings.key_path"></el-input>
|
||||
@@ -313,7 +170,30 @@
|
||||
|
||||
</div>
|
||||
|
||||
<el-button :element-loading-text="lang.wait_desc" v-loading.fullscreen.lock="fullscreenLoading" id="next" style="margin-top: 12px" @click="next">{{
|
||||
<div v-if="dnsChecking">
|
||||
<label>{{ lang.dns_desc }}</label>
|
||||
<el-table :data="sslSettings.paramsList" border v-loading="sslSettings.paramsList.length == 0">
|
||||
<el-table-column prop="host" label="HOSTNAME" width="110px" />
|
||||
<el-table-column prop="type" label="TYPE" width="110px" />
|
||||
<el-table-column prop="value" label="VALUE">
|
||||
<template #default="scope">
|
||||
<div style="display: flex; align-items: center">
|
||||
<el-tooltip :content="scope.row.tips" placement="top" v-if="scope.row.tips != ''">
|
||||
{{ scope.row.value }}
|
||||
</el-tooltip>
|
||||
<span v-else>{{ scope.row.value }}</span>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
</el-table-column>
|
||||
<el-table-column prop="ttl" label="TTL" width="110px" />
|
||||
</el-table>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<el-button :element-loading-text="waitDesc" v-loading.fullscreen.lock="fullscreenLoading" id="next"
|
||||
style="margin-top: 12px" @click="next">{{
|
||||
lang.next }}</el-button>
|
||||
|
||||
</div>
|
||||
@@ -324,10 +204,11 @@ import { reactive, ref } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import lang from '../i18n/i18n';
|
||||
import axios from 'axios'
|
||||
|
||||
import { getCurrentInstance } from 'vue'
|
||||
const app = getCurrentInstance()
|
||||
const $http = app.appContext.config.globalProperties.$http
|
||||
const waitDesc = ref(lang.wait_desc)
|
||||
|
||||
|
||||
const adminSettings = reactive({
|
||||
"account": "admin",
|
||||
@@ -349,18 +230,16 @@ const domainSettings = reactive({
|
||||
|
||||
const sslSettings = reactive({
|
||||
"type": "0",
|
||||
"provider": "",
|
||||
"challenge": "http",
|
||||
"key_path": "./config/ssl/private.key",
|
||||
"crt_path": "./config/ssl/public.crt",
|
||||
"paramsList": {},
|
||||
"paramsList": [],
|
||||
})
|
||||
|
||||
const dnsApiParams = reactive({})
|
||||
|
||||
const active = ref(0)
|
||||
const fullscreenLoading = ref(false)
|
||||
|
||||
const dnsChecking = ref(false)
|
||||
|
||||
const dnsInfos = ref([
|
||||
])
|
||||
@@ -455,9 +334,9 @@ const getSSLConfig = () => {
|
||||
ElMessage.error(res.errorMsg)
|
||||
} else {
|
||||
sslSettings.type = res.data.type
|
||||
if (sslSettings.type == "2"){
|
||||
if (sslSettings.type == "2") {
|
||||
sslSettings.type = "0"
|
||||
sslSettings.challenge="dns"
|
||||
sslSettings.challenge = "dns"
|
||||
}
|
||||
|
||||
|
||||
@@ -475,24 +354,6 @@ const setSSLConfig = () => {
|
||||
sslType = "2"
|
||||
}
|
||||
|
||||
if (sslType == "2") {
|
||||
|
||||
let params = { "action": "setParams", "step": "ssl", };
|
||||
|
||||
params = Object.assign(params, dnsApiParams);
|
||||
|
||||
// dns验证方式先提交DNS api Key
|
||||
$http.post("/api/setup", params).then((res) => {
|
||||
if (res.errorNo != 0) {
|
||||
fullscreenLoading.value = false;
|
||||
ElMessage.error(res.errorMsg);
|
||||
return;
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
$http.post("/api/setup", {
|
||||
@@ -500,15 +361,18 @@ const setSSLConfig = () => {
|
||||
"step": "ssl",
|
||||
"ssl_type": sslType,
|
||||
"key_path": sslSettings.key_path,
|
||||
"crt_path": sslSettings.crt_path,
|
||||
"serviceName": sslSettings.provider
|
||||
"crt_path": sslSettings.crt_path
|
||||
}).then((res) => {
|
||||
if (res.errorNo != 0) {
|
||||
fullscreenLoading.value = false;
|
||||
ElMessage.error(res.errorMsg)
|
||||
} else {
|
||||
if (sslType == 2) {
|
||||
fullscreenLoading.value = false;
|
||||
dnsChecking.value = true;
|
||||
getSSLDNSParams();
|
||||
}
|
||||
checkStatus();
|
||||
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -542,16 +406,23 @@ const setDomainConfig = () => {
|
||||
})
|
||||
}
|
||||
|
||||
const provide_change = () => {
|
||||
console.log(sslSettings.provider)
|
||||
$http.post("/api/setup", { "action": "getParams", "step": "ssl", "serverName": sslSettings.provider }).then((res) => {
|
||||
const getSSLDNSParams = () => {
|
||||
$http.post("/api/setup", { "action": "getParams", "step": "ssl" }).then((res) => {
|
||||
if (res.errorNo != 0) {
|
||||
ElMessage.error(res.errorMsg)
|
||||
} else {
|
||||
sslSettings.paramsList = res.data
|
||||
console.log(sslSettings.paramsList)
|
||||
}
|
||||
})
|
||||
|
||||
if (sslSettings.paramsList.length == 0) {
|
||||
setTimeout(function () {
|
||||
getSSLDNSParams()
|
||||
}, 1000);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -576,8 +447,12 @@ const next = () => {
|
||||
active.value++
|
||||
break
|
||||
case 5:
|
||||
setSSLConfig();
|
||||
active.value++
|
||||
if (dnsChecking.value) {
|
||||
fullscreenLoading.value = true;
|
||||
waitDesc.value = lang.dns_challenge_wait;
|
||||
} else {
|
||||
setSSLConfig();
|
||||
}
|
||||
break
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user