Merge pull request #4673 from kobergj/BackportVirusscanData

Backport Virusscan Data
cs3org · May 3, 2024 · 86d3f52 · 86d3f52
2 parents 6e9976b + a26c929
commit 86d3f52
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/changelog/unreleased/add-virus-filter.md b/changelog/unreleased/add-virus-filter.md
@@ -0,0 +1,5 @@
+Enhancement: Add virus filter to list uploads sessions
+
+Adds a filter for filtering for infected uploads
+
+https://github.com/cs3org/reva/pull/4673
diff --git a/pkg/storage/uploads.go b/pkg/storage/uploads.go
@@ -86,4 +86,5 @@ type UploadSessionFilter struct {
 	ID         *string
 	Processing *bool
 	Expired    *bool
+	HasVirus   *bool
 }
diff --git a/pkg/storage/utils/decomposedfs/upload.go b/pkg/storage/utils/decomposedfs/upload.go
@@ -376,6 +376,13 @@ func (fs *Decomposedfs) ListUploadSessions(ctx context.Context, filter storage.U
 				}
 			}
 		}
+		if filter.HasVirus != nil {
+			sr, _ := session.ScanData()
+			infected := sr != ""
+			if *filter.HasVirus != infected {
+				continue
+			}
+		}
 		filteredSessions = append(filteredSessions, session)
 	}
 	return filteredSessions, nil