yanistyle/sing-box-extended
1
0
Fork 0
mirror of https://github.com/shtorm-7/sing-box-extended.git synced 2026-06-22 18:44:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add ECH support for QUIC based protocols

Browse Source
This commit is contained in:
世界
2023-08-31 11:37:26 +08:00
parent 7d7d49d314
commit 928cccc285
19 changed files with 385 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
common/tls/ech_server.go
View File

@@ -159,7 +159,7 @@ func (c *echServerConfig) startECHWatcher() error {
if err != nil {
return err
}
c.watcher = watcher
c.echWatcher = watcher
go c.loopECHUpdate()
return nil
}
@@ -178,7 +178,7 @@ func (c *echServerConfig) loopECHUpdate() {
if err != nil {
c.logger.Error(E.Cause(err, "reload ECH key"))
}
case err, ok := <-c.watcher.Errors:
case err, ok := <-c.echWatcher.Errors:
if !ok {
return
}
@@ -277,7 +277,7 @@ func NewECHServer(ctx context.Context, logger log.Logger, options option.Inbound
certificate = content
}
if len(options.Key) > 0 {
key = []byte(strings.Join(options.Key, ""))
key = []byte(strings.Join(options.Key, "\n"))
} else if options.KeyPath != "" {
content, err := os.ReadFile(options.KeyPath)
if err != nil {
@@ -298,7 +298,20 @@ func NewECHServer(ctx context.Context, logger log.Logger, options option.Inbound
}
tlsConfig.Certificates = []cftls.Certificate{keyPair}
block, rest := pem.Decode([]byte(strings.Join(options.ECH.Key, "\n")))
var echKey []byte
if len(options.ECH.Key) > 0 {
echKey = []byte(strings.Join(options.ECH.Key, "\n"))
} else if options.KeyPath != "" {
content, err := os.ReadFile(options.ECH.KeyPath)
if err != nil {
return nil, E.Cause(err, "read ECH key")
}
echKey = content
} else {
return nil, E.New("missing ECH key")
}
block, rest := pem.Decode(echKey)
if block == nil || block.Type != "ECH KEYS" || len(rest) > 0 {
return nil, E.New("invalid ECH keys pem")
}