auth key from param

Gopkg.lock

@@ -1,30 +1,12 @@
 # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
 
 
-[[projects]]
-  branch = "master"
-  name = "git.links123.net/links123.com/uc"
-  packages = ["app"]
-  revision = "928bb1c9ed0d1fd2c2ea50c837d99dcbfef661e4"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/Unknwon/i18n"
-  packages = ["."]
-  revision = "b64d336589669d317928070e70ba0ae558f16633"
-
 [[projects]]
   name = "github.com/dgrijalva/jwt-go"
   packages = ["."]
   revision = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"
   version = "v3.2.0"
 
-[[projects]]
-  name = "github.com/fsnotify/fsnotify"
-  packages = ["."]
-  revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
-  version = "v1.4.7"
-
 [[projects]]
   name = "github.com/gin-contrib/cors"
   packages = ["."]
@@ -54,47 +36,18 @@
   revision = "925541529c1fa6821df4e44ce2723319eb2be768"
   version = "v1.0.0"
 
-[[projects]]
-  branch = "master"
-  name = "github.com/hashicorp/hcl"
-  packages = [
-    ".",
-    "hcl/ast",
-    "hcl/parser",
-    "hcl/printer",
-    "hcl/scanner",
-    "hcl/strconv",
-    "hcl/token",
-    "json/parser",
-    "json/scanner",
-    "json/token"
-  ]
-  revision = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"
-
 [[projects]]
   name = "github.com/json-iterator/go"
   packages = ["."]
   revision = "ca39e5af3ece67bbcda3d0f4f56a8e24d9f2dad4"
   version = "1.1.3"
 
-[[projects]]
-  name = "github.com/magiconair/properties"
-  packages = ["."]
-  revision = "c2353362d570a7bfa228149c62842019201cfb71"
-  version = "v1.8.0"
-
 [[projects]]
   name = "github.com/mattn/go-isatty"
   packages = ["."]
   revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
   version = "v0.0.3"
 
-[[projects]]
-  branch = "master"
-  name = "github.com/mitchellh/mapstructure"
-  packages = ["."]
-  revision = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b"
-
 [[projects]]
   name = "github.com/modern-go/concurrent"
   packages = ["."]
@@ -107,51 +60,12 @@
   revision = "1df9eeb2bb81f327b96228865c5687bc2194af3f"
   version = "1.0.0"
 
-[[projects]]
-  name = "github.com/pelletier/go-toml"
-  packages = ["."]
-  revision = "acdc4509485b587f5e675510c4f2c63e90ff68a8"
-  version = "v1.1.0"
-
 [[projects]]
   name = "github.com/sirupsen/logrus"
   packages = ["."]
   revision = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
   version = "v1.0.5"
 
-[[projects]]
-  name = "github.com/spf13/afero"
-  packages = [
-    ".",
-    "mem"
-  ]
-  revision = "63644898a8da0bc22138abf860edaf5277b6102e"
-  version = "v1.1.0"
-
-[[projects]]
-  name = "github.com/spf13/cast"
-  packages = ["."]
-  revision = "8965335b8c7107321228e3e3702cab9832751bac"
-  version = "v1.2.0"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/spf13/jwalterweatherman"
-  packages = ["."]
-  revision = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"
-
-[[projects]]
-  name = "github.com/spf13/pflag"
-  packages = ["."]
-  revision = "583c0c0531f06d5278b7d917446061adc344b5cd"
-  version = "v1.0.1"
-
-[[projects]]
-  name = "github.com/spf13/viper"
-  packages = ["."]
-  revision = "b5e8006cbee93ec955a89ab31e0e3ce3204f3736"
-  version = "v1.0.2"
-
 [[projects]]
   name = "github.com/ugorji/go"
   packages = ["codec"]
@@ -173,31 +87,12 @@
   ]
   revision = "79b0c6888797020a994db17c8510466c72fe75d9"
 
-[[projects]]
-  name = "golang.org/x/text"
-  packages = [
-    "internal/gen",
-    "internal/triegen",
-    "internal/ucd",
-    "transform",
-    "unicode/cldr",
-    "unicode/norm"
-  ]
-  revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
-  version = "v0.3.0"
-
 [[projects]]
   name = "gopkg.in/go-playground/validator.v8"
   packages = ["."]
   revision = "5f1438d3fca68893a817e4a66806cea46a9e4ebf"
   version = "v8.18.2"
 
-[[projects]]
-  name = "gopkg.in/ini.v1"
-  packages = ["."]
-  revision = "06f5f3d67269ccec1fe5fe4134ba6e982984f7f5"
-  version = "v1.37.0"
-
 [[projects]]
   name = "gopkg.in/yaml.v2"
   packages = ["."]
@@ -207,6 +102,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "80c547f8209d4ae9870858725d4476ddb7188a377993464463de3a554014cc3a"
+  inputs-digest = "7fe5f8b83f3a0556f7574a9334d97c080f888f616754772851ed06f70be00a37"
   solver-name = "gps-cdcl"
   solver-version = 1

middleware/auth/auth.go

@@ -5,7 +5,6 @@ import (
 	"net/http"
 	"time"
 
-	"git.links123.net/links123.com/uc/app"
 	"github.com/dgrijalva/jwt-go"
 	"github.com/gin-gonic/gin"
 )
@@ -17,49 +16,51 @@ const (
 	ctxRequestTokenExpired        = "expired"
 )
 
