GuanM/hysteria
1
0
Fork 0
mirror of https://github.com/cedar2025/hysteria.git synced 2025-06-21 12:09:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #547 from apernet/wip-exclusive-acme-cert

Browse Source 
feat: make acme and cert options mutually exclusive to avoid user confusion
This commit is contained in:
Toby 2023-01-15 19:36:42 -08:00 committed by GitHub
commit 3e1d2a8c92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/cmd/config.go
View File

@ -104,6 +104,9 @@ func (c *serverConfig) Check() error {
if len(c.ACME.Domains) == 0 && (len(c.CertFile) == 0 || len(c.KeyFile) == 0) { if len(c.ACME.Domains) == 0 && (len(c.CertFile) == 0 || len(c.KeyFile) == 0) {
return errors.New("need either ACME info or cert/key files") return errors.New("need either ACME info or cert/key files")
} }
if len(c.ACME.Domains) > 0 && (len(c.CertFile) > 0 || len(c.KeyFile) > 0) {
return errors.New("cannot use both ACME and cert/key files, they are mutually exclusive")
}
if up, down, err := c.Speed(); err != nil || (up != 0 && up < minSpeedBPS) || (down != 0 && down < minSpeedBPS) { if up, down, err := c.Speed(); err != nil || (up != 0 && up < minSpeedBPS) || (down != 0 && down < minSpeedBPS) {
return errors.New("invalid speed") return errors.New("invalid speed")
} }