Skip to content

[stable20] Fixes for naughty filenames #872

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

Merged
skjnldsv merged 5 commits into from
May 3, 2021
Merged

[stable20] Fixes for naughty filenames #872

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e255eed
tests: Add tests for naughty filenames
beardhatcode Apr 18, 2021
43433b0
fix: Properly encode the DAV path
beardhatcode Apr 18, 2021
66a1f84
Bump webdav: 3.3.0 -> 3.6.2 to fix encoding bug
beardhatcode May 2, 2021
a2826c2
fix: make cypress create user more informative
beardhatcode Apr 19, 2021
d417304
tests: stop oddname prematurely if too many fails
beardhatcode Apr 30, 2021
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
Prev Previous commit
Next Next commit
fix: Properly encode the DAV path 
This change is based on 85f6806

Signed-off-by: Robbert Gurdeep Singh <[email protected]>

Use encodeFilePath as it is availible

Signed-off-by: Robbert Gurdeep Singh <[email protected]>
  • Loading branch information
@beardhatcode
beardhatcode committed May 2, 2021
commit 43433b0e8e7c6a4a1aec151ddd562851f9a1f474
16 changes: 8 additions & 8 deletions js/viewer-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/viewer-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/mixins/PreviewUrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ export default {
// TODO: allow proper dav access without the need of basic auth
// https://github.com/nextcloud/server/issues/19700
if (isPublic()) {
return generateUrl(`/s/${getToken()}/download?path=${this.filename.replace(this.basename, '')}&files=${this.basename}`)
return generateUrl(`/s/${getToken()}/download?path=${encodeURIComponent(this.filename.replace(this.basename, ''))}&files=${encodeURIComponent(this.basename)}`)
}
return getRootPath() + this.filename
return getRootPath() + encodeFilePath(this.filename)
},
},
methods: {
Expand Down