-func Auth(ctx *gin.Context) {
-	var (
-		err error
-		tk  = ctx.Request.Header.Get(ctxRequestHeaderAuthorization)
-	)
+func Auth(authKey string) gin.HandlerFunc {
+	return func(ctx *gin.Context) {
+		var (
+			err error
+			tk  = ctx.Request.Header.Get(ctxRequestHeaderAuthorization)
+		)
 
-	if tk == "" {
-		tk, err = ctx.Cookie(ctxRequestCookieAuthorization)
-		if err != nil {
+		if tk == "" {
+			tk, err = ctx.Cookie(ctxRequestCookieAuthorization)
+			if err != nil {
+				ctx.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"msg": "auth failed"})
+				return
+			}
+
+			tk = "Bearer " + tk
+		}
+
+		if len(tk) < 8 {
 			ctx.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"msg": "auth failed"})
 			return
 		}
 
-		tk = "Bearer " + tk
-	}
+		token, err := jwt.Parse(tk[7:], func(token *jwt.Token) (interface{}, error) {
+			if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
+				return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
+			}
 
-	if len(tk) < 8 {
-		ctx.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"msg": "auth failed"})
-		return
-	}
+			return []byte(authKey), nil
+		})
 
-	token, err := jwt.Parse(tk[7:], func(token *jwt.Token) (interface{}, error) {
-		if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
-			return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
+		if err != nil || !token.Valid {
+			ctx.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"msg": "auth failed"})
+			return
 		}
 
-		return []byte(app.Config.Token.AuthKey), nil
-	})
-
-	if err != nil || !token.Valid {
-		ctx.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"msg": "auth failed"})
-		return
-	}
-
-	mapClaims := token.Claims.(jwt.MapClaims)
-	expired := int64(mapClaims[ctxRequestTokenExpired].(float64))
-	if expired < time.Now().Unix() {
-		// Only cookie is blank value, check token expired
-		if _, err := ctx.Cookie(ctxRequestCookieAuthorization); err != nil {
-			ctx.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"msg": "auth failed, token timeout"})
-			return
+		mapClaims := token.Claims.(jwt.MapClaims)
+		expired := int64(mapClaims[ctxRequestTokenExpired].(float64))
+		if expired < time.Now().Unix() {
+			// Only cookie is blank value, check token expired
+			if _, err := ctx.Cookie(ctxRequestCookieAuthorization); err != nil {
+				ctx.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"msg": "auth failed, token timeout"})
+				return
+			}
 		}
-	}
 
-	ctx.Set(CtxRequestHeaderUserId, int(mapClaims[CtxRequestHeaderUserId].(float64)))
+		ctx.Set(CtxRequestHeaderUserId, int(mapClaims[CtxRequestHeaderUserId].(float64)))
+	}
 }

middleware/auth/optional_auth.go

@@ -4,50 +4,51 @@ import (
 	"fmt"
 	"time"
 
-	"git.links123.net/links123.com/uc/app"
 	"github.com/dgrijalva/jwt-go"
 	"github.com/gin-gonic/gin"
 )
 
-func OptionalAuth(ctx *gin.Context) {
-	var (
-		err error
-		tk  = ctx.Request.Header.Get(ctxRequestHeaderAuthorization)
-	)
+func OptionalAuth(authKey string) gin.HandlerFunc {
+	return func(ctx *gin.Context) {
+		var (
+			err error
+			tk  = ctx.Request.Header.Get(ctxRequestHeaderAuthorization)
+		)
 
-	if tk == "" {
-		tk, err = ctx.Cookie(ctxRequestCookieAuthorization)
-		if err != nil {
-			return
-		}
-
-		tk = "Bearer " + tk
-	}
+		if tk == "" {
+			tk, err = ctx.Cookie(ctxRequestCookieAuthorization)
+			if err != nil {
+				return
+			}
 
-	if len(tk) < 8 {
-		return
-	}
+			tk = "Bearer " + tk
+		}
 
-	token, err := jwt.Parse(tk[7:], func(token *jwt.Token) (interface{}, error) {
-		if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
-			return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
+		if len(tk) < 8 {
+			return
 		}
 
-		return []byte(app.Config.Token.AuthKey), nil
-	})
+		token, err := jwt.Parse(tk[7:], func(token *jwt.Token) (interface{}, error) {
+			if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
+				return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
+			}
 
-	if err != nil || !token.Valid {
-		return
-	}
+			return []byte(authKey), nil
+		})
 
-	mapClaims := token.Claims.(jwt.MapClaims)
-	expired := int64(mapClaims[ctxRequestTokenExpired].(float64))
-	if expired < time.Now().Unix() {
-		// Only cookie is blank value, check token expired
-		if _, err := ctx.Cookie(ctxRequestCookieAuthorization); err != nil {
+		if err != nil || !token.Valid {
 			return
 		}
-	}
 
-	ctx.Set(CtxRequestHeaderUserId, int(mapClaims[CtxRequestHeaderUserId].(float64)))
+		mapClaims := token.Claims.(jwt.MapClaims)
+		expired := int64(mapClaims[ctxRequestTokenExpired].(float64))
+		if expired < time.Now().Unix() {
+			// Only cookie is blank value, check token expired
+			if _, err := ctx.Cookie(ctxRequestCookieAuthorization); err != nil {
+				return
+			}
+		}
+
+		ctx.Set(CtxRequestHeaderUserId, int(mapClaims[CtxRequestHeaderUserId].(float64)))
+	}
 }