From cca867eadbd06731f0184840c18338ca7fa97343 Mon Sep 17 00:00:00 2001
From: ziirish <ziirish@ziirish.info>
Date: Thu, 4 Jan 2018 16:34:30 +0100
Subject: [PATCH] fix demo build

---
 .gitlab-ci.yml                                | 2 +-
 docker/demo/docker-burp1/assets/setup/install | 2 ++
 docker/demo/docker-burpui/Dockerfile          | 1 +
 docker/demo/docker-burpui/assets/init         | 6 ++++--
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 54e5c4e1..3f63e11e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -128,7 +128,7 @@ build:docker:demo:
 deploy:demo:
   stage: deploy
   script:
-  - find docker/demo/ -name "install" | xargs sed -i "s/@build@/$CI_COMMIT_SHA/"
+  - find docker/demo/ -name "install" -o -name "init" | xargs sed -i "s/@build@/$CI_COMMIT_SHA/"
   - cd docker/demo/ && find . -maxdepth 1 -type d -a ! -name dist -exec cp -r ../../dist "{}/" \; -exec cp -r ../../meta "{}/" \; && cd ../..
   - find docker/demo/ -name "Dockerfile" | xargs sed -i "s,^.*@ARTIFACTS@.*$,COPY dist/*.tar.gz /tmp/burpui.dev.tar.gz,;s,^.*@BUIAGENT_ARTIFACTS@.*$,COPY meta/burp-ui-agent*.tar.gz /tmp/burp-ui-agent.dev.tar.gz,"
   - test -d /srv/demo/docker && rm -rf /srv/demo/docker
diff --git a/docker/demo/docker-burp1/assets/setup/install b/docker/demo/docker-burp1/assets/setup/install
index ae738034..2e1cc85b 100755
--- a/docker/demo/docker-burp1/assets/setup/install
+++ b/docker/demo/docker-burp1/assets/setup/install
@@ -30,6 +30,8 @@ pip install gevent
 #pip install --upgrade cffi
 pip install --upgrade $BURPUI
 pip install ujson
+pip install ipaddress
+pip install enum34
 
 # Create burp-ui User
 useradd -m -s /bin/bash -d /var/lib/burpui -c 'Burp-UI daemon user' -u 5337 burpui
diff --git a/docker/demo/docker-burpui/Dockerfile b/docker/demo/docker-burpui/Dockerfile
index 3a2872af..d0edf112 100644
--- a/docker/demo/docker-burpui/Dockerfile
+++ b/docker/demo/docker-burpui/Dockerfile
@@ -7,3 +7,4 @@ ADD assets/init /app/init
 RUN chmod 755 /app/init
 
 ENTRYPOINT ["/app/init"]
+CMD ["app:start"]
diff --git a/docker/demo/docker-burpui/assets/init b/docker/demo/docker-burpui/assets/init
index f2e12a4c..154010a9 100755
--- a/docker/demo/docker-burpui/assets/init
+++ b/docker/demo/docker-burpui/assets/init
@@ -37,8 +37,10 @@ appStart () {
   sed -i -r "s'@DSN@'$SENTRY_DSN'" /etc/burp/burpui.cfg
 
   # patch demo with piwik
-  REP=$(cat ${CONFIG_DIR}/patch/piwik.patch | tr '\n' "\\n")
-  sed -i -r "s#^.*@DEMO@.*\$#$REP#" /usr/local/lib/python3.6/site-packages/burpui/templates/layout.html
+  REP=$(cat ${CONFIG_DIR}/patch/piwik.patch)
+  awk -v r="$REP" '{gsub(/^.*@DEMO@.*$/,r)}1' /usr/local/lib/python3.6/site-packages/burpui/templates/layout.html >/tmp/layout.html
+  cat /tmp/layout.html >/usr/local/lib/python3.6/site-packages/burpui/templates/layout.html
+  rm /tmp/layout.html
 
   # Create burp-ui User
   getent group | grep -q burpui || addgroup -g $BURPUI_GID burpui