Merge pull request #15 from Comcast/context-additions

Context additions

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [v0.2.2]
+- Updated Errors `Error()` function
+- Added request URL and method to context
+
 ## [v0.2.1]
 - Removed request from logging statements
 
@@ -24,7 +28,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added constructor, enforcer, and listener alice decorators
 - Basic code and structure established
 
-[Unreleased]: https://github.com/Comcast/comcast-bascule/compare/v0.2.1...HEAD
+[Unreleased]: https://github.com/Comcast/comcast-bascule/compare/v0.2.2...HEAD
+[v0.2.2]: https://github.com/Comcast/comcast-bascule/compare/0.2.1...v0.2.2
 [v0.2.1]: https://github.com/Comcast/comcast-bascule/compare/0.2.0...v0.2.1
 [v0.2.0]: https://github.com/Comcast/comcast-bascule/compare/0.1.1...v0.2.0
 [v0.1.1]: https://github.com/Comcast/comcast-bascule/compare/0.1.0...v0.1.1

bascule/basculehttp/constructor.go

@@ -67,6 +67,10 @@ func (c *constructor) decorate(next http.Handler) http.Handler {
 			bascule.Authentication{
 				Authorization: key,
 				Token:         token,
+				Request: bascule.Request{
+					URL:    request.URL.EscapedPath(),
+					Method: request.Method,
+				},
 			},
 		)
 		logger.Log(level.Key(), level.DebugValue(), "msg", "authentication added to context",

bascule/context.go

@@ -1,6 +1,8 @@
 package bascule
 
-import "context"
+import (
+	"context"
+)
 
 // Authorization represents the authorization mechanism performed on the token,
 // e.g. "Basic", "Bearer", etc for HTTP security environments.
@@ -10,6 +12,12 @@ type Authorization string
 type Authentication struct {
 	Authorization Authorization
 	Token         Token
+	Request       Request
+}
+
+type Request struct {
+	URL    string
+	Method string
 }
 
 type authenticationKey struct{}

bascule/error.go

@@ -1,5 +1,7 @@
 package bascule
 
+import "fmt"
+
 // Error is an optional interface to be implemented by security related errors
 type Error interface {
 	Cause() error
@@ -13,7 +15,11 @@ type MultiError interface {
 type Errors []error
 
 func (e Errors) Error() string {
-	return "multiple errors"
+	var errors string
+	for _, err := range e {
+		errors = errors + ", " + err.Error()
+	}
+	return fmt.Sprintf("multiple errors: [%v]", errors)
 }
 
 func (e Errors) Errors() []error {