diff --git a/logging_handler.go b/logging_handler.go index 17fca97..540b540 100644 --- a/logging_handler.go +++ b/logging_handler.go @@ -9,9 +9,14 @@ import ( "net" "net/http" "net/url" + "text/template" "time" ) +const ( + defaultRequestLoggingFormat = "{{.Client}} - {{.Username}} [{{.Timestamp}}] {{.Host}} {{.RequestMethod}} {{.Upstream}} {{.RequestURI}} {{.Protocol}} {{.UserAgent}} {{.StatusCode}} {{.ResponseSize}} {{.RequestDuration}}" +) + // responseLogger is wrapper of http.ResponseWriter that keeps track of its HTTP status // code and body size type responseLogger struct { @@ -64,15 +69,38 @@ func (l *responseLogger) Size() int { return l.size } -// loggingHandler is the http.Handler implementation for LoggingHandlerTo and its friends -type loggingHandler struct { - writer io.Writer - handler http.Handler - enabled bool +// logMessageData is the container for all values that are available as variables in the request logging format. +// All values are pre-formatted strings so it is easy to use them in the format string. +type logMessageData struct { + Client, + Host, + Protocol, + RequestDuration, + RequestMethod, + RequestURI, + ResponseSize, + StatusCode, + Timestamp, + Upstream, + UserAgent, + Username string } -func LoggingHandler(out io.Writer, h http.Handler, v bool) http.Handler { - return loggingHandler{out, h, v} +// loggingHandler is the http.Handler implementation for LoggingHandlerTo and its friends +type loggingHandler struct { + writer io.Writer + handler http.Handler + enabled bool + logTemplate *template.Template +} + +func LoggingHandler(out io.Writer, h http.Handler, v bool, requestLoggingTpl string) http.Handler { + return loggingHandler{ + writer: out, + handler: h, + enabled: v, + logTemplate: template.Must(template.New("request-log").Parse(requestLoggingTpl)), + } } func (h loggingHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { @@ -83,14 +111,13 @@ func (h loggingHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { if !h.enabled { return } - logLine := buildLogLine(logger.authInfo, logger.upstream, req, url, t, logger.Status(), logger.Size()) - h.writer.Write(logLine) + h.writeLogLine(logger.authInfo, logger.upstream, req, url, t, logger.Status(), logger.Size()) } // Log entry for req similar to Apache Common Log Format. // ts is the timestamp with which the entry should be logged. // status, size are used to provide the response HTTP status and size. -func buildLogLine(username, upstream string, req *http.Request, url url.URL, ts time.Time, status int, size int) []byte { +func (h loggingHandler) writeLogLine(username, upstream string, req *http.Request, url url.URL, ts time.Time, status int, size int) { if username == "" { username = "-" } @@ -114,19 +141,20 @@ func buildLogLine(username, upstream string, req *http.Request, url url.URL, ts duration := float64(time.Now().Sub(ts)) / float64(time.Second) - logLine := fmt.Sprintf("%s - %s [%s] %s %s %s %q %s %q %d %d %0.3f\n", - client, - username, - ts.Format("02/Jan/2006:15:04:05 -0700"), - req.Host, - req.Method, - upstream, - url.RequestURI(), - req.Proto, - req.UserAgent(), - status, - size, - duration, - ) - return []byte(logLine) + h.logTemplate.Execute(h.writer, logMessageData{ + Client: client, + Host: req.Host, + Protocol: req.Proto, + RequestDuration: fmt.Sprintf("%0.3f", duration), + RequestMethod: req.Method, + RequestURI: fmt.Sprintf("%q", url.RequestURI()), + ResponseSize: fmt.Sprintf("%d", size), + StatusCode: fmt.Sprintf("%d", status), + Timestamp: ts.Format("02/Jan/2006:15:04:05 -0700"), + Upstream: upstream, + UserAgent: fmt.Sprintf("%q", req.UserAgent()), + Username: username, + }) + + h.writer.Write([]byte("\n")) } diff --git a/main.go b/main.go index ab0e4d3..114a2a8 100644 --- a/main.go +++ b/main.go @@ -67,6 +67,7 @@ func main() { flagSet.Bool("cookie-httponly", true, "set HttpOnly cookie flag") flagSet.Bool("request-logging", true, "Log requests to stdout") + flagSet.String("request-logging-format", defaultRequestLoggingFormat, "Template for log lines") flagSet.String("provider", "google", "OAuth provider") flagSet.String("login-url", "", "Authentication endpoint") @@ -124,7 +125,7 @@ func main() { } s := &Server{ - Handler: LoggingHandler(os.Stdout, oauthproxy, opts.RequestLogging), + Handler: LoggingHandler(os.Stdout, oauthproxy, opts.RequestLogging, opts.RequestLoggingFormat), Opts: opts, } s.ListenAndServe() diff --git a/options.go b/options.go index f1df916..e8ec4ff 100644 --- a/options.go +++ b/options.go @@ -71,7 +71,8 @@ type Options struct { Scope string `flag:"scope" cfg:"scope"` ApprovalPrompt string `flag:"approval-prompt" cfg:"approval_prompt"` - RequestLogging bool `flag:"request-logging" cfg:"request_logging"` + RequestLogging bool `flag:"request-logging" cfg:"request_logging"` + RequestLoggingFormat string `flag:"request-logging-format" cfg:"request_logging_format"` SignatureKey string `flag:"signature-key" cfg:"signature_key" env:"OAUTH2_PROXY_SIGNATURE_KEY"` @@ -90,23 +91,24 @@ type SignatureData struct { func NewOptions() *Options { return &Options{ - ProxyPrefix: "/oauth2", - HttpAddress: "127.0.0.1:4180", - HttpsAddress: ":443", - DisplayHtpasswdForm: true, - CookieName: "_oauth2_proxy", - CookieSecure: true, - CookieHttpOnly: true, - CookieExpire: time.Duration(168) * time.Hour, - CookieRefresh: time.Duration(0), - SetXAuthRequest: false, - SkipAuthPreflight: false, - PassBasicAuth: true, - PassUserHeaders: true, - PassAccessToken: false, - PassHostHeader: true, - ApprovalPrompt: "force", - RequestLogging: true, + ProxyPrefix: "/oauth2", + HttpAddress: "127.0.0.1:4180", + HttpsAddress: ":443", + DisplayHtpasswdForm: true, + CookieName: "_oauth2_proxy", + CookieSecure: true, + CookieHttpOnly: true, + CookieExpire: time.Duration(168) * time.Hour, + CookieRefresh: time.Duration(0), + SetXAuthRequest: false, + SkipAuthPreflight: false, + PassBasicAuth: true, + PassUserHeaders: true, + PassAccessToken: false, + PassHostHeader: true, + ApprovalPrompt: "force", + RequestLogging: true, + RequestLoggingFormat: defaultRequestLoggingFormat, } }