You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by GitBox <gi...@apache.org> on 2021/07/22 13:44:48 UTC

[GitHub] [servicecomb-service-center] little-cui opened a new pull request #1103: Add list self permission API

little-cui opened a new pull request #1103:
URL: https://github.com/apache/servicecomb-service-center/pull/1103


   Follow this checklist to help us incorporate your contribution quickly and easily:
   
    - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it).  Trivial changes like typos do not require a JIRA issue.  Your pull request should address just this issue, without pulling in other changes.
    - [ ] Each commit in the pull request should have a meaningful subject line and body.
    - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue.
    - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
    - [ ] Run `go build` `go test` `go fmt` `go vet` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically.
    - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).
    - [ ] Never comment source code, delete it.
    - [ ] UT should has "context, subject, expected result" result as test case name, when you call t.Run().
   ---
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [servicecomb-service-center] tianxiaoliang commented on a change in pull request #1103: Add list self permission API

Posted by GitBox <gi...@apache.org>.
tianxiaoliang commented on a change in pull request #1103:
URL: https://github.com/apache/servicecomb-service-center/pull/1103#discussion_r675326465



##########
File path: server/resource/v4/auth_resource.go
##########
@@ -43,6 +41,7 @@ type AuthResource struct {
 func (ar *AuthResource) URLPatterns() []rest.Route {
 	return []rest.Route{
 		{Method: http.MethodPost, Path: "/v4/token", Func: ar.Login},
+		{Method: http.MethodGet, Path: "/v4/self-perms", Func: ar.ListSelfPerms},

Review comment:
       要看下这个API会不会被权限检查拦截

##########
File path: server/resource/v4/auth_resource.go
##########
@@ -182,21 +181,26 @@ func (ar *AuthResource) Login(w http.ResponseWriter, r *http.Request) {
 		authr.ExpireAfter(a.TokenExpirationTime))
 	if err != nil {
 		log.Error("not authorized", err)
-		writeErrsvcOrInternalErr(w, err)
+		rest.WriteServiceError(w, err)
 		return
 	}
 	rest.WriteResponse(w, r, nil, &rbac.Token{TokenStr: t})
 }
 
-func MakeBanKey(name, ip string) string {
-	return name + "::" + ip
-}
-
-func writeErrsvcOrInternalErr(w http.ResponseWriter, err error) {
-	e, ok := err.(*errsvc.Error)
-	if ok {
-		rest.WriteErrsvcError(w, e)
+func (ar *AuthResource) ListSelfPerms(w http.ResponseWriter, r *http.Request) {

Review comment:
       要通过httpstest包补充端到端UT




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [servicecomb-service-center] little-cui commented on a change in pull request #1103: Add list self permission API

Posted by GitBox <gi...@apache.org>.
little-cui commented on a change in pull request #1103:
URL: https://github.com/apache/servicecomb-service-center/pull/1103#discussion_r675419499



##########
File path: server/resource/v4/auth_resource.go
##########
@@ -182,21 +181,26 @@ func (ar *AuthResource) Login(w http.ResponseWriter, r *http.Request) {
 		authr.ExpireAfter(a.TokenExpirationTime))
 	if err != nil {
 		log.Error("not authorized", err)
-		writeErrsvcOrInternalErr(w, err)
+		rest.WriteServiceError(w, err)
 		return
 	}
 	rest.WriteResponse(w, r, nil, &rbac.Token{TokenStr: t})
 }
 
-func MakeBanKey(name, ip string) string {
-	return name + "::" + ip
-}
-
-func writeErrsvcOrInternalErr(w http.ResponseWriter, err error) {
-	e, ok := err.(*errsvc.Error)
-	if ok {
-		rest.WriteErrsvcError(w, e)
+func (ar *AuthResource) ListSelfPerms(w http.ResponseWriter, r *http.Request) {

Review comment:
       DONE




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [servicecomb-service-center] little-cui commented on a change in pull request #1103: Feature: Add list self permission API

Posted by GitBox <gi...@apache.org>.
little-cui commented on a change in pull request #1103:
URL: https://github.com/apache/servicecomb-service-center/pull/1103#discussion_r676252502



##########
File path: server/service/rbac/perm_service.go
##########
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package rbac
+
+import (
+	"context"
+
+	"github.com/apache/servicecomb-service-center/datasource"
+	errorsEx "github.com/apache/servicecomb-service-center/pkg/errors"
+	"github.com/go-chassis/cari/rbac"
+)
+
+// ListSelfPerms list the user permission from ctx
+func ListSelfPerms(ctx context.Context) ([]*rbac.Permission, error) {
+	user := UserFromContext(ctx)
+	if len(user) == 0 {
+		return nil, rbac.NewError(rbac.ErrUnauthorized, errorsEx.MsgListSelfPermsFailed)
+	}
+	account, err := datasource.GetAccountManager().GetAccount(ctx, user)

Review comment:
       当前是rbacsvc包实现




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [servicecomb-service-center] little-cui commented on a change in pull request #1103: Add list self permission API

Posted by GitBox <gi...@apache.org>.
little-cui commented on a change in pull request #1103:
URL: https://github.com/apache/servicecomb-service-center/pull/1103#discussion_r675388308



##########
File path: server/resource/v4/auth_resource.go
##########
@@ -43,6 +41,7 @@ type AuthResource struct {
 func (ar *AuthResource) URLPatterns() []rest.Route {
 	return []rest.Route{
 		{Method: http.MethodPost, Path: "/v4/token", Func: ar.Login},
+		{Method: http.MethodGet, Path: "/v4/self-perms", Func: ar.ListSelfPerms},

Review comment:
       DONE




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [servicecomb-service-center] little-cui commented on a change in pull request #1103: Add list self permission API

Posted by GitBox <gi...@apache.org>.
little-cui commented on a change in pull request #1103:
URL: https://github.com/apache/servicecomb-service-center/pull/1103#discussion_r675388308



##########
File path: server/resource/v4/auth_resource.go
##########
@@ -43,6 +41,7 @@ type AuthResource struct {
 func (ar *AuthResource) URLPatterns() []rest.Route {
 	return []rest.Route{
 		{Method: http.MethodPost, Path: "/v4/token", Func: ar.Login},
+		{Method: http.MethodGet, Path: "/v4/self-perms", Func: ar.ListSelfPerms},

Review comment:
       已经加到白名单，由ListSelfPerms自己身份鉴权，不做数据权限




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [servicecomb-service-center] tianxiaoliang commented on a change in pull request #1103: Feature: Add list self permission API

Posted by GitBox <gi...@apache.org>.
tianxiaoliang commented on a change in pull request #1103:
URL: https://github.com/apache/servicecomb-service-center/pull/1103#discussion_r676235235



##########
File path: server/service/rbac/perm_service.go
##########
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package rbac
+
+import (
+	"context"
+
+	"github.com/apache/servicecomb-service-center/datasource"
+	errorsEx "github.com/apache/servicecomb-service-center/pkg/errors"
+	"github.com/go-chassis/cari/rbac"
+)
+
+// ListSelfPerms list the user permission from ctx
+func ListSelfPerms(ctx context.Context) ([]*rbac.Permission, error) {
+	user := UserFromContext(ctx)
+	if len(user) == 0 {
+		return nil, rbac.NewError(rbac.ErrUnauthorized, errorsEx.MsgListSelfPermsFailed)
+	}
+	account, err := datasource.GetAccountManager().GetAccount(ctx, user)

Review comment:
       rbacsvc包没有get account方法的话，那就加一下，不暴露复杂结构




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [servicecomb-service-center] tianxiaoliang commented on a change in pull request #1103: Add list self permission API

Posted by GitBox <gi...@apache.org>.
tianxiaoliang commented on a change in pull request #1103:
URL: https://github.com/apache/servicecomb-service-center/pull/1103#discussion_r675325374



##########
File path: pkg/rest/util.go
##########
@@ -35,13 +35,18 @@ var errNilRequestBody = errors.New("request body is nil")
 
 func WriteError(w http.ResponseWriter, code int32, detail string) {
 	err := discovery.NewError(code, detail)
-	WriteErrsvcError(w, err)
+	WriteServiceError(w, err)
 }
 
-func WriteErrsvcError(w http.ResponseWriter, err *errsvc.Error) {
+func WriteServiceError(w http.ResponseWriter, err error) {
+	e, ok := err.(*errsvc.Error)
+	if !ok {
+		WriteError(w, discovery.ErrInternal, err.Error())
+		return
+	}
 	w.Header().Set(HeaderContentType, ContentTypeJSON)
-	w.WriteHeader(err.StatusCode())
-	b, _ := json.Marshal(err)
+	w.WriteHeader(e.StatusCode())
+	b, _ := json.Marshal(e)
 	_, _ = w.Write(b)

Review comment:
       这行的error还是有必要打印记录




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [servicecomb-service-center] little-cui commented on a change in pull request #1103: Add list self permission API

Posted by GitBox <gi...@apache.org>.
little-cui commented on a change in pull request #1103:
URL: https://github.com/apache/servicecomb-service-center/pull/1103#discussion_r675388008



##########
File path: pkg/rest/util.go
##########
@@ -35,13 +35,18 @@ var errNilRequestBody = errors.New("request body is nil")
 
 func WriteError(w http.ResponseWriter, code int32, detail string) {
 	err := discovery.NewError(code, detail)
-	WriteErrsvcError(w, err)
+	WriteServiceError(w, err)
 }
 
-func WriteErrsvcError(w http.ResponseWriter, err *errsvc.Error) {
+func WriteServiceError(w http.ResponseWriter, err error) {
+	e, ok := err.(*errsvc.Error)
+	if !ok {
+		WriteError(w, discovery.ErrInternal, err.Error())
+		return
+	}
 	w.Header().Set(HeaderContentType, ContentTypeJSON)
-	w.WriteHeader(err.StatusCode())
-	b, _ := json.Marshal(err)
+	w.WriteHeader(e.StatusCode())
+	b, _ := json.Marshal(e)
 	_, _ = w.Write(b)

Review comment:
       DONE




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [servicecomb-service-center] tianxiaoliang merged pull request #1103: Feature: Add list self permission API

Posted by GitBox <gi...@apache.org>.
tianxiaoliang merged pull request #1103:
URL: https://github.com/apache/servicecomb-service-center/pull/1103


   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org