From 840a3410c9f1d63cbcb877d9177057aa012ea05c Mon Sep 17 00:00:00 2001 From: Michael Schaefer Date: Fri, 16 Mar 2018 11:05:42 +0100 Subject: [PATCH 1/5] Dockerfile for webui instance --- Dockerfile | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..e486de6b --- /dev/null +++ b/Dockerfile @@ -0,0 +1,20 @@ +FROM debian:stretch + +RUN apt-get update +RUN apt-get -y upgrade +RUN apt-get -y install git wget python3-pip pwgen +RUN git clone https://github.com/CIRCL/lookyloo.git +WORKDIR lookyloo + +RUN pip3 install -r requirements.txt +RUN pip3 install -e . +RUN wget https://d3js.org/d3.v4.min.js -O lookyloo/static/d3.v4.min.js +RUN wget https://cdn.rawgit.com/eligrey/FileSaver.js/5733e40e5af936eb3f48554cf6a8a7075d71d18a/FileSaver.js -O lookyloo/static/FileSaver.js + +RUN sed -i "s/SPLASH = 'http:\/\/127.0.0.1:8050'/SPLASH = 'http:\/\/splash:8050'/g" lookyloo/__init__.py +RUN secret_key=`pwgen -Bsv1 32`; sed -i "s/app.secret_key = 'changeme'/app.secret_key = '$secret_key'/g" lookyloo/__init__.py +ENV LC_ALL=C.UTF-8 +ENV LANG=C.UTF-8 +ENV FLASK_APP=lookyloo +EXPOSE 5000 +ENTRYPOINT ["flask", "run", "--host=0.0.0.0"] From 0bd831f92bb865c4107f61d072cc8242128def53 Mon Sep 17 00:00:00 2001 From: Michael Schaefer Date: Fri, 16 Mar 2018 11:06:16 +0100 Subject: [PATCH 2/5] docker-compose for webui + scraper --- docker-compose.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..e29dbfea --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3' +services: + splash: + image: "scrapinghub/splash" + expose: + - "8050" + - "5023" + command: --disable-ui --disable-lua + lookyloo: + build: . + ports: + - "5000:5000" \ No newline at end of file From ffe2a0ff35583ea8afa41df336dc827b03f6de31 Mon Sep 17 00:00:00 2001 From: sw-mschaefer <35770098+sw-mschaefer@users.noreply.github.com> Date: Fri, 16 Mar 2018 11:12:57 +0100 Subject: [PATCH 3/5] Fixed missing newline --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index e29dbfea..3c1e03f3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,4 +9,5 @@ services: lookyloo: build: . ports: - - "5000:5000" \ No newline at end of file + - "5000:5000" + From 6bdaf62af039b98ffe54418e4a849aa24798b53e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Fri, 16 Mar 2018 11:54:46 +0100 Subject: [PATCH 4/5] Update LICENSE --- LICENSE | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index c044b128..e437f77f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,8 @@ BSD 3-Clause License -Copyright (c) 2017, CIRCL - Computer Incident Response Center Luxembourg +Copyright (c) 2017-2018, Quinn Norton +Copyright (c) 2017-2018, Raphaƫl Vinot +Copyright (c) 2017-2018, CIRCL - Computer Incident Response Center Luxembourg All rights reserved. Redistribution and use in source and binary forms, with or without From eb4eae672db89ed0bcab28209de1bad5bc4005b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Fri, 16 Mar 2018 11:57:54 +0100 Subject: [PATCH 5/5] fix: Missing dependency (beautifulsoup4) Fix #13 --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 4675c83d..7796344a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,6 +2,7 @@ flask flask-bootstrap ete3 +beautifulsoup4 # Backend libs git+https://github.com/viper-framework/har2tree.git