mirror of
https://github.com/oauth2-proxy/oauth2-proxy.git
synced 2026-10-18 13:18:26 +02:00
Add the allowed_email_domains and the allowed_groups on the auth_request endpoint + support standard wildcard char for validation with sub-domain and email-domain.
Signed-off-by: Valentin Pichard <github@w3st.fr>
This commit is contained in:
committed by
Valentin Pichard
parent
c5a98c6d03
commit
2b4c8a9846
@@ -9,6 +9,8 @@ import (
|
||||
"io/ioutil"
|
||||
"math/big"
|
||||
"net"
|
||||
"net/url"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
@@ -66,3 +68,84 @@ func GenerateCert() ([]byte, []byte, error) {
|
||||
certBytes, err := x509.CreateCertificate(rand.Reader, &template, &template, &priv.PublicKey, priv)
|
||||
return certBytes, keyBytes, err
|
||||
}
|
||||
|
||||
// SplitHostPort separates host and port. If the port is not valid, it returns
|
||||
// the entire input as host, and it doesn't check the validity of the host.
|
||||
// Unlike net.SplitHostPort, but per RFC 3986, it requires ports to be numeric.
|
||||
// *** taken from net/url, modified validOptionalPort() to accept ":*"
|
||||
func SplitHostPort(hostport string) (host, port string) {
|
||||
host = hostport
|
||||
|
||||
colon := strings.LastIndexByte(host, ':')
|
||||
if colon != -1 && validOptionalPort(host[colon:]) {
|
||||
host, port = host[:colon], host[colon+1:]
|
||||
}
|
||||
|
||||
if strings.HasPrefix(host, "[") && strings.HasSuffix(host, "]") {
|
||||
host = host[1 : len(host)-1]
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
// validOptionalPort reports whether port is either an empty string
|
||||
// or matches /^:\d*$/
|
||||
// *** taken from net/url, modified to accept ":*"
|
||||
func validOptionalPort(port string) bool {
|
||||
if port == "" || port == ":*" {
|
||||
return true
|
||||
}
|
||||
if port[0] != ':' {
|
||||
return false
|
||||
}
|
||||
for _, b := range port[1:] {
|
||||
if b < '0' || b > '9' {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
// IsEndpointAllowed checks whether the endpoint URL is allowed based
|
||||
// on an allowed domains list.
|
||||
func IsEndpointAllowed(endpoint *url.URL, allowedDomains []string) bool {
|
||||
hostname := endpoint.Hostname()
|
||||
|
||||
for _, allowedDomain := range allowedDomains {
|
||||
allowedHost, allowedPort := SplitHostPort(allowedDomain)
|
||||
if allowedHost == "" {
|
||||
continue
|
||||
}
|
||||
|
||||
if isHostnameAllowed(hostname, allowedHost) {
|
||||
// the domain names match, now validate the ports
|
||||
// if the allowed domain's port is '*', allow all ports
|
||||
// if the allowed domain contains a specific port, only allow that port
|
||||
// if the allowed domain doesn't contain a port at all, only allow empty redirect ports ie http and https
|
||||
redirectPort := endpoint.Port()
|
||||
if allowedPort == "*" ||
|
||||
allowedPort == redirectPort ||
|
||||
(allowedPort == "" && redirectPort == "") {
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
func isHostnameAllowed(hostname, allowedHost string) bool {
|
||||
// check if we have a perfect match between hostname and allowedHost
|
||||
if hostname == strings.TrimPrefix(allowedHost, ".") ||
|
||||
hostname == strings.TrimPrefix(allowedHost, "*.") {
|
||||
return true
|
||||
}
|
||||
|
||||
// check if hostname is a sub domain of the allowedHost
|
||||
if (strings.HasPrefix(allowedHost, ".") && strings.HasSuffix(hostname, allowedHost)) ||
|
||||
(strings.HasPrefix(allowedHost, "*.") && strings.HasSuffix(hostname, allowedHost[1:])) {
|
||||
return true
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user