sprinterfreak/ansible-ffrgb
1
0
Fork 0
forked from FF-RGB/ansible
Code Pull Requests 1 Releases Activity

Added IP to logging for helping mitigate Shortcuts

Browse Source
This commit is contained in:
Bastian 2019-04-27 15:09:14 +02:00
parent 009639b6a2
commit 10738aa721
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/fastd/files/blacklist.sh
View File

@ -1,7 +1,8 @@
#!/bin/bash #!/bin/bash
PEER_KEY=$1 PEER_KEY=$1
PEER_ADDRESS=$2 PEER_ADDRESS=$2
if /bin/grep -Fq $PEER_KEY /opt/ffrgb_cty/vpn-blacklist/blacklist.json; then BLACKLIST=$3
if /bin/grep -Fq $PEER_KEY $BLACKLIST; then
echo "BANNED KEY: $PEER_KEY $PEER_ADDRESS" echo "BANNED KEY: $PEER_KEY $PEER_ADDRESS"
exit 1 exit 1
else else

2
roles/fastd/templates/fastd.conf.j2
View File

@ -38,7 +38,7 @@ on down "
"; ";
{% if fastd_anonymous %} {% if fastd_anonymous %}
on verify "/etc/fastd/{{ site_code }}/blacklist.sh $PEER_KEY $PEER_ADDRESS /opt/{{ site_code }}/vpn-blacklist/blacklist.json"; on verify "/etc/fastd/{{ site_code }}/blacklist.sh $PEER_KEY $PEER_ADDRESS /etc/fastd/{{ site_code }}/vpn-blacklist/blacklist.json";
{% endif %} {% endif %}
include peers from "peers"; include peers from "peers";