Merge pull request #326 from devGregA/master

Fixes #325 and a bug in dedupe

Author: devGregA

.travis.yml

@@ -24,7 +24,7 @@ before_install:
   - docker run -e DOJO_ADMIN_USER=$DOJO_ADMIN_USER -e DOJO_ADMIN_PASSWORD=$DOJO_ADMIN_PASSWORD --name dojo -d -p 127.0.0.1:8000:8000 $REPO:${TRAVIS_COMMIT::8} bash /django-DefectDojo/docker/docker-startup.bash
   - sleep 15 #allow dojo time to startup
   - docker logs dojo
-  - docker run -d --name zap --link dojo -p 127.0.0.1:8080:8080 -daemon -host 0.0.0.0 -port 8080 -config api.disablekey=true
+  - docker run -d --name zap --link dojo -p 127.0.0.1:8080:8080 -i owasp/zap2docker-stable zap.sh -daemon -host 0.0.0.0 -port 8080 -config api.disablekey=true
   - docker ps -a
   - docker logs dojo
   - echo "Checking to see if dojo is running"

dojo/tasks.py

@@ -207,7 +207,7 @@ def add_comment_task(find, note):
     add_comment(find, note)
 
 @app.task(name='async_dedupe')
-def async_dedupe(self,  new_finding, *args, **kwargs):
+def async_dedupe(new_finding, *args, **kwargs):
     logger.info("running deduplication")
     eng_findings_cwe = Finding.objects.filter(test__engagement__product=new_finding.test.engagement.product,
                                               cwe=new_finding.cwe).exclude(id=new_finding.id).exclude(cwe=None).exclude(endpoints=None)

run_dojo.bash

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+function control_c()
+# run if user hits control-c
+{
+  kill -15 $cpid  $bpid $ppid
+  exit $?
+}
+
+trap 'control_c' SIGINT
+
+celery -A dojo worker -l info --concurrency 3 &
+cpid=$!
+
+celery beat -A dojo -l info &
+bpid=$!
+
+python manage.py runserver
+ppid=$!
+
+tail -f /dev/null

setup.bash

@@ -141,7 +141,9 @@ else
     sudo python manage.py makemigrations dojo
     sudo python manage.py makemigrations
     sudo python manage.py migrate
-    sudo python manage.py syncdb
+    echo -e "${GREEN}${BOLD}Create Dojo superuser:"
+    tput sgr0
+    sudo python manage.py createsuperuser
     sudo python manage.py loaddata product_type
     sudo python manage.py loaddata test_type
     sudo python manage.py loaddata development_environment