Skip to content

[BUGFIX] fix "getPersonalToken" and uploading files bugs #67

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

Merged
lisyoen merged 2 commits into from
Jul 29, 2015
Merged

[BUGFIX] fix "getPersonalToken" and uploading files bugs #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fd7ab5
[BUGFIX] fix bug that "getPersonalToken" always returns duplicated items
Jul 28, 2015
128a696
[BUGFIX] prevent unexpected closing of connection while uploading files
Jul 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions src/server/auth/lib/userdb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,17 +412,15 @@ exports.deleteAllPersonalTokens = function (uid, callback) {
exports.getPersonalTokens = function (uid, callback, context) {
dao.token.getPersonalTokensByUid({uid: uid}, function (err, context) {
var tokens = context.result();
var result = [];
var tokenObj = {};
if (err) {
return callback(err);
}
tokens.forEach(function (token, index) {
tokenObj.issueTime = tokens[index].created;
tokenObj.data = tokens[index].token;
result[index] = tokenObj;
});
callback(null, result);
callback(null, tokens.map(function (token) {
return {
issueTime: token.created,
data: token.token
};
}));
}, context);
/*d.tokens.find({uid: uid, expireTime: 'INFINITE'},
function (err, tokens) {
Expand Down
126 changes: 45 additions & 81 deletions src/server/fs/lib/fs-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1649,65 +1649,72 @@ router.post('/webida/api/fs/file/:fsid/*',
var fsid = req.params.fsid;
var pathStr = Path.join('/', decodeURI(req.params[0]));
var wfsUrl = 'wfs://' + fsid + Path.join('/', decodeURI(req.params[0]));
logger.info('writeFile', req.user, wfsUrl);
var form;
var fields = [];
var uid = req.user && req.user.uid;
logger.info('writeFile', req.user, wfsUrl);

if (wfsUrl.indexOf(';') !== -1) {
return res.sendfail(new ClientError(403, 'You can not use \';\' in the path'));
}

var isAborted = false;

var form = new formidable.IncomingForm();
var files = [];
var fields = [];
form = new formidable.IncomingForm();

form
.on('field', function(field, value) {
logger.info('field = ', field, 'value = ', value);
.on('field', function (field, value) {
logger.info('field = ', field, 'value = ', value);
fields.push([field, value]);
})
.on('file', function(name, file) {
.on('file', function (name, file) {
logger.info('file', name, file);
if (name !== 'file') {
var errmsg = 'Bad upload request format';
logger.error(errmsg + ':' + file.path);
res.header('Connection', 'close');
isAborted = true;
return res.sendfail(new ClientError(413, errmsg));
logger.error('Bad upload request format: ', file.path);
return res.sendfail(new ClientError(400, 'Bad upload request format'));
}
files.push([name, file]);
if (file.size >= config.services.fs.uploadPolicy.maxUploadSize) {
return res.status(413).send('Uploading file is too large: ' + file.size + ' bytes');
}
writeFile(wfsUrl, file.path, function (err) {
Fs.unlink(file.path, function (cleanErr) {
var localPath;
if (cleanErr) {
logger.warn('Write File clean error: ', cleanErr);
}

if (err) {
logger.error('!!!!!!! form.parse->writeFile, error:', err);
return res.sendfail(err);
}
logger.info('sessionID: ', fields.sessionID);
fsChangeNotifyTopics(pathStr, 'file.written', uid, fsid, fields.sessionID);

localPath = getPathFromUrl(wfsUrl);
flinkMap.updateFileLink(fsid, localPath, function (err, flinkInfo) {
if (!err) {
logger.info('flink updated -- ', flinkInfo);
}
});
return res.send(utils.ok());
});
});
})
.on('fileBegin', function(name, file) {
.on('fileBegin', function (name, file) {
logger.info('fileBegin -' + name + ':' + JSON.stringify(file));
})
.on('progress', function(bytesReceived, bytesExpected) {
// limits file size up to 100mb
if (bytesExpected >= config.services.fs.uploadPolicy.maxUploadSize) {
res.header('Connection', 'close');
var errmsg = 'Uploading file is too large.';
logger.error(errmsg);
return res.sendfail(new ClientError(413, errmsg));
}
logger.info('progress:' + bytesReceived + '/' + bytesExpected);
})
.on('error', function(err) {
var errmsg = 'Failed to upload with error (' + err + ').';
logger.error(errmsg);
res.header('Connection', 'close');
if (err) {
return res.status(400).send(utils.fail(errmsg));
}
.on('error', function (err) {
logger.error('Failed to upload with error:', err);
return res.status(400).send(utils.fail('Failed to upload with error (' + err + ').'));
})
.on('aborted', function() {
.on('aborted', function () {
logger.info('Uploading is aborted.');
})
.on('end', function() {
.on('end', function () {
logger.info('Finished to upload file to tmp dir.');
});
});

//form.uploadDir = process.env.TMP || process.env.TMPDIR || process.env.TEMP || '/tmp' || process.cwd();
form.hash = false; //'sha1';
form.keepExtensions = true;
form.maxFieldSize = config.services.fs.uploadPolicy.maxUploadSize;

canWrite(uid, wfsUrl, function (err, writable) {
// TODO This is not atomic operation. Consider using fs-ext.flock()
Expand All @@ -1718,55 +1725,12 @@ router.post('/webida/api/fs/file/:fsid/*',
if (!writable) {
return res.sendfail(new ClientError(403, 'Need WRITE permission'));
}

form.parse(req, function(err, fields, files) {
logger.info('parse - ' + JSON.stringify(files));

if (err) {
return res.sendfail(err, 'Failed to write file');
}

if (isAborted) {
logger.error('Request is aborted, delete temporary file: ', files.file.path);
Fs.unlink(files.file.path, function (cleanErr) {
if (cleanErr) {
logger.warn('Write File clean error: ', cleanErr);
}
});
} else {
writeFile(wfsUrl, files.file.path, function (err) {
Fs.unlink(files.file.path, function (cleanErr) {
if (cleanErr) {
logger.warn('Write File clean error: ', cleanErr);
}

if (err) {
return res.sendfail(err);
}
logger.debug('sessionID: ', fields.sessionID);
fsChangeNotifyTopics(pathStr, 'file.written', uid, fsid, fields.sessionID);

// sec
var localPath = getPathFromUrl(wfsUrl);
flinkMap.updateFileLink(fsid, localPath, function (err, flinkInfo) {
//if (err) {
//logger.debug(err);
//} else {
if(!err){
logger.info('flink updated -- ', flinkInfo);
}
});
return res.send(utils.ok());
});
});
}
});
form.parse(req);
});
}
);



/**
* Delete file
* Requires WRITE permission.
Expand Down
2 changes: 1 addition & 1 deletion src/server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"filequeue": "0.5.0",
"graceful-fs": "3.0.2",
"ffi": "1.2.6",
"formidable" : "1.0.14",
"formidable": "1.0.17",
"fs-extra": "0.8.1",
"pty.js": "0.2.7-1",
"q": "1.0.1",
Expand Down