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

[stable10] Switch web UI to new dav + encoding fixes #28769

Merged
merged 4 commits into from Aug 22, 2017
Merged

[stable10] Switch web UI to new dav + encoding fixes #28769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99f6b04
Switch the web UI to the new endpoint for logged in users
Jul 15, 2016
c99f5b4
Fix encoding mismatch in JS
Aug 21, 2017
15a049c
more UI tests to test special char in file/folder names
individual-it Aug 21, 2017
9d42ce6
Don't encode paths passed to OC.Files.Client
Aug 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions apps/files/js/file-upload.js
View file
Open in desktop
Expand Up @@ -259,7 +259,7 @@ OC.FileUpload.prototype = {
) {
data.isChunked = true;
chunkFolderPromise = this.uploader.davClient.createDirectory(
'uploads/' + encodeURIComponent(OC.getCurrentUser().uid) + '/' + encodeURIComponent(this.getId())
'uploads/' + OC.getCurrentUser().uid + '/' + this.getId()
);
// TODO: if fails, it means same id already existed, need to retry
} else {
Expand Down Expand Up @@ -296,8 +296,8 @@ OC.FileUpload.prototype = {
}

return this.uploader.davClient.move(
'uploads/' + encodeURIComponent(uid) + '/' + encodeURIComponent(this.getId()) + '/.file',
'files/' + encodeURIComponent(uid) + '/' + OC.joinPaths(this.getFullPath(), this.getFileName()),
'uploads/' + uid + '/' + this.getId() + '/.file',
'files/' + uid + '/' + OC.joinPaths(this.getFullPath(), this.getFileName()),
true,
headers
);
Expand All @@ -306,7 +306,7 @@ OC.FileUpload.prototype = {
_deleteChunkFolder: function() {
// delete transfer directory for this upload
this.uploader.davClient.remove(
'uploads/' + encodeURIComponent(OC.getCurrentUser().uid) + '/' + encodeURIComponent(this.getId())
'uploads/' + OC.getCurrentUser().uid + '/' + this.getId()
);
},

Expand Down
56 changes: 43 additions & 13 deletions core/js/files/client.js
View file
Open in desktop
Expand Up @@ -43,6 +43,9 @@
};
this._baseUrl = url;

this._rootSections = _.filter(this._root.split('/'), function(section) { return section !== '';});
this._rootSections = _.map(this._rootSections, window.decodeURIComponent);

var clientOptions = {
baseUrl: this._baseUrl,
xmlNamespaces: {
Expand Down Expand Up @@ -240,6 +243,33 @@
return etag;
},

/**
* Parse sub-path from href
*
* @param {String} path href path
* @return {String} sub-path section
*/
_extractPath: function(path) {
var pathSections = path.split('/');
pathSections = _.filter(pathSections, function(section) { return section !== '';});

var i = 0;
for (i = 0; i < this._rootSections.length; i++) {
if (this._rootSections[i] !== decodeURIComponent(pathSections[i])) {
// mismatch
return null;
}
}

// build the sub-path from the remaining sections
var subPath = '';
while (i < pathSections.length) {
subPath += '/' + decodeURIComponent(pathSections[i]);
i++;
}
return subPath;
},

/**
* Parse Webdav result
*
Expand All @@ -248,17 +278,12 @@
* @return {Array.<FileInfo>} array of file info
*/
_parseFileInfo: function(response) {
var path = response.href;
if (path.substr(0, this._root.length) === this._root) {
path = path.substr(this._root.length);
}

if (path.charAt(path.length - 1) === '/') {
path = path.substr(0, path.length - 1);
var path = this._extractPath(response.href);
// invalid subpath
if (path === null) {
return null;
}

path = decodeURIComponent(path);

if (response.propStat.length === 0 || response.propStat[0].status !== 'HTTP/1.1 200 OK') {
return null;
}
Expand Down Expand Up @@ -356,9 +381,14 @@
*/
_parseResult: function(responses) {
var self = this;
return _.map(responses, function(response) {
return self._parseFileInfo(response);
});
var fileInfos = [];
for (var i = 0; i < responses.length; i++) {
var fileInfo = self._parseFileInfo(responses[i]);
if (fileInfo !== null) {
fileInfos.push(fileInfo);
}
}
return fileInfos;
},

/**
Expand Down Expand Up @@ -837,7 +867,7 @@

var client = new OC.Files.Client({
host: OC.getHost(),
root: OC.linkToRemoteBase('webdav'),
root: OC.linkToRemoteBase('dav') + '/files/' + encodeURIComponent(OC.getCurrentUser().uid) + '/',
useHTTPS: OC.getProtocol() === 'https'
});
OC.Files._defaultClient = client;
Expand Down