7x31
/
anylink
mirror of https://github.com/bjdgyc/anylink.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复Banner特殊字符

This commit is contained in:
bjdgyc 2023-11-15 11:57:12 +08:00
parent aa2b89855f
commit 3879c3a4bc
2 changed files with 14 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
server/handler/dtls.go
View File

@ -18,32 +18,14 @@ import (
"github.com/pion/logging"
)
const (
dtlsSigneRsa = 1
dtlsSigneEcdsa = 2
)
var dtlsSigneType = dtlsSigneRsa
func startDtls() {
if !base.Cfg.ServerDTLS {
return
}
var (
err error
certificate tls.Certificate
)
// rsa 兼容 open connect
if dtlsSigneType == dtlsSigneRsa {
priv, _ := rsa.GenerateKey(rand.Reader, 2048)
certificate, err = selfsign.SelfSign(priv)
}
// ecdsa
if dtlsSigneType == dtlsSigneEcdsa {
certificate, err = selfsign.GenerateSelfSigned()
}
certificate, err := selfsign.SelfSign(priv)
if err != nil {
panic(err)
}
@ -61,11 +43,9 @@ func startDtls() {
ExtendedMasterSecret: dtls.DisableExtendedMasterSecret,
CipherSuites: func() []dtls.CipherSuiteID {
var cs = []dtls.CipherSuiteID{}
for _, v := range dtlsCipherSuites {
for _, vv := range v {
for _, vv := range dtlsCipherSuites {
cs = append(cs, vv)
}
}
return cs
}(),
LoggerFactory: logf,
@ -131,35 +111,21 @@ func (ms *sessionStore) Del(key []byte) error {
}
// 客户端和服务端映射 X-DTLS12-CipherSuite
var dtlsCipherSuites = map[string]map[string]dtls.CipherSuiteID{
"ECDSA": {
"ECDHE-ECDSA-AES256-GCM-SHA384": dtls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
"ECDHE-ECDSA-AES128-GCM-SHA256": dtls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
},
"RSA": {
var dtlsCipherSuites = map[string]dtls.CipherSuiteID{
// "ECDHE-ECDSA-AES256-GCM-SHA384": dtls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
// "ECDHE-ECDSA-AES128-GCM-SHA256": dtls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
"ECDHE-RSA-AES256-GCM-SHA384": dtls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
"ECDHE-RSA-AES128-GCM-SHA256": dtls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
},
}
func checkDtls12Ciphersuite(ciphersuite string) string {
csArr := strings.Split(ciphersuite, ",")
// ECDSA
if dtlsSigneType == dtlsSigneEcdsa {
for _, v := range csArr {
if _, ok := dtlsCipherSuites["ECDSA"][v]; ok {
return v
}
}
// 返回默认值
return "ECDHE-ECDSA-AES256-GCM-SHA384"
}
csArr := strings.Split(ciphersuite, ":")
for _, v := range csArr {
if _, ok := dtlsCipherSuites["RSA"][v]; ok {
if _, ok := dtlsCipherSuites[v]; ok {
return v
}
}
// 返回默认值
return "ECDHE-RSA-AES256-GCM-SHA384"
return "ECDHE-RSA-AES128-GCM-SHA256"
}

2
server/handler/link_auth.go
View File

@ -14,6 +14,7 @@ import (
"github.com/bjdgyc/anylink/base"
"github.com/bjdgyc/anylink/dbdata"
"github.com/bjdgyc/anylink/sessdata"
"golang.org/x/net/html"
)
var profileHash = ""
@ -157,6 +158,7 @@ func tplRequest(typ int, w io.Writer, data RequestData) {
if strings.Contains(data.Banner, "\n") {
// 替换xml文件的换行符
data.Banner = strings.ReplaceAll(data.Banner, "\n", "
")
data.Banner = html.EscapeString(data.Banner)
}
t, _ := template.New("auth_complete").Parse(auth_complete)
_ = t.Execute(w, data)