verdnatura-mirror
/
loopback-component-storage
mirror of https://github.com/strongloop/loopback-component-storage.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update validateName() to support file name with slash

This commit is contained in:
Fang Fang Huo 2017-11-16 14:19:39 +08:00
parent bcd6965b8f
commit b8b2210ec5
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/providers/filesystem/index.js
View File

@ -43,6 +43,7 @@ function FileSystemProvider(options) {
var namePattern = new RegExp('[^' + path.sep + '/]+');
// To detect any file/directory containing dotdot paths
var containsDotDotPaths = /(^|[\\\/])\.\.([\\\/]|$)/;
var multiNameSpacePattern = new RegExp('^(.*/)([^/]*)$');
function validateName(name, cb) {
if (!name || containsDotDotPaths.test(name)) {
@ -56,6 +57,11 @@ function validateName(name, cb) {
if (match && match.index === 0 && match[0].length === name.length) {
return true;
} else {
// Allow multiple file path as the filename,such as '/namespace1/namespace2/filename'
var matchM = multiNameSpacePattern.exec(name);
if (matchM && matchM.index === 0 && matchM[0].length === name.length) {
return true;
}
cb && process.nextTick(cb.bind(null,
new Error(g.f('{{FileSystemProvider}}: Invalid name: %s', name))));
if (!cb) {
@ -200,6 +206,17 @@ FileSystemProvider.prototype.upload = function(options, cb) {
mode: options.mode || parseInt('0666', 8),
};
// If folders do not exist, try to create folder.
let dataPath = '';
const dirs = filePath.split('/');
for (let i = 0; i < dirs.length - 1; i += 1) {
dataPath += `${dirs[i]}/`;
// logger.silly(`Current filesToRoot is ${dataPath}`);
if (!fs.existsSync(dataPath)) {
fs.mkdirSync(dataPath);
}
}
try {
// simulate the success event in filesystem provider
// fixes: https://github.com/strongloop/loopback-component-storage/issues/58