mirror of
https://github.com/oauth2-proxy/oauth2-proxy.git
synced 2024-11-24 08:52:25 +02:00
2c851fcd4f
* Add an option to allow health checks based on User-Agent. * Formatting fix * Rename field and avoid unnecessary interface. * Skip the redirect fix so it can be put into a different PR. * Add CHANGELOG entry * Adding a couple tests for the PingUserAgent option.
129 lines
4.1 KiB
Go
129 lines
4.1 KiB
Go
package main
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"net/url"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/oauth2-proxy/oauth2-proxy/pkg/apis/options"
|
|
"github.com/oauth2-proxy/oauth2-proxy/pkg/logger"
|
|
"github.com/oauth2-proxy/oauth2-proxy/pkg/validation"
|
|
)
|
|
|
|
func TestLoggingHandler_ServeHTTP(t *testing.T) {
|
|
ts := time.Now()
|
|
|
|
tests := []struct {
|
|
Format,
|
|
ExpectedLogMessage,
|
|
Path string
|
|
ExcludePaths []string
|
|
SilencePingLogging bool
|
|
}{
|
|
{logger.DefaultRequestLoggingFormat, fmt.Sprintf("127.0.0.1 - - [%s] test-server GET - \"/foo/bar\" HTTP/1.1 \"\" 200 4 0.000\n", logger.FormatTimestamp(ts)), "/foo/bar", []string{}, false},
|
|
{logger.DefaultRequestLoggingFormat, fmt.Sprintf("127.0.0.1 - - [%s] test-server GET - \"/foo/bar\" HTTP/1.1 \"\" 200 4 0.000\n", logger.FormatTimestamp(ts)), "/foo/bar", []string{}, true},
|
|
{logger.DefaultRequestLoggingFormat, fmt.Sprintf("127.0.0.1 - - [%s] test-server GET - \"/foo/bar\" HTTP/1.1 \"\" 200 4 0.000\n", logger.FormatTimestamp(ts)), "/foo/bar", []string{"/ping"}, false},
|
|
{logger.DefaultRequestLoggingFormat, "", "/foo/bar", []string{"/foo/bar"}, false},
|
|
{logger.DefaultRequestLoggingFormat, "", "/ping", []string{}, true},
|
|
{logger.DefaultRequestLoggingFormat, "", "/ping", []string{"/ping"}, false},
|
|
{logger.DefaultRequestLoggingFormat, "", "/ping", []string{"/ping"}, true},
|
|
{logger.DefaultRequestLoggingFormat, "", "/ping", []string{"/foo/bar", "/ping"}, false},
|
|
{"{{.RequestMethod}}", "GET\n", "/foo/bar", []string{}, true},
|
|
{"{{.RequestMethod}}", "GET\n", "/foo/bar", []string{"/ping"}, false},
|
|
{"{{.RequestMethod}}", "GET\n", "/ping", []string{}, false},
|
|
{"{{.RequestMethod}}", "", "/ping", []string{"/ping"}, true},
|
|
}
|
|
|
|
for _, test := range tests {
|
|
buf := bytes.NewBuffer(nil)
|
|
handler := func(w http.ResponseWriter, req *http.Request) {
|
|
_, ok := w.(http.Hijacker)
|
|
if !ok {
|
|
t.Error("http.Hijacker is not available")
|
|
}
|
|
|
|
w.Write([]byte("test"))
|
|
}
|
|
|
|
logger.SetOutput(buf)
|
|
logger.SetReqTemplate(test.Format)
|
|
if test.SilencePingLogging {
|
|
test.ExcludePaths = append(test.ExcludePaths, "/ping")
|
|
}
|
|
logger.SetExcludePaths(test.ExcludePaths)
|
|
h := LoggingHandler(http.HandlerFunc(handler))
|
|
|
|
r, _ := http.NewRequest("GET", test.Path, nil)
|
|
r.RemoteAddr = "127.0.0.1"
|
|
r.Host = "test-server"
|
|
|
|
h.ServeHTTP(httptest.NewRecorder(), r)
|
|
|
|
actual := buf.String()
|
|
if !strings.Contains(actual, test.ExpectedLogMessage) {
|
|
t.Errorf("Log message was\n%s\ninstead of matching \n%s", actual, test.ExpectedLogMessage)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestLoggingHandler_PingUserAgent(t *testing.T) {
|
|
tests := []struct {
|
|
ExpectedLogMessage string
|
|
Path string
|
|
SilencePingLogging bool
|
|
WithUserAgent string
|
|
}{
|
|
{"444\n", "/foo", true, "Blah"},
|
|
{"444\n", "/foo", false, "Blah"},
|
|
{"", "/ping", true, "Blah"},
|
|
{"200\n", "/ping", false, "Blah"},
|
|
{"", "/ping", true, "PingMe!"},
|
|
{"", "/ping", false, "PingMe!"},
|
|
{"", "/foo", true, "PingMe!"},
|
|
{"", "/foo", false, "PingMe!"},
|
|
}
|
|
|
|
for idx, test := range tests {
|
|
t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) {
|
|
opts := options.NewOptions()
|
|
opts.PingUserAgent = "PingMe!"
|
|
opts.SkipAuthRegex = []string{"/foo"}
|
|
opts.Upstreams = []string{"static://444/foo"}
|
|
opts.Logging.SilencePing = test.SilencePingLogging
|
|
if test.SilencePingLogging {
|
|
opts.Logging.ExcludePaths = []string{"/ping"}
|
|
}
|
|
opts.RawRedirectURL = "localhost"
|
|
validation.Validate(opts)
|
|
|
|
p := NewOAuthProxy(opts, func(email string) bool {
|
|
return true
|
|
})
|
|
p.provider = NewTestProvider(&url.URL{Host: "localhost"}, "")
|
|
|
|
buf := bytes.NewBuffer(nil)
|
|
logger.SetOutput(buf)
|
|
logger.SetReqEnabled(true)
|
|
logger.SetReqTemplate("{{.StatusCode}}")
|
|
|
|
r, _ := http.NewRequest("GET", test.Path, nil)
|
|
if test.WithUserAgent != "" {
|
|
r.Header.Set("User-Agent", test.WithUserAgent)
|
|
}
|
|
|
|
h := LoggingHandler(p)
|
|
h.ServeHTTP(httptest.NewRecorder(), r)
|
|
|
|
actual := buf.String()
|
|
if !strings.Contains(actual, test.ExpectedLogMessage) {
|
|
t.Errorf("Log message was\n%s\ninstead of matching \n%s", actual, test.ExpectedLogMessage)
|
|
}
|
|
})
|
|
}
|
|
}
|