Release v1.0.1 (#10)

J12934 · web-flow · commit 0e4e630e5649 · 2019-08-05T19:50:06.000+02:00
Release v1.0.1
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. macOS 12]
+ - Browser [e.g. chrome, safari]
+ - Box-Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -0,0 +1,20 @@
+name-template: 'v$NEXT_PATCH_VERSION'
+tag-template: 'v$NEXT_PATCH_VERSION'
+categories:
+    - title: '🚀 Features'
+      label: 'enhancement'
+    - title: '🐛 Bug Fixes'
+      label: 'bug'
+    - title: '🔧 Maintenance'
+      label: 'maintenance'
+    - title: '🧪 Test'
+      label: 'test'
+    - title: '🧪 Documentation'
+      label: 'docs'
+    - title: '📌 Dependencies'
+      label: 'dependencies'
+change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+exclude-labels:
+    - 'skip-changelog'
+template: |
+    $CHANGES
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,7 @@
 FROM ruby:latest
 
 WORKDIR /sectools/
+COPY Gemfile /sectools
 
 ARG ARACHNI_DISTRIBUTION=https://github.com/Arachni/arachni/releases/download/v1.5.1/arachni-1.5.1-0.5.12-linux-x86_64.tar.gz
 # Name of the arachni main folder contained in the .tar.gz
@@ -10,17 +11,15 @@ ENV ARACHNI_LONG_VERSION ${ARACHNI_LONG_VERSION}
 
 RUN wget ${ARACHNI_DISTRIBUTION} -P /sectools --output-document arachni.tar.gz && \
     tar zxvf arachni.tar.gz && \
+    bundle install && \
     mv arachni-${ARACHNI_LONG_VERSION} arachni && \
     rm arachni.tar.gz
 
 HEALTHCHECK --interval=30s --timeout=5s --start-period=120s --retries=3 CMD curl --fail http://localhost:8080/status || exit 1
 
 COPY Gemfile src/
 
-RUN bundle install --gemfile=/sectools/src/Gemfile
-
 COPY src/ src/
-COPY lib/ lib/
 
 RUN addgroup -system arachni && \
     adduser -system arachni && \
@@ -58,4 +57,4 @@ LABEL org.opencontainers.image.title="secureCodeBox scanner-webapplication-arach
     org.opencontainers.image.revision=$COMMIT_ID \
     org.opencontainers.image.created=$BUILD_DATE
 
-ENTRYPOINT ["bash","/sectools/src/starter.sh"]
+ENTRYPOINT ["bash","./src/starter.sh"]
diff --git a/Gemfile b/Gemfile
@@ -3,3 +3,5 @@ source 'https://rubygems.org'
 gem "sinatra"
 gem "rest-client"
 # gem "arachni"
+
+gem "ruby-scanner-scaffolding", :git => "https://github.com/secureCodeBox/ruby-scanner-scaffolding.git", :tag => "v1.0.0"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -0,0 +1,53 @@
+GIT
+  remote: https://github.com/secureCodeBox/ruby-scanner-scaffolding.git
+  revision: fff6c92edffb1f55bde432156ffd60c38c034e49
+  tag: v1.0.0
+  specs:
+    ruby-scanner-scaffolding (1.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    domain_name (0.5.20180417)
+      unf (>= 0.0.5, < 1.0.0)
+    ffi (1.10.0-x64-mingw32)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    mime-types (3.2.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.0331)
+    mustermann (1.0.3)
+    netrc (0.11.0)
+    rack (2.0.7)
+    rack-protection (2.0.5)
+      rack
+    rest-client (2.0.2)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rest-client (2.0.2-x64-mingw32)
+      ffi (~> 1.9)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    sinatra (2.0.5)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.5)
+      tilt (~> 2.0)
+    tilt (2.0.9)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.6)
+
+PLATFORMS
+  ruby
+  x64-mingw32
+
+DEPENDENCIES
+  rest-client
+  ruby-scanner-scaffolding!
+  sinatra
+
+BUNDLED WITH
+   2.0.1
diff --git a/lib/camunda_worker.rb b/lib/camunda_worker.rb
diff --git a/src/arachni_worker.rb b/src/arachni_worker.rb
@@ -1,6 +1,6 @@
 require 'json'
-
-require_relative "../lib/camunda_worker"
+require 'rest-client'
+require 'ruby-scanner-scaffolding'
 
 require_relative "./arachni_scan"
 require_relative "./arachni_configuration"
@@ -35,4 +35,17 @@ def work(job_id, targets)
         scannerType: 'arachni'
     }
   end
+
+  def healthy?
+    begin
+      response = RestClient::Request.execute(
+          method: :get,
+          url: 'http://127.0.0.1:7331/scans',
+          timeout: 2
+      )
+      response.code == 200
+    rescue
+      return false
+    end
+  end
 end
diff --git a/src/main.rb b/src/main.rb
diff --git a/src/starter.sh b/src/starter.sh
