mirrors
/
gotosocial
mirror of
1
Fork 0
Code Issues Releases Activity

remove regex hostname parsing (#67) 

Drop regex validation for postgres hostname, because it was breaking when running in a docker-compose stack where hostnames can be just one word.

If necessary this can be added in again later, but it probably won't be necessary because it doesn't actually add anything useful!
This commit is contained in:
Tobi Smethurst 2021-06-26 20:59:38 +02:00 committed by GitHub
parent b6c62309f2
commit b71bbc86a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/db/pg/pg.go
View File

@ -26,7 +26,6 @@ import (
"fmt" "fmt"
"net" "net"
"net/mail" "net/mail"
"regexp"
"strings" "strings"
"time" "time"
@ -48,7 +47,6 @@ type postgresService struct {
conn *pg.DB conn *pg.DB
log *logrus.Logger log *logrus.Logger
cancel context.CancelFunc cancel context.CancelFunc
// federationDB pub.Database
} }
// NewPostgresService returns a postgresService derived from the provided config, which implements the go-fed DB interface. // NewPostgresService returns a postgresService derived from the provided config, which implements the go-fed DB interface.
@ -120,12 +118,6 @@ func derivePGOptions(c *config.Config) (*pg.Options, error) {
return nil, errors.New("no address set") return nil, errors.New("no address set")
} }
ipv4Regex := regexp.MustCompile(`^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$`)
hostnameRegex := regexp.MustCompile(`^(?:[a-z0-9]+(?:-[a-z0-9]+)*\.)+[a-z]{2,}$`)
if !hostnameRegex.MatchString(c.DBConfig.Address) && !ipv4Regex.MatchString(c.DBConfig.Address) && c.DBConfig.Address != "localhost" {
return nil, fmt.Errorf("address %s was neither an ipv4 address nor a valid hostname", c.DBConfig.Address)
}
// validate username // validate username
if c.DBConfig.User == "" { if c.DBConfig.User == "" {
return nil, errors.New("no user set") return nil, errors.New("no user set")