Another module moved to new interface

zetaab · Aug 14, 2014 · 0416ff8 · 0416ff8
1 parent 7404850
commit 0416ff8
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 34 deletions.
diff --git a/gateway_test.go b/gateway_test.go
@@ -52,7 +52,7 @@ func getChain(spec APISpec) http.Handler {
 	tykMiddleware := TykMiddleware{spec, proxy}
 	chain := alice.New(
 		CreateMiddleware(&AuthKey{tykMiddleware}, tykMiddleware),
-		VersionCheck{tykMiddleware}.New(),
+		CreateMiddleware(&VersionCheck{tykMiddleware}, tykMiddleware),
 		CreateMiddleware(&KeyExpired{tykMiddleware}, tykMiddleware),
 		AccessRightsCheck{tykMiddleware}.New(),
 		RateLimitAndQuotaCheck{tykMiddleware}.New()).Then(proxyHandler)

diff --git a/main.go b/main.go
@@ -210,7 +210,7 @@ func loadApps(APISpecs []APISpec, Muxer *http.ServeMux) {
 			chain := alice.New(
 				keyCheck,
 				CreateMiddleware(&KeyExpired{tykMiddleware}, tykMiddleware),
-				VersionCheck{tykMiddleware}.New(),
+				CreateMiddleware(&VersionCheck{tykMiddleware}, tykMiddleware),
 				AccessRightsCheck{tykMiddleware}.New(),
 				RateLimitAndQuotaCheck{tykMiddleware}.New()).Then(proxyHandler)
 

diff --git a/middleware.go b/middleware.go
@@ -28,14 +28,19 @@ func CreateMiddleware(mw TykMiddlewareImplementation, tykMwSuper TykMiddleware)
 			}
 
 			// Process the Request
-			if reqErr, errCode := mw.ProcessRequest(w, r, thisMwConfiguration); reqErr != nil {
+			reqErr, errCode := mw.ProcessRequest(w, r, thisMwConfiguration)
+			if reqErr != nil {
 				handler := ErrorHandler{tykMwSuper}
 				handler.HandleError(w, r, reqErr.Error(), errCode)
 				return
 			}
 
-			// No error, carry on...
-			h.ServeHTTP(w, r)
+			// Special code, bypasses all other execution
+			if errCode != 666 {
+				// No error, carry on...
+				h.ServeHTTP(w, r)
+			}
+
 		}
 
 		return http.HandlerFunc(thisHandler)

diff --git a/middleware_version_check.go b/middleware_version_check.go
@@ -1,5 +1,7 @@
 package main
 
+import "errors"
+
 import "net/http"
 
 import ()
@@ -9,34 +11,28 @@ type VersionCheck struct {
 	TykMiddleware
 }
 
-// New creates a new HttpHandler for the alice middleware package
-func (s VersionCheck) New() func(http.Handler) http.Handler {
-	aliceHandler := func(h http.Handler) http.Handler {
-		thisHandler := func(w http.ResponseWriter, r *http.Request) {
-
-			// Check versioning, blacklist, whitelist and ignored status
-			requestValid, stat := s.TykMiddleware.Spec.IsRequestValid(r)
-			if requestValid == false {
-				handler := ErrorHandler{s.TykMiddleware}
-				// stop execution
-				handler.HandleError(w, r, string(stat), 409)
-				return
-			}
-
-			if stat == StatusOkAndIgnore {
-				handler := SuccessHandler{s.TykMiddleware}
-				// Skip all other execution
-				handler.ServeHTTP(w, r)
-				return
-			}
-
-			// Request is valid, carry on
-			h.ServeHTTP(w, r)
-
-		}
-
-		return http.HandlerFunc(thisHandler)
+// New lets you do any initialisations for the object can be done here
+func (v *VersionCheck) New() {}
+
+// GetConfig retrieves the configuration from the API config
+func (v *VersionCheck) GetConfig() (interface{}, error) {
+	return nil, nil
+}
+
+// ProcessRequest will run any checks on the request on the way through the system, return an error to have the chain fail
+func (v *VersionCheck) ProcessRequest(w http.ResponseWriter, r *http.Request,  configuration interface{}) (error, int) {
+	// Check versioning, blacklist, whitelist and ignored status
+	requestValid, stat := v.TykMiddleware.Spec.IsRequestValid(r)
+	if requestValid == false {
+		return errors.New(string(stat)), 409
+	}
+
+	if stat == StatusOkAndIgnore {
+		handler := SuccessHandler{v.TykMiddleware}
+		// Skip all other execution
+		handler.ServeHTTP(w, r)
+		return nil, 666
 	}
 
-	return aliceHandler
+	return nil, 200
 }
diff --git a/oauth_manager_test.go b/oauth_manager_test.go
@@ -84,7 +84,7 @@ func getOAuthChain(spec APISpec, Muxer *http.ServeMux) {
 	proxyHandler := http.HandlerFunc(ProxyHandler(proxy, spec))
 	tykMiddleware := TykMiddleware{spec, proxy}
 	chain := alice.New(
-		VersionCheck{tykMiddleware}.New(),
+		CreateMiddleware(&VersionCheck{tykMiddleware}, tykMiddleware),
 		Oauth2KeyExists{tykMiddleware}.New(),
 		CreateMiddleware(&KeyExpired{tykMiddleware}, tykMiddleware),
 		AccessRightsCheck{tykMiddleware}.New(),