garrensmith closed pull request #1003: Fix file uploads when filename contains special chars URL: https://github.com/apache/couchdb-fauxton/pull/1003
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/app/addons/documents/doc-editor/__tests__/doc-editor.actions.test.js b/app/addons/documents/doc-editor/__tests__/doc-editor.actions.test.js new file mode 100644 index 000000000..85527f03a --- /dev/null +++ b/app/addons/documents/doc-editor/__tests__/doc-editor.actions.test.js @@ -0,0 +1,57 @@ +// Licensed under the Apache License, Version 2.0 (the "License"); you may not +// use this file except in compliance with the License. You may obtain a copy of +// the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +// License for the specific language governing permissions and limitations under +// the License. + +import FauxtonAPI from "../../../../core/api"; +import Actions from "../actions"; +import Documents from "../../resources"; +import Databases from "../../../databases/base"; +import utils from "../../../../../test/mocha/testUtils"; +import sinon from "sinon"; + +const { restore } = utils; + +describe('DocEditorActions', () => { + const database = new Databases.Model({ id: 'db1' }); + const doc = new Documents.Doc({ _id: 'foo' }, { database: database }); + + afterEach(() => { + restore(FauxtonAPI.addNotification); + restore(FauxtonAPI.navigate); + restore(FauxtonAPI.urls); + }); + + it('uploadAttachment handles filenames with special chars', () => { + sinon.stub(FauxtonAPI, 'addNotification'); + sinon.stub(FauxtonAPI, 'urls').callsFake((p1, p2, p3, p4, p5, p6) => { + return [p1, p2, p3, p4, p5, p6].join('/'); + }); + const stub = sinon.stub($, 'ajax'); + const params = { + rev: 'rev-num', + doc: doc, + files: [ + { + name: 'file-#?&-123.txt', + length: 100 + } + ] + }; + + Actions.uploadAttachment(params); + sinon.assert.calledWithMatch(stub, + { + url: 'document/attachment/db1/foo/' + encodeURIComponent(params.files[0].name) + '/?rev=rev-num' + } + ); + }); + +}); diff --git a/app/addons/documents/doc-editor/actions.js b/app/addons/documents/doc-editor/actions.js index 7fda0dfe6..e66d5cd8a 100644 --- a/app/addons/documents/doc-editor/actions.js +++ b/app/addons/documents/doc-editor/actions.js @@ -169,7 +169,7 @@ function uploadAttachment (params) { var file = params.files[0]; $.ajax({ - url: FauxtonAPI.urls('document', 'attachment', db, docId, file.name, query), + url: FauxtonAPI.urls('document', 'attachment', db, docId, encodeURIComponent(file.name), query), type: 'PUT', data: file, contentType: file.type, ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
