From 009639b6a2e407f75e316263842ac375c42ddbd2 Mon Sep 17 00:00:00 2001
From: Bastian Maeuser <mephisto@mephis.to>
Date: Sat, 27 Apr 2019 14:44:14 +0200
Subject: [PATCH] Blacklist refined, More shortcutters added

---
 roles/fastd/files/blacklist.json    | 4 +++-
 roles/fastd/files/blacklist.sh      | 2 +-
 roles/fastd/tasks/main.yml          | 2 +-
 roles/fastd/templates/fastd.conf.j2 | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/roles/fastd/files/blacklist.json b/roles/fastd/files/blacklist.json
index 133f9e2..be4b66d 100644
--- a/roles/fastd/files/blacklist.json
+++ b/roles/fastd/files/blacklist.json
@@ -1,3 +1,5 @@
 {
-	"ffnwshortcutter": "739ef68045fbc0614e526ecdabdf82e8142762e909e4a101d21d0dbd88d282da"
+	"ffnwshortcutter": "739ef68045fbc0614e526ecdabdf82e8142762e909e4a101d21d0dbd88d282da",
+	"penner1": "3d0bfe6ff87becf0245385dca02206497a8845199742a7d766cc71913ea5e0e6",
+	"penner2": "f2fca7649bc086366930441d6737ffed7fd1fc809ff775917303493ff27e06fc"
 }
diff --git a/roles/fastd/files/blacklist.sh b/roles/fastd/files/blacklist.sh
index 4b4de82..eed994b 100644
--- a/roles/fastd/files/blacklist.sh
+++ b/roles/fastd/files/blacklist.sh
@@ -5,6 +5,6 @@ if /bin/grep -Fq $PEER_KEY /opt/ffrgb_cty/vpn-blacklist/blacklist.json; then
     echo "BANNED KEY: $PEER_KEY $PEER_ADDRESS"
     exit 1
 else
-    echo "CLEAN KEY: $PEER_KEY "
+    echo "CLEAN KEY: $PEER_KEY $PEER_ADDRESS"
     exit 0
 fi
diff --git a/roles/fastd/tasks/main.yml b/roles/fastd/tasks/main.yml
index 581f21e..4b0900c 100644
--- a/roles/fastd/tasks/main.yml
+++ b/roles/fastd/tasks/main.yml
@@ -45,7 +45,7 @@
   with_sequence: start=0 count={{ fastd_instances }}
 
 - name: Create Blacklist Script
-  copy: src=blacklist.sh dest=/etc/fastd/{{ site_code }}/blacklist.sh mode=0755 force=no
+  copy: src=blacklist.sh dest=/etc/fastd/{{ site_code }}/blacklist.sh mode=0755 force=yes
 
 - name: Create symlinks (blacklist)
   file: src=/etc/fastd/{{ site_code }}/blacklist.sh dest=/etc/fastd/{{ site_code }}{{ item }}/blacklist.sh state=link
diff --git a/roles/fastd/templates/fastd.conf.j2 b/roles/fastd/templates/fastd.conf.j2
index 05be83f..58afd72 100644
--- a/roles/fastd/templates/fastd.conf.j2
+++ b/roles/fastd/templates/fastd.conf.j2
@@ -38,7 +38,7 @@ on down "
 ";
 
 {% if fastd_anonymous %}
-on verify "/etc/fastd/{{ site_code }}/blacklist.sh /opt/{{ site_code }}/vpn-blacklist/blacklist.json";
+on verify "/etc/fastd/{{ site_code }}/blacklist.sh $PEER_KEY $PEER_ADDRESS /opt/{{ site_code }}/vpn-blacklist/blacklist.json";
 {% endif %}
 
 include peers from "peers";