hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-04-18 17:53:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Shift order around

Browse source
This commit is contained in:
Neil Alexander 2021-06-02 16:10:54 +01:00
parent 32459bbe47
commit bbe07a4edd
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
setup/config/config_global.go
View file

@ -85,22 +85,22 @@ func (c *Global) Verify(configErrs *ConfigErrors, isMonolith bool) {
idna.VerifyDNSLength(true), idna.VerifyDNSLength(true),
) )
sn := string(c.ServerName) sn := string(c.ServerName)
if _, err := validator.ToUnicode(sn); err != nil { if n, p, err := net.SplitHostPort(sn); err == nil {
if n, p, err := net.SplitHostPort(sn); err == nil { // A valid port was specified but we don't care about it.
// A valid port was specified but we don't care about it. // If it's an IPv6 literal at this point then the [] will
// If it's an IPv6 literal at this point then the [] will // already have been stripped by net.SplitHostPort.
// already have been stripped by net.SplitHostPort. sn = n
sn = n // Check that the port number also makes sense.
// Check that the port number also makes sense. if sp, err := strconv.Atoi(p); err != nil || sp <= 0 || sp > 65535 {
if sp, err := strconv.Atoi(p); err != nil || sp <= 0 || sp > 65535 { configErrs.Add(fmt.Sprintf("server_name %q contains an invalid port number", c.ServerName))
configErrs.Add(fmt.Sprintf("server_name %q contains an invalid port number", c.ServerName))
}
} else {
// If we didn't have a port then the net.SplitHostPort
// call will fail, leaving us with a possible []-wrapped
// IPv6 literal. Strip those before checking if it's valid.
sn = strings.Trim(sn, "[]")
} }
} else {
// If we didn't have a port then the net.SplitHostPort
// call will fail, leaving us with a possible []-wrapped
// IPv6 literal. Strip those before checking if it's valid.
sn = strings.Trim(sn, "[]")
}
if _, err := validator.ToUnicode(sn); err != nil {
// Check if it's a valid IP address. If the server name is a // Check if it's a valid IP address. If the server name is a
// valid IPv4 or IPv6 literal then this won't return nil. // valid IPv4 or IPv6 literal then this won't return nil.
if net.ParseIP(sn) == nil { if net.ParseIP(sn) == nil {