auth 为一个函数

Author: yumaojun03

http/mock/auth.go

@@ -20,7 +20,7 @@ func NewMockAuther() router.Auther {
 
 type mockAuther struct{}
 
-func (m *mockAuther) Auth(r *http.Request) (authInfo interface{}, err error) {
+func (m *mockAuther) Auth(r *http.Request, entry router.Entry) (authInfo interface{}, err error) {
 	authHeader := r.Header.Get("Authorization")
 	if authHeader == "" {
 		return nil, exception.NewUnauthorized("Authorization missed in header")
@@ -38,7 +38,3 @@ func (m *mockAuther) Auth(r *http.Request) (authInfo interface{}, err error) {
 	}
 	return access, nil
 }
-
-func (m *mockAuther) Permission(authInfo interface{}, entry router.Entry) error {
-	return nil
-}

http/router/auther.go

@@ -6,8 +6,7 @@ import "net/http"
 // Header 用于鉴定身份
 // Entry 用于鉴定权限
 type Auther interface {
-	Auth(*http.Request) (authInfo interface{}, err error)
-	Permission(authInfo interface{}, entry Entry) (err error)
+	Auth(req *http.Request, entry Entry) (authInfo interface{}, err error)
 }
 
 // The AutherFunc type is an adapter to allow the use of

http/router/httprouter/httprouter.go

@@ -5,7 +5,6 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/infraboard/mcube/exception"
 	"github.com/infraboard/mcube/http/context"
 	"github.com/infraboard/mcube/http/response"
 	"github.com/infraboard/mcube/http/router"
@@ -146,22 +145,12 @@ func (r *httpRouter) addHandler(method, path string, h http.Handler) {
 				return
 			}
 
-			if entry.AuthEnable {
-				ai, err := r.auther.Auth(req)
-				if err != nil {
-					response.Failed(w, exception.NewUnauthorized(err.Error()))
-					return
-				}
-				authInfo = ai
-			}
-
-			if entry.PermissionEnable {
-				err := r.auther.Permission(authInfo, *entry.Entry)
-				if err != nil {
-					response.Failed(w, exception.NewPermissionDeny(err.Error()))
-					return
-				}
+			ai, err := r.auther.Auth(req, *entry.Entry)
+			if err != nil {
+				response.Failed(w, err)
+				return
 			}
+			authInfo = ai
 		}
 
 		rc := context.GetContext(req)