Fix webdav file versions endpoint bugs (cs3org#1526)

changelog/unreleased/fix_file_versions.md

@@ -0,0 +1,6 @@
+Bugfix: Fix webdav file versions endpoint bugs
+
+Etag and error code related bugs have been fixed for the webdav file versions endpoint and removed from the expected failures file.
+
+
+https://github.com/cs3org/reva/pull/1526

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/cheggaaa/pb v1.0.29
 	github.com/coreos/go-oidc v2.2.1+incompatible
 	github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e
-	github.com/cs3org/go-cs3apis v0.0.0-20210310133342-f4a10134033c
+	github.com/cs3org/go-cs3apis v0.0.0-20210316113645-e4a74cb8761c
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/eventials/go-tus v0.0.0-20200718001131-45c7ec8f5d59
 	github.com/ffurano/grpc-proto v0.0.0-20210312134900-65801a1ca184

internal/grpc/services/storageregistry/storageregistry.go

@@ -108,31 +108,38 @@ func (s *service) ListStorageProviders(ctx context.Context, req *registrypb.List
 		}, nil
 	}
 
+	providers := make([]*registrypb.ProviderInfo, 0, len(pinfos))
+	for _, info := range pinfos {
+		fill(info)
+		providers = append(providers, info)
+	}
+
 	res := &registrypb.ListStorageProvidersResponse{
 		Status:    status.NewOK(ctx),
-		Providers: pinfos,
+		Providers: providers,
 	}
 	return res, nil
 }
 
-func (s *service) GetStorageProviders(ctx context.Context, req *registrypb.GetStorageProvidersRequest) (*registrypb.GetStorageProvidersResponse, error) {
-	p, err := s.reg.FindProviders(ctx, req.Ref)
+func (s *service) GetStorageProvider(ctx context.Context, req *registrypb.GetStorageProviderRequest) (*registrypb.GetStorageProviderResponse, error) {
+	p, err := s.reg.FindProvider(ctx, req.Ref)
 	if err != nil {
 		switch err.(type) {
 		case errtypes.IsNotFound:
-			return &registrypb.GetStorageProvidersResponse{
+			return &registrypb.GetStorageProviderResponse{
 				Status: status.NewNotFound(ctx, err.Error()),
 			}, nil
 		default:
-			return &registrypb.GetStorageProvidersResponse{
+			return &registrypb.GetStorageProviderResponse{
 				Status: status.NewInternal(ctx, err, "error finding storage provider"),
 			}, nil
 		}
 	}
 
-	res := &registrypb.GetStorageProvidersResponse{
-		Status:    status.NewOK(ctx),
-		Providers: p,
+	fill(p)
+	res := &registrypb.GetStorageProviderResponse{
+		Status:   status.NewOK(ctx),
+		Provider: p,
 	}
 	return res, nil
 }
@@ -154,3 +161,6 @@ func (s *service) GetHome(ctx context.Context, req *registrypb.GetHomeRequest) (
 	}
 	return res, nil
 }
+
+// TODO(labkode): fix
+func fill(p *registrypb.ProviderInfo) {}

internal/http/services/owncloud/ocdav/versions.go

@@ -46,6 +46,11 @@ func (h *VersionsHandler) Handler(s *svc, rid *provider.ResourceId) http.Handler
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
 
+		if rid == (*provider.ResourceId)(nil) {
+			http.Error(w, "404 Not Found", http.StatusNotFound)
+			return
+		}
+
 		// baseURI is encoded as part of the response payload in href field
 		baseURI := path.Join(ctx.Value(ctxKeyBaseURI).(string), wrapResourceID(rid))
 		ctx = context.WithValue(ctx, ctxKeyBaseURI, baseURI)
@@ -130,17 +135,6 @@ func (h *VersionsHandler) doListVersions(w http.ResponseWriter, r *http.Request,
 	// add version dir . entry, derived from file info
 	infos = append(infos, &provider.ResourceInfo{
 		Type: provider.ResourceType_RESOURCE_TYPE_CONTAINER,
-		Id: &provider.ResourceId{
-			StorageId: "virtual", // this is a virtual storage
-			OpaqueId:  path.Join("meta", wrapResourceID(rid), "v"),
-		},
-		Etag:     info.Etag,
-		MimeType: "httpd/unix-directory",
-		Mtime:    info.Mtime,
-		Path:     "v",
-		// PermissionSet
-		Size:  0,
-		Owner: info.Owner,
 	})
 
 	for i := range versions {
@@ -153,7 +147,7 @@ func (h *VersionsHandler) doListVersions(w http.ResponseWriter, r *http.Request,
 				OpaqueId:  info.Id.OpaqueId + "@" + versions[i].GetKey(),
 			},
 			// Checksum
-			// Etag: v.ETag,
+			Etag: versions[i].Etag,
 			// MimeType
 			Mtime: &types.Timestamp{
 				Seconds: versions[i].Mtime,

pkg/storage/fs/owncloud/owncloud.go

@@ -1950,6 +1950,7 @@ func (fs *ocfs) filterAsRevision(ctx context.Context, bn string, md os.FileInfo)
 			Key:   version,
 			Size:  uint64(md.Size()),
 			Mtime: uint64(mtime),
+			Etag:  calcEtag(ctx, md),
 		}
 	}
 	return nil