Formatted

api_definition_manager.go

@@ -7,11 +7,11 @@ import (
 	"labix.org/v2/mgo"
 	"labix.org/v2/mgo/bson"
 	"net/http"
+	"net/url"
 	"path/filepath"
 	"regexp"
 	"strings"
 	"time"
-	"net/url"
 )
 
 // APIDefinition represents the configuration for a single proxied API and it's versions.
@@ -34,7 +34,7 @@ type APIDefinition struct {
 		Key      string `bson:"key" json:"key"`
 	} `bson:"definition" json:"definition"`
 	EnableSignatureChecking bool `bson:"enable_signature_checking" json:"enable_signature_checking"`
-	VersionData struct {
+	VersionData             struct {
 		NotVersioned bool                   `bson:"not_versioned" json:"not_versioned"`
 		Versions     map[string]VersionInfo `bson:"versions" json:"versions"`
 	} `bson:"version_data" json:"version_data"`
@@ -102,7 +102,7 @@ type APISpec struct {
 	APIDefinition
 	RxPaths          map[string][]URLSpec
 	WhiteListEnabled map[string]bool
-	target *url.URL
+	target           *url.URL
 }
 
 // APIDefinitionLoader will load an Api definition from a storage system. It has two methods LoadDefinitionsFromMongo()

auth_manager.go

@@ -1,11 +1,11 @@
 package main
 
 import (
+	"encoding/base64"
 	"encoding/json"
-	"time"
 	"github.com/nu7hatch/gouuid"
 	"strings"
-	"encoding/base64"
+	"time"
 )
 
 // AuthorisationHandler is used to validate a session key,
@@ -99,6 +99,5 @@ func (b AuthorisationManager) GenerateHMACSecret() string {
 	cleanSting := strings.Replace(u5.String(), "-", "", -1)
 	newSecret := base64.StdEncoding.EncodeToString([]byte(cleanSting))
 
-
 	return newSecret
 }

config.go

@@ -11,7 +11,7 @@ type Config struct {
 	Secret          string `json:"secret"`
 	TemplatePath    string `json:"template_path"`
 	UseDBAppConfigs bool   `json:"use_db_app_configs"`
-	AppPath			string `json:"app_path"`
+	AppPath         string `json:"app_path"`
 	Storage         struct {
 		Type     string `json:"type"`
 		Host     string `json:"host"`

main.go

@@ -291,7 +291,6 @@ func init() {
 		log.Debug("Enabling debug-level output")
 	}
 
-
 }
 
 func main() {

middleware_access_rights.go

@@ -29,9 +29,9 @@ func (a AccessRightsCheck) New() func(http.Handler) http.Handler {
 				versionList, apiExists := thisSessionState.AccessRights[a.Spec.APIID]
 				if !apiExists {
 					log.WithFields(logrus.Fields{
-						"path":   r.URL.Path,
-						"origin": r.RemoteAddr,
-						"key":    authHeaderValue,
+						"path":      r.URL.Path,
+						"origin":    r.RemoteAddr,
+						"key":       authHeaderValue,
 						"api_found": false,
 					}).Info("Attempted access to unauthorised API.")
 					handler := ErrorHandler{a.TykMiddleware}
@@ -56,10 +56,10 @@ func (a AccessRightsCheck) New() func(http.Handler) http.Handler {
 				if !found {
 					// Not found? Bounce
 					log.WithFields(logrus.Fields{
-						"path":   r.URL.Path,
-						"origin": r.RemoteAddr,
-						"key":    authHeaderValue,
-						"api_found": true,
+						"path":          r.URL.Path,
+						"origin":        r.RemoteAddr,
+						"key":           authHeaderValue,
+						"api_found":     true,
 						"version_found": false,
 					}).Info("Attempted access to unauthorised API version.")
 					handler := ErrorHandler{a.TykMiddleware}

middleware_check_HMAC_signature.go

@@ -3,16 +3,16 @@ package main
 import "net/http"
 
 import (
+	"crypto/hmac"
+	"crypto/sha1"
+	"encoding/base64"
 	"github.com/Sirupsen/logrus"
 	"github.com/gorilla/context"
-	"strings"
+	"math"
 	"net/url"
 	"sort"
-	"crypto/hmac"
-	"crypto/sha1"
-	"encoding/base64"
+	"strings"
 	"time"
-	"math"
 )
 
 // Test key: 53ac07777cbb8c2d530000021a42331a43bd45555d5c923bdb36fc8a
@@ -100,7 +100,7 @@ func (hm HMACMiddleware) New() func(http.Handler) http.Handler {
 			keyId := ""
 			algorithm := ""
 			signature := ""
-			for _, v := range(splitValues) {
+			for _, v := range splitValues {
 				splitKeyValuePair := strings.Split(v, "=")
 				if len(splitKeyValuePair) != 2 {
 					hm.authorizationError(w, r)
@@ -194,12 +194,12 @@ func (hm HMACMiddleware) parseFormParams(values url.Values) string {
 
 	log.Debug("Parsing header values")
 
-	for k, v := range(values) {
+	for k, v := range values {
 		log.Debug("Form parser - processing key: ", k)
 		log.Debug("Form parser - processing value: ", v)
 		encodedKey := url.QueryEscape(k)
 		encodedVals := []string{}
-		for _, raw_value := range(v) {
+		for _, raw_value := range v {
 			encodedVals = append(encodedVals, url.QueryEscape(raw_value))
 		}
 		joined_vals := strings.Join(encodedVals, "|")
@@ -213,7 +213,7 @@ func (hm HMACMiddleware) parseFormParams(values url.Values) string {
 	sortedKvs := []string{}
 
 	// Put the prepared key value params in order according to above sort
-	for _, sk := range(keys) {
+	for _, sk := range keys {
 		sortedKvs = append(sortedKvs, kvValues[sk])
 	}
 

oauth_manager.go

@@ -51,11 +51,11 @@ const (
 // NewOAuthNotification is a notification sent to a
 // webhook when an access request or a refresh request comes in.
 type NewOAuthNotification struct {
-	AuthCode         string
-	NewOAuthToken    string
-	RefreshToken     string
-	OldRefreshToken  string
-	NotificationType OAuthNotificationType
+	AuthCode         string                `json:"auth_code"`
+	NewOAuthToken    string                `json:"new_oauth_token"`
+	RefreshToken     string                `json:"refresh_token"`
+	OldRefreshToken  string                `json:"old_refresh_token"`
+	NotificationType OAuthNotificationType `json:"notification_type"`
 }
 
 // OAuthHandlers are the HTTP Handlers that manage the Tyk OAuth flow
@@ -385,7 +385,6 @@ func (r RedisOsinStorageInterface) SaveAuthorize(authData *osin.AuthorizeData) e
 
 	}
 
-
 }
 
 // LoadAuthorize loads auth data from redis
@@ -446,8 +445,6 @@ func (r RedisOsinStorageInterface) SaveAccess(accessData *osin.AccessData) error
 
 	authManager.UpdateSession(accessData.AccessToken, newSession)
 
-
-
 	// Store the refresh token too
 	if accessData.RefreshToken != "" {
 		if accessDataJSON, marshalErr := json.Marshal(&accessData); marshalErr != nil {
@@ -459,7 +456,6 @@ func (r RedisOsinStorageInterface) SaveAccess(accessData *osin.AccessData) error
 			return nil
 		}
 
-
 	}
 
 	return nil

session_manager.go

@@ -30,8 +30,8 @@ type SessionState struct {
 	BasicAuthData    struct {
 		Password string `json:"password"`
 	} `json:"basic_auth_data"`
-	HMACEnabled bool `json:"hmac_enabled"`
-	HmacSecret string `json:"hmac_string"`
+	HMACEnabled bool   `json:"hmac_enabled"`
+	HmacSecret  string `json:"hmac_string"`
 }
 
 // SessionLimiter is the rate limiter for the API, use ForwardMessage() to

tykReverseProxy.go

@@ -8,12 +8,11 @@ package main
 
 import (
 	"net/http"
+	"net/http/httputil"
 	"net/url"
 	"strings"
-	"net/http/httputil"
 )
 
-
 // Copied form the original stdlib for ReverseProxy
 func singleJoiningSlash(a, b string) string {
 	aslash := strings.HasSuffix(a, "/")
@@ -48,4 +47,3 @@ func TykNewSingleHostReverseProxy(target *url.URL) *httputil.ReverseProxy {
 	}
 	return &httputil.ReverseProxy{Director: director}
 }
-