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

fix content-dispostion header in dav #4498

Merged
merged 3 commits into from
Feb 6, 2024
Merged

fix content-dispostion header in dav #4498

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a432c00
fix content-dispostion header in dav
dragonchaser Feb 6, 2024
a0cd76a
Add expected failures
dragonchaser Feb 6, 2024
427bc57
adjust expected-failures for content-disposition header fix
phil-davis Feb 6, 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
6 changes: 6 additions & 0 deletions changelog/unreleased/fix-content-disposition-header.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bugfix: Fix Content-Disposition header in dav

We have added missing quotes to the Content-Disposition header in the dav service. This fixes an issue with files containing special characters in their names.

https://github.com/cs3org/reva/pull/4498
https://github.com/owncloud/ocis/issues/8361
2 changes: 1 addition & 1 deletion internal/http/services/owncloud/ocdav/net/builders.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (

// ContentDispositionAttachment builds a ContentDisposition Attachment header with various filename encodings
func ContentDispositionAttachment(filename string) string {
return "attachment; filename*=UTF-8''" + filename + "; filename=\"" + filename + "\""
return "attachment; filename*=UTF-8''\"" + filename + "\"; filename=\"" + filename + "\""
}

// RFC1123Z formats a CS3 Timestamp to be used in HTTP headers like Last-Modified
Expand Down
5 changes: 5 additions & 0 deletions tests/acceptance/expected-failures-on-OCIS-storage.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,5 +287,10 @@ _The below features have been added after I last categorized them. AFAICT they a
- [coreApiWebdavMove2/moveFile.feature:121](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveFile.feature#L121)
- [coreApiWebdavMove2/moveFile.feature:126](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveFile.feature#L126)

### [Fix Content-Dispositon header for download requests](
- [coreApiVersions/fileVersions.feature:158](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L158)
- [coreApiVersions/fileVersions.feature:176](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L176)
)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should fix the expected-failure file

Suggested change
### [Fix Content-Dispositon header for download requests](
- [coreApiVersions/fileVersions.feature:158](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L158)
- [coreApiVersions/fileVersions.feature:176](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L176)
)
### [Fix Content-Dispositon header for download requests](https://github.com/cs3org/reva/pull/4498)
- [coreApiVersions/fileVersions.feature:158](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L158)
- [coreApiVersions/fileVersions.feature:176](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L176)


- Note: always have an empty line at the end of this file.
The bash script that processes this file may not process a scenario reference on the last line.
4 changes: 4 additions & 0 deletions tests/acceptance/expected-failures-on-S3NG-storage.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,5 +290,9 @@ _The below features have been added after I last categorized them. AFAICT they a
- [coreApiWebdavMove2/moveFile.feature:121](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveFile.feature#L121)
- [coreApiWebdavMove2/moveFile.feature:126](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveFile.feature#L126)

### [Fix Content-Dispositon header for download requests](
- [coreApiVersions/fileVersions.feature:158](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L158)
- [coreApiVersions/fileVersions.feature:176](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L176)

Note: always have an empty line at the end of this file.
The bash script that processes this file may not process a scenario reference on the last line.
Loading