Security upgrades and test fixes

Author: mattgodbolt

lib/handlers/compile.js

@@ -35,11 +35,11 @@ const temp = require('temp'),
 
 temp.track();
 
-let oneTimeInit = false;
+let hasSetUpAutoClean = false;
 
 function initialise(compilerEnv) {
-    if (oneTimeInit) return;
-    oneTimeInit = true;
+    if (hasSetUpAutoClean) return;
+    hasSetUpAutoClean = true;
     const tempDirCleanupSecs = compilerEnv.ceProps("tempDirCleanupSecs", 600);
     logger.info(`Cleaning temp dirs every ${tempDirCleanupSecs} secs`);
     setInterval(() => {
@@ -197,7 +197,7 @@ class CompileHandler {
 
     splitArguments(options) {
         return _.chain(quote.parse(options || '')
-            .map(x => typeof(x) === "string" ? x : x.pattern))
+            .map(x => typeof (x) === "string" ? x : x.pattern))
             .compact()
             .value();
     }
@@ -250,9 +250,9 @@ class CompileHandler {
             },
             error => {
                 logger.error("Error during compilation", error);
-                if (typeof(error) !== "string") {
+                if (typeof (error) !== "string") {
                     if (error.code) {
-                        if (typeof(error.stderr) === "string") {
+                        if (typeof (error.stderr) === "string") {
                             error.stdout = utils.parseOutput(error.stdout);
                             error.stderr = utils.parseOutput(error.stderr);
                         }
@@ -267,3 +267,6 @@ class CompileHandler {
 }
 
 module.exports.Handler = CompileHandler;
+module.exports.SetTestMode = function () {
+    hasSetUpAutoClean = true;
+};

package.json

@@ -65,15 +65,15 @@
     "aws-sdk-mock": "^1.7.0",
     "chai": "3.5.x",
     "chai-as-promised": "^7.1.1",
-    "chai-http": "^3.0.0",
+    "chai-http": "^4.2.1",
     "codecov": "^3.0.0",
     "copy-webpack-plugin": "^4.1.1",
-    "css-loader": "^0.28.7",
+    "css-loader": "^2.1.0",
     "eslint": "^4.17.0",
     "extract-text-webpack-plugin": "^3.0.1",
     "file-loader": "^1.1.5",
     "istanbul": "^0.4.5",
-    "mocha": "^3.3.0",
+    "mocha": "^5.2.0",
     "nock": "^9.1.4",
     "requirejs": "*",
     "style-loader": "^0.19.0",

test/handlers/api-tests.js

@@ -58,11 +58,16 @@ describe('API handling', () => {
         }
     }, (key, def) => {
         switch (key) {
-            case "formatters": return "formatt:badformatt";
-            case "formatter.formatt.exe": return "echo";
-            case "formatter.formatt.version": return "Release";
-            case "formatter.formatt.name": return "FormatT";
-            default: return def;
+            case "formatters":
+                return "formatt:badformatt";
+            case "formatter.formatt.exe":
+                return "echo";
+            case "formatter.formatt.version":
+                return "Release";
+            case "formatter.formatt.name":
+                return "FormatT";
+            default:
+                return def;
         }
     });
     app.use('/api', apiHandler.handle);
@@ -71,16 +76,16 @@ describe('API handling', () => {
         name: "GCC 9.0.0",
         lang: "c++"
     },
-    {
-        id: "fpc302",
-        name: "FPC 3.0.2",
-        lang: "pascal"
-    },
-    {
-        id: "clangtrunk",
-        name: "Clang trunk",
-        lang: "c++"
-    }];
+        {
+            id: "fpc302",
+            name: "FPC 3.0.2",
+            lang: "pascal"
+        },
+        {
+            id: "clangtrunk",
+            name: "Clang trunk",
+            lang: "c++"
+        }];
     apiHandler.setCompilers(compilers);
     apiHandler.setLanguages(languages);
 
@@ -190,23 +195,20 @@ describe('API handling', () => {
             })
             .catch(err => {
                 throw err;
-            })
+            });
     });
     it('should not go through with invalid tools', () => {
         return chai.request(app)
             .post('/api/format/invalid')
             .set('Accept', 'application/json')
             .then(res => {
-                // Not expected to go here
-                res.should.equal(null);
-            })
-            .catch(err => {
-                err.response.should.have.status(422);
-                err.response.should.be.json;
-                err.response.body.should.deep.equals({exit: 2, answer: "Tool not supported"});
-            })
+                res.should.have.status(422);
+                res.should.be.json;
+                res.body.should.deep.equals({exit: 2, answer: "Tool not supported"});
+            });
     });
-    xit('should not go through with invalid base styles', () => {
+    /*
+    it('should not go through with invalid base styles', () => {
         return chai.request(app)
             .post('/api/format/formatt')
             .set('Accept', 'application/json')
@@ -216,13 +218,10 @@ describe('API handling', () => {
                 source: ""
             })
             .then(res => {
-                // Not expected to go here
-                res.should.equal(null);
-            })
-            .catch(err => {
-                err.response.should.have.status(422);
-                err.response.should.be.json;
-                err.response.body.should.deep.equals({exit: 3, answer: "Base style not supported"});
+                res.should.have.status(422);
+                res.should.be.json;
+                res.body.should.deep.equals({exit: 3, answer: "Base style not supported"});
             });
     });
+    */
 });

test/handlers/compile-tests.js

@@ -22,6 +22,8 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
+require('../../lib/handlers/compile').SetTestMode();
+
 const chai = require('chai'),
     CompilationEnvironment = require('../../lib/compilation-env'),
     CompileHandler = require('../../lib/handlers/compile').Handler,
@@ -49,10 +51,8 @@ describe('Compiler tests', () => {
     it('throws for unknown compilers', () => {
         return chai.request(app)
             .post('/NOT_A_COMPILER/compile')
-            .then(() => {
-                throw "Shouldn't succeeed";
-            }, (e) => {
-                e.should.have.status(404);
+            .then((res) => {
+                res.should.have.status(404);
             });
     });
 

test/lang-tests.js

@@ -38,10 +38,8 @@ describe('Language definitions tests', () => {
     it('Has examples & are initialized', () => {
         Object.keys(languages).forEach(languageKey => {
             const lang = languages[languageKey];
-            fs.stat(path.join('examples', lang.id, 'default' + lang.extensions[0]), (err, fd) => {
-                should.equal(err, null);
-                should.equal(fd, lang.example);
-            });
+            const example = fs.readFileSync(path.join('examples', lang.id, 'default' + lang.extensions[0]), 'utf-8');
+            should.equal(example, lang.example);
         });
     });
 });