From 90729422a959bf31fe64b0d6dd4693c80d9ca0b6 Mon Sep 17 00:00:00 2001
From: Tobias Kessels <tobias.kessels@certbw.de>
Date: Mon, 19 Nov 2018 13:48:17 +0100
Subject: [PATCH] updated some files and added dockerproxyscript

---
 codegrab/json_save.py              |  0
 codegrab/sort.py                   |  0
 commands                           |  3 ++
 depth                              |  6 ++--
 dockerfiles/docker-waf             |  1 +
 dockerfiles/docker-waf2            |  1 +
 dockerfiles/elk/docker-compose.yml |  5 +--
 reset_screens.sh                   |  4 +--
 screenshot.js                      | 51 ++++++++++++++++++++++++++++++
 update_docker_proxy.sh             | 11 +++++++
 10 files changed, 76 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 codegrab/json_save.py
 mode change 100644 => 100755 codegrab/sort.py
 mode change 100755 => 100644 commands
 create mode 160000 dockerfiles/docker-waf
 create mode 160000 dockerfiles/docker-waf2
 create mode 100755 screenshot.js
 create mode 100755 update_docker_proxy.sh

diff --git a/codegrab/json_save.py b/codegrab/json_save.py
old mode 100644
new mode 100755
diff --git a/codegrab/sort.py b/codegrab/sort.py
old mode 100644
new mode 100755
diff --git a/commands b/commands
old mode 100755
new mode 100644
index e053d2a..37e4373
--- a/commands
+++ b/commands
@@ -10,3 +10,6 @@ sudo rtcwake -m mem -t +`date -u +%s -d +60minutes`
 
 #Zahlen verteilung analysieren
 primes 1 100 |gnuplot -p -e 'plot "/dev/stdin"'
+
+#use w3m without internet
+unshare -r -n w3m
diff --git a/depth b/depth
index 0d9f41b..8754b8d 100755
--- a/depth
+++ b/depth
@@ -1,8 +1,10 @@
 #!/bin/bash
+file="${1}"
+stag="${2}"
 max=0
 open=0
-grep -Po "</?div" OFFIZIELLE\ GEWINN...htigung\ und\ letzter\).eml | while read tag; do
-  if [[ "$tag" == "<div" ]] ; then
+grep -Po "</?${stag}" "${file}" | while read tag; do
+  if [[ "$tag" == "<${stag}" ]] ; then
     (( open++ ))
   else
     (( open--))
diff --git a/dockerfiles/docker-waf b/dockerfiles/docker-waf
new file mode 160000
index 0000000..5137aca
--- /dev/null
+++ b/dockerfiles/docker-waf
@@ -0,0 +1 @@
+Subproject commit 5137aca1762ad3fba1a157d8efcbf67cca22f2f6
diff --git a/dockerfiles/docker-waf2 b/dockerfiles/docker-waf2
new file mode 160000
index 0000000..5137aca
--- /dev/null
+++ b/dockerfiles/docker-waf2
@@ -0,0 +1 @@
+Subproject commit 5137aca1762ad3fba1a157d8efcbf67cca22f2f6
diff --git a/dockerfiles/elk/docker-compose.yml b/dockerfiles/elk/docker-compose.yml
index 5581873..f2f52cf 100644
--- a/dockerfiles/elk/docker-compose.yml
+++ b/dockerfiles/elk/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
     elasticsearch:
-        image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2
+        image: docker.elastic.co/elasticsearch/elasticsearch:6.4.2
         container_name: elasticsearch
         hostname: elasticsearch
         ports:
@@ -21,7 +21,8 @@ services:
         - elk
 
     kibana:
-        image: docker.elastic.co/kibana/kibana:6.3.2
+        image:
+            docker.elastic.co/kibana/kibana:6.4.2
         hostname: kibana
         ports:
         - "5601:5601"
diff --git a/reset_screens.sh b/reset_screens.sh
index a75d495..50555f0 100755
--- a/reset_screens.sh
+++ b/reset_screens.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 xrandr --output DVI-I-1 --mode 1920x1080 --rotate left --pos 0x0
-xrandr --output DP-2 --primary --mode 2560x1440 --pos 1080x350
-xrandr --output DP-1 --mode 2560x1440 --pos 3640x350
+xrandr --output DP-1 --primary --mode 2560x1440 --pos 1080x350
+xrandr --output DP-2 --mode 2560x1440 --pos 3640x350
diff --git a/screenshot.js b/screenshot.js
new file mode 100755
index 0000000..29bc32c
--- /dev/null
+++ b/screenshot.js
@@ -0,0 +1,51 @@
+//Requires PhantomJS
+//Install with apt install phantomjs
+
+var system = require('system');
+var args = system.args;
+
+if (args.length === 1) {
+  console.log('Try to pass some arguments when invoking this script!');
+} else {
+  args.forEach(function(arg, i) {
+    console.log(i + ': ' + arg);
+  });
+}
+var scriptname=args.shift()
+urls=args
+// var urls = [
+// 		"http://www.google.de",
+// 		"http://heise.de",
+// 		"https://www.test.de"
+// 	]
+var	webpage = require('webpage'),
+	page = webpage.create(),
+	nr = 0;
+// Seitendimensionen ggf. anpassen
+//page.viewportSize = {width: 1920, height: 4000};
+
+var screenshot = function() {
+	if (!urls.length) phantom.exit();
+	var _url = urls.shift();
+	console.log('Öffne Seite ' + (nr+1) + ': ' + _url);
+	page.open(_url, function(status) {
+		if (status !== 'success') {
+			console.log('Netzwerkproblem: ' + status);
+			urls.unshift(_url);
+			setTimeout(screenshot, 1000);
+		} else {
+			++nr;
+			page.evaluate(function() {
+				var style = document.createElement('style'),
+					bg = document.createTextNode('body {background: #fff}; html {width: 1000px};');
+				style.setAttribute('type', 'text/css');
+				style.appendChild(bg);
+				document.head.insertBefore(style, document.head.firstChild);
+			});
+			page.render('screenshot_' + nr + '_' + Date.now() + '.jpg', {format: 'jpeg', quality: 80});
+			setTimeout(screenshot, 2000);
+		}
+	});
+}
+
+screenshot();
diff --git a/update_docker_proxy.sh b/update_docker_proxy.sh
new file mode 100755
index 0000000..9a7605d
--- /dev/null
+++ b/update_docker_proxy.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+echo -n "Username: "
+read username
+echo -n "Password: "
+read -s password
+echo "[Service]" > /etc/systemd/system/docker.service.d/http-proxy.conf
+echo -n "Environment=HTTPS_PROXY='http://" >> /etc/systemd/system/docker.service.d/http-proxy.conf
+echo -n "${username}:${password}@192.168.193.6:8080/' " >> /etc/systemd/system/docker.service.d/http-proxy.conf
+echo -n '"NO_PROXY=localhost,127.0.0.1"'  >> /etc/systemd/system/docker.service.d/http-proxy.conf
+systemctl daemon-reload
+systemctl restart docker