mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-06 14:33:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Use url.Parse instead of verifying just the prefix"

Browse source 
This reverts commit e45b125d3a.
This commit is contained in:
Till Faelligen 2023-11-25 21:19:47 +01:00
parent e45b125d3a
commit 6fe9d0b531
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
setup/config/config_global.go
View file

@ -3,7 +3,6 @@ package config
import (
"fmt"
"math/rand"
"net/url"
"strconv"
"strings"
"time"
@ -117,14 +116,8 @@ func (c *Global) Verify(configErrs *ConfigErrors) {
checkNotEmpty(configErrs, "global.private_key", string(c.PrivateKeyPath))
// Check that client well-known has a proper format
if c.WellKnownClientName != "" {
parsedURL, err := url.Parse(c.WellKnownClientName)
if err != nil {
logrus.WithError(err).Warn("The configuration for well_known_client_name does not have a proper format, consider adding http:// or https://. Some clients may fail to connect.")
} else {
c.WellKnownClientName = parsedURL.String()
}
if c.WellKnownClientName != "" && !(strings.HasPrefix(c.WellKnownClientName, "http://") || strings.HasPrefix(c.WellKnownClientName, "https://")) {
logrus.Warn("The configuration for well_known_client_name does not have a proper format, consider adding http:// or https://. Some clients may fail to connect.")
}
for _, v := range c.VirtualHosts {