Revert "add filter-files to the dav REPORT API (cs3org#2071)"

This reverts commit df33e69.

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

@@ -35,15 +35,11 @@ import (
 	provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
 	"github.com/cs3org/reva/pkg/appctx"
 	ctxpkg "github.com/cs3org/reva/pkg/ctx"
-	"github.com/cs3org/reva/pkg/errtypes"
 	"github.com/cs3org/reva/pkg/rgrpc/todo/pool"
 	"github.com/cs3org/reva/pkg/rhttp"
 	"github.com/cs3org/reva/pkg/rhttp/global"
 	"github.com/cs3org/reva/pkg/rhttp/router"
 	"github.com/cs3org/reva/pkg/sharedconf"
-	"github.com/cs3org/reva/pkg/storage"
-	"github.com/cs3org/reva/pkg/storage/favorite"
-	"github.com/cs3org/reva/pkg/storage/fs/registry"
 	"github.com/cs3org/reva/pkg/storage/utils/templates"
 	"github.com/mitchellh/mapstructure"
 	"github.com/pkg/errors"
@@ -101,13 +97,11 @@ type Config struct {
 	// Example: if WebdavNamespace is /users/{{substr 0 1 .Username}}/{{.Username}}
 	// and received path is /docs the internal path will be:
 	// /users/<first char of username>/<username>/docs
-	WebdavNamespace string                            `mapstructure:"webdav_namespace"`
-	GatewaySvc      string                            `mapstructure:"gatewaysvc"`
-	Timeout         int64                             `mapstructure:"timeout"`
-	Insecure        bool                              `mapstructure:"insecure"`
-	PublicURL       string                            `mapstructure:"public_url"`
-	Driver          string                            `mapstructure:"driver"`
-	Drivers         map[string]map[string]interface{} `mapstructure:"drivers" docs:"url:pkg/storage/fs/localhome/localhome.go"`
+	WebdavNamespace string `mapstructure:"webdav_namespace"`
+	GatewaySvc      string `mapstructure:"gatewaysvc"`
+	Timeout         int64  `mapstructure:"timeout"`
+	Insecure        bool   `mapstructure:"insecure"`
+	PublicURL       string `mapstructure:"public_url"`
 }
 
 func (c *Config) init() {
@@ -116,18 +110,10 @@ func (c *Config) init() {
 }
 
 type svc struct {
-	c                *Config
-	webDavHandler    *WebDavHandler
-	davHandler       *DavHandler
-	favoritesManager favorite.Manager
-	client           *http.Client
-}
-
-func getFS(c *Config) (storage.FS, error) {
-	if f, ok := registry.NewFuncs[c.Driver]; ok {
-		return f(c.Drivers[c.Driver])
-	}
-	return nil, errtypes.NotFound("driver not found: " + c.Driver)
+	c             *Config
+	webDavHandler *WebDavHandler
+	davHandler    *DavHandler
+	client        *http.Client
 }
 
 // New returns a new ocdav
@@ -139,11 +125,6 @@ func New(m map[string]interface{}, log *zerolog.Logger) (global.Service, error)
 
 	conf.init()
 
-	fs, err := getFS(conf)
-	if err != nil {
-		return nil, err
-	}
-
 	s := &svc{
 		c:             conf,
 		webDavHandler: new(WebDavHandler),
@@ -152,7 +133,6 @@ func New(m map[string]interface{}, log *zerolog.Logger) (global.Service, error)
 			rhttp.Timeout(time.Duration(conf.Timeout*int64(time.Second))),
 			rhttp.Insecure(conf.Insecure),
 		),
-		favoritesManager: favorite.NewInMemoryManager(fs),
 	}
 	// initialize handlers and set default configs
 	if err := s.webDavHandler.init(conf.WebdavNamespace, true); err != nil {

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

@@ -134,7 +134,7 @@ func (s *svc) handleSpacesPropfind(w http.ResponseWriter, r *http.Request, space
 }
 
 func (s *svc) propfindResponse(ctx context.Context, w http.ResponseWriter, r *http.Request, namespace string, pf propfindXML, parentInfo *provider.ResourceInfo, resourceInfos []*provider.ResourceInfo, log zerolog.Logger) {
-	propRes, err := s.multistatusResponse(ctx, &pf, resourceInfos, namespace)
+	propRes, err := s.formatPropfind(ctx, &pf, resourceInfos, namespace)
 	if err != nil {
 		log.Error().Err(err).Msg("error formatting propfind")
 		w.WriteHeader(http.StatusInternalServerError)
@@ -342,7 +342,7 @@ func readPropfind(r io.Reader) (pf propfindXML, status int, err error) {
 	return pf, 0, nil
 }
 
-func (s *svc) multistatusResponse(ctx context.Context, pf *propfindXML, mds []*provider.ResourceInfo, ns string) (string, error) {
+func (s *svc) formatPropfind(ctx context.Context, pf *propfindXML, mds []*provider.ResourceInfo, ns string) (string, error) {
 	responses := make([]*responseXML, 0, len(mds))
 	for i := range mds {
 		res, err := s.mdToPropResponse(ctx, pf, mds[i], ns)

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

@@ -30,7 +30,6 @@ import (
 	rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1"
 	provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1"
 	"github.com/cs3org/reva/pkg/appctx"
-	ctxpkg "github.com/cs3org/reva/pkg/ctx"
 	rtrace "github.com/cs3org/reva/pkg/trace"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog"
@@ -233,19 +232,6 @@ func (s *svc) handleProppatch(ctx context.Context, w http.ResponseWriter, r *htt
 					HandleErrorStatus(&log, w, res.Status)
 					return nil, nil, false
 				}
-				if key == "http://owncloud.org/ns/favorite" {
-					statRes, err := c.Stat(ctx, &provider.StatRequest{Ref: ref})
-					if err != nil {
-						w.WriteHeader(http.StatusInternalServerError)
-						return nil, nil, false
-					}
-					currentUser := ctxpkg.ContextMustGetUser(ctx)
-					err = s.favoritesManager.UnsetFavorite(ctx, currentUser.Id, statRes.Info.Id)
-					if err != nil {
-						w.WriteHeader(http.StatusInternalServerError)
-						return nil, nil, false
-					}
-				}
 				removedProps = append(removedProps, propNameXML)
 			} else {
 				sreq.ArbitraryMetadata.Metadata[key] = value
@@ -273,20 +259,6 @@ func (s *svc) handleProppatch(ctx context.Context, w http.ResponseWriter, r *htt
 
 				acceptedProps = append(acceptedProps, propNameXML)
 				delete(sreq.ArbitraryMetadata.Metadata, key)
-
-				if key == "http://owncloud.org/ns/favorite" {
-					statRes, err := c.Stat(ctx, &provider.StatRequest{Ref: ref})
-					if err != nil {
-						w.WriteHeader(http.StatusInternalServerError)
-						return nil, nil, false
-					}
-					currentUser := ctxpkg.ContextMustGetUser(ctx)
-					err = s.favoritesManager.SetFavorite(ctx, currentUser.Id, statRes.Info.Id)
-					if err != nil {
-						w.WriteHeader(http.StatusInternalServerError)
-						return nil, nil, false
-					}
-				}
 			}
 		}
 		// FIXME: in case of error, need to set all properties back to the original state,

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

@@ -186,7 +186,7 @@ func (s *svc) handlePropfindOnToken(w http.ResponseWriter, r *http.Request, ns s
 
 	infos := s.getPublicFileInfos(onContainer, depth == "0", tokenStatInfo)
 
-	propRes, err := s.multistatusResponse(ctx, &pf, infos, ns)
+	propRes, err := s.formatPropfind(ctx, &pf, infos, ns)
 	if err != nil {
 		sublog.Error().Err(err).Msg("error formatting propfind")
 		w.WriteHeader(http.StatusInternalServerError)

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

@@ -24,12 +24,6 @@ import (
 	"net/http"
 
 	"github.com/cs3org/reva/pkg/appctx"
-	ctxpkg "github.com/cs3org/reva/pkg/ctx"
-)
-
-const (
-	elementNameSearchFiles = "search-files"
-	elementNameFilterFiles = "filter-files"
 )
 
 func (s *svc) handleReport(w http.ResponseWriter, r *http.Request, ns string) {
@@ -48,11 +42,6 @@ func (s *svc) handleReport(w http.ResponseWriter, r *http.Request, ns string) {
 		return
 	}
 
-	if rep.FilterFiles != nil {
-		s.doFilterFiles(w, r, rep.FilterFiles, ns)
-		return
-	}
-
 	// TODO(jfd): implement report
 
 	w.WriteHeader(http.StatusNotImplemented)
@@ -70,39 +59,9 @@ func (s *svc) doSearchFiles(w http.ResponseWriter, r *http.Request, sf *reportSe
 	w.WriteHeader(http.StatusNotImplemented)
 }
 
-func (s *svc) doFilterFiles(w http.ResponseWriter, r *http.Request, ff *reportFilterFiles, namespace string) {
-	ctx := r.Context()
-	log := appctx.GetLogger(ctx)
-
-	if ff.Rules.Favorite {
-		// List the users favorite resources.
-		currentUser := ctxpkg.ContextMustGetUser(ctx)
-		favorites, err := s.favoritesManager.ListFavorites(ctx, currentUser.Id)
-		if err != nil {
-			log.Error().Err(err).Msg("error getting favorites")
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-
-		responsesXML, err := s.multistatusResponse(ctx, &propfindXML{Prop: ff.Prop}, favorites, namespace)
-		if err != nil {
-			log.Error().Err(err).Msg("error formatting propfind")
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-		w.Header().Set(HeaderDav, "1, 3, extended-mkcol")
-		w.Header().Set(HeaderContentType, "application/xml; charset=utf-8")
-		w.WriteHeader(http.StatusMultiStatus)
-		if _, err := w.Write([]byte(responsesXML)); err != nil {
-			log.Err(err).Msg("error writing response")
-		}
-	}
-}
-
 type report struct {
 	SearchFiles *reportSearchFiles
 	// FilterFiles TODO add this for tag based search
-	FilterFiles *reportFilterFiles `xml:"filter-files"`
 }
 type reportSearchFiles struct {
 	XMLName xml.Name                `xml:"search-files"`
@@ -116,18 +75,6 @@ type reportSearchFilesSearch struct {
 	Offset  int    `xml:"offset"`
 }
 
-type reportFilterFiles struct {
-	XMLName xml.Name               `xml:"filter-files"`
-	Lang    string                 `xml:"xml:lang,attr,omitempty"`
-	Prop    propfindProps          `xml:"DAV: prop"`
-	Rules   reportFilterFilesRules `xml:"filter-rules"`
-}
-
-type reportFilterFilesRules struct {
-	Favorite  bool `xml:"favorite"`
-	SystemTag int  `xml:"systemtag"`
-}
-
 func readReport(r io.Reader) (rep *report, status int, err error) {
 	decoder := xml.NewDecoder(r)
 	rep = &report{}
@@ -142,20 +89,13 @@ func readReport(r io.Reader) (rep *report, status int, err error) {
 		}
 
 		if v, ok := t.(xml.StartElement); ok {
-			if v.Name.Local == elementNameSearchFiles {
+			if v.Name.Local == "search-files" {
 				var repSF reportSearchFiles
 				err = decoder.DecodeElement(&repSF, &v)
 				if err != nil {
 					return nil, http.StatusBadRequest, err
 				}
 				rep.SearchFiles = &repSF
-			} else if v.Name.Local == elementNameFilterFiles {
-				var repFF reportFilterFiles
-				err = decoder.DecodeElement(&repFF, &v)
-				if err != nil {
-					return nil, http.StatusBadRequest, err
-				}
-				rep.FilterFiles = &repFF
 			}
 		}
 	}

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

@@ -164,7 +164,7 @@ func (h *VersionsHandler) doListVersions(w http.ResponseWriter, r *http.Request,
 		infos = append(infos, vi)
 	}
 
-	propRes, err := s.multistatusResponse(ctx, &pf, infos, "")
+	propRes, err := s.formatPropfind(ctx, &pf, infos, "")
 	if err != nil {
 		sublog.Error().Err(err).Msg("error formatting propfind")
 		w.WriteHeader(http.StatusInternalServerError)