homelab/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Forward all header values from forward auth response

Browse source
This commit is contained in:
ctas582 2019-04-10 16:18:06 +01:00 • committed by Traefiker Bot
parent d356ef1c5b
commit 3d7633f4a6
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/middlewares/auth/forward.go
View file

@ -147,7 +147,11 @@ func (fa *forwardAuth) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
} }
for _, headerName := range fa.authResponseHeaders { for _, headerName := range fa.authResponseHeaders {
req.Header.Set(headerName, forwardResponse.Header.Get(headerName)) headerKey := http.CanonicalHeaderKey(headerName)
req.Header.Del(headerKey)
if len(forwardResponse.Header[headerKey]) > 0 {
req.Header[headerKey] = append([]string(nil), forwardResponse.Header[headerKey]...)
}
} }
req.RequestURI = req.URL.RequestURI() req.RequestURI = req.URL.RequestURI()

6
pkg/middlewares/auth/forward_test.go
View file

@ -50,6 +50,8 @@ func TestForwardAuthSuccess(t *testing.T) {
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("X-Auth-User", "user@example.com") w.Header().Set("X-Auth-User", "user@example.com")
w.Header().Set("X-Auth-Secret", "secret") w.Header().Set("X-Auth-Secret", "secret")
w.Header().Add("X-Auth-Group", "group1")
w.Header().Add("X-Auth-Group", "group2")
fmt.Fprintln(w, "Success") fmt.Fprintln(w, "Success")
})) }))
defer server.Close() defer server.Close()
@ -57,12 +59,13 @@ func TestForwardAuthSuccess(t *testing.T) {
next := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { next := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
assert.Equal(t, "user@example.com", r.Header.Get("X-Auth-User")) assert.Equal(t, "user@example.com", r.Header.Get("X-Auth-User"))
assert.Empty(t, r.Header.Get("X-Auth-Secret")) assert.Empty(t, r.Header.Get("X-Auth-Secret"))
assert.Equal(t, []string{"group1", "group2"}, r.Header["X-Auth-Group"])
fmt.Fprintln(w, "traefik") fmt.Fprintln(w, "traefik")
}) })
auth := config.ForwardAuth{ auth := config.ForwardAuth{
Address: server.URL, Address: server.URL,
AuthResponseHeaders: []string{"X-Auth-User"}, AuthResponseHeaders: []string{"X-Auth-User", "X-Auth-Group"},
} }
middleware, err := NewForward(context.Background(), next, auth, "authTest") middleware, err := NewForward(context.Background(), next, auth, "authTest")
require.NoError(t, err) require.NoError(t, err)
@ -71,6 +74,7 @@ func TestForwardAuthSuccess(t *testing.T) {
defer ts.Close() defer ts.Close()
req := testhelpers.MustNewRequest(http.MethodGet, ts.URL, nil) req := testhelpers.MustNewRequest(http.MethodGet, ts.URL, nil)
req.Header.Set("X-Auth-Group", "admin_group")
res, err := http.DefaultClient.Do(req) res, err := http.DefaultClient.Do(req)
require.NoError(t, err) require.NoError(t, err)
assert.Equal(t, http.StatusOK, res.StatusCode) assert.Equal(t, http.StatusOK, res.StatusCode)