Merge pull request #1231 from nextcloud/backport-1224-do-not-allow-linebreak-in-paths
[stable10] Do not allow linebreaks and null bytes in paths
This commit is contained in:
commit
1b4cbba376
|
@ -107,6 +107,7 @@ nbproject
|
|||
/build/lib/
|
||||
/build/jsdocs/
|
||||
/npm-debug.log
|
||||
/PhantomJS_*
|
||||
|
||||
# puphpet
|
||||
puphpet
|
||||
|
|
|
@ -1400,6 +1400,10 @@
|
|||
return OC.linkTo('files', 'index.php')+"?dir="+ encodeURIComponent(dir).replace(/%2F/g, '/');
|
||||
},
|
||||
|
||||
/**
|
||||
* @param {string} path
|
||||
* @returns {boolean}
|
||||
*/
|
||||
_isValidPath: function(path) {
|
||||
var sections = path.split('/');
|
||||
for (var i = 0; i < sections.length; i++) {
|
||||
|
@ -1407,7 +1411,9 @@
|
|||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
|
||||
return path.toLowerCase().indexOf(decodeURI('%0a')) === -1 &&
|
||||
path.toLowerCase().indexOf(decodeURI('%00')) === -1;
|
||||
},
|
||||
|
||||
/**
|
||||
|
|
|
@ -1379,9 +1379,11 @@ describe('OCA.Files.FileList tests', function() {
|
|||
'/abc/..',
|
||||
'/abc/../',
|
||||
'/../abc/',
|
||||
'/foo%0Abar/',
|
||||
'/foo%00bar/',
|
||||
'/another\\subdir/../foo\\../bar\\..\\file/..\\folder/../'
|
||||
], function(path) {
|
||||
fileList.changeDirectory(path);
|
||||
fileList.changeDirectory(decodeURI(path));
|
||||
expect(fileList.getCurrentDirectory()).toEqual('/');
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue