Merge pull request #513 from CodeNow/SAN-706-post-instances-id-actions-copy

San 706 post instances id actions copy

Author: cflynn07

lib/middlewares/me.js

@@ -52,22 +52,6 @@ module.exports = createMongooseMiddleware(User, 'sessionUser', {
       }
     };
   },
-  isHelloRunnable: function (modelKey) {
-    return function (req, res, next) {
-      var model = keypather.get(req, modelKey);
-      var modelGithubId = model.owner.github;
-      var userGithubId = req.sessionUser.accounts.github.id;
-      if (modelGithubId === process.env.HELLO_RUNNABLE_GITHUB_ID) {
-        next();
-      }
-      else if (userGithubId === process.env.HELLO_RUNNABLE_GITHUB_ID) {
-        next();
-      }
-      else {
-        next(Boom.forbidden('Access denied (!owner)', { githubId: modelGithubId }));
-      }
-    };
-  },
   isRegistered: function (req, res, next) {
     this.permission('registered')(req, res, next);
   },

lib/routes/actions/analyze/index.js

@@ -9,6 +9,7 @@
 
 var app = module.exports = require('express')();
 var debug = require('debug')('runnable-api:actions:analyze');
+var dogstatsd = require('models/datadog');
 var find = require('101/find');
 var flow = require('middleware-flow');
 var github = require('middlewares/apis').github;
@@ -105,6 +106,7 @@ var extractProjectDependencyList = flow.series(
  */
 function extractJS (req, res, next) {
   debug('extracting project dependency-modules for languageFramework: %s', req.languageFramework);
+  var start = new Date();
   var depFile;
   try {
     depFile = JSON.parse(req.dependencyFileContent);
@@ -122,6 +124,7 @@ function extractJS (req, res, next) {
     nodejs: nodev,
     npm: npmv
   };
+  dogstatsd.timing('api.actions-analyze-index.extractJS', new Date()-start, 1, []);
   next();
 }
 
@@ -133,6 +136,7 @@ function extractJS (req, res, next) {
  */
 function extractRuby (req, res, next) {
   debug('extracting project dependency-modules for languageFramework: %s', req.languageFramework);
+  var start = new Date();
   var dependencies = [];
   var gemfileDependenciesRegexPattern = /^(\s+)?gem\s+['"](\S+)['"]/gm;
   var execResult = gemfileDependenciesRegexPattern.exec(req.dependencyFileContent);
@@ -145,6 +149,7 @@ function extractRuby (req, res, next) {
     ruby: req.supportedLanguageVersions.defaultVersion,
     rails: stacks.rails.defaultVersion
   };
+  dogstatsd.timing('api.actions-analyze-index.extractRuby', new Date()-start, 1, []);
   next();
 }
 
@@ -156,6 +161,7 @@ function extractRuby (req, res, next) {
  */
 function extractPython (req, res, next) {
   debug('extracting project dependency-modules for languageFramework: %s', req.languageFramework);
+  var start = new Date();
   var dependencies = [];
   var pythonDependenciesRegexPattern = /^([A-z0-9-_]+)/gm;
   var execResult = pythonDependenciesRegexPattern.exec(req.dependencyFileContent);
@@ -167,6 +173,7 @@ function extractPython (req, res, next) {
   req.inferredLanguageVersion = {
     python: req.supportedLanguageVersions.defaultVersion
   };
+  dogstatsd.timing('api.actions-analyze-index.extractPython', new Date()-start, 1, []);
   next();
 }
 
@@ -198,6 +205,7 @@ function inferDependenciesFromDependencyList (req, res, next) {
       suggestableServices = suggestableServicesPython;
       break;
   }
+  var start = new Date();
   var inferredServices = suggestableServicesKeys.filter(function (key) {
     return find(suggestableServices[key], function (moduleThatMatchesSuggestableService) {
       return find(req.dependencyList, function (dependencyInProject) {
@@ -208,6 +216,8 @@ function inferDependenciesFromDependencyList (req, res, next) {
       });
     });
   });
+  dogstatsd.timing('api.actions-analyze-index.inferDependenciesFromDependencyList',
+                   new Date()-start, 1, []);
   req.inferredDependencies = inferredServices;
   next();
 }

lib/routes/builds.js

@@ -22,13 +22,15 @@ var runnable = require('middlewares/apis').runnable;
 var error = require('error');
 var pluck = require('101/pluck');
 var noop = require('101/noop');
+var ownerIsHelloRunnable = require('middlewares/owner-is-hello-runnable');
 
 var findBuild = flow.series(
   mw.params('id').require().validate(validations.isObjectId),
   builds.findById('params.id'),
   checkFound('build'),
   flow.or(
     me.isOwnerOf('build'),
+    ownerIsHelloRunnable('build'),
     me.isModerator));
 
 /** Create a build

lib/routes/contexts/versions/index.js

@@ -28,12 +28,14 @@ var transformations = require('middlewares/transformations');
 var mavis = require('middlewares/apis').mavis;
 var docker = require('middlewares/apis').docker;
 var error = require('error');
+var ownerIsHelloRunnable = require('middlewares/owner-is-hello-runnable');
 
 var findContext = flow.series(
   contexts.findById('params.contextId'),
   checkFound('context'),
   flow.or(
     me.isOwnerOf('context'),
+    ownerIsHelloRunnable('context'),
     mw.req('context.isSource').validate(validations.equals(true)),
     me.isModerator));
 

lib/routes/instances/index.js

@@ -48,6 +48,7 @@ var findBuild = flow.series(
   checkFound('build'),
   flow.or(
     me.isOwnerOf('build'),
+    ownerIsHelloRunnable('build'),
     me.isModerator),
   mw.req('build.started').require()
     .else(mw.next(Boom.badRequest('Instances cannot use builds that haven\'t been started'))));
@@ -601,7 +602,10 @@ app.post('/instances/:id/actions/copy',
     me.isModerator),
   mw.body('owner.github').require().then(
     mw.body('owner.github').number(),
-    me.isOwnerOf('body')),
+    flow.or(
+      me.isOwnerOf('body'),
+      ownerIsHelloRunnable('body')
+    )),
   // The best way to clone an instance is to just use the post route
   // If we deep copy the build, we can attach its id to the body, and just use the post route
   findBuild,