bump reva

Signed-off-by: Christian Richter <crichter@owncloud.com>

vendor/github.com/cs3org/reva/v2/internal/grpc/services/publicshareprovider/publicshareprovider.go

@@ -24,6 +24,10 @@ import (
 
 	rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
 	link "github.com/cs3org/go-cs3apis/cs3/sharing/link/v1beta1"
+	"github.com/mitchellh/mapstructure"
+	"github.com/pkg/errors"
+	"google.golang.org/grpc"
+
 	"github.com/cs3org/reva/v2/pkg/appctx"
 	"github.com/cs3org/reva/v2/pkg/conversions"
 	ctxpkg "github.com/cs3org/reva/v2/pkg/ctx"
@@ -32,9 +36,6 @@ import (
 	"github.com/cs3org/reva/v2/pkg/publicshare/manager/registry"
 	"github.com/cs3org/reva/v2/pkg/rgrpc"
 	"github.com/cs3org/reva/v2/pkg/rgrpc/status"
-	"github.com/mitchellh/mapstructure"
-	"github.com/pkg/errors"
-	"google.golang.org/grpc"
 )
 
 func init() {
@@ -163,15 +164,17 @@ func (s *service) CreatePublicShare(ctx context.Context, req *link.CreatePublicS
 		log.Error().Msg("error getting user from context")
 	}
 
+	res := &link.CreatePublicShareResponse{}
 	share, err := s.sm.CreatePublicShare(ctx, u, req.ResourceInfo, req.Grant)
-	if err != nil {
-		log.Debug().Err(err).Str("createShare", "shares").Msg("error connecting to storage provider")
+	switch {
+	case err != nil:
+		log.Error().Err(err).Interface("request", req).Msg("could not write public share")
+		res.Status = status.NewInternal(ctx, "error persisting public share:"+err.Error())
+	default:
+		res.Status = status.NewOK(ctx)
+		res.Share = share
 	}
 
-	res := &link.CreatePublicShareResponse{
-		Status: status.NewOK(ctx),
-		Share:  share,
-	}
 	return res, nil
 }
 

vendor/github.com/cs3org/reva/v2/internal/grpc/services/usershareprovider/usershareprovider.go

@@ -23,6 +23,7 @@ import (
 	"regexp"
 
 	userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
+	rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
 	collaboration "github.com/cs3org/go-cs3apis/cs3/sharing/collaboration/v1beta1"
 	provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
 	"github.com/mitchellh/mapstructure"
@@ -209,8 +210,15 @@ func (s *service) RemoveShare(ctx context.Context, req *collaboration.RemoveShar
 func (s *service) GetShare(ctx context.Context, req *collaboration.GetShareRequest) (*collaboration.GetShareResponse, error) {
 	share, err := s.sm.GetShare(ctx, req.Ref)
 	if err != nil {
+		var st *rpc.Status
+		switch err.(type) {
+		case errtypes.IsNotFound:
+			st = status.NewNotFound(ctx, err.Error())
+		default:
+			st = status.NewInternal(ctx, err.Error())
+		}
 		return &collaboration.GetShareResponse{
-			Status: status.NewInternal(ctx, "error getting share"),
+			Status: st,
 		}, nil
 	}
 

vendor/github.com/cs3org/reva/v2/internal/http/services/owncloud/ocs/data/capabilities.go

@@ -236,6 +236,7 @@ type CapabilitiesFilesSharingPublic struct {
 	ExpireDate         *CapabilitiesFilesSharingPublicExpireDate `json:"expire_date" xml:"expire_date" mapstructure:"expire_date"`
 	CanEdit            ocsBool                                   `json:"can_edit" xml:"can_edit" mapstructure:"can_edit"`
 	Alias              ocsBool                                   `json:"alias" xml:"alias"`
+	DefaultPermissions int                                       `json:"default_permissions" xml:"default_permissions" mapstructure:"default_permissions"`
 }
 
 // CapabilitiesFilesSharingPublicPassword TODO document

vendor/github.com/cs3org/reva/v2/pkg/mime/mime.go

@@ -322,6 +322,7 @@ var mimeTypes = map[string]string{
 	"geojson":                  "application/geo+json",
 	"gex":                      "application/vnd.geometry-explorer",
 	"ggb":                      "application/vnd.geogebra.file",
+	"ggs":                      "application/vnd.geogebra.slides",
 	"ggt":                      "application/vnd.geogebra.tool",
 	"ghf":                      "application/vnd.groove-help",
 	"gif":                      "image/gif",

vendor/github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/spaces.go

@@ -424,15 +424,15 @@ func (fs *Decomposedfs) ListStorageSpaces(ctx context.Context, filter []*provide
 					continue
 				}
 				// always read link in case storage space id != node id
-				spaceID, nodeID, err = ReadSpaceAndNodeFromIndexLink(match)
+				linkSpaceID, linkNodeID, err := ReadSpaceAndNodeFromIndexLink(match)
 				if err != nil {
 					appctx.GetLogger(ctx).Error().Err(err).Str("match", match).Msg("could not read link, skipping")
 					continue
 				}
 
-				n, err := node.ReadNode(ctx, fs.lu, spaceID, nodeID, true, nil, true)
+				n, err := node.ReadNode(ctx, fs.lu, linkSpaceID, linkNodeID, true, nil, true)
 				if err != nil {
-					appctx.GetLogger(ctx).Error().Err(err).Str("id", nodeID).Msg("could not read node, skipping")
+					appctx.GetLogger(ctx).Error().Err(err).Str("id", linkNodeID).Msg("could not read node, skipping")
 					continue
 				}
 
@@ -448,7 +448,7 @@ func (fs *Decomposedfs) ListStorageSpaces(ctx context.Context, filter []*provide
 					case errtypes.NotFound:
 						// ok
 					default:
-						appctx.GetLogger(ctx).Error().Err(err).Str("id", nodeID).Msg("could not convert to storage space")
+						appctx.GetLogger(ctx).Error().Err(err).Str("id", linkNodeID).Msg("could not convert to storage space")
 					}
 					continue
 				}