Added checks for worker uuid

Author: shirish87

lib/server.js

@@ -82,11 +82,7 @@ exports.Server = function Server(bsClient, workers) {
     var writeResponse = function(err, data) {
 
       if (err) {
-        response.writeHead(500, {
-          'Content-Type': 'text/plain'
-        });
-        response.write(err + '\n');
-        response.end();
+        sendError(response, err, 500);
         return;
       }
 
@@ -123,11 +119,7 @@ exports.Server = function Server(bsClient, workers) {
 
       fs.exists(filename, function(exists) {
         if (!exists) {
-          response.writeHead(404, {
-            'Content-Type': 'text/plain'
-          });
-          response.write('404 Not Found\n');
-          response.end();
+          sendError(response,'file not found', 404);
           return;
         }
 
@@ -143,8 +135,7 @@ exports.Server = function Server(bsClient, workers) {
         } else {
           send(request, filename)
             .on('error', function onSendError(err) {
-              response.statusCode = err.status || 500;
-              response.end(err.message || 'Internal Server Error');
+              sendError(response, (err.message || 'Internal Server Error'), err.status || 500);
             })
             .pipe(response);
         }
@@ -200,19 +191,46 @@ exports.Server = function Server(bsClient, workers) {
     return config.test_path[ ++worker.path_index ];
   }
 
+
+  function getWorkerUuid(request) {
+    var uuid = request.headers['x-worker-uuid'];
+    uuid = uuid && uuid.replace(/[^a-zA-Z0-9\-]/, '');
+    return (uuid && workers[uuid]) ? uuid : null;
+  }
+
+
+  function sendError(response, errMessage, statusCode) {
+    response.writeHead(statusCode || 400, {
+      'Content-Type': 'text/plain'
+    });
+
+    if (errMessage) {
+      response.write(errMessage + '\n');
+    }
+
+    response.end();
+  }
+
+
   var handlers = {
     '_progress': function progressHandler(uri, body, request, response) {
-      var uuid = request.headers['x-worker-uuid'];
-      var worker = workers[uuid] || {};
+      var uuid = getWorkerUuid(request);
+      if (!uuid) {
+        sendError(response, 'worker not found', 404);
+        return;
+      }
+
+      var worker = workers[uuid];
       var query = null;
+
       try {
         query = parseBody(body);
       } catch(e) {
         logger.info('[%s] Exception in parsing log', worker.string);
         logger.info('[%s] Log: ' + qs.parse(body).data, worker.string);
       }
 
-      if (query.tracebacks) {
+      if (query && query.tracebacks) {
         query.tracebacks.forEach(function(traceback) {
           logger.info('[%s] ' + chalk.red('Error:'), worker.getTestBrowserInfo(), formatTraceback(traceback));
         });
@@ -221,14 +239,19 @@ exports.Server = function Server(bsClient, workers) {
     },
 
     '_report': function reportHandler(uri, body, request, response) {
+      var uuid = getWorkerUuid(request);
+      if (!uuid) {
+        sendError(response, 'worker not found', 404);
+        return;
+      }
+
+      var worker = workers[uuid];
+      worker._worker_key = uuid;
+
       var query = null;
       try {
         query = parseBody(body);
       } catch (e) {}
-      var uuid = request.headers['x-worker-uuid'];
-      uuid = uuid && uuid.replace(/[^a-zA-Z0-9\-]/, '');
-      var worker = workers[uuid] || {};
-      worker._worker_key = uuid;
 
       if (query === null) {
         logger.info('[%s] Null response from remote Browser', request.headers['x-browser-string']);