Check for empty post data

Author: zvecr

src/routes/compile.js

@@ -18,31 +18,43 @@ const BUILD_TIMEOUT = process.env.BUILD_TIMEOUT || 10000;
 const router = express.Router();
 const queueMw = expressQueue({ activeLimit: 1, queuedLimit: 20 });
 
+/** Utility function to convert script->exe */
+async function compileScript(id, script) {
+  try {
+    await fs.writeFile(`/tmp/${id}.ahk`, script);
+
+    await new Promise(async (resolve) => {
+      proc.exec(`xvfb-run -a wine Ahk2Exe.exe /in /tmp/${id}.ahk`, { timeout: BUILD_TIMEOUT }, (err, stout, sterr) => {
+        resolve(err ? stout : sterr);
+      });
+    });
+
+    return await fs.readFile(`/tmp/${id}.exe`);
+  } finally {
+    await del(`/tmp/${id}.*`, { force: true });
+  }
+}
+
 router.post('/', queueMw, async (req, res) => {
+  if (!req.body) {
+    res.status(400).send({ error: { code: -1, message: 'Empty body' } });
+    return;
+  }
+
   const id = md5(req.body);
 
   let data = mcache.get(id);
   if (!data) {
     console.log(`processing uncached:${id}`);
 
     try {
-      await fs.writeFile(`/tmp/${id}.ahk`, req.body);
-
-      await new Promise(async (resolve) => {
-        proc.exec(`xvfb-run -a wine Ahk2Exe.exe /in /tmp/${id}.ahk`, { timeout: BUILD_TIMEOUT }, (err, stout, sterr) => {
-          resolve(err ? stout : sterr);
-        });
-      });
-
-      data = await fs.readFile(`/tmp/${id}.exe`);
+      data = await compileScript(id, req.body);
 
       mcache.put(id, data, CACHE_TIMEOUT);
     } catch (err) {
       console.error(err.message);
-      res.status(400).send({ error: { code: err.code || -1, message: err.message || 'unknown' } });
+      res.status(500).send({ error: { code: err.code || -1, message: err.message || 'unknown' } });
       return;
-    } finally {
-      await del(`/tmp/${id}.*`, { force: true });
     }
   }
 

test/e2e.js

@@ -6,7 +6,7 @@ import server from '../src/app';
 chai.should();
 chai.use(chaiHttp);
 
-describe('Status endpoint', () => {
+describe('IT::Status endpoint', () => {
   it('should report zero when idle', (done) => {
     chai.request(server).get('/status')
       .end((err, res) => {

test/routes/compile.js

@@ -4,6 +4,7 @@ import httpMocks from 'node-mocks-http';
 import { promises as fs } from 'fs';
 import proc from 'child_process';
 import sinon from 'sinon';
+import ee from 'events';
 import compile from '../../src/routes/compile';
 
 chai.should();
@@ -14,10 +15,11 @@ return
 `;
 const ID = '3ab771baa15b807fc028f9766eb111b0';
 
-describe('Compile route', () => {
+describe('Compile endpoint', () => {
   let exec;
   let fswriteFile;
   let fsreadFile;
+
   beforeEach(() => {
     fswriteFile = sinon.stub(fs, 'writeFile');
     fsreadFile = sinon.stub(fs, 'readFile').returns(Buffer.from('<EXE DATA>'));
@@ -28,31 +30,53 @@ describe('Compile route', () => {
     sinon.restore();
   });
 
+  it('should reject a empty request', (done) => {
+    const res = httpMocks.createResponse({
+      eventEmitter: ee.EventEmitter,
+    });
+    const req = httpMocks.createRequest({
+      method: 'POST',
+      url: '/',
+      body: '',
+    });
+    // TODO: undo bodge with body producing {}
+    req.body = '';
+
+    res.once('end', () => {
+      res.statusCode.should.equal(400);
+
+      done();
+    });
+
+    compile.router.handle(req, res);
+  });
+
   it('should convert a valid request', (done) => {
-    const response = httpMocks.createResponse();
-    const request = httpMocks.createRequest({
+    const res = httpMocks.createResponse({
+      eventEmitter: ee.EventEmitter,
+    });
+    const req = httpMocks.createRequest({
       method: 'POST',
       url: '/',
       body: SCRIPT,
     });
 
-    // TODO: use for negative test case
-    // response.on('end', () => {
-    //   response._getData().should.equal('world');
-    //   done();
-    // });
+    res.sendFileBuffer = (name, data) => {
+      name.should.be.equal(`${ID}.exe`);
+      data.should.be.instanceof(Buffer);
+
+      // boilerplate to behave as real express middleware
+      res.status(200).send();
+    };
 
-    response.sendFileBuffer = (name, data) => {
+    res.once('end', () => {
       sinon.assert.calledWith(fswriteFile, `/tmp/${ID}.ahk`, SCRIPT);
       sinon.assert.calledWith(exec, `xvfb-run -a wine Ahk2Exe.exe /in /tmp/${ID}.ahk`);
       sinon.assert.calledWith(fsreadFile, `/tmp/${ID}.exe`);
 
-      name.should.be.equal(`${ID}.exe`);
-      data.should.be.instanceof(Buffer);
-
       done();
-    };
+    });
 
-    compile.router.handle(request, response);
+    compile.router.handle(req, res);
   });
 });