outman/frpc-desktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ tls修改

Browse Source
This commit is contained in:
刘嘉伟 2024-09-04 13:08:16 +08:00
parent 2592e201ed
commit 707b9c4b9e
2 changed files with 106 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
electron/api/frpc.ts
View File

@ -128,15 +128,35 @@ webServer.addr = "127.0.0.1"
webServer.port = 57400
transport.tls.enable = ${config.tlsConfigEnable}
${
config.tlsConfigEnable
config.tlsConfigEnable && config.tlsConfigCertFile
? `
transport.tls.certFile = "${config.tlsConfigCertFile}"
transport.tls.keyFile = "${config.tlsConfigKeyFile}"
transport.tls.trustedCaFile = "${config.tlsConfigTrustedCaFile}"
transport.tls.serverName = "${config.tlsConfigServerName}"
`
: ""
}
${
config.tlsConfigEnable && config.tlsConfigKeyFile
? `
transport.tls.keyFile = "${config.tlsConfigKeyFile}"
`
: ""
}
${
config.tlsConfigEnable && config.tlsConfigTrustedCaFile
? `
transport.tls.trustedCaFile = "${config.tlsConfigTrustedCaFile}"
`
: ""
}
${
config.tlsConfigEnable && config.tlsConfigServerName
? `
transport.tls.serverName = "${config.tlsConfigServerName}"
`
: ""
}
${
config.proxyConfigEnable
? `
@ -245,16 +265,36 @@ log_max_days = ${config.logMaxDays}
admin_addr = 127.0.0.1
admin_port = 57400
tls_enable = ${config.tlsConfigEnable}
${
config.tlsConfigEnable
config.tlsConfigEnable && config.tlsConfigCertFile
? `
tls_cert_file = ${config.tlsConfigCertFile}
tls_key_file = ${config.tlsConfigKeyFile}
tls_trusted_ca_file = ${config.tlsConfigTrustedCaFile}
tls_server_name = ${config.tlsConfigServerName}
`
: ""
}
${
config.tlsConfigEnable && config.tlsConfigKeyFile
? `
tls_key_file = ${config.tlsConfigKeyFile}
`
: ""
}
${
config.tlsConfigEnable && config.tlsConfigTrustedCaFile
? `
tls_trusted_ca_file = ${config.tlsConfigTrustedCaFile}
`
: ""
}
${
config.tlsConfigEnable && config.tlsConfigServerName
? `
tls_server_name = ${config.tlsConfigServerName}
`
: ""
}
${
config.proxyConfigEnable
? `

89
src/views/config/index.vue
View File

@ -8,6 +8,7 @@ import { clone } from "@/utils/clone";
import { Base64 } from "js-base64";
import IconifyIconOffline from "@/components/IconifyIcon/src/iconifyIconOffline";
import confetti from "canvas-confetti/src/confetti.js";
defineComponent({
name: "Config"
});
@ -74,18 +75,18 @@ const rules = reactive<FormRules>({
tlsConfigEnable: [
{ required: true, message: "请选择 TLS 状态", trigger: "change" }
],
tlsConfigCertFile: [
{ required: true, message: "请选择 TLS 证书文件", trigger: "change" }
],
tlsConfigKeyFile: [
{ required: true, message: "请选择 TLS 密钥文件", trigger: "change" }
],
tlsConfigTrustedCaFile: [
{ required: true, message: "请选择 CA 证书文件", trigger: "change" }
],
tlsConfigServerName: [
{ required: true, message: "请输入 TLS Server 名称", trigger: "blur" }
],
// tlsConfigCertFile: [
// { required: true, message: "请选择 TLS 证书文件", trigger: "change" }
// ],
// tlsConfigKeyFile: [
// { required: true, message: "请选择 TLS 密钥文件", trigger: "change" }
// ],
// tlsConfigTrustedCaFile: [
// { required: true, message: "请选择 CA 证书文件", trigger: "change" }
// ],
// tlsConfigServerName: [
// { required: true, message: "请输入 TLS Server 名称", trigger: "blur" }
// ],
proxyConfigEnable: [
{ required: true, message: "请选择代理状态", trigger: "change" }
],
@ -714,16 +715,25 @@ onUnmounted(() => {
TLS 证书文件：
</template>
<el-input
class="button-input"
class="button-input !cursor-pointer"
v-model="formData.tlsConfigCertFile"
placeholder="请选择TLS证书文件"
placeholder="点击选择TLS证书文件"
readonly
/>
<el-button
class="ml-2"
type="primary"
clearable
@click="handleSelectFile(1, ['crt'])"
>选择
/>
<!-- <el-button-->
<!-- class="ml-2"-->
<!-- type="primary"-->
<!-- @click="handleSelectFile(1, ['crt'])"-->
<!-- >选择-->
<!-- </el-button>-->
<el-button
v-if="formData.tlsConfigCertFile"
class="ml-2"
type="danger"
@click="formData.tlsConfigCertFile = ''"
>清除
</el-button>
</el-form-item>
</el-col>
@ -755,14 +765,22 @@ onUnmounted(() => {
<el-input
class="button-input"
v-model="formData.tlsConfigKeyFile"
placeholder="请选择 TLS 密钥文件"
placeholder="点击选择 TLS 密钥文件"
readonly
/>
<el-button
class="ml-2"
type="primary"
@click="handleSelectFile(2, ['key'])"
>选择
/>
<!-- <el-button-->
<!-- class="ml-2"-->
<!-- type="primary"-->
<!-- @click="handleSelectFile(2, ['key'])"-->
<!-- >选择-->
<!-- </el-button>-->
<el-button
v-if="formData.tlsConfigKeyFile"
class="ml-2"
type="danger"
@click="formData.tlsConfigKeyFile = ''"
>清除
</el-button>
</el-form-item>
</el-col>
@ -794,14 +812,22 @@ onUnmounted(() => {
<el-input
class="button-input"
v-model="formData.tlsConfigTrustedCaFile"
placeholder="请选择CA证书文件"
placeholder="点击选择 CA 证书文件"
readonly
/>
<el-button
class="ml-2"
type="primary"
@click="handleSelectFile(3, ['crt'])"
>选择
/>
<!-- <el-button-->
<!-- class="ml-2"-->
<!-- type="primary"-->
<!-- @click="handleSelectFile(3, ['crt'])"-->
<!-- >选择-->
<!-- </el-button>-->
<el-button
v-if="formData.tlsConfigTrustedCaFile"
class="ml-2"
type="danger"
@click="formData.tlsConfigTrustedCaFile = ''"
>清除
</el-button>
</el-form-item>
</el-col>
@ -833,6 +859,7 @@ onUnmounted(() => {
<el-input
v-model="formData.tlsConfigServerName"
placeholder="请输入TLS Server 名称"
clearable
/>
</el-form-item>
</el-col>