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.

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

fix(files): Update webdav to make XML entities in filenames work #43353

Merged
merged 2 commits into from
Feb 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 32 additions & 0 deletions cypress/e2e/files/FilesUtils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/**
* @copyright Copyright (c) 2024 Ferdinand Thiessen <[email protected]>
*
* @author Ferdinand Thiessen <[email protected]>
*
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

export const getRowForFile = (filename: string) => cy.get(`[data-cy-files-list-row-name="${CSS.escape(filename)}"]`)

export const getActionsForFile = (filename: string) => getRowForFile(filename).find('[data-cy-files-list-row-actions]')

export const getActionButtonForFile = (filename: string) => getActionsForFile(filename).find('button[aria-label="Actions"]')

export const triggerActionForFile = (filename: string, actionId: string) => {
getActionButtonForFile(filename).click()
cy.get(`[data-cy-files-list-row-action="${CSS.escape(actionId)}"] > button`).should('exist').click()
}
68 changes: 68 additions & 0 deletions cypress/e2e/files/files-xml-regression.cy.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/**
* @copyright Copyright (c) 2024 Ferdinand Thiessen
*
* @author John Molakvoæ <[email protected]>
*
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

import { getRowForFile, triggerActionForFile } from './FilesUtils.ts'

/**
* This is a regression test for https://github.com/nextcloud/server/issues/43331
* Where files with XML entities in their names were wrongly displayed and could no longer be renamed / deleted etc.
*/
describe('Files: Can handle XML entities in file names', { testIsolation: false }, () => {
before(() => {
cy.createRandomUser().then((user) => {
cy.uploadContent(user, new Blob(), 'text/plain', '/and.txt')
cy.login(user)
cy.visit('/apps/files/')
})
})

it('Can reanme to a file name containing XML entities', () => {
cy.intercept('MOVE', /\/remote.php\/dav\/files\//).as('renameFile')
triggerActionForFile('and.txt', 'rename')
getRowForFile('and.txt')
.find('form[aria-label="Rename file"] input')
.type('{selectAll}&amp;.txt{enter}')

cy.wait('@renameFile')
getRowForFile('&amp;.txt').should('be.visible')
})

it('After a reload the filename is preserved', () => {
cy.reload()
getRowForFile('&amp;.txt').should('be.visible')
getRowForFile('&.txt').should('not.exist')
})

it('Can delete the file', () => {
cy.intercept('DELETE', /\/remote.php\/dav\/files\//).as('deleteFile')
triggerActionForFile('&amp;.txt', 'delete')
cy.wait('@deleteFile')

cy.contains('.toast-success', /Delete .* successfull/)
.should('be.visible')
getRowForFile('&amp;.txt').should('not.exist')

cy.reload()
getRowForFile('&amp;.txt').should('not.exist')
getRowForFile('&.txt').should('not.exist')
})
})
8 changes: 1 addition & 7 deletions cypress/e2e/files/files_copy-move.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,7 @@
*
*/

const getRowForFile = (filename: string) => cy.get(`[data-cy-files-list-row-name="${filename}"]`)
const getActionsForFile = (filename: string) => getRowForFile(filename).find('[data-cy-files-list-row-actions]')
const getActionButtonForFile = (filename: string) => getActionsForFile(filename).find('button[aria-label="Actions"]')
const triggerActionForFile = (filename: string, actionId: string) => {
getActionButtonForFile(filename).click()
cy.get(`[data-cy-files-list-row-action="${actionId}"] > button`).should('exist').click()
}
import { getRowForFile, triggerActionForFile } from './FilesUtils.ts'

describe('Files: Move or copy files', { testIsolation: true }, () => {
let currentUser
Expand Down
4 changes: 2 additions & 2 deletions dist/comments-comments-app.js

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions dist/comments-comments-app.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/*! https://mths.be/base64 v1.0.0 by @mathias | MIT license */

/*! https://mths.be/he v1.2.0 by @mathias | MIT license */

/**
* @copyright Copyright (c) 2020 John Molakvoæ <[email protected]>
*
Expand Down
2 changes: 1 addition & 1 deletion dist/comments-comments-app.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/comments-comments-tab.js

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions dist/comments-comments-tab.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/*! https://mths.be/base64 v1.0.0 by @mathias | MIT license */

/*! https://mths.be/he v1.2.0 by @mathias | MIT license */

/**
* @copyright Copyright (c) 2020 John Molakvoæ <[email protected]>
*
Expand Down
2 changes: 1 addition & 1 deletion dist/comments-comments-tab.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/core-common.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-common.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/files-init.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files-init.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/systemtags-init.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/systemtags-init.js.map

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
"vuedraggable": "^2.24.3",
"vuex": "^3.6.2",
"vuex-router-sync": "^5.0.0",
"webdav": "^5.3.1",
"webdav": "^5.3.2",
"xml2js": "^0.6.2"
},
"devDependencies": {
Expand Down
Loading