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

settings.json.template

@@ -74,19 +74,22 @@
   /* 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" : 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.
      Note: /admin always requires authentication. */
-  "requireAuthentication": false,
+  "requireAuthentication" : false,
 
   /* 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*/
-  "trustProxy": false,
+  "trustProxy" : false,
   
   /* Privacy: disable IP logging */
-  "disableIPlogging": false,  
+  "disableIPlogging" : false,  
   
   /* Users for basic authentication. is_admin = true gives access to /admin.
      If you do not uncomment this, /admin will not be available! */

src/node/handler/ImportHandler.js

@@ -92,9 +92,14 @@ exports.doImport = function(req, res, padId)
       }
       //we need to rename this file with a .txt ending
       else {
-        var oldSrcFile = srcFile;
-        srcFile = path.join(path.dirname(srcFile),path.basename(srcFile, fileEnding)+".txt");
-        fs.rename(oldSrcFile, srcFile, callback);
+        if(settings.allowUnknownFileEnds === true){
+          var oldSrcFile = srcFile;
+          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){

src/node/utils/Settings.js

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