Improve micro.mu check

This commit is contained in:
Ben Toogood 2020-04-07 10:34:26 +01:00
parent 501fc5c059
commit bd23dc1f18

View File

@ -147,11 +147,6 @@ func (h authHandler) NamespaceFromRequest(req *http.Request) string {
host = req.Host // host does not contain a port host = req.Host // host does not contain a port
} }
// check for the micro.mu domain
if strings.HasSuffix(host, "micro.mu") {
return auth.DefaultNamespace
}
// check for an ip address // check for an ip address
if net.ParseIP(host) != nil { if net.ParseIP(host) != nil {
return auth.DefaultNamespace return auth.DefaultNamespace
@ -169,9 +164,9 @@ func (h authHandler) NamespaceFromRequest(req *http.Request) string {
return auth.DefaultNamespace return auth.DefaultNamespace
} }
// check to see if the domain is the host, in this // check to see if the domain matches the host of micr.mu, in
// case we return the default namespace // these casees we return the default namespace
if domain == host { if domain == host || domain == "micro.mu" {
return auth.DefaultNamespace return auth.DefaultNamespace
} }