Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

fix: list token for others failed (#2440)

Athurg Gooth043357d7dc4f
diff --git a/api/v2/user_service.go b/api/v2/user_service.go
index 40a589a57..9d2cda269 100644
--- a/api/v2/user_service.go
+++ b/api/v2/user_service.go
@@ -160,12 +160,23 @@ func (s *UserService) ListUserAccessTokens(ctx context.Context, request *apiv2pb
return nil, status.Errorf(codes.PermissionDenied, "permission denied")
}
- // Normal users can only list their access tokens.
- if user.Role == store.RoleUser && user.Username != request.Username {
- return nil, status.Errorf(codes.PermissionDenied, "permission denied")
+ userID := user.ID
+ // List access token for other users need to be verified.
+ if user.Username != request.Username {
+ // Normal users can only list their access tokens.
+ if user.Role == store.RoleUser {
+ return nil, status.Errorf(codes.PermissionDenied, "permission denied")
+ }
+
+ // The request user must be exist.
+ requestUser, err := s.Store.GetUser(ctx, &store.FindUser{Username: &request.Username})
+ if requestUser == nil || err != nil {
+ return nil, status.Errorf(codes.NotFound, "fail to find user %s", request.Username)
+ }
+ userID = requestUser.ID
}
- userAccessTokens, err := s.Store.GetUserAccessTokens(ctx, user.ID)
+ userAccessTokens, err := s.Store.GetUserAccessTokens(ctx, userID)
if err != nil {
return nil, status.Errorf(codes.Internal, "failed to list access tokens: %v", err)
}