lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-23 00:25:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

generate jwt token when looking up needle id

Browse Source 
fix https://github.com/seaweedfs/seaweedfs/issues/4577
This commit is contained in:
chrislu
2023-06-17 00:11:23 -07:00
parent 75f7893c11
commit 94fbf02ea2
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
weed/server/master_grpc_server_volume.go
View File

@@ -82,7 +82,13 @@ func (ms *MasterServer) LookupVolume(ctx context.Context, req *master_pb.LookupV
resp := &master_pb.LookupVolumeResponse{} resp := &master_pb.LookupVolumeResponse{}
volumeLocations := ms.lookupVolumeId(req.VolumeOrFileIds, req.Collection) volumeLocations := ms.lookupVolumeId(req.VolumeOrFileIds, req.Collection)
for _, result := range volumeLocations { for _, volumeOrFileId := range req.VolumeOrFileIds {
vid := volumeOrFileId
commaSep := strings.Index(vid, ",")
if commaSep > 0 {
vid = vid[0:commaSep]
}
if result, found := volumeLocations[vid]; found {
var locations []*master_pb.Location var locations []*master_pb.Location
for _, loc := range result.Locations { for _, loc := range result.Locations {
locations = append(locations, &master_pb.Location{ locations = append(locations, &master_pb.Location{
@@ -92,7 +98,7 @@ func (ms *MasterServer) LookupVolume(ctx context.Context, req *master_pb.LookupV
}) })
} }
var auth string var auth string
if strings.Contains(result.VolumeOrFileId, ",") { // this is a file id if commaSep > 0 { // this is a file id
auth = string(security.GenJwtForVolumeServer(ms.guard.SigningKey, ms.guard.ExpiresAfterSec, result.VolumeOrFileId)) auth = string(security.GenJwtForVolumeServer(ms.guard.SigningKey, ms.guard.ExpiresAfterSec, result.VolumeOrFileId))
} }
resp.VolumeIdLocations = append(resp.VolumeIdLocations, &master_pb.LookupVolumeResponse_VolumeIdLocation{ resp.VolumeIdLocations = append(resp.VolumeIdLocations, &master_pb.LookupVolumeResponse_VolumeIdLocation{
@@ -102,6 +108,7 @@ func (ms *MasterServer) LookupVolume(ctx context.Context, req *master_pb.LookupV
Auth: auth, Auth: auth,
}) })
} }
}
return resp, nil return resp, nil
} }