Chore: introduce logger

Author: till

driver/configuration/provider_viper_public_test.go

@@ -258,7 +258,7 @@ func TestViperProvider(t *testing.T) {
 		})
 
 		t.Run("authenticator=cookie_session", func(t *testing.T) {
-			a := authn.NewAuthenticatorCookieSession(p)
+			a := authn.NewAuthenticatorCookieSession(p, logger)
 			assert.True(t, p.AuthenticatorIsEnabled(a.GetID()))
 			require.NoError(t, a.Validate(nil))
 

driver/registry_memory.go

@@ -365,8 +365,8 @@ func (r *RegistryMemory) prepareAuthn() {
 	if r.authenticators == nil {
 		interim := []authn.Authenticator{
 			authn.NewAuthenticatorAnonymous(r.c),
-			authn.NewAuthenticatorCookieSession(r.c),
-			authn.NewAuthenticatorBearerToken(r.c),
+			authn.NewAuthenticatorCookieSession(r.c, r.Logger()),
+			authn.NewAuthenticatorBearerToken(r.c, r.Logger()),
 			authn.NewAuthenticatorJWT(r.c, r),
 			authn.NewAuthenticatorNoOp(r.c),
 			authn.NewAuthenticatorOAuth2ClientCredentials(r.c),

pipeline/authn/authenticator_bearer_token.go

@@ -12,6 +12,8 @@ import (
 	"github.com/ory/oathkeeper/driver/configuration"
 	"github.com/ory/oathkeeper/helper"
 	"github.com/ory/oathkeeper/pipeline"
+
+	"github.com/ory/x/logrusx"
 )
 
 func init() {
@@ -36,12 +38,14 @@ type AuthenticatorBearerTokenConfiguration struct {
 }
 
 type AuthenticatorBearerToken struct {
-	c configuration.Provider
+	c      configuration.Provider
+	logger *logrusx.Logger
 }
 
-func NewAuthenticatorBearerToken(c configuration.Provider) *AuthenticatorBearerToken {
+func NewAuthenticatorBearerToken(c configuration.Provider, logger *logrusx.Logger) *AuthenticatorBearerToken {
 	return &AuthenticatorBearerToken{
-		c: c,
+		c:      c,
+		logger: logger,
 	}
 }
 
@@ -86,7 +90,7 @@ func (a *AuthenticatorBearerToken) Authenticate(r *http.Request, session *Authen
 		return errors.WithStack(ErrAuthenticatorNotResponsible)
 	}
 
-	body, err := forwardRequestToSessionStore(r, cf.CheckSessionURL, cf.PreserveQuery, cf.PreservePath, cf.PreserveHost, cf.SetHeaders, cf.ForceMethod)
+	body, err := forwardRequestToSessionStore(r, cf.CheckSessionURL, cf.PreserveQuery, cf.PreservePath, cf.PreserveHost, cf.SetHeaders, cf.ForceMethod, a.logger)
 	if err != nil {
 		return err
 	}

pipeline/authn/authenticator_cookie_session.go

@@ -16,6 +16,8 @@ import (
 	"github.com/ory/oathkeeper/driver/configuration"
 	"github.com/ory/oathkeeper/helper"
 	"github.com/ory/oathkeeper/pipeline"
+
+	"github.com/ory/x/logrusx"
 )
 
 func init() {
@@ -40,12 +42,14 @@ type AuthenticatorCookieSessionConfiguration struct {
 }
 
 type AuthenticatorCookieSession struct {
-	c configuration.Provider
+	c      configuration.Provider
+	logger *logrusx.Logger
 }
 
-func NewAuthenticatorCookieSession(c configuration.Provider) *AuthenticatorCookieSession {
+func NewAuthenticatorCookieSession(c configuration.Provider, logger *logrusx.Logger) *AuthenticatorCookieSession {
 	return &AuthenticatorCookieSession{
-		c: c,
+		c:      c,
+		logger: logger,
 	}
 }
 
@@ -89,7 +93,7 @@ func (a *AuthenticatorCookieSession) Authenticate(r *http.Request, session *Auth
 		return errors.WithStack(ErrAuthenticatorNotResponsible)
 	}
 
-	body, err := forwardRequestToSessionStore(r, cf.CheckSessionURL, cf.PreserveQuery, cf.PreservePath, cf.PreserveHost, cf.SetHeaders, cf.ForceMethod)
+	body, err := forwardRequestToSessionStore(r, cf.CheckSessionURL, cf.PreserveQuery, cf.PreservePath, cf.PreserveHost, cf.SetHeaders, cf.ForceMethod, a.logger)
 	if err != nil {
 		return err
 	}
@@ -129,7 +133,7 @@ func cookieSessionResponsible(r *http.Request, only []string) bool {
 	return false
 }
 
-func forwardRequestToSessionStore(r *http.Request, checkSessionURL string, preserveQuery bool, preservePath bool, preserveHost bool, setHeaders map[string]string, m string) (json.RawMessage, error) {
+func forwardRequestToSessionStore(r *http.Request, checkSessionURL string, preserveQuery bool, preservePath bool, preserveHost bool, setHeaders map[string]string, m string, logger *logrusx.Logger) (json.RawMessage, error) {
 	reqUrl, err := url.Parse(checkSessionURL)
 	if err != nil {
 		return nil, errors.WithStack(herodot.ErrInternalServerError.WithReasonf("Unable to parse session check URL: %s", err))
@@ -177,12 +181,14 @@ func forwardRequestToSessionStore(r *http.Request, checkSessionURL string, prese
 
 	body, err := ioutil.ReadAll(res.Body)
 	if err != nil {
+		logger.Tracef("Error reading response from remote: %v", err)
 		return json.RawMessage{}, errors.WithStack(herodot.ErrInternalServerError.WithReasonf("Unable to read response from remote: %s", err))
 	}
 
 	if res.StatusCode == 200 {
 		return body, nil
 	}
 
+	logger.Tracef("Remote returned non-200 status code '%d' with body: %s", res.StatusCode, body)
 	return json.RawMessage{}, errors.WithStack(helper.ErrUnauthorized.WithReasonf("Remote returned non 200 status code: %d", res.StatusCode))
 }