mirror of
https://github.com/pomerium/pomerium.git
synced 2025-05-15 18:17:49 +02:00
integration: unauthorized response Content-Type (#4956)
Modify the request 'Accept' header to behave more like a web browser, and add an assertion to verify that Pomerium serves an HTML response for the unauthorized error page.
This commit is contained in:
parent
7edd538be7
commit
f9808a73ba
2 changed files with 22 additions and 2 deletions
|
@ -28,6 +28,7 @@ type authenticateConfig struct {
|
|||
groups []string
|
||||
tokenExpiration time.Duration
|
||||
apiPath string
|
||||
requestHeaders http.Header
|
||||
}
|
||||
|
||||
// An AuthenticateOption is an option for authentication.
|
||||
|
@ -36,6 +37,7 @@ type AuthenticateOption func(cfg *authenticateConfig)
|
|||
func getAuthenticateConfig(options ...AuthenticateOption) *authenticateConfig {
|
||||
cfg := &authenticateConfig{
|
||||
tokenExpiration: time.Hour * 24,
|
||||
requestHeaders: http.Header{},
|
||||
}
|
||||
for _, option := range options {
|
||||
if option != nil {
|
||||
|
@ -73,6 +75,12 @@ func WithAPI() AuthenticateOption {
|
|||
}
|
||||
}
|
||||
|
||||
func WithRequestHeader(name, value string) AuthenticateOption {
|
||||
return func(cfg *authenticateConfig) {
|
||||
cfg.requestHeaders.Set(name, value)
|
||||
}
|
||||
}
|
||||
|
||||
// Authenticate submits a request to a URL, expects a redirect to authenticate and then openid and logs in.
|
||||
// Finally it expects to redirect back to the original page.
|
||||
func Authenticate(ctx context.Context, client *http.Client, url *url.URL, options ...AuthenticateOption) (*http.Response, error) {
|
||||
|
@ -168,6 +176,7 @@ func Authenticate(ctx context.Context, client *http.Client, url *url.URL, option
|
|||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
addRequestHeaders(req, cfg.requestHeaders)
|
||||
} else {
|
||||
req, err = requestFromRedirectResponse(ctx, res, req)
|
||||
if err != nil {
|
||||
|
@ -238,5 +247,12 @@ func requestFromRedirectResponse(ctx context.Context, res *http.Response, req *h
|
|||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
addRequestHeaders(newreq, req.Header)
|
||||
return newreq, nil
|
||||
}
|
||||
|
||||
func addRequestHeaders(req *http.Request, headers http.Header) {
|
||||
for h := range headers {
|
||||
req.Header[h] = headers[h]
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue