feature: pack authnode api

Signed-off-by: wenjia322 <[email protected]>
shuoranliu · Jan 9, 2020 · 455a23d · 455a23d
1 parent 6c39ad9
commit 455a23d
Show file tree

Hide file tree

Showing 3 changed files with 131 additions and 55 deletions.
diff --git a/sdk/auth/api.go b/sdk/auth/api.go
@@ -2,16 +2,12 @@ package auth
 
 import (
 	"encoding/json"
+
 	"github.com/chubaofs/chubaofs/proto"
 	"github.com/chubaofs/chubaofs/util/auth"
 	"github.com/chubaofs/chubaofs/util/cryptoutil"
-	"github.com/chubaofs/chubaofs/util/keystore"
 )
 
-type API struct {
-	ac *AuthClient
-}
-
 func (api *API) GetTicket(clientId string, clientKey string, serviceID string) (ticket *auth.Ticket, err error) {
 	var (
 		key      []byte
@@ -47,53 +43,3 @@ func (api *API) GetTicket(clientId string, clientKey string, serviceID string) (
 	}
 	return
 }
-
-func (api *API) OSSAddCaps(clientID, clientKey, accessKey string, caps []byte) (newAKCaps *keystore.AccessKeyCaps, err error) {
-	if api.ac.ticket == nil {
-		if api.ac.ticket, err = api.GetTicket(clientID, clientKey, proto.AuthServiceID); err != nil {
-			return
-		}
-	}
-	akCaps := &keystore.AccessKeyCaps{
-		AccessKey: accessKey,
-		Caps:      caps,
-	}
-	return api.ac.serveOSSRequest(clientID, clientKey, api.ac.ticket, akCaps, proto.MsgAuthOSAddCapsReq, proto.OSAddCaps)
-}
-
-func (api *API) OSSDeleteCaps(clientID, clientKey, accessKey string, caps []byte) (newAKCaps *keystore.AccessKeyCaps, err error) {
-	if api.ac.ticket == nil {
-		if api.ac.ticket, err = api.GetTicket(clientID, clientKey, proto.AuthServiceID); err != nil {
-			return
-		}
-	}
-	akCaps := &keystore.AccessKeyCaps{
-		AccessKey: accessKey,
-		Caps:      caps,
-	}
-	return api.ac.serveOSSRequest(clientID, clientKey, api.ac.ticket, akCaps, proto.MsgAuthOSDeleteCapsReq, proto.OSDeleteCaps)
-}
-
-func (api *API) OSSGetCaps(clientID, clientKey, accessKey string) (caps *keystore.AccessKeyCaps, err error) {
-	if api.ac.ticket == nil {
-		if api.ac.ticket, err = api.GetTicket(clientID, clientKey, proto.AuthServiceID); err != nil {
-			return
-		}
-	}
-	akCaps := &keystore.AccessKeyCaps{
-		AccessKey: accessKey,
-	}
-	return api.ac.serveOSSRequest(clientID, clientKey, api.ac.ticket, akCaps, proto.MsgAuthOSGetCapsReq, proto.OSGetCaps)
-}
-
-func (api *API) AdminGetCaps(clientID, clientKey, userID string) (res *keystore.KeyInfo, err error) {
-	if api.ac.ticket == nil {
-		if api.ac.ticket, err = api.GetTicket(clientID, clientKey, proto.AuthServiceID); err != nil {
-			return
-		}
-	}
-	keyInfo := &keystore.KeyInfo{
-		ID: userID,
-	}
-	return api.ac.serveAdminRequest(clientID, clientKey, api.ac.ticket, keyInfo, proto.MsgAuthGetCapsReq, proto.AdminGetCaps)
-}
diff --git a/sdk/auth/api_admin.go b/sdk/auth/api_admin.go
@@ -0,0 +1,82 @@
+package auth
+
+import (
+	"github.com/chubaofs/chubaofs/proto"
+	"github.com/chubaofs/chubaofs/util/keystore"
+)
+
+func (api *API) AdminCreateKey(clientID, clientKey, userID, role string, caps []byte) (res *keystore.KeyInfo, err error) {
+	if api.ac.ticket == nil {
+		if api.ac.ticket, err = api.GetTicket(clientID, clientKey, proto.AuthServiceID); err != nil {
+			return
+		}
+	}
+	keyInfo := &keystore.KeyInfo{
+		ID:   userID,
+		Role: role,
+		Caps: caps,
+	}
+	return api.ac.serveAdminRequest(clientID, clientKey, api.ac.ticket, keyInfo, proto.MsgAuthCreateKeyReq, proto.AdminCreateKey)
+}
+
+func (api *API) AdminDeleteKey(clientID, clientKey, userID string) (res *keystore.KeyInfo, err error) {
+	if api.ac.ticket == nil {
+		if api.ac.ticket, err = api.GetTicket(clientID, clientKey, proto.AuthServiceID); err != nil {
+			return
+		}
+	}
+	keyInfo := &keystore.KeyInfo{
+		ID: userID,
+	}
+	return api.ac.serveAdminRequest(clientID, clientKey, api.ac.ticket, keyInfo, proto.MsgAuthDeleteKeyReq, proto.AdminDeleteKey)
+}
+
+func (api *API) AdminGetKey(clientID, clientKey, userID string) (res *keystore.KeyInfo, err error) {
+	if api.ac.ticket == nil {
+		if api.ac.ticket, err = api.GetTicket(clientID, clientKey, proto.AuthServiceID); err != nil {
+			return
+		}
+	}
+	keyInfo := &keystore.KeyInfo{
+		ID: userID,
+	}
+	return api.ac.serveAdminRequest(clientID, clientKey, api.ac.ticket, keyInfo, proto.MsgAuthGetKeyReq, proto.AdminGetKey)
+}
+
+func (api *API) AdminAddCaps(clientID, clientKey, userID string, caps []byte) (res *keystore.KeyInfo, err error) {
+	if api.ac.ticket == nil {
+		if api.ac.ticket, err = api.GetTicket(clientID, clientKey, proto.AuthServiceID); err != nil {
+			return
+		}
+	}
+	keyInfo := &keystore.KeyInfo{
+		ID:   userID,
+		Caps: caps,
+	}
+	return api.ac.serveAdminRequest(clientID, clientKey, api.ac.ticket, keyInfo, proto.MsgAuthAddCapsReq, proto.AdminAddCaps)
+}
+
+func (api *API) AdminDeleteCaps(clientID, clientKey, userID string, caps []byte) (res *keystore.KeyInfo, err error) {
+	if api.ac.ticket == nil {
+		if api.ac.ticket, err = api.GetTicket(clientID, clientKey, proto.AuthServiceID); err != nil {
+			return
+		}
+	}
+	keyInfo := &keystore.KeyInfo{
+		ID:   userID,
+		Caps: caps,
+	}
+	return api.ac.serveAdminRequest(clientID, clientKey, api.ac.ticket, keyInfo, proto.MsgAuthDeleteCapsReq, proto.AdminDeleteCaps)
+}
+
+func (api *API) AdminGetCaps(clientID, clientKey, userID string) (res *keystore.KeyInfo, err error) {
+	if api.ac.ticket == nil {
+		if api.ac.ticket, err = api.GetTicket(clientID, clientKey, proto.AuthServiceID); err != nil {
+			return
+		}
+	}
+	keyInfo := &keystore.KeyInfo{
+		ID: userID,
+	}
+	return api.ac.serveAdminRequest(clientID, clientKey, api.ac.ticket, keyInfo, proto.MsgAuthGetCapsReq, proto.AdminGetCaps)
+}
diff --git a/sdk/auth/api_object.go b/sdk/auth/api_object.go
@@ -0,0 +1,48 @@
+package auth
+
+import (
+	"github.com/chubaofs/chubaofs/proto"
+	"github.com/chubaofs/chubaofs/util/keystore"
+)
+
+type API struct {
+	ac *AuthClient
+}
+
+func (api *API) OSSAddCaps(clientID, clientKey, accessKey string, caps []byte) (newAKCaps *keystore.AccessKeyCaps, err error) {
+	if api.ac.ticket == nil {
+		if api.ac.ticket, err = api.GetTicket(clientID, clientKey, proto.AuthServiceID); err != nil {
+			return
+		}
+	}
+	akCaps := &keystore.AccessKeyCaps{
+		AccessKey: accessKey,
+		Caps:      caps,
+	}
+	return api.ac.serveOSSRequest(clientID, clientKey, api.ac.ticket, akCaps, proto.MsgAuthOSAddCapsReq, proto.OSAddCaps)
+}
+
+func (api *API) OSSDeleteCaps(clientID, clientKey, accessKey string, caps []byte) (newAKCaps *keystore.AccessKeyCaps, err error) {
+	if api.ac.ticket == nil {
+		if api.ac.ticket, err = api.GetTicket(clientID, clientKey, proto.AuthServiceID); err != nil {
+			return
+		}
+	}
+	akCaps := &keystore.AccessKeyCaps{
+		AccessKey: accessKey,
+		Caps:      caps,
+	}
+	return api.ac.serveOSSRequest(clientID, clientKey, api.ac.ticket, akCaps, proto.MsgAuthOSDeleteCapsReq, proto.OSDeleteCaps)
+}
+
+func (api *API) OSSGetCaps(clientID, clientKey, accessKey string) (caps *keystore.AccessKeyCaps, err error) {
+	if api.ac.ticket == nil {
+		if api.ac.ticket, err = api.GetTicket(clientID, clientKey, proto.AuthServiceID); err != nil {
+			return
+		}
+	}
+	akCaps := &keystore.AccessKeyCaps{
+		AccessKey: accessKey,
+	}
+	return api.ac.serveOSSRequest(clientID, clientKey, api.ac.ticket, akCaps, proto.MsgAuthOSGetCapsReq, proto.OSGetCaps)
+}