usememos/memos
1
1
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-11-10 17:31:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

chore: fix acl interceptor

Browse source
This commit is contained in:
Steven 2023-09-18 21:50:59 +08:00
parent 462f10ab60
commit 2375001453
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
api/v2/acl.go
View file

@ -13,6 +13,7 @@ import (
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
"github.com/usememos/memos/api/auth" "github.com/usememos/memos/api/auth"
"github.com/usememos/memos/common/util"
storepb "github.com/usememos/memos/proto/gen/store" storepb "github.com/usememos/memos/proto/gen/store"
"github.com/usememos/memos/store" "github.com/usememos/memos/store"
) )
@ -103,18 +104,22 @@ func (in *GRPCAuthInterceptor) authenticate(ctx context.Context, accessToken str
) )
} }
username := claims.Name // We either have a valid access token or we will attempt to generate new access token.
userID, err := util.ConvertStringToInt32(claims.Subject)
if err != nil {
return "", errors.Wrap(err, "malformed ID in the token")
}
user, err := in.Store.GetUser(ctx, &store.FindUser{ user, err := in.Store.GetUser(ctx, &store.FindUser{
Username: &username, ID: &userID,
}) })
if err != nil { if err != nil {
return "", errors.Wrap(err, "failed to get user") return "", errors.Wrap(err, "failed to get user")
} }
if user == nil { if user == nil {
return "", errors.Errorf("user %q not exists in the access token", username) return "", errors.Errorf("user %q not exists", userID)
} }
if user.RowStatus == store.Archived { if user.RowStatus == store.Archived {
return "", errors.Errorf("user %q is archived", username) return "", errors.Errorf("user %q is archived", userID)
} }
accessTokens, err := in.Store.GetUserAccessTokens(ctx, user.ID) accessTokens, err := in.Store.GetUserAccessTokens(ctx, user.ID)
@ -125,7 +130,7 @@ func (in *GRPCAuthInterceptor) authenticate(ctx context.Context, accessToken str
return "", status.Errorf(codes.Unauthenticated, "invalid access token") return "", status.Errorf(codes.Unauthenticated, "invalid access token")
} }
return username, nil return user.Username, nil
} }
func getTokenFromMetadata(md metadata.MD) (string, error) { func getTokenFromMetadata(md metadata.MD) (string, error) {