totole/services
1
0
Fork 0
mirror of https://github.com/kevin-DL/services.git synced 2026-01-11 10:54:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix data for spaces API (#384)

Browse Source
This commit is contained in:
Dominic Wong
2022-02-21 14:04:47 +00:00
committed by GitHub
parent b42acc2ed3
commit ce82de67b0
1 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
space/handler/space.go
View File

@@ -225,7 +225,7 @@ func (s Space) List(ctx context.Context, request *pb.ListRequest, response *pb.L
}
recs, err := store.Read(fmt.Sprintf("%s/%s", prefixByUser, objectName), store.ReadPrefix())
if err != nil {
if err != nil && err != store.ErrNotFound {
log.Errorf("Error listing objects %s", err)
return errors.InternalServerError(method, "Error listing objects")
}
@@ -285,10 +285,16 @@ func (s Space) Head(ctx context.Context, request *pb.HeadRequest, response *pb.H
}
md, err := s.objectMeta(objectName)
if err != nil {
if err != nil && err != store.ErrNotFound {
log.Errorf("Error reading object meta %s", err)
return errors.InternalServerError(method, "Error reading object")
}
if md == nil {
md, err = s.reconstructMeta(ctx, method, objectName, *goo.LastModified)
if err != nil {
return err
}
}
url := ""
if md.Visibility == visibilityPublic {
@@ -338,7 +344,7 @@ func (s *Space) Read(ctx context.Context, req *pb.ReadRequest, rsp *pb.ReadRespo
})
if err != nil {
aerr, ok := err.(awserr.Error)
if ok && aerr.Code() == "NotSuchKey" {
if ok && aerr.Code() == "NoSuchKey" {
return errors.BadRequest(method, "Object not found")
}
log.Errorf("Error s3 %s", err)
@@ -346,10 +352,16 @@ func (s *Space) Read(ctx context.Context, req *pb.ReadRequest, rsp *pb.ReadRespo
}
md, err := s.objectMeta(objectName)
if err != nil {
if err != nil && err != store.ErrNotFound {
log.Errorf("Error reading meta %s", err)
return errors.InternalServerError(method, "Error reading object")
}
if md == nil {
md, err = s.reconstructMeta(ctx, method, objectName, *goo.LastModified)
if err != nil {
return err
}
}
url := ""
if md.Visibility == visibilityPublic {
@@ -377,6 +389,44 @@ func (s *Space) Read(ctx context.Context, req *pb.ReadRequest, rsp *pb.ReadRespo
return nil
}
func (s *Space) reconstructMeta(ctx context.Context, method, objectName string, lastMod time.Time) (*meta, error) {
aclo, err := s.client.GetObjectAcl(&sthree.GetObjectAclInput{
Bucket: aws.String(s.conf.SpaceName),
Key: aws.String(objectName),
})
if err != nil {
aerr, ok := err.(awserr.Error)
if ok && aerr.Code() == "NotFound" {
return nil, errors.BadRequest(method, "Object not found")
}
log.Errorf("Error s3 %s", err)
return nil, errors.InternalServerError(method, "Error reading object")
}
vis := visibilityPrivate
for _, v := range aclo.Grants {
if v.Grantee != nil &&
v.Grantee.URI != nil && *(v.Grantee.URI) == "http://acs.amazonaws.com/groups/global/AllUsers" &&
v.Permission != nil && *(v.Permission) == "READ" {
vis = visibilityPublic
break
}
}
md := &meta{
Visibility: vis,
CreateTime: lastMod.Format(time.RFC3339Nano),
ModifiedTime: lastMod.Format(time.RFC3339Nano),
}
// store the metadata for easy retrieval for listing
if err := store.Write(store.NewRecord(fmt.Sprintf("%s/%s", prefixByUser, objectName), md)); err != nil {
log.Errorf("Error writing object to store %s", err)
return nil, errors.InternalServerError(method, "Error reading object")
}
return md, nil
}
func (s *Space) Download(ctx context.Context, req *api.Request, rsp *api.Response) error {
method := "space.Download"
tnt, ok := tenant.FromContext(ctx)