Skip to content
Permalink
Browse files

Match for /../

  • Loading branch information...
LukasReschke committed Jul 1, 2016
1 parent 2da43e3 commit 8aa0832bd449c44ec300da4189bd8ed4e036140c
Showing with 5 additions and 1 deletion.
  1. +1 −1 apps/files/js/filelist.js
  2. +4 −0 apps/files/tests/js/filelistSpec.js
@@ -1333,7 +1333,7 @@
* @param changeUrl true to also update the URL, false otherwise (default)
*/
_setCurrentDir: function(targetDir, changeUrl) {
targetDir = targetDir.replace(/\\/g, '/').replace(/\.\.\//g, '');
targetDir = targetDir.replace(/\\/g, '/').replace(/\/\.\.\//g, '/');
var previousDir = this.getCurrentDirectory(),
baseDir = OC.basename(targetDir);

@@ -1327,6 +1327,10 @@ describe('OCA.Files.FileList tests', function() {
fileList.changeDirectory('/another\\subdir/../foo\\../bar\\..\\file/..\\folder/../');
expect(fileList.getCurrentDirectory()).toEqual('/another/subdir/foo/bar/file/folder/');
});
it('does not convert folders with a ".." in the name', function() {
fileList.changeDirectory('/abc../def');
expect(fileList.getCurrentDirectory()).toEqual('/abc../def');
});
it('switches to root dir when current directory does not exist', function() {
fileList.changeDirectory('/unexist');
deferredList.reject(404);

0 comments on commit 8aa0832

Please sign in to comment.
You can’t perform that action at this time.