go/oauth2-proxy
1
0
Fork 0
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git synced 2025-08-08 22:46:33 +02:00
Code Issues Releases Activity

Add reverse proxy setting (#331)

Browse Source 
* Add reverse proxy setting (#321)
This commit is contained in:
Martin Campbell
2020-01-24 17:54:13 +00:00
committed by Joel Speed
parent 79a0759c10
commit d9362d3bb9
7 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/logger/logger.go
View File

@ -88,6 +88,7 @@ type Logger struct {
stdEnabled bool
authEnabled bool
reqEnabled bool
reverseProxy bool
excludePaths map[string]struct{}
stdLogTemplate *template.Template
authTemplate *template.Template
@ -102,6 +103,7 @@ func New(flag int) *Logger {
stdEnabled: true,
authEnabled: true,
reqEnabled: true,
reverseProxy: false,
excludePaths: nil,
stdLogTemplate: template.Must(template.New("std-log").Parse(DefaultStandardLoggingFormat)),
authTemplate: template.Must(template.New("auth-log").Parse(DefaultAuthLoggingFormat)),
@ -151,7 +153,7 @@ func (l *Logger) PrintAuth(username string, req *http.Request, status AuthStatus
username = "-"
}
client := GetClient(req)
client := GetClient(req, l.reverseProxy)
l.mu.Lock()
defer l.mu.Unlock()
@ -199,7 +201,7 @@ func (l *Logger) PrintReq(username, upstream string, req *http.Request, url url.
}
}
client := GetClient(req)
client := GetClient(req, l.reverseProxy)
l.mu.Lock()
defer l.mu.Unlock()
@ -251,10 +253,12 @@ func (l *Logger) GetFileLineString(calldepth int) string {
}
// GetClient parses an HTTP request for the client/remote IP address.
func GetClient(req *http.Request) string {
client := req.Header.Get("X-Real-IP")
if client == "" {
client = req.RemoteAddr
func GetClient(req *http.Request, reverseProxy bool) string {
client := req.RemoteAddr
if reverseProxy {
if ip := req.Header.Get("X-Real-IP"); ip != "" {
client = ip
}
}
if c, _, err := net.SplitHostPort(client); err == nil {
@ -308,6 +312,13 @@ func (l *Logger) SetReqEnabled(e bool) {
l.reqEnabled = e
}
// SetReverseProxy controls whether logging will trust headers that can be set by a reverse proxy.
func (l *Logger) SetReverseProxy(e bool) {
l.mu.Lock()
defer l.mu.Unlock()
l.reverseProxy = e
}
// SetExcludePaths sets the paths to exclude from logging.
func (l *Logger) SetExcludePaths(s []string) {
l.mu.Lock()
@ -381,6 +392,12 @@ func SetReqEnabled(e bool) {
std.SetReqEnabled(e)
}
// SetReverseProxy controls whether logging will trust headers that can be set
// by a reverse proxy for the standard logger.
func SetReverseProxy(e bool) {
std.SetReverseProxy(e)
}
// SetExcludePaths sets the path to exclude from logging, eg: health checks
func SetExcludePaths(s []string) {
std.SetExcludePaths(s)