public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2203 from ether/setting-to-not-import-unknown-file-types 

Allow for a setting so you can stop unknown file types from being imported
pull/1826/merge
John McLear 2014-11-15 15:41:08 +00:00
parent f5fbcbbc81 83b7ca529b
commit 3bf108f3b4
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
settings.json.template
View File

@ -74,19 +74,22 @@
/* This is the path to the Abiword executable. Setting it to null, disables abiword. /* This is the path to the Abiword executable. Setting it to null, disables abiword.
Abiword is needed to advanced import/export features of pads*/ Abiword is needed to advanced import/export features of pads*/
"abiword" : null, "abiword" : null,
/* Allow import of file types other than the supported types: txt, doc, docx, rtf, odt, html & htm */
"allowUnknownFileEnds" : true,
/* This setting is used if you require authentication of all users. /* This setting is used if you require authentication of all users.
Note: /admin always requires authentication. */ Note: /admin always requires authentication. */
"requireAuthentication": false, "requireAuthentication" : false,
/* Require authorization by a module, or a user with is_admin set, see below. */ /* Require authorization by a module, or a user with is_admin set, see below. */
"requireAuthorization": false, "requireAuthorization" : false,
/*when you use NginX or another proxy/ load-balancer set this to true*/ /*when you use NginX or another proxy/ load-balancer set this to true*/
"trustProxy": false, "trustProxy" : false,
/* Privacy: disable IP logging */ /* Privacy: disable IP logging */
"disableIPlogging": false, "disableIPlogging" : false,
/* Users for basic authentication. is_admin = true gives access to /admin. /* Users for basic authentication. is_admin = true gives access to /admin.
If you do not uncomment this, /admin will not be available! */ If you do not uncomment this, /admin will not be available! */

11
src/node/handler/ImportHandler.js
View File

@ -92,9 +92,14 @@ exports.doImport = function(req, res, padId)
} }
//we need to rename this file with a .txt ending //we need to rename this file with a .txt ending
else { else {
var oldSrcFile = srcFile; if(settings.allowUnknownFileEnds === true){
srcFile = path.join(path.dirname(srcFile),path.basename(srcFile, fileEnding)+".txt"); var oldSrcFile = srcFile;
fs.rename(oldSrcFile, srcFile, callback); srcFile = path.join(path.dirname(srcFile),path.basename(srcFile, fileEnding)+".txt");
fs.rename(oldSrcFile, srcFile, callback);
}else{
console.warn("Not allowing unknown file type to be imported", fileEnding);
callback("uploadFailed");
}
} }
}, },
function(callback){ function(callback){

5
src/node/utils/Settings.js
View File

@ -129,6 +129,11 @@ exports.minify = true;
*/ */
exports.abiword = null; exports.abiword = null;
/**
* Should we support none natively supported file types on import?
*/
exports.allowUnknownFileEnds = true;
/** /**
* The log level of log4js * The log level of log4js
*/ */