@@ -31,40 +31,25 @@ func FromHeadersOrDefault(h *http.Header, r *http.Request, defaultURL *url.URL)
31
31
if host == "" || r .Host == "" {
32
32
defaultURL = defaultURL .JoinPath (path )
33
33
log .Info (r .Context (), "X-Forwarded-Host or r.Host is empty, using default URL" , log.Data {
34
- "r.Host" : r .Host ,
35
- "r.remoteAddr" : r .RemoteAddr ,
36
- "X-Forwarded-Proto" : h .Get ("X-Forwarded-Proto" ),
37
- "X-Forwarded-Host" : h .Get ("X-Forwarded-Host" ),
38
- "X-Forwarded-Port" : h .Get ("X-Forwarded-Port" ),
39
- "X-Forwarded-Path-Prefix" : h .Get ("X-Forwarded-Path-Prefix" ),
40
- "X-Forwarded-For" : h .Get ("X-Forwarded-For" ),
34
+ "r.Host" : r .Host ,
35
+ "r.remoteAddr" : r .RemoteAddr ,
41
36
})
42
37
return & Builder {
43
38
URL : defaultURL ,
44
39
}
45
40
}
46
41
if ! strings .HasPrefix (host , "api" ) {
47
42
log .Info (r .Context (), "X-Forwarded-Host is not an external host, using incoming request host" , log.Data {
48
- "r.Host" : r .Host ,
49
- "r.remoteAddr" : r .RemoteAddr ,
50
- "X-Forwarded-Proto" : h .Get ("X-Forwarded-Proto" ),
51
- "X-Forwarded-Host" : h .Get ("X-Forwarded-Host" ),
52
- "X-Forwarded-Port" : h .Get ("X-Forwarded-Port" ),
53
- "X-Forwarded-Path-Prefix" : h .Get ("X-Forwarded-Path-Prefix" ),
54
- "X-Forwarded-For" : h .Get ("X-Forwarded-For" ),
43
+ "r.Host" : r .Host ,
44
+ "r.remoteAddr" : r .RemoteAddr ,
55
45
})
56
46
host = r .Host
57
47
}
58
48
59
49
scheme := h .Get ("X-Forwarded-Proto" )
60
50
if scheme == "" {
61
51
log .Info (r .Context (), "X-Forwarded-Proto is empty, using http or https based on host" , log.Data {
62
- "host" : host ,
63
- "X-Forwarded-Proto" : h .Get ("X-Forwarded-Proto" ),
64
- "X-Forwarded-Host" : h .Get ("X-Forwarded-Host" ),
65
- "X-Forwarded-Port" : h .Get ("X-Forwarded-Port" ),
66
- "X-Forwarded-Path-Prefix" : h .Get ("X-Forwarded-Path-Prefix" ),
67
- "X-Forwarded-For" : h .Get ("X-Forwarded-For" ),
52
+ "host" : host ,
68
53
})
69
54
if ! strings .HasPrefix (host , "api" ) {
70
55
scheme = "http"
0 commit comments