mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-06-21 14:29:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

implement review feedback

Browse Source
This commit is contained in:
David Christofas
2020-03-24 10:42:47 +01:00
parent a718777747
commit eb539bc78e
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/config/config.go
View File

@@ -55,11 +55,11 @@ type RouteType string
const (
// PrefixRoute are routes matched by a prefix
PrefixRoute RouteType = "Prefix"
PrefixRoute RouteType = "prefix"
// QueryRoute are routes machted by a prefix and query parameters
QueryRoute RouteType = "Query"
QueryRoute RouteType = "query"
// RegexRoute are routes matched by a pattern
RegexRoute RouteType = "Regex"
RegexRoute RouteType = "regex"
// DefaultRouteType is the PrefixRoute
DefaultRouteType RouteType = PrefixRoute
)

14
pkg/proxy/proxy.go
View File

@@ -120,20 +120,20 @@ func (p *MultiHostReverseProxy) ServeHTTP(w http.ResponseWriter, r *http.Request
var handler func(string, url.URL) bool
switch routeType {
case config.QueryRoute:
handler = p.queryRouteHandler
handler = p.queryRouteMatcher
case config.RegexRoute:
handler = p.regexRouteHandler
handler = p.regexRouteMatcher
case config.PrefixRoute:
fallthrough
default:
handler = p.prefixRouteHandler
handler = p.prefixRouteMatcher
}
for endpoint := range p.Directors[policy][routeType] {
if handler(endpoint, *r.URL) {
p.Director = p.Directors[policy][routeType][endpoint]
hit = true
p.logger.
Info().
Debug().
Str("policy", policy).
Str("prefix", endpoint).
Str("path", r.URL.Path).
@@ -153,7 +153,7 @@ func (p *MultiHostReverseProxy) ServeHTTP(w http.ResponseWriter, r *http.Request
p.ReverseProxy.ServeHTTP(w, r)
}
func (p MultiHostReverseProxy) queryRouteHandler(endpoint string, target url.URL) bool {
func (p MultiHostReverseProxy) queryRouteMatcher(endpoint string, target url.URL) bool {
u, _ := url.Parse(endpoint)
if strings.HasPrefix(target.Path, u.Path) && endpoint != "/" {
query := u.Query()
@@ -174,7 +174,7 @@ func (p MultiHostReverseProxy) queryRouteHandler(endpoint string, target url.URL
return false
}
func (p *MultiHostReverseProxy) regexRouteHandler(endpoint string, target url.URL) bool {
func (p *MultiHostReverseProxy) regexRouteMatcher(endpoint string, target url.URL) bool {
matched, err := regexp.MatchString(endpoint, target.String())
if err != nil {
p.logger.Warn().Err(err).Msgf("regex with pattern %s failed", endpoint)
@@ -182,7 +182,7 @@ func (p *MultiHostReverseProxy) regexRouteHandler(endpoint string, target url.UR
return matched
}
func (p *MultiHostReverseProxy) prefixRouteHandler(endpoint string, target url.URL) bool {
func (p *MultiHostReverseProxy) prefixRouteMatcher(endpoint string, target url.URL) bool {
return strings.HasPrefix(target.Path, endpoint) && endpoint != "/"
}