torjus/ezshare
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Merge pull request 'Fix delete panic' (#27) from 26-delete-panic into master

Browse Source 
Reviewed-on: https://gitea.benny.dog/torjus/ezshare/pulls/27
This commit is contained in:
Torjus Håkestad 2021-12-08 14:49:42 +00:00
commit 2f7676b35e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/fileservice.go
View File

@ -106,7 +106,11 @@ func (s *GRPCFileServiceServer) DeleteFile(ctx context.Context, req *pb.DeleteFi
// Ensure owner of file or admin // Ensure owner of file or admin
f, err := s.store.GetFile(req.Id) f, err := s.store.GetFile(req.Id)
if err != nil { if err != nil {
if err == store.ErrNoSuchItem {
return nil, status.Error(codes.NotFound, "no such file")
}
s.Logger.Warnw("Error getting file.", "error", err) s.Logger.Warnw("Error getting file.", "error", err)
return nil, status.Errorf(codes.Internal, "error getting file: %s", err)
} }
if !(f.Metadata.Owner == interceptors.UserIDFromContext(ctx) || interceptors.RoleFromContext(ctx) == pb.User_ADMIN) { if !(f.Metadata.Owner == interceptors.UserIDFromContext(ctx) || interceptors.RoleFromContext(ctx) == pb.User_ADMIN) {
return nil, status.Error(codes.PermissionDenied, "permission denied") return nil, status.Error(codes.PermissionDenied, "permission denied")