添加auther

Author: yumaojun03

http/auth/mock/mock.go renamed to http/mock/auth.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/infraboard/mcube/exception"
-	"github.com/infraboard/mcube/http/auth"
+	"github.com/infraboard/mcube/http/router"
 )
 
 var (
@@ -14,7 +14,7 @@ var (
 )
 
 // NewMockAuther mock
-func NewMockAuther() auth.Auther {
+func NewMockAuther() router.Auther {
 	return &mockAuther{}
 }
 

http/auth/auther_test.go renamed to http/router/auth_test.go

@@ -1,10 +1,10 @@
-package auth_test
+package router_test
 
 import (
 	"net/http"
 	"testing"
 
-	"github.com/infraboard/mcube/http/auth"
+	"github.com/infraboard/mcube/http/router"
 	"github.com/stretchr/testify/require"
 )
 
@@ -16,7 +16,7 @@ func simpleAuth(h http.Header) (authInfo interface{}, err error) {
 func TestAutherFunc(t *testing.T) {
 	should := require.New(t)
 
-	auther := auth.AutherFunc(simpleAuth)
+	auther := router.AutherFunc(simpleAuth)
 	header := make(http.Header)
 	header.Add("Authorization", "ok")
 	authInfo, err := auther.Auth(header)

http/auth/auther.go renamed to http/router/auther.go

@@ -1,4 +1,4 @@
-package auth
+package router
 
 import "net/http"
 

http/router/entry.go

@@ -0,0 +1,31 @@
+package router
+
+// Entry 路由条目
+type Entry struct {
+	Name      string            `json:"name,omitempty"`
+	Resource  string            `json:"resource,omitempty"`
+	Path      string            `json:"path,omitempty"`
+	Method    string            `json:"method,omitempty"`
+	Protected bool              `json:"protected"`
+	Labels    map[string]string `json:"labels,omitempty"`
+}
+
+// NewEntrySet 实例化一个集合
+func NewEntrySet() *EntrySet {
+	return &EntrySet{}
+}
+
+// EntrySet 路由集合
+type EntrySet struct {
+	items []Entry
+}
+
+// AddEntry 添加理由条目
+func (s *EntrySet) AddEntry(e ...Entry) {
+	s.items = append(s.items, e...)
+}
+
+// ShowEntries 显示理由条目
+func (s *EntrySet) ShowEntries() []Entry {
+	return s.items
+}

http/router/httprouter/httprouter.go

@@ -4,7 +4,6 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/infraboard/mcube/http/auth"
 	"github.com/infraboard/mcube/http/context"
 	"github.com/infraboard/mcube/http/response"
 	"github.com/infraboard/mcube/http/router"
@@ -26,7 +25,7 @@ type httpRouter struct {
 
 	middlewareChain []router.Middleware
 	entries         []*entry
-	authMiddleware  router.Middleware
+	auther          router.Auther
 	mergedHandler   http.Handler
 	labels          []*router.Label
 }
@@ -80,9 +79,8 @@ func (r *httpRouter) AddPublict(method, path string, h http.HandlerFunc) {
 	r.add(e)
 }
 
-func (r *httpRouter) SetAuther(at auth.Auther) {
-	am := router.NewAutherMiddleware(at)
-	r.authMiddleware = am
+func (r *httpRouter) SetAuther(at router.Auther) {
+	r.auther = at
 	return
 }
 
@@ -105,13 +103,14 @@ func (r *httpRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	r.r.ServeHTTP(response.NewResponse(w), req)
 }
 
-func (r *httpRouter) GetEndpoints() []router.Entry {
-	entries := make([]router.Entry, 0, len(r.entries))
+func (r *httpRouter) GetEndpoints() *router.EntrySet {
+	es := router.NewEntrySet()
+
 	for i := range r.entries {
-		entries = append(entries, r.entries[i].Entry)
+		es.AddEntry(r.entries[i].Entry)
 	}
 
-	return entries
+	return es
 }
 
 func (r *httpRouter) EnableAPIRoot() {
@@ -139,29 +138,42 @@ func (r *httpRouter) debug(format string, args ...interface{}) {
 func (r *httpRouter) add(e *entry) {
 	var handler http.Handler
 
-	if e.Protected && r.authMiddleware == nil {
+	if e.Protected && r.auther == nil {
 		r.debug("add projected endpoint, but no auther set")
 	}
 
-	if e.Protected && r.authMiddleware != nil {
-		handler = r.authMiddleware.Handler(e.h)
-	} else {
-		handler = http.HandlerFunc(e.h)
-	}
+	handler = http.HandlerFunc(e.h)
 
-	r.addHandler(e.Method, e.Path, handler)
+	r.addHandler(e.Protected, e.Method, e.Path, handler)
 	r.addEntry(e)
 }
 
-func (r *httpRouter) addHandler(method, path string, h http.Handler) {
+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) {
-			rc := &context.ReqContext{
-				PS: ps,
+			// 使用auther进行认证
+			if protected && r.auther != nil {
+				authInfo, err := r.auther.Auth(req.Header)
+				if err != nil {
+					response.Failed(w, err)
+					return
+				}
+
+				rc := context.GetContext(req)
+				rc.AuthInfo = authInfo
+				req = context.WithContext(req, rc)
 			}
-			req = context.WithContext(req, rc)
-			h.ServeHTTP(w, req)
 
+			// 未包含和auth为nil
+			if !protected || r.auther == nil {
+				rc := &context.ReqContext{
+					PS: ps,
+				}
+
+				req = context.WithContext(req, rc)
+			}
+
+			h.ServeHTTP(w, req)
 		},
 	)
 }

http/router/httprouter/httprouter_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/infraboard/mcube/exception"
-	"github.com/infraboard/mcube/http/auth/mock"
+	"github.com/infraboard/mcube/http/mock"
 	"github.com/infraboard/mcube/http/context"
 	"github.com/infraboard/mcube/http/response"
 	"github.com/infraboard/mcube/http/router"
@@ -80,7 +80,7 @@ func TestWithAutherOK(t *testing.T) {
 	r.AddProtected("GET", "/", IndexHandler)
 	r.ServeHTTP(w, req)
 
-	should.Equal(w.Code, 200)
+	should.Equal(200, w.Code)
 }
 
 func TestWithParamsOK(t *testing.T) {
@@ -94,7 +94,7 @@ func TestWithParamsOK(t *testing.T) {
 	r.AddProtected("GET", "/:id", WithContextHandler)
 	r.ServeHTTP(w, req)
 
-	should.Equal(w.Code, 200)
+	should.Equal(200, w.Code)
 }
 
 func TestWithParamsFailed(t *testing.T) {
@@ -108,7 +108,7 @@ func TestWithParamsFailed(t *testing.T) {
 	r.AddProtected("GET", "/:id", WithContextHandler)
 	r.ServeHTTP(w, req)
 
-	should.Equal(w.Code, 400)
+	should.Equal(400, w.Code)
 }
 
 func TestSetLabel(t *testing.T) {
@@ -118,7 +118,7 @@ func TestSetLabel(t *testing.T) {
 	r.SetLabel(router.NewLable("k1", "v1"))
 	r.AddProtected("GET", "/:id", WithContextHandler)
 
-	entries := r.GetEndpoints()
+	entries := r.GetEndpoints().ShowEntries()
 
 	should.Equal(entries[0].Labels["k1"], "v1")
 }

http/router/httprouter/subrouter.go

@@ -16,6 +16,7 @@ func newSubRouter(basePath string, root *httpRouter) *subRouter {
 
 type subRouter struct {
 	basePath        string
+	resourceName    string
 	root            *httpRouter
 	labels          []*router.Label
 	middlewareChain []router.Middleware
@@ -56,10 +57,11 @@ func (r *subRouter) AddProtected(method, path string, h http.HandlerFunc) {
 func (r *subRouter) AddPublict(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,
+			Name:     router.GetHandlerFuncName(h),
+			Method:   method,
+			Path:     path,
+			Labels:   map[string]string{},
 		},
 		needAuth: false,
 		h:        h,
@@ -72,6 +74,14 @@ func (r *subRouter) SetLabel(labels ...*router.Label) {
 	r.labels = append(r.labels, labels...)
 }
 
+func (r *subRouter) ResourceRouter(resourceName string) router.SubRouter {
+	return &subRouter{
+		resourceName: resourceName,
+		basePath:     r.basePath + "/" + resourceName,
+		root:         r.root,
+	}
+}
+
 func (r *subRouter) add(e *entry) {
 	// 子路由全局标签
 	for i := range r.labels {
@@ -81,7 +91,7 @@ func (r *subRouter) add(e *entry) {
 
 	mergedHandler := r.combineHandler(e)
 	e.Path = r.calculateAbsolutePath(e.Path)
-	r.root.addHandler(e.Method, e.Path, mergedHandler)
+	r.root.addHandler(e.Protected, e.Method, e.Path, mergedHandler)
 	r.root.addEntry(e)
 }
 

http/router/httprouter/subrouter_test.go

@@ -17,6 +17,7 @@ func TestSubRouterTestSuit(t *testing.T) {
 
 	t.Run("SetLabel", suit.testSetLabel())
 	t.Run("AddPublictOK", suit.testAddPublictOK())
+	t.Run("ResourceRouterOK", suit.testResourceRouterOK())
 }
 
 func newSubRouterTestSuit(t *testing.T) *subRouterTestSuit {
@@ -45,7 +46,7 @@ func (a *subRouterTestSuit) testSetLabel() func(t *testing.T) {
 		a.sub.SetLabel(router.NewLable("k1", "v1"))
 		a.sub.AddPublict("GET", "/index", IndexHandler)
 
-		entries := a.root.GetEndpoints()
+		entries := a.root.GetEndpoints().ShowEntries()
 
 		a.should.Equal(entries[0].Labels["k1"], "v1")
 	}
@@ -65,3 +66,15 @@ func (a *subRouterTestSuit) testAddPublictOK() func(t *testing.T) {
 		a.should.Equal(w.Code, 200)
 	}
 }
+
+func (a *subRouterTestSuit) testResourceRouterOK() func(t *testing.T) {
+	return func(t *testing.T) {
+		a.sub.ResourceRouter("resources").AddPublict("GET", "/", IndexHandler)
+
+		w := httptest.NewRecorder()
+		req, _ := http.NewRequest("GET", "/v1/resources/", nil)
+		a.root.ServeHTTP(w, req)
+
+		a.should.Equal(w.Code, 200)
+	}
+}

http/router/middleware.go

@@ -2,10 +2,6 @@ package router
 
 import (
 	"net/http"
-
-	"github.com/infraboard/mcube/http/auth"
-	"github.com/infraboard/mcube/http/context"
-	"github.com/infraboard/mcube/http/response"
 )
 
 // Middleware 中间件的函数签名
@@ -21,34 +17,3 @@ type MiddlewareFunc func(http.Handler) http.Handler
 func (h MiddlewareFunc) Handler(next http.Handler) http.Handler {
 	return h(next)
 }
-
-// NewAutherMiddleware 初始化一个认证中间件
-func NewAutherMiddleware(auther auth.Auther) Middleware {
-	return &AutherMiddleware{
-		auther: auther,
-	}
-}
-
-// AutherMiddleware 认证中间件
-type AutherMiddleware struct {
-	auther auth.Auther
-}
-
-// Handler 实现中间件
-func (m *AutherMiddleware) Handler(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(wr http.ResponseWriter, r *http.Request) {
-		// 使用auther进行认证
-		authInfo, err := m.auther.Auth(r.Header)
-		if err != nil {
-			response.Failed(wr, err)
-			return
-		}
-
-		rc := context.GetContext(r)
-		rc.AuthInfo = authInfo
-		context.WithContext(r, rc)
-
-		// next handler
-		next.ServeHTTP(wr, r)
-	})
-}