Merge pull request olacabs#121 from olacabs/jch-v2

merging the latest pull request to master
slumdunking · Apr 22, 2019 · fe77928 · fe77928
2 parents 2444c8c + d6dd97d
commit fe77928
Show file tree

Hide file tree

Showing 48 changed files with 377 additions and 501 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -12,7 +12,13 @@ RUN rm -rf /var/lib/apt/lists/* && apt-get clean && apt-get update \
 
 #RUN apt-get -y update
 #RUN apt-get install -y maven
-
+RUN apt-get update -qq && apt-get install -qqy \
+    apt-transport-https \
+    ca-certificates \
+    curl \
+    lxc \
+    iptables
+RUN curl -sSL https://get.docker.com/ | sh
 RUN mkdir -p /home/src/jch_server
 ENV WORKSPACE /home/src/jch_server
 WORKDIR $WORKSPACE

diff --git a/config.yml b/config.yml
@@ -33,6 +33,7 @@ toolManagerConfiguration:
   threadPoolSize: 5 # 5 threads
   initialDelay: 60 # 30 seconds delay on startup
   period: 60 #seconds
+  enableAutoScaling: true
 gitConfiguration:
   threadPoolSize: 5 # 5 threads
   initialDelay: 0 # 0 days delay on startup

diff --git a/docker-compose-with-no-marathon.yml b/docker-compose-with-no-marathon.yml
@@ -32,6 +32,8 @@ services:
      - jch_net
    environment:
      ENABLED_MARATHON: 'false'
+   volumes:
+     - /var/run/docker.sock:/var/run/docker.sock
   jch-client:
     image: jackhammer/jackhammer-client
     ports:

diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/dump.sql b/dump.sql
@@ -1081,4 +1081,6 @@ alter table scanTools add column isDeleted tinyint(1) default false;
 alter table tools add column isDeleted tinyint(1) default false;
 alter table toolInstances add column isDeleted tinyint(1) default false;
 alter table uploads add column isDeleted tinyint(1) default false;
+alter table toolInstances add column containerId varchar(100);
+alter table toolInstances add column port int(11);
 -- Dump completed on 2018-09-19 11:35:46
diff --git a/payloads/andro.json b/payloads/andro.json
@@ -1,7 +1,9 @@
 {
   "id": "jackhammer/andro",
   "cpus": 1,
-  "instances": 1,
+  "initialInstances": 1,
+  "minInstances": 0,
+  "maxInstances": 2,
   "container": {
     "type": "DOCKER",
     "docker": {

diff --git a/payloads/arachni.json b/payloads/arachni.json
@@ -1,7 +1,9 @@
 {
   "id": "jackhammer/arachni",
   "cpus": 4.0,
-  "instances": 1,
+  "initialInstances": 1,
+  "minInstances": 0,
+  "maxInstances": 2,
   "container": {
     "type": "DOCKER",
     "docker": {

diff --git a/payloads/bandit.json b/payloads/bandit.json
@@ -1,7 +1,9 @@
 {
   "id": "jackhammer/bandit",
   "cpus": 4.0,
-  "instances": 1,
+  "initialInstances": 1,
+  "minInstances": 0,
+  "maxInstances": 2,
   "container": {
     "type": "DOCKER",
     "docker": {

diff --git a/payloads/brakeman.json b/payloads/brakeman.json
@@ -1,7 +1,9 @@
 {
   "id": "jackhammer/brakeman",
   "cpus": 1.0,
-  "instances": 1,
+  "initialInstances": 1,
+  "minInstances": 0,
+  "maxInstances": 2,
   "container": {
     "type": "DOCKER",
     "docker": {

diff --git a/payloads/bundle-audit.json b/payloads/bundle-audit.json
@@ -1,7 +1,9 @@
 {
   "id": "jackhammer/bundle-audit",
   "cpus": 1.0,
-  "instances": 1,
+  "initialInstances": 1,
+  "minInstances": 0,
+  "maxInstances": 2,
   "container": {
     "type": "DOCKER",
     "docker": {

diff --git a/payloads/dawn-scanner.json b/payloads/dawn-scanner.json
@@ -1,7 +1,9 @@
 {
   "id": "jackhammer/dawn-scanner",
   "cpus": 1.0,
-  "instances": 1,
+  "initialInstances": 1,
+  "minInstances": 0,
+  "maxInstances": 2,
   "container": {
     "type": "DOCKER",
     "docker": {

diff --git a/payloads/exakat.json b/payloads/exakat.json
@@ -2,6 +2,9 @@
   "id": "jackhammer/exakat",
   "cpus": 1.0,
   "instances": 1,
+  "initialInstances": 1,
+  "minInstances": 0,
+  "maxInstances": 2,
   "container": {
     "type": "DOCKER",
     "docker": {

diff --git a/payloads/find-sec-bugs.json b/payloads/find-sec-bugs.json
@@ -1,7 +1,9 @@
 {
   "id": "jackhammer/findsecbugs",
   "cpus": 2.0,
-  "instances": 2,
+  "initialInstances": 2,
+  "minInstances": 1,
+  "maxInstances": 3,
   "container": {
     "type": "DOCKER",
     "docker": {
@@ -26,5 +28,6 @@
 	 "SUPPORTED_PLATFORM": "Java",
 	 "MAX_ALLOWED_SCANS": "1",
 	 "localSetup": "true"
+	 "MAX_HEAP_SIZE": 3000
 }
 }
diff --git a/payloads/nmap.json b/payloads/nmap.json
@@ -1,7 +1,9 @@
 {
   "id": "jackhammer/nmap",
   "cpus": 1.0,
-  "instances": 1,
+  "initialInstances": 1,
+  "minInstances": 0,
+  "maxInstances": 2,
   "container": {
     "type": "DOCKER",
     "docker": {

diff --git a/payloads/nsp.json b/payloads/nsp.json
@@ -1,7 +1,9 @@
 {
   "id": "jackhammer/nsp",
   "cpus": 1.0,
-  "instances": 1,
+  "initialInstances": 1,
+  "minInstances": 0,
+  "maxInstances": 2,
   "container": {
     "type": "DOCKER",
     "docker": {

diff --git a/payloads/retire.json b/payloads/retire.json
@@ -1,7 +1,9 @@
 {
   "id": "jackhammer/retire",
   "cpus": 1.0,
-  "instances": 1,
+  "initialInstances": 1,
+  "minInstances": 0,
+  "maxInstances": 2,
   "container": {
     "type": "DOCKER",
     "docker": {

diff --git a/payloads/truffle-hog.json b/payloads/truffle-hog.json
@@ -1,7 +1,9 @@
 {
   "id": "jackhammer/truffle-hog",
   "cpus": 1.0,
-  "instances": 1,
+  "initialInstances": 1,
+  "minInstances": 0,
+  "maxInstances": 2,
   "container": {
     "type": "DOCKER",
     "docker": {

diff --git a/payloads/wpscan.json b/payloads/wpscan.json
@@ -1,7 +1,9 @@
 {
   "id": "jackhammer/wpscan",
   "cpus": 1.0,
-  "instances": 1,
+  "initialInstances": 1,
+  "minInstances": 0,
+  "maxInstances": 2,
   "container": {
     "type": "DOCKER",
     "docker": {

diff --git a/payloads/xanitizer.json b/payloads/xanitizer.json
@@ -1,7 +1,9 @@
 {
   "id": "jackhammer/xanitizer",
   "cpus": 4.0,
-  "instances": 1,
+  "initialInstances": 1,
+  "minInstances": 0,
+  "maxInstances": 2,
   "container": {
     "type": "DOCKER",
     "docker": {

diff --git a/src/main/java/com/olacabs/jackhammer/application/JackhammerBinder.java b/src/main/java/com/olacabs/jackhammer/application/JackhammerBinder.java
@@ -259,6 +259,10 @@ protected void configure() {
 
         //docker util
         bind(DockerUtil.class);
+
+        //AutoScalingTool
+        bind(AutoScalingManager.class);
+        bind(AutoScalingTool.class);
     }
 
     @Provides

diff --git a/src/main/java/com/olacabs/jackhammer/application/JackhammerService.java b/src/main/java/com/olacabs/jackhammer/application/JackhammerService.java
@@ -10,6 +10,7 @@
 import com.olacabs.jackhammer.git.manager.GitPooler;
 import com.olacabs.jackhammer.scan.manager.ScheduledScanPooler;
 import com.olacabs.jackhammer.scan.manager.WpScanSchedulerPooler;
+import com.olacabs.jackhammer.tool.interfaces.container.manager.AutoScalingManager;
 import com.olacabs.jackhammer.tool.interfaces.container.manager.HangedToolInstanceManager;
 import com.olacabs.jackhammer.tool.interfaces.container.manager.ActiveToolInstanceManager;
 import io.dropwizard.Application;
@@ -69,14 +70,14 @@ public void run(JackhammerConfiguration jackhammerConfiguration, Environment env
 
         //register filters
         environment.servlets().addFilter(Constants.CORS_FILTER, CORSFilter.class)
-                .addMappingForUrlPatterns(EnumSet.allOf(DispatcherType.class),true,Constants.CORS_URL_PATTERN);
+                .addMappingForUrlPatterns(EnumSet.allOf(DispatcherType.class), true, Constants.CORS_URL_PATTERN);
         environment.servlets()
-                .addFilter(Constants.AUTHENTICATION_FILTER,(AuthenticationFilter)guiceBundle
-                .getInjector()
-                .getInstance(AuthenticationFilter.class))
+                .addFilter(Constants.AUTHENTICATION_FILTER, (AuthenticationFilter) guiceBundle
+                        .getInjector()
+                        .getInstance(AuthenticationFilter.class))
                 .addMappingForUrlPatterns(EnumSet.allOf(DispatcherType.class), true, Constants.AUTH_BASE_URL_PATTERN);
         environment.servlets()
-                .addFilter(Constants.AUTHORIZATION_FILTER,(AuthorizationFilter)guiceBundle
+                .addFilter(Constants.AUTHORIZATION_FILTER, (AuthorizationFilter) guiceBundle
                         .getInjector()
                         .getInstance(AuthorizationFilter.class))
                 .addMappingForUrlPatterns(EnumSet.allOf(DispatcherType.class), true, Constants.AUTH_BASE_URL_PATTERN);
@@ -119,6 +120,10 @@ public void run(JackhammerConfiguration jackhammerConfiguration, Environment env
         environment.lifecycle().manage(guiceBundle.getInjector().getInstance(GitPooler.class));
         environment.lifecycle().manage(guiceBundle.getInjector().getInstance(HangedToolInstanceManager.class));
         environment.lifecycle().manage(guiceBundle.getInjector().getInstance(WpScanSchedulerPooler.class));
+
+        if (jackhammerConfiguration.getToolManagerConfiguration().getEnableAutoScaling())
+            environment.lifecycle().manage(guiceBundle.getInjector().getInstance(AutoScalingManager.class));
+
     }
 
     @Override