完善auther接口

Author: yumaojun03

http/mock/auth.go

@@ -15,12 +15,13 @@ var (
 
 // NewMockAuther mock
 func NewMockAuther() router.Auther {
+
 	return &mockAuther{}
 }
 
 type mockAuther struct{}
 
-func (m *mockAuther) Auth(h http.Header) (authInfo interface{}, err error) {
+func (m *mockAuther) Auth(h http.Header, entry router.Entry) (authInfo interface{}, err error) {
 	authHeader := h.Get("Authorization")
 	if authHeader == "" {
 		return nil, exception.NewUnauthorized("Authorization missed in header")

http/router/auther.go

@@ -3,8 +3,10 @@ package router
 import "net/http"
 
 // Auther 设置受保护路由使用的认证器
+// Header 用于鉴定身份
+// Entry 用于鉴定权限
 type Auther interface {
-	Auth(http.Header) (authInfo interface{}, err error)
+	Auth(http.Header, Entry) (authInfo interface{}, err error)
 }
 
 // The AutherFunc type is an adapter to allow the use of

http/router/entry.go

@@ -1,31 +1,67 @@
 package router
 
+import "fmt"
+
 // Entry 路由条目
 type Entry struct {
-	Name      string            `json:"name,omitempty"`
-	Resource  string            `json:"resource,omitempty"`
 	Path      string            `json:"path,omitempty"`
 	Method    string            `json:"method,omitempty"`
+	Resource  string            `json:"resource,omitempty"`
 	Protected bool              `json:"protected"`
 	Labels    map[string]string `json:"labels,omitempty"`
 }
 
+func gernateEntryID(path, mothod string) string {
+	return path + "." + mothod
+}
+
+// ID entry 唯一标识符
+func (e *Entry) ID() string {
+	return e.Path + "." + e.Method
+}
+
 // NewEntrySet 实例化一个集合
 func NewEntrySet() *EntrySet {
-	return &EntrySet{}
+	return &EntrySet{
+		items: make(map[string]*Entry),
+	}
 }
 
 // EntrySet 路由集合
 type EntrySet struct {
-	items []Entry
+	items map[string]*Entry
 }
 
 // AddEntry 添加理由条目
-func (s *EntrySet) AddEntry(e ...Entry) {
-	s.items = append(s.items, e...)
+func (s *EntrySet) AddEntry(es ...*Entry) error {
+	for _, e := range es {
+		if v, ok := s.items[e.ID()]; ok {
+			return fmt.Errorf("router entry %s has exist", v.ID())
+		}
+		s.items[e.ID()] = e
+	}
+
+	return nil
 }
 
 // ShowEntries 显示理由条目
 func (s *EntrySet) ShowEntries() []Entry {
-	return s.items
+	entries := make([]Entry, 0, len(s.items))
+	for _, v := range s.items {
+		entries = append(entries, *v)
+	}
+
+	return entries
+}
+
+// FindEntry 通过函数地址找到对于的路由条目
+// 由于该接口是高频接口, 为了不影响性能 采用指针输出, 请不要修改Entry
+func (s *EntrySet) FindEntry(path, method string) *Entry {
+	id := gernateEntryID(path, method)
+	entry, ok := s.items[id]
+	if !ok {
+		return nil
+	}
+
+	return entry
 }

http/router/entry_test.go

@@ -0,0 +1,12 @@
+package router_test
+
+import (
+	"net/http"
+
+	"github.com/infraboard/mcube/http/response"
+)
+
+func indexHandler(w http.ResponseWriter, r *http.Request) {
+	response.Success(w, "ok")
+	return
+}

http/router/httprouter/httprouter.go

@@ -3,6 +3,7 @@ package httprouter
 import (
 	"log"
 	"net/http"
+	"strings"
 
 	"github.com/infraboard/mcube/http/context"
 	"github.com/infraboard/mcube/http/response"
@@ -24,15 +25,18 @@ type httpRouter struct {
 	l logger.Logger
 
 	middlewareChain []router.Middleware
-	entries         []*entry
+	entrySet        *router.EntrySet
 	auther          router.Auther
 	mergedHandler   http.Handler
 	labels          []*router.Label
+	notFound        http.Handler
 }
 
 // New 基于社区的httprouter进行封装
 func New() router.Router {
 	r := &httpRouter{
+		notFound: http.HandlerFunc(http.NotFound),
+		entrySet: router.NewEntrySet(),
 		r: &httprouter.Router{
 			RedirectTrailingSlash:  true,
 			RedirectFixedPath:      true,
@@ -55,7 +59,6 @@ func (r *httpRouter) Use(m router.Middleware) {
 func (r *httpRouter) AddProtected(method, path string, h http.HandlerFunc) {
 	e := &entry{
 		Entry: router.Entry{
-			Name:      router.GetHandlerFuncName(h),
 			Method:    method,
 			Path:      path,
 			Protected: true,
@@ -69,7 +72,6 @@ func (r *httpRouter) AddProtected(method, path string, h http.HandlerFunc) {
 func (r *httpRouter) AddPublict(method, path string, h http.HandlerFunc) {
 	e := &entry{
 		Entry: router.Entry{
-			Name:      router.GetHandlerFuncName(h),
 			Method:    method,
 			Path:      path,
 			Protected: false,
@@ -104,21 +106,15 @@ func (r *httpRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 }
 
 func (r *httpRouter) GetEndpoints() *router.EntrySet {
-	es := router.NewEntrySet()
-
-	for i := range r.entries {
-		es.AddEntry(r.entries[i].Entry)
-	}
-
-	return es
+	return r.entrySet
 }
 
 func (r *httpRouter) EnableAPIRoot() {
 	r.AddPublict("GET", "/", r.apiRoot)
 }
 
 func (r *httpRouter) apiRoot(w http.ResponseWriter, req *http.Request) {
-	response.Success(w, r.entries)
+	response.Success(w, r.entrySet.ShowEntries)
 	return
 }
 
@@ -151,9 +147,14 @@ func (r *httpRouter) add(e *entry) {
 func (r *httpRouter) addHandler(protected bool, method, path string, h http.Handler) {
 	r.r.Handle(method, path,
 		func(w http.ResponseWriter, req *http.Request, ps httprouter.Params) {
+			entry := r.findEntry(method, path)
+			if entry == nil {
+				r.notFound.ServeHTTP(w, req)
+				return
+			}
 			// 使用auther进行认证
 			if protected && r.auther != nil {
-				authInfo, err := r.auther.Auth(req.Header)
+				authInfo, err := r.auther.Auth(req.Header, *entry)
 				if err != nil {
 					response.Failed(w, err)
 					return
@@ -184,5 +185,23 @@ func (r *httpRouter) addEntry(e *entry) {
 		kv := r.labels[i]
 		e.Labels[kv.Key()] = kv.Value()
 	}
-	r.entries = append(r.entries, e)
+
+	if err := r.entrySet.AddEntry(&e.Entry); err != nil {
+		panic(err)
+	}
+}
+
+func (r *httpRouter) findEntry(method, path string) *router.Entry {
+	hander, paras, _ := r.r.Lookup(method, path)
+	if hander == nil {
+		return nil
+	}
+
+	targetPath := path
+	for _, kv := range paras {
+		targetPath = strings.Replace(targetPath, ":"+kv.Key, kv.Value, 1)
+	}
+
+	return r.entrySet.FindEntry(targetPath, method)
+
 }

http/router/httprouter/httprouter_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/infraboard/mcube/exception"
-	"github.com/infraboard/mcube/http/mock"
 	"github.com/infraboard/mcube/http/context"
+	"github.com/infraboard/mcube/http/mock"
 	"github.com/infraboard/mcube/http/response"
 	"github.com/infraboard/mcube/http/router"
 	"github.com/infraboard/mcube/http/router/httprouter"

http/router/httprouter/subrouter.go

@@ -42,10 +42,10 @@ func (r *subRouter) With(m ...router.Middleware) router.SubRouter {
 func (r *subRouter) AddProtected(method, path string, h http.HandlerFunc) {
 	e := &entry{
 		Entry: router.Entry{
-			Name:   router.GetHandlerFuncName(h),
-			Method: method,
-			Path:   path,
-			Labels: map[string]string{},
+			Resource: r.resourceName,
+			Method:   method,
+			Path:     path,
+			Labels:   map[string]string{},
 		},
 		needAuth: true,
 		h:        h,
@@ -58,7 +58,6 @@ func (r *subRouter) AddPublict(method, path string, h http.HandlerFunc) {
 	e := &entry{
 		Entry: router.Entry{
 			Resource: r.resourceName,
-			Name:     router.GetHandlerFuncName(h),
 			Method:   method,
 			Path:     path,
 			Labels:   map[string]string{},

http/router/httprouter/subrouter_test.go

@@ -75,6 +75,7 @@ func (a *subRouterTestSuit) testResourceRouterOK() func(t *testing.T) {
 		req, _ := http.NewRequest("GET", "/v1/resources/", nil)
 		a.root.ServeHTTP(w, req)
 
+		t.Log(a.root.GetEndpoints().ShowEntries())
 		a.should.Equal(w.Code, 200)
 	}
 }