make exclude denials configurable

Moved the exclude denials filter to the ocs layer so that it's still possible to get rejected shares from the usershareprovider

internal/grpc/services/usershareprovider/usershareprovider.go

@@ -187,17 +187,6 @@ func (s *service) UpdateShare(ctx context.Context, req *collaboration.UpdateShar
 }
 
 func (s *service) ListReceivedShares(ctx context.Context, req *collaboration.ListReceivedSharesRequest) (*collaboration.ListReceivedSharesResponse, error) {
-	// For the UI add a filter to not display the denial shares
-	foundExclude := false
-	for _, f := range req.Filters {
-		if f.Type == collaboration.Filter_TYPE_EXCLUDE_DENIALS {
-			foundExclude = true
-			break
-		}
-	}
-	if !foundExclude {
-		req.Filters = append(req.Filters, &collaboration.Filter{Type: collaboration.Filter_TYPE_EXCLUDE_DENIALS})
-	}
 	shares, err := s.sm.ListReceivedShares(ctx, req.Filters) // TODO(labkode): check what to update
 	if err != nil {
 		return &collaboration.ListReceivedSharesResponse{

internal/http/services/owncloud/ocs/config/config.go

@@ -32,6 +32,7 @@ type Config struct {
 	DefaultUploadProtocol   string                            `mapstructure:"default_upload_protocol"`
 	UserAgentChunkingMap    map[string]string                 `mapstructure:"user_agent_chunking_map"`
 	SharePrefix             string                            `mapstructure:"share_prefix"`
+	ShowRejectedShares      bool                              `mapstructure:"show_rejected_shares"`
 	HomeNamespace           string                            `mapstructure:"home_namespace"`
 	AdditionalInfoAttribute string                            `mapstructure:"additional_info_attribute"`
 	CacheWarmupDriver       string                            `mapstructure:"cache_warmup_driver"`

internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go

@@ -68,6 +68,7 @@ type Handler struct {
 	publicURL              string
 	sharePrefix            string
 	homeNamespace          string
+	showRejectedShares     bool
 	additionalInfoTemplate *template.Template
 	userIdentifierCache    *ttlcache.Cache
 	resourceInfoCache      gcache.Cache
@@ -96,6 +97,7 @@ func (h *Handler) Init(c *config.Config) {
 	h.homeNamespace = c.HomeNamespace
 	h.resourceInfoCache = gcache.New(c.ResourceInfoCacheSize).LFU().Build()
 	h.resourceInfoCacheTTL = time.Second * time.Duration(c.ResourceInfoCacheTTL)
+	h.showRejectedShares = c.ShowRejectedShares
 
 	h.additionalInfoTemplate, _ = template.New("additionalInfo").Parse(c.AdditionalInfoAttribute)
 
@@ -544,8 +546,7 @@ func (h *Handler) listSharesWithMe(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	}
-
-	filters := []*collaboration.Filter{}
+	var filters []*collaboration.Filter
 	var shareTypes []string
 	shareTypesParam := r.URL.Query().Get("share_types")
 	if shareTypesParam != "" {
@@ -573,6 +574,9 @@ func (h *Handler) listSharesWithMe(w http.ResponseWriter, r *http.Request) {
 		response.WriteOCSSuccess(w, r, []*conversions.ShareData{})
 		return
 	}
+	if !h.showRejectedShares {
+		filters = append(filters, share.ExcludeDenialsFilter())
+	}
 
 	lrsRes, err := client.ListReceivedShares(ctx, &collaboration.ListReceivedSharesRequest{Filters: filters})
 	if err != nil {

pkg/share/share.go

@@ -117,3 +117,10 @@ func MatchesFilter(share *collaboration.Share, filter *collaboration.Filter) boo
 		return false
 	}
 }
+
+// ExcludeDenialsFilter returns the collaboration filter to not list rejected shares.
+func ExcludeDenialsFilter() *collaboration.Filter {
+	return &collaboration.Filter{
+		Type: collaboration.Filter_TYPE_EXCLUDE_DENIALS,
+	}
+}

tests/oc-integration-tests/drone/frontend.toml

@@ -61,6 +61,7 @@ files_namespace = "/oc"
 webdav_namespace = "/home"
 
 [http.services.ocs]
+show_rejected_shares = true
 
 [http.services.ocs.capabilities.capabilities.core.status]
 version = "10.0.11.5"

tests/oc-integration-tests/local/frontend.toml

@@ -61,6 +61,7 @@ files_namespace = "/users"
 webdav_namespace = "/home"
 
 [http.services.ocs]
+show_rejected_shares = true
 
 [http.services.ocs.capabilities.capabilities.core.status]
 version = "10.0.11.5"