Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
企猫商务
frp
提交
1e420cc7
F
frp
项目概览
企猫商务
/
frp
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
frp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
1e420cc7
编写于
9月 18, 2020
作者:
F
fatedier
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update tls
上级
4fff3c74
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
14 addition
and
12 deletion
+14
-12
conf/frpc_full.ini
conf/frpc_full.ini
+4
-0
conf/frps_full.ini
conf/frps_full.ini
+4
-0
models/config/client_common.go
models/config/client_common.go
+3
-4
models/config/server_common.go
models/config/server_common.go
+3
-8
未找到文件。
conf/frpc_full.ini
浏览文件 @
1e420cc7
...
...
@@ -52,6 +52,10 @@ protocol = tcp
# if tls_enable is true, frpc will connect frps by tls
tls_enable
=
true
# tls_cert_file = client.crt
# tls_key_file = client.key
# tls_trusted_ca_file = ca.crt
# specify a dns server, so frpc will use this instead of default one
# dns_server = 8.8.8.8
...
...
conf/frps_full.ini
浏览文件 @
1e420cc7
...
...
@@ -103,6 +103,10 @@ max_ports_per_client = 0
# TlsOnly specifies whether to only accept TLS-encrypted connections. By default, the value is false.
tls_only
=
false
# tls_cert_file = server.crt
# tls_key_file = server.key
# tls_trusted_ca_file = ca.crt
# if subdomain_host is not empty, you can set subdomain when type is http or https in frpc's configure file
# when subdomain is test, the host used by routing is test.frps.com
subdomain_host
=
frps.com
...
...
models/config/client_common.go
浏览文件 @
1e420cc7
...
...
@@ -350,17 +350,16 @@ func (cfg *ClientCommonConf) Check() (err error) {
if
cfg
.
TLSEnable
==
false
{
if
cfg
.
TLSCertFile
!=
""
{
fmt
.
Println
(
"WARNING!
Because tls_enable is not true, so tls_cert_file will not make sen
se"
)
fmt
.
Println
(
"WARNING!
tls_cert_file is invalid when tls_enable is fal
se"
)
}
if
cfg
.
TLSKeyFile
!=
""
{
fmt
.
Println
(
"WARNING!
Because tls_enable is not true, so tls_key_file will not make sen
se"
)
fmt
.
Println
(
"WARNING!
tls_key_file is invalid when tls_enable is fal
se"
)
}
if
cfg
.
TLSTrustedCaFile
!=
""
{
fmt
.
Println
(
"WARNING!
Because tls_enable is not true, so tls_trusted_ca_file will not make sen
se"
)
fmt
.
Println
(
"WARNING!
tls_trusted_ca_file is invalid when tls_enable is fal
se"
)
}
}
return
}
models/config/server_common.go
浏览文件 @
1e420cc7
...
...
@@ -448,6 +448,7 @@ func UnmarshalServerConfFromIni(content string) (cfg ServerCommonConf, err error
if
tmpStr
,
ok
:=
conf
.
Get
(
"common"
,
"tls_trusted_ca_file"
);
ok
{
cfg
.
TLSTrustedCaFile
=
tmpStr
cfg
.
TLSOnly
=
true
}
return
...
...
@@ -471,12 +472,6 @@ func UnmarshalPluginsFromIni(sections ini.File, cfg *ServerCommonConf) {
}
}
func
(
cfg
*
ServerCommonConf
)
Check
()
(
err
error
)
{
if
cfg
.
TLSOnly
==
false
{
if
cfg
.
TLSTrustedCaFile
!=
""
{
err
=
fmt
.
Errorf
(
"Parse conf error: forbidden tls_trusted_ca_file, it only works when tls_only is true"
)
return
}
}
return
func
(
cfg
*
ServerCommonConf
)
Check
()
error
{
return
nil
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录