Merge pull request #501 from CodeNow/hotfix.fixhash

Hotfix.fixhash

Author: tjmehta

lib/models/mongo/infra-code-version.js

@@ -7,7 +7,7 @@ var last = require('101/last');
 var isFunction = require('101/is-function');
 var debug = require('debug')('runnable-api:infra-code-version:model');
 var regexpQuote = require('regexp-quote');
-var bcrypt = require('bcrypt');
+var crypto = require('crypto');
 var jsonHash = require('json-stable-stringify');
 var dogstatsd = require('models/datadog');
 var uuid = require('uuid');
@@ -607,19 +607,16 @@ InfraCodeVersionSchema.methods.getHash = function (cb) {
 
 
 function hashString(data, cb) {
-  // salt from require('bcrypt'.enSaltSync(1);
-  var salt = '$2a$04$fLg/VU5eeDAUARmPVfyUo.';
   var start = new Date();
-  bcrypt.hash(data
-      .replace(/[\s\uFEFF\xA0]+\n/g, '\n')   // trim whitespace after line
-      .replace(/\n[\s\uFEFF\xA0]*\n/g, '\n') // remove blank lines
-      .replace(/^[\s\uFEFF\xA0]*\n/g, '') // remove start of file blank lines
-      .replace(/[\s\uFEFF\xA0]+$/g, '\n'), salt, function(err, hash) {
-        if (err) { return cb(err); }
-        dogstatsd.timing('api.infraCodeVersion.hashTime', new Date()-start, 1,
-          ['length:'+data.length]);
-        cb(null, hash);
-      });
+  var md5 = crypto.createHash('md5');
+  data = data
+    .replace(/[\s\uFEFF\xA0]+\n/g, '\n')   // trim whitespace after line
+    .replace(/\n[\s\uFEFF\xA0]*\n/g, '\n') // remove blank lines
+    .replace(/^[\s\uFEFF\xA0]*\n/g, '') // remove start of file blank lines
+    .replace(/[\s\uFEFF\xA0]+$/g, '\n');
+  var hash = md5.update(data, 'utf8').digest('hex');
+  dogstatsd.timing('api.infraCodeVersion.hashTime', new Date()-start, 1, ['length:'+data.length]);
+  cb(null, hash);
 }
 
 var InfraCodeVersion = module.exports = mongoose.model('InfraCodeVersion', InfraCodeVersionSchema);

package.json

@@ -12,7 +12,6 @@
     "async": "^0.9.0",
     "aws-sdk": "^2.0.14",
     "batch": "^0.5.1",
-    "bcrypt": "~0.7.5",
     "body-parser": "^1.4.3",
     "busboy": "^0.2.8",
     "callback-count": "~0.1.0",
@@ -30,8 +29,6 @@
     "dogerode": "0.0.3",
     "dogstatsyware": "0.0.1",
     "dotenv": "^0.4.0",
-    "engine.io": "^1.3.1",
-    "engine.io-client": "^1.3.1",
     "eson": "^0.5.0",
     "exec-sync": "^0.1.6",
     "express": "^4.8.3",
@@ -49,18 +46,13 @@
     "json-stable-stringify": "^1.0.0",
     "keypather": "^1.8.1",
     "middleware-flow": "^0.6.1",
-    "mkdirp": "^0.5.0",
     "mongoose": "^3.8.13",
-    "mongoose-text-search": "0.0.2",
     "mongoose-validator": "^1.0.0",
     "morgan": "^1.1.1",
     "multiparty": "^3.3.2",
     "newrelic": "^1.12.2",
     "node-dogstatsd": "0.0.5",
     "node-forge": "^0.6.12",
-    "node-uuid": "~1.4.0",
-    "nodemailer": "^0.7.0",
-    "nodetime": "^0.8.15",
     "passport": "~0.2.0",
     "passport-github": "~0.1.5",
     "passport-strategy": "^1.0.0",
@@ -70,7 +62,6 @@
     "redis-types": "^0.2.3",
     "regexp-quote": "0.0.0",
     "request": "2.42.0",
-    "rimraf": "^2.2.8",
     "rollbar": "^0.3.13",
     "runnable": "git+ssh://[email protected]:CodeNow/runnable-api-client#v0.38.16",
     "s3-stream-upload": "0.0.6",
@@ -98,6 +89,7 @@
     "nock": "^0.51.0",
     "nodemon": "^1.2.1",
     "require-inject": "^1.1.0",
+    "rimraf": "^2.2.8",
     "sauron": "git+ssh://[email protected]:codenow/sauron#v0.0.8",
     "server-destroy": "^1.0.0"
   },

scripts/add-hash-to-files.js

@@ -1,6 +1,6 @@
 'use strict';
 require('loadenv')();
-var bcrypt = require('bcrypt');
+var crypto = require('crypto');
 var InfraCodeVersion = require('models/mongo/infra-code-version.js');
 var debug = require('debug')('script');
 var mongoose = require('mongoose');
@@ -24,21 +24,21 @@ function getAllInfra (cb) {
     'files': {
       $elemMatch: {
         isDir: false,
-        hash: { $exists: false }
+        hash: { $regex: /^\$/ } // find only bcrypt files
       }
     }
   }, cb);
 }
 
 function hashString(data, cb) {
-  debug('hashString');
-  // salt from require('bcrypt'.enSaltSync(1);
-  var salt = '$2a$04$fLg/VU5eeDAUARmPVfyUo.';
-  bcrypt.hash(data
+  var md5 = crypto.createHash('md5');
+  data = data
     .replace(/[\s\uFEFF\xA0]+\n/g, '\n')   // trim whitespace after line
     .replace(/\n[\s\uFEFF\xA0]*\n/g, '\n') // remove blank lines
     .replace(/^[\s\uFEFF\xA0]*\n/g, '') // remove start of file blank lines
-    .replace(/[\s\uFEFF\xA0]+$/g, '\n'), salt, cb);
+    .replace(/[\s\uFEFF\xA0]+$/g, '\n');
+  var hash = md5.update(data, 'utf8').digest('hex');
+  cb(null, hash);
 }
 
 function eachInfra (infras, cb) {
@@ -52,7 +52,7 @@ function eachInfra (infras, cb) {
     // for each file
 
     async.each(infra.files, function(file, cb) {
-      if(file.isDir || file.hash) { return cb(); }
+      if(file.isDir) { return cb(); }
 
       debug('eachInfra:infra:file', infra._id, file._id);
       var filePath = file.Key.substr(file.Key.indexOf('/source')+7);