Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport Virusscan Data #4673

Merged
merged 2 commits into from
May 3, 2024
Merged

Backport Virusscan Data #4673

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66039c2
feat(decomposedfs): allow filtering sessions for viruses
kobergj May 2, 2024
a26c929
fix(changelog): adjust changelog
kobergj May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog/unreleased/add-virus-filter.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/4672
kobergj marked this conversation as resolved.
Show resolved Hide resolved
1 change: 1 addition & 0 deletions pkg/storage/uploads.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,5 @@ type UploadSessionFilter struct {
ID *string
Processing *bool
Expired *bool
HasVirus *bool
}
7 changes: 7 additions & 0 deletions pkg/storage/utils/decomposedfs/upload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading