README.md

@@ -261,7 +261,7 @@ type res struct{
     Output2 bool
 }
 
-func myHandler(ctx *api.Context, r req) (*res, api.Err) {
+func myHandler(r req) (*res, api.Err) {
     err := doSomething()
     if err != nil {
         return nil, api.ErrFailure

api/adapter.go

@@ -0,0 +1,13 @@
+package api
+
+import "net/http"
+
+// Adapter to encapsulate incoming requests
+type Adapter func(http.HandlerFunc) http.HandlerFunc
+
+// AuthHandlerFunc is http.HandlerFunc with additional Authorization information
+type AuthHandlerFunc func(Auth, http.ResponseWriter, *http.Request)
+
+// AuthAdapter to encapsulate incoming request with access to api.Auth
+// to manage permissions
+type AuthAdapter func(AuthHandlerFunc) AuthHandlerFunc

api/auth.go

@@ -21,7 +21,7 @@ type Auth struct {
 
 // Granted returns whether the authorization is granted
 // i.e. Auth.Active fulfills Auth.Required
-func (a *Auth) Granted() bool {
+func (a Auth) Granted() bool {
 	var nothingRequired = true
 
 	// first dimension: OR ; at least one is valid
@@ -43,7 +43,7 @@ func (a *Auth) Granted() bool {
 }
 
 // returns whether Auth.Active fulfills (contains) all @required roles
-func (a *Auth) fulfills(required []string) bool {
+func (a Auth) fulfills(required []string) bool {
 	for _, requiredRole := range required {
 		var found = false
 		for _, activeRole := range a.Active {

api/context.go

@@ -7,8 +7,12 @@ import (
 	"git.xdrm.io/go/aicra/internal/ctx"
 )
 
-// GetRequest extracts the current request from a context.Context
+// Context is a simple wrapper around context.Context that adds helper methods
-func GetRequest(c context.Context) *http.Request {
+// to access additional information
+type Context struct{ context.Context }
+
+// Request current request
+func (c Context) Request() *http.Request {
 	var (
 		raw      = c.Value(ctx.Request)
 		cast, ok = raw.(*http.Request)
@@ -19,8 +23,8 @@ func GetRequest(c context.Context) *http.Request {
 	return cast
 }
 
-// GetResponseWriter extracts the response writer from a context.Context
+// ResponseWriter for this request
-func GetResponseWriter(c context.Context) http.ResponseWriter {
+func (c Context) ResponseWriter() http.ResponseWriter {
 	var (
 		raw      = c.Value(ctx.Response)
 		cast, ok = raw.(http.ResponseWriter)
@@ -31,8 +35,8 @@ func GetResponseWriter(c context.Context) http.ResponseWriter {
 	return cast
 }
 
-// GetAuth returns the api.Auth associated with this request from a context.Context
+// Auth associated with this request
-func GetAuth(c context.Context) *Auth {
+func (c Context) Auth() *Auth {
 	var (
 		raw      = c.Value(ctx.Auth)
 		cast, ok = raw.(*Auth)

builder.go

@@ -5,6 +5,7 @@ import (
 	"io"
 	"net/http"
 
+	"git.xdrm.io/go/aicra/api"
 	"git.xdrm.io/go/aicra/datatype"
 	"git.xdrm.io/go/aicra/internal/config"
 	"git.xdrm.io/go/aicra/internal/dynfunc"
@@ -12,16 +13,10 @@ import (
 
 // Builder for an aicra server
 type Builder struct {
-	// the server configuration defining available services
+	conf         *config.Server
-	conf *config.Server
+	handlers     []*apiHandler
-	// user-defined handlers bound to services from the configuration
+	adapters     []api.Adapter
-	handlers []*apiHandler
+	authAdapters []api.AuthAdapter
-	// http middlewares wrapping the entire http connection (e.g. logger)
-	middlewares []func(http.Handler) http.Handler
-	// custom middlewares only wrapping the service handler of a request
-	// they will benefit from the request's context that contains service-specific
-	// information (e.g. required permisisons from the configuration)
-	ctxMiddlewares []func(http.Handler) http.Handler
 }
 
 // represents an api handler (method-pattern combination)
@@ -46,36 +41,26 @@ func (b *Builder) AddType(t datatype.T) error {
 	return nil
 }
 
-// With adds an http middleware on top of the http connection
+// With adds an http adapter (middleware)
-//
+func (b *Builder) With(adapter api.Adapter) {
-// Authentication management can only be done with the WithContext() methods as
-// the service associated with the request has not been found at this stage.
-// This stage is perfect for logging or generic request management.
-func (b *Builder) With(mw func(http.Handler) http.Handler) {
 	if b.conf == nil {
 		b.conf = &config.Server{}
 	}
-	if b.middlewares == nil {
+	if b.adapters == nil {
-		b.middlewares = make([]func(http.Handler) http.Handler, 0)
+		b.adapters = make([]api.Adapter, 0)
 	}
-	b.middlewares = append(b.middlewares, mw)
+	b.adapters = append(b.adapters, adapter)
 }
 
-// WithContext adds an http middleware with the fully loaded context
+// WithAuth adds an http adapter with auth capabilities (middleware)
-//
+func (b *Builder) WithAuth(adapter api.AuthAdapter) {
-// Logging or generic request management should be done with the With() method as
-// it wraps the full http connection. Middlewares added through this method only
-// wrap the user-defined service handler. The context.Context is filled with useful
-// data that can be access with api.GetRequest(), api.GetResponseWriter(),
-// api.GetAuth(), etc methods.
-func (b *Builder) WithContext(mw func(http.Handler) http.Handler) {
 	if b.conf == nil {
 		b.conf = &config.Server{}
 	}
-	if b.ctxMiddlewares == nil {
+	if b.authAdapters == nil {
-		b.ctxMiddlewares = make([]func(http.Handler) http.Handler, 0)
+		b.authAdapters = make([]api.AuthAdapter, 0)
 	}
-	b.ctxMiddlewares = append(b.ctxMiddlewares, mw)
+	b.authAdapters = append(b.authAdapters, adapter)
 }
 
 // Setup the builder with its api definition file

builder_test.go

@@ -1,7 +1,6 @@
 package aicra
 
 import (
-	"context"
 	"errors"
 	"net/http"
 	"strings"
@@ -73,7 +72,7 @@ func TestBind(t *testing.T) {
 			Config:        "[]",
 			HandlerMethod: "",
 			HandlerPath:   "",
-			HandlerFn:     func(context.Context) (*struct{}, api.Err) { return nil, api.ErrSuccess },
+			HandlerFn:     func(*api.Context) (*struct{}, api.Err) { return nil, api.ErrSuccess },
 			BindErr:       errUnknownService,
 			BuildErr:      nil,
 		},
@@ -109,7 +108,7 @@ func TestBind(t *testing.T) {
 			]`,
 			HandlerMethod: http.MethodPost,
 			HandlerPath:   "/path",
-			HandlerFn:     func(context.Context) (*struct{}, api.Err) { return nil, api.ErrSuccess },
+			HandlerFn:     func(*api.Context) (*struct{}, api.Err) { return nil, api.ErrSuccess },
 			BindErr:       errUnknownService,
 			BuildErr:      errMissingHandler,
 		},
@@ -127,7 +126,7 @@ func TestBind(t *testing.T) {
 			]`,
 			HandlerMethod: http.MethodGet,
 			HandlerPath:   "/paths",
-			HandlerFn:     func(context.Context) (*struct{}, api.Err) { return nil, api.ErrSuccess },
+			HandlerFn:     func(*api.Context) (*struct{}, api.Err) { return nil, api.ErrSuccess },
 			BindErr:       errUnknownService,
 			BuildErr:      errMissingHandler,
 		},
@@ -145,7 +144,7 @@ func TestBind(t *testing.T) {
 			]`,
 			HandlerMethod: http.MethodGet,
 			HandlerPath:   "/path",
-			HandlerFn:     func(context.Context) (*struct{}, api.Err) { return nil, api.ErrSuccess },
+			HandlerFn:     func(*api.Context) (*struct{}, api.Err) { return nil, api.ErrSuccess },
 			BindErr:       nil,
 			BuildErr:      nil,
 		},
@@ -165,7 +164,7 @@ func TestBind(t *testing.T) {
 			]`,
 			HandlerMethod: http.MethodGet,
 			HandlerPath:   "/path",
-			HandlerFn:     func(context.Context, struct{ Name int }) (*struct{}, api.Err) { return nil, api.ErrSuccess },
+			HandlerFn:     func(*api.Context, struct{ Name int }) (*struct{}, api.Err) { return nil, api.ErrSuccess },
 			BindErr:       nil,
 			BuildErr:      nil,
 		},
@@ -185,7 +184,7 @@ func TestBind(t *testing.T) {
 			]`,
 			HandlerMethod: http.MethodGet,
 			HandlerPath:   "/path",
-			HandlerFn:     func(context.Context, struct{ Name uint }) (*struct{}, api.Err) { return nil, api.ErrSuccess },
+			HandlerFn:     func(*api.Context, struct{ Name uint }) (*struct{}, api.Err) { return nil, api.ErrSuccess },
 			BindErr:       nil,
 			BuildErr:      nil,
 		},
@@ -205,7 +204,7 @@ func TestBind(t *testing.T) {
 			]`,
 			HandlerMethod: http.MethodGet,
 			HandlerPath:   "/path",
-			HandlerFn:     func(context.Context, struct{ Name string }) (*struct{}, api.Err) { return nil, api.ErrSuccess },
+			HandlerFn:     func(*api.Context, struct{ Name string }) (*struct{}, api.Err) { return nil, api.ErrSuccess },
 			BindErr:       nil,
 			BuildErr:      nil,
 		},
@@ -225,7 +224,7 @@ func TestBind(t *testing.T) {
 			]`,
 			HandlerMethod: http.MethodGet,
 			HandlerPath:   "/path",
-			HandlerFn:     func(context.Context, struct{ Name bool }) (*struct{}, api.Err) { return nil, api.ErrSuccess },
+			HandlerFn:     func(*api.Context, struct{ Name bool }) (*struct{}, api.Err) { return nil, api.ErrSuccess },
 			BindErr:       nil,
 			BuildErr:      nil,
 		},

handler.go

@@ -17,31 +17,30 @@ type Handler Builder
 
 // ServeHTTP implements http.Handler and wraps it in middlewares (adapters)
 func (s Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	var h http.Handler = http.HandlerFunc(s.resolve)
+	var h = http.HandlerFunc(s.resolve)
 
-	for _, mw := range s.middlewares {
+	for _, adapter := range s.adapters {
-		h = mw(h)
+		h = adapter(h)
 	}
-	h.ServeHTTP(w, r)
+	h(w, r)
 }
 
-// ServeHTTP implements http.Handler and wraps it in middlewares (adapters)
 func (s Handler) resolve(w http.ResponseWriter, r *http.Request) {
-	// 1ind a matching service from config
+	// 1. find a matching service from config
 	var service = s.conf.Find(r)
 	if service == nil {
 		handleError(api.ErrUnknownService, w, r)
 		return
 	}
 
-	// extract request data
+	// 2. extract request data
 	var input, err = extractInput(service, *r)
 	if err != nil {
 		handleError(api.ErrMissingParam, w, r)
 		return
 	}
 
-	// find a matching handler
+	// 3. find a matching handler
 	var handler *apiHandler
 	for _, h := range s.handlers {
 		if h.Method == service.Method && h.Path == service.Pattern {
@@ -49,36 +48,63 @@ func (s Handler) resolve(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	// fail on no matching handler
+	// 4. fail on no matching handler
 	if handler == nil {
 		handleError(api.ErrUncallableService, w, r)
 		return
 	}
 
+	// replace format '[a]' in scope where 'a' is an existing input's name
+	scope := make([][]string, len(service.Scope))
+	for a, list := range service.Scope {
+		scope[a] = make([]string, len(list))
+		for b, perm := range list {
+			scope[a][b] = perm
+			for name, value := range input.Data {
+				var (
+					token       = fmt.Sprintf("[%s]", name)
+					replacement = ""
+				)
+				if value != nil {
+					replacement = fmt.Sprintf("[%v]", value)
+				}
+				scope[a][b] = strings.ReplaceAll(scope[a][b], token, replacement)
+			}
+		}
+	}
+
+	var auth = api.Auth{
+		Required: scope,
+		Active:   []string{},
+	}
+
+	// 5. run auth-aware middlewares
+	var h = api.AuthHandlerFunc(func(a api.Auth, w http.ResponseWriter, r *http.Request) {
+		if !a.Granted() {
+			handleError(api.ErrPermission, w, r)
+			return
+		}
+
+		s.handle(input, handler, service, w, r)
+	})
+
+	for _, adapter := range s.authAdapters {
+		h = adapter(h)
+	}
+	h(auth, w, r)
+
+}
+
+func (s *Handler) handle(input *reqdata.T, handler *apiHandler, service *config.Service, w http.ResponseWriter, r *http.Request) {
 	// build context with builtin data
 	c := r.Context()
 	c = context.WithValue(c, ctx.Request, r)
 	c = context.WithValue(c, ctx.Response, w)
-	c = context.WithValue(c, ctx.Auth, buildAuth(service.Scope, input.Data))
+	c = context.WithValue(c, ctx.Auth, w)
+	apictx := &api.Context{Context: c}
 
-	// create http handler
-	var h http.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		// use context defined in the request
-		s.handle(r.Context(), input, handler, service, w, r)
-	})
-
-	// run middlewares the handler
-	for _, mw := range s.ctxMiddlewares {
-		h = mw(h)
-	}
-
-	// serve using the context with values
-	h.ServeHTTP(w, r.WithContext(c))
-}
-
-func (s *Handler) handle(c context.Context, input *reqdata.T, handler *apiHandler, service *config.Service, w http.ResponseWriter, r *http.Request) {
 	// pass execution to the handler
-	var outData, outErr = handler.dyn.Handle(c, input.Data)
+	var outData, outErr = handler.dyn.Handle(apictx, input.Data)
 
 	// build response from returned arguments
 	var res = api.EmptyResponse().WithError(outErr)
@@ -131,35 +157,3 @@ func extractInput(service *config.Service, req http.Request) (*reqdata.T, error)
 
 	return dataset, nil
 }
-
-// buildAuth builds the api.Auth struct from the service scope configuration
-//
-// it replaces format '[a]' in scope where 'a' is an existing input argument's
-// name with its value
-func buildAuth(scope [][]string, in map[string]interface{}) *api.Auth {
-	updated := make([][]string, len(scope))
-
-	// replace '[arg_name]' with the 'arg_name' value if it is a known variable
-	// name
-	for a, list := range scope {
-		updated[a] = make([]string, len(list))
-		for b, perm := range list {
-			updated[a][b] = perm
-			for name, value := range in {
-				var (
-					token       = fmt.Sprintf("[%s]", name)
-					replacement = ""
-				)
-				if value != nil {
-					replacement = fmt.Sprintf("[%v]", value)
-				}
-				updated[a][b] = strings.ReplaceAll(updated[a][b], token, replacement)
-			}
-		}
-	}
-
-	return &api.Auth{
-		Required: updated,
-		Active:   []string{},
-	}
-}

handler_test.go

@@ -48,15 +48,15 @@ func TestWith(t *testing.T) {
 	type ckey int
 	const key ckey = 0
 
-	middleware := func(next http.Handler) http.Handler {
+	middleware := func(next http.HandlerFunc) http.HandlerFunc {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		return func(w http.ResponseWriter, r *http.Request) {
 			newr := r
 
 			// first time -> store 1
 			value := r.Context().Value(key)
 			if value == nil {
 				newr = r.WithContext(context.WithValue(r.Context(), key, int(1)))
-				next.ServeHTTP(w, newr)
+				next(w, newr)
 				return
 			}
 
@@ -67,8 +67,8 @@ func TestWith(t *testing.T) {
 			}
 			cast++
 			newr = r.WithContext(context.WithValue(r.Context(), key, cast))
-			next.ServeHTTP(w, newr)
+			next(w, newr)
-		})
+		}
 	}
 
 	// add middleware @n times
@@ -82,7 +82,7 @@ func TestWith(t *testing.T) {
 		t.Fatalf("setup: unexpected error <%v>", err)
 	}
 
-	pathHandler := func(ctx context.Context) (*struct{}, api.Err) {
+	pathHandler := func(ctx *api.Context) (*struct{}, api.Err) {
 		// write value from middlewares into response
 		value := ctx.Value(key)
 		if value == nil {
@@ -93,7 +93,7 @@ func TestWith(t *testing.T) {
 			t.Fatalf("cannot cast context data to int")
 		}
 		// write to response
-		api.GetResponseWriter(ctx).Write([]byte(fmt.Sprintf("#%d#", cast)))
+		ctx.ResponseWriter().Write([]byte(fmt.Sprintf("#%d#", cast)))
 
 		return nil, api.ErrSuccess
 	}
@@ -212,13 +212,8 @@ func TestWithAuth(t *testing.T) {
 			}
 
 			// tester middleware (last executed)
-			builder.WithContext(func(next http.Handler) http.Handler {
+			builder.WithAuth(func(next api.AuthHandlerFunc) api.AuthHandlerFunc {
-				return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				return func(a api.Auth, w http.ResponseWriter, r *http.Request) {
-					a := api.GetAuth(r.Context())
-					if a == nil {
-						t.Fatalf("cannot access api.Auth form request context")
-					}
-
 					if a.Granted() == tc.granted {
 						return
 					}
@@ -227,20 +222,14 @@ func TestWithAuth(t *testing.T) {
 					} else {
 						t.Fatalf("expected granted auth")
 					}
-					next.ServeHTTP(w, r)
+				}
-				})
 			})
 
-			builder.WithContext(func(next http.Handler) http.Handler {
+			builder.WithAuth(func(next api.AuthHandlerFunc) api.AuthHandlerFunc {
-				return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				return func(a api.Auth, w http.ResponseWriter, r *http.Request) {
-					a := api.GetAuth(r.Context())
-					if a == nil {
-						t.Fatalf("cannot access api.Auth form request context")
-					}
-
 					a.Active = tc.permissions
-					next.ServeHTTP(w, r)
+					next(a, w, r)
-				})
+				}
 			})
 
 			err := builder.Setup(strings.NewReader(tc.manifest))
@@ -248,7 +237,7 @@ func TestWithAuth(t *testing.T) {
 				t.Fatalf("setup: unexpected error <%v>", err)
 			}
 
-			pathHandler := func(ctx context.Context) (*struct{}, api.Err) {
+			pathHandler := func(ctx *api.Context) (*struct{}, api.Err) {
 				return nil, api.ErrNotImplemented
 			}
 
@@ -301,7 +290,7 @@ func TestDynamicScope(t *testing.T) {
 				}
 			]`,
 			path:        "/path/{id}",
-			handler:     func(context.Context, struct{ Input1 uint }) (*struct{}, api.Err) { return nil, api.ErrSuccess },
+			handler:     func(*api.Context, struct{ Input1 uint }) (*struct{}, api.Err) { return nil, api.ErrSuccess },
 			url:         "/path/123",
 			body:        ``,
 			permissions: []string{"user[123]"},
@@ -322,7 +311,7 @@ func TestDynamicScope(t *testing.T) {
 				}
 			]`,
 			path:        "/path/{id}",
-			handler:     func(context.Context, struct{ Input1 uint }) (*struct{}, api.Err) { return nil, api.ErrSuccess },
+			handler:     func(*api.Context, struct{ Input1 uint }) (*struct{}, api.Err) { return nil, api.ErrSuccess },
 			url:         "/path/666",
 			body:        ``,
 			permissions: []string{"user[123]"},
@@ -343,7 +332,7 @@ func TestDynamicScope(t *testing.T) {
 				}
 			]`,
 			path:        "/path/{id}",
-			handler:     func(context.Context, struct{ User uint }) (*struct{}, api.Err) { return nil, api.ErrSuccess },
+			handler:     func(*api.Context, struct{ User uint }) (*struct{}, api.Err) { return nil, api.ErrSuccess },
 			url:         "/path/123",
 			body:        ``,
 			permissions: []string{"prefix.user[123].suffix"},
@@ -365,7 +354,7 @@ func TestDynamicScope(t *testing.T) {
 				}
 			]`,
 			path: "/prefix/{pid}/user/{uid}",
-			handler: func(context.Context, struct {
+			handler: func(*api.Context, struct {
 				Prefix uint
 				User   uint
 			}) (*struct{}, api.Err) {
@@ -392,7 +381,7 @@ func TestDynamicScope(t *testing.T) {
 				}
 			]`,
 			path: "/prefix/{pid}/user/{uid}",
-			handler: func(context.Context, struct {
+			handler: func(*api.Context, struct {
 				Prefix uint
 				User   uint
 			}) (*struct{}, api.Err) {
@@ -420,7 +409,7 @@ func TestDynamicScope(t *testing.T) {
 				}
 			]`,
 			path: "/prefix/{pid}/user/{uid}/suffix/{sid}",
-			handler: func(context.Context, struct {
+			handler: func(*api.Context, struct {
 				Prefix uint
 				User   uint
 				Suffix uint
@@ -449,7 +438,7 @@ func TestDynamicScope(t *testing.T) {
 				}
 			]`,
 			path: "/prefix/{pid}/user/{uid}/suffix/{sid}",
-			handler: func(context.Context, struct {
+			handler: func(*api.Context, struct {
 				Prefix uint
 				User   uint
 				Suffix uint
@@ -471,12 +460,8 @@ func TestDynamicScope(t *testing.T) {
 			}
 
 			// tester middleware (last executed)
-			builder.WithContext(func(next http.Handler) http.Handler {
+			builder.WithAuth(func(next api.AuthHandlerFunc) api.AuthHandlerFunc {
-				return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				return func(a api.Auth, w http.ResponseWriter, r *http.Request) {
-					a := api.GetAuth(r.Context())
-					if a == nil {
-						t.Fatalf("cannot access api.Auth form request context")
-					}
 					if a.Granted() == tc.granted {
 						return
 					}
@@ -485,20 +470,15 @@ func TestDynamicScope(t *testing.T) {
 					} else {
 						t.Fatalf("expected granted auth")
 					}
-					next.ServeHTTP(w, r)
+				}
-				})
 			})
 
 			// update permissions
-			builder.WithContext(func(next http.Handler) http.Handler {
+			builder.WithAuth(func(next api.AuthHandlerFunc) api.AuthHandlerFunc {
-				return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				return func(a api.Auth, w http.ResponseWriter, r *http.Request) {
-					a := api.GetAuth(r.Context())
-					if a == nil {
-						t.Fatalf("cannot access api.Auth form request context")
-					}
 					a.Active = tc.permissions
-					next.ServeHTTP(w, r)
+					next(a, w, r)
-				})
+				}
 			})
 
 			err := builder.Setup(strings.NewReader(tc.manifest))

internal/dynfunc/errors.go

@@ -14,7 +14,7 @@ const errHandlerNotFunc = cerr("handler must be a func")
 const errNoServiceForHandler = cerr("no service found for this handler")
 
 // errMissingHandlerArgumentParam - missing params arguments for handler
-const errMissingHandlerContextArgument = cerr("missing handler first argument of type context.Context")
+const errMissingHandlerContextArgument = cerr("missing handler first argument of type *api.Context")
 
 // errMissingHandlerInputArgument - missing params arguments for handler
 const errMissingHandlerInputArgument = cerr("missing handler argument: input struct")

internal/dynfunc/handler.go

@@ -1,7 +1,6 @@
 package dynfunc
 
 import (
-	"context"
 	"fmt"
 	"log"
 	"reflect"
@@ -51,7 +50,7 @@ func Build(fn interface{}, service config.Service) (*Handler, error) {
 }
 
 // Handle binds input `data` into the dynamic function and returns an output map
-func (h *Handler) Handle(ctx context.Context, data map[string]interface{}) (map[string]interface{}, api.Err) {
+func (h *Handler) Handle(ctx *api.Context, data map[string]interface{}) (map[string]interface{}, api.Err) {
 	var (
 		ert      = reflect.TypeOf(api.Err{})
 		fnv      = reflect.ValueOf(h.fn)

internal/dynfunc/handler_test.go

@@ -1,7 +1,6 @@
 package dynfunc
 
 import (
-	"context"
 	"fmt"
 	"reflect"
 	"testing"
@@ -53,7 +52,7 @@ func TestInput(t *testing.T) {
 		{
 			Name:           "none required none provided",
 			Spec:           (&testsignature{}).withArgs(),
-			Fn:             func(context.Context) (*struct{}, api.Err) { return nil, api.ErrSuccess },
+			Fn:             func(*api.Context) (*struct{}, api.Err) { return nil, api.ErrSuccess },
 			HasContext:     false,
 			Input:          []interface{}{},
 			ExpectedOutput: []interface{}{},
@@ -62,7 +61,7 @@ func TestInput(t *testing.T) {
 		{
 			Name: "int proxy (0)",
 			Spec: (&testsignature{}).withArgs(reflect.TypeOf(int(0))),
-			Fn: func(ctx context.Context, in intstruct) (*intstruct, api.Err) {
+			Fn: func(ctx *api.Context, in intstruct) (*intstruct, api.Err) {
 				return &intstruct{P1: in.P1}, api.ErrSuccess
 			},
 			HasContext:     false,
@@ -73,7 +72,7 @@ func TestInput(t *testing.T) {
 		{
 			Name: "int proxy (11)",
 			Spec: (&testsignature{}).withArgs(reflect.TypeOf(int(0))),
-			Fn: func(ctx context.Context, in intstruct) (*intstruct, api.Err) {
+			Fn: func(ctx *api.Context, in intstruct) (*intstruct, api.Err) {
 				return &intstruct{P1: in.P1}, api.ErrSuccess
 			},
 			HasContext:     false,
@@ -84,7 +83,7 @@ func TestInput(t *testing.T) {
 		{
 			Name: "*int proxy (nil)",
 			Spec: (&testsignature{}).withArgs(reflect.TypeOf(new(int))),
-			Fn: func(ctx context.Context, in intptrstruct) (*intptrstruct, api.Err) {
+			Fn: func(ctx *api.Context, in intptrstruct) (*intptrstruct, api.Err) {
 				return &intptrstruct{P1: in.P1}, api.ErrSuccess
 			},
 			HasContext:     false,
@@ -95,7 +94,7 @@ func TestInput(t *testing.T) {
 		{
 			Name: "*int proxy (28)",
 			Spec: (&testsignature{}).withArgs(reflect.TypeOf(new(int))),
-			Fn: func(ctx context.Context, in intptrstruct) (*intstruct, api.Err) {
+			Fn: func(ctx *api.Context, in intptrstruct) (*intstruct, api.Err) {
 				return &intstruct{P1: *in.P1}, api.ErrSuccess
 			},
 			HasContext:     false,
@@ -106,7 +105,7 @@ func TestInput(t *testing.T) {
 		{
 			Name: "*int proxy (13)",
 			Spec: (&testsignature{}).withArgs(reflect.TypeOf(new(int))),
-			Fn: func(ctx context.Context, in intptrstruct) (*intstruct, api.Err) {
+			Fn: func(ctx *api.Context, in intptrstruct) (*intstruct, api.Err) {
 				return &intstruct{P1: *in.P1}, api.ErrSuccess
 			},
 			HasContext:     false,
@@ -132,7 +131,7 @@ func TestInput(t *testing.T) {
 				input[key] = val
 			}
 
-			var output, err = handler.Handle(context.Background(), input)
+			var output, err = handler.Handle(&api.Context{}, input)
 			if err != tcase.ExpectedErr {
 				t.Fatalf("expected api error <%v> got <%v>", tcase.ExpectedErr, err)
 			}

internal/dynfunc/signature.go

@@ -1,7 +1,6 @@
 package dynfunc
 
 import (
-	"context"
 	"fmt"
 	"reflect"
 	"strings"
@@ -49,17 +48,12 @@ func BuildSignature(service config.Service) *Signature {
 
 // ValidateInput validates a handler's input arguments against the service signature
 func (s *Signature) ValidateInput(handlerType reflect.Type) error {
-	ctxType := reflect.TypeOf((*context.Context)(nil)).Elem()
+	ctxType := reflect.TypeOf(api.Context{})
 
-	// missing or invalid first arg: context.Context
+	// missing or invalid first arg: api.Context
-	if handlerType.NumIn() < 1 {
+	if handlerType.NumIn() < 1 || ctxType.AssignableTo(handlerType.In(0)) {
 		return errMissingHandlerContextArgument
 	}
-	firstArgType := handlerType.In(0)
-
-	if !firstArgType.Implements(ctxType) {
-		return fmt.Errorf("fock")
-	}
 
 	// no input required
 	if len(s.Input) == 0 {

internal/dynfunc/signature_test.go

@@ -1,7 +1,6 @@
 package dynfunc
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"reflect"
@@ -21,22 +20,22 @@ func TestInputCheck(t *testing.T) {
 		{
 			Name:  "no input 0 given",
 			Input: map[string]reflect.Type{},
-			Fn:    func(context.Context) {},
+			Fn:    func(*api.Context) {},
-			FnCtx: func(context.Context) {},
+			FnCtx: func(*api.Context) {},
 			Err:   nil,
 		},
 		{
 			Name:  "no input 1 given",
 			Input: map[string]reflect.Type{},
-			Fn:    func(context.Context, int) {},
+			Fn:    func(*api.Context, int) {},
-			FnCtx: func(context.Context, int) {},
+			FnCtx: func(*api.Context, int) {},
 			Err:   errUnexpectedInput,
 		},
 		{
 			Name:  "no input 2 given",
 			Input: map[string]reflect.Type{},
-			Fn:    func(context.Context, int, string) {},
+			Fn:    func(*api.Context, int, string) {},
-			FnCtx: func(context.Context, int, string) {},
+			FnCtx: func(*api.Context, int, string) {},
 			Err:   errUnexpectedInput,
 		},
 		{
@@ -44,8 +43,8 @@ func TestInputCheck(t *testing.T) {
 			Input: map[string]reflect.Type{
 				"Test1": reflect.TypeOf(int(0)),
 			},
-			Fn:    func(context.Context) {},
+			Fn:    func(*api.Context) {},
-			FnCtx: func(context.Context) {},
+			FnCtx: func(*api.Context) {},
 			Err:   errMissingHandlerInputArgument,
 		},
 		{
@@ -53,8 +52,8 @@ func TestInputCheck(t *testing.T) {
 			Input: map[string]reflect.Type{
 				"Test1": reflect.TypeOf(int(0)),
 			},
-			Fn:    func(context.Context, int) {},
+			Fn:    func(*api.Context, int) {},
-			FnCtx: func(context.Context, int) {},
+			FnCtx: func(*api.Context, int) {},
 			Err:   errMissingParamArgument,
 		},
 		{
@@ -62,8 +61,8 @@ func TestInputCheck(t *testing.T) {
 			Input: map[string]reflect.Type{
 				"test1": reflect.TypeOf(int(0)),
 			},
-			Fn:    func(context.Context, struct{}) {},
+			Fn:    func(*api.Context, struct{}) {},
-			FnCtx: func(context.Context, struct{}) {},
+			FnCtx: func(*api.Context, struct{}) {},
 			Err:   errUnexportedName,
 		},
 		{
@@ -71,8 +70,8 @@ func TestInputCheck(t *testing.T) {
 			Input: map[string]reflect.Type{
 				"Test1": reflect.TypeOf(int(0)),
 			},
-			Fn:    func(context.Context, struct{}) {},
+			Fn:    func(*api.Context, struct{}) {},
-			FnCtx: func(context.Context, struct{}) {},
+			FnCtx: func(*api.Context, struct{}) {},
 			Err:   errMissingConfigArgument,
 		},
 		{
@@ -80,8 +79,8 @@ func TestInputCheck(t *testing.T) {
 			Input: map[string]reflect.Type{
 				"Test1": reflect.TypeOf(int(0)),
 			},
-			Fn:    func(context.Context, struct{ Test1 string }) {},
+			Fn:    func(*api.Context, struct{ Test1 string }) {},
-			FnCtx: func(context.Context, struct{ Test1 string }) {},
+			FnCtx: func(*api.Context, struct{ Test1 string }) {},
 			Err:   errWrongParamTypeFromConfig,
 		},
 		{
@@ -89,8 +88,8 @@ func TestInputCheck(t *testing.T) {
 			Input: map[string]reflect.Type{
 				"Test1": reflect.TypeOf(int(0)),
 			},
-			Fn:    func(context.Context, struct{ Test1 int }) {},
+			Fn:    func(*api.Context, struct{ Test1 int }) {},
-			FnCtx: func(context.Context, struct{ Test1 int }) {},
+			FnCtx: func(*api.Context, struct{ Test1 int }) {},
 			Err:   nil,
 		},
 		{
@@ -98,8 +97,8 @@ func TestInputCheck(t *testing.T) {
 			Input: map[string]reflect.Type{
 				"Test1": reflect.TypeOf(new(int)),
 			},
-			Fn:    func(context.Context, struct{}) {},
+			Fn:    func(*api.Context, struct{}) {},
-			FnCtx: func(context.Context, struct{}) {},
+			FnCtx: func(*api.Context, struct{}) {},
 			Err:   errMissingConfigArgument,
 		},
 		{
@@ -107,8 +106,8 @@ func TestInputCheck(t *testing.T) {
 			Input: map[string]reflect.Type{
 				"Test1": reflect.TypeOf(new(int)),
 			},
-			Fn:    func(context.Context, struct{ Test1 string }) {},
+			Fn:    func(*api.Context, struct{ Test1 string }) {},
-			FnCtx: func(context.Context, struct{ Test1 string }) {},
+			FnCtx: func(*api.Context, struct{ Test1 string }) {},
 			Err:   errWrongParamTypeFromConfig,
 		},
 		{
@@ -116,8 +115,8 @@ func TestInputCheck(t *testing.T) {
 			Input: map[string]reflect.Type{
 				"Test1": reflect.TypeOf(new(int)),
 			},
-			Fn:    func(context.Context, struct{ Test1 *string }) {},
+			Fn:    func(*api.Context, struct{ Test1 *string }) {},
-			FnCtx: func(context.Context, struct{ Test1 *string }) {},
+			FnCtx: func(*api.Context, struct{ Test1 *string }) {},
 			Err:   errWrongParamTypeFromConfig,
 		},
 		{
@@ -125,8 +124,8 @@ func TestInputCheck(t *testing.T) {
 			Input: map[string]reflect.Type{
 				"Test1": reflect.TypeOf(new(int)),
 			},
-			Fn:    func(context.Context, struct{ Test1 *int }) {},
+			Fn:    func(*api.Context, struct{ Test1 *int }) {},
-			FnCtx: func(context.Context, struct{ Test1 *int }) {},
+			FnCtx: func(*api.Context, struct{ Test1 *int }) {},
 			Err:   nil,
 		},
 		{
@@ -134,8 +133,8 @@ func TestInputCheck(t *testing.T) {
 			Input: map[string]reflect.Type{
 				"Test1": reflect.TypeOf(string("")),
 			},
-			Fn:    func(context.Context, struct{ Test1 string }) {},
+			Fn:    func(*api.Context, struct{ Test1 string }) {},
-			FnCtx: func(context.Context, struct{ Test1 string }) {},
+			FnCtx: func(*api.Context, struct{ Test1 string }) {},
 			Err:   nil,
 		},
 		{
@@ -143,8 +142,8 @@ func TestInputCheck(t *testing.T) {
 			Input: map[string]reflect.Type{
 				"Test1": reflect.TypeOf(uint(0)),
 			},
-			Fn:    func(context.Context, struct{ Test1 uint }) {},
+			Fn:    func(*api.Context, struct{ Test1 uint }) {},
-			FnCtx: func(context.Context, struct{ Test1 uint }) {},
+			FnCtx: func(*api.Context, struct{ Test1 uint }) {},
 			Err:   nil,
 		},
 		{
@@ -152,8 +151,8 @@ func TestInputCheck(t *testing.T) {
 			Input: map[string]reflect.Type{
 				"Test1": reflect.TypeOf(float64(0)),
 			},
-			Fn:    func(context.Context, struct{ Test1 float64 }) {},
+			Fn:    func(*api.Context, struct{ Test1 float64 }) {},
-			FnCtx: func(context.Context, struct{ Test1 float64 }) {},
+			FnCtx: func(*api.Context, struct{ Test1 float64 }) {},
 			Err:   nil,
 		},
 		{
@@ -161,8 +160,8 @@ func TestInputCheck(t *testing.T) {
 			Input: map[string]reflect.Type{
 				"Test1": reflect.TypeOf([]byte("")),
 			},
-			Fn:    func(context.Context, struct{ Test1 []byte }) {},
+			Fn:    func(*api.Context, struct{ Test1 []byte }) {},
-			FnCtx: func(context.Context, struct{ Test1 []byte }) {},
+			FnCtx: func(*api.Context, struct{ Test1 []byte }) {},
 			Err:   nil,
 		},
 		{
@@ -170,8 +169,8 @@ func TestInputCheck(t *testing.T) {
 			Input: map[string]reflect.Type{
 				"Test1": reflect.TypeOf([]rune("")),
 			},
-			Fn:    func(context.Context, struct{ Test1 []rune }) {},
+			Fn:    func(*api.Context, struct{ Test1 []rune }) {},
-			FnCtx: func(context.Context, struct{ Test1 []rune }) {},
+			FnCtx: func(*api.Context, struct{ Test1 []rune }) {},
 			Err:   nil,
 		},
 		{
@@ -179,8 +178,8 @@ func TestInputCheck(t *testing.T) {
 			Input: map[string]reflect.Type{
 				"Test1": reflect.TypeOf(new(string)),
 			},
-			Fn:    func(context.Context, struct{ Test1 *string }) {},
+			Fn:    func(*api.Context, struct{ Test1 *string }) {},
-			FnCtx: func(context.Context, struct{ Test1 *string }) {},
+			FnCtx: func(*api.Context, struct{ Test1 *string }) {},
 			Err:   nil,
 		},
 		{
@@ -188,8 +187,8 @@ func TestInputCheck(t *testing.T) {
 			Input: map[string]reflect.Type{
 				"Test1": reflect.TypeOf(new(uint)),
 			},
-			Fn:    func(context.Context, struct{ Test1 *uint }) {},
+			Fn:    func(*api.Context, struct{ Test1 *uint }) {},
-			FnCtx: func(context.Context, struct{ Test1 *uint }) {},
+			FnCtx: func(*api.Context, struct{ Test1 *uint }) {},
 			Err:   nil,
 		},
 		{
@@ -197,8 +196,8 @@ func TestInputCheck(t *testing.T) {
 			Input: map[string]reflect.Type{
 				"Test1": reflect.TypeOf(new(float64)),
 			},
-			Fn:    func(context.Context, struct{ Test1 *float64 }) {},
+			Fn:    func(*api.Context, struct{ Test1 *float64 }) {},
-			FnCtx: func(context.Context, struct{ Test1 *float64 }) {},
+			FnCtx: func(*api.Context, struct{ Test1 *float64 }) {},
 			Err:   nil,
 		},
 		{
@@ -206,8 +205,8 @@ func TestInputCheck(t *testing.T) {
 			Input: map[string]reflect.Type{
 				"Test1": reflect.TypeOf(new([]byte)),
 			},
-			Fn:    func(context.Context, struct{ Test1 *[]byte }) {},
+			Fn:    func(*api.Context, struct{ Test1 *[]byte }) {},
-			FnCtx: func(context.Context, struct{ Test1 *[]byte }) {},
+			FnCtx: func(*api.Context, struct{ Test1 *[]byte }) {},
 			Err:   nil,
 		},
 		{
@@ -215,8 +214,8 @@ func TestInputCheck(t *testing.T) {
 			Input: map[string]reflect.Type{
 				"Test1": reflect.TypeOf(new([]rune)),
 			},
-			Fn:    func(context.Context, struct{ Test1 *[]rune }) {},
+			Fn:    func(*api.Context, struct{ Test1 *[]rune }) {},
-			FnCtx: func(context.Context, struct{ Test1 *[]rune }) {},
+			FnCtx: func(*api.Context, struct{ Test1 *[]rune }) {},
 			Err:   nil,
 		},
 	}
@@ -260,37 +259,37 @@ func TestOutputCheck(t *testing.T) {
 		// no input -> missing api.Err
 		{
 			Output: map[string]reflect.Type{},
-			Fn:     func(context.Context) {},
+			Fn:     func(*api.Context) {},
 			Err:    errMissingHandlerOutputArgument,
 		},
 		// no input -> with last type not api.Err
 		{
 			Output: map[string]reflect.Type{},
-			Fn:     func(context.Context) bool { return true },
+			Fn:     func(*api.Context) bool { return true },
 			Err:    errMissingHandlerErrorArgument,
 		},
 		// no input -> with api.Err
 		{
 			Output: map[string]reflect.Type{},
-			Fn:     func(context.Context) api.Err { return api.ErrSuccess },
+			Fn:     func(*api.Context) api.Err { return api.ErrSuccess },
 			Err:    nil,
 		},
-		// no input -> missing context.Context
+		// no input -> missing *api.Context
 		{
 			Output: map[string]reflect.Type{},
-			Fn:     func(context.Context) api.Err { return api.ErrSuccess },
+			Fn:     func(*api.Context) api.Err { return api.ErrSuccess },
 			Err:    errMissingHandlerContextArgument,
 		},
-		// no input -> invlaid context.Context type
+		// no input -> invlaid *api.Context type
 		{
 			Output: map[string]reflect.Type{},
-			Fn:     func(context.Context, int) api.Err { return api.ErrSuccess },
+			Fn:     func(*api.Context, int) api.Err { return api.ErrSuccess },
 			Err:    errMissingHandlerContextArgument,
 		},
 		// func can have output if not specified
 		{
 			Output: map[string]reflect.Type{},
-			Fn:     func(context.Context) (*struct{}, api.Err) { return nil, api.ErrSuccess },
+			Fn:     func(*api.Context) (*struct{}, api.Err) { return nil, api.ErrSuccess },
 			Err:    nil,
 		},
 		// missing output struct in func