From bbbc05ab3ae83f63787347019f0815b11c5448c4 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 4 Jan 2021 20:53:39 +0100 Subject: [PATCH 01/56] =?UTF-8?q?=C3=9Cberfl=C3=BCssige=20Kommentare=20ent?= =?UTF-8?q?fernt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 10-50-reverse.sh | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/10-50-reverse.sh b/10-50-reverse.sh index 6006790..d067131 100755 --- a/10-50-reverse.sh +++ b/10-50-reverse.sh @@ -1,26 +1,17 @@ #!/bin/bash -#Name der Zone DomainZone="50.10.in-addr.arpa." -#Positionen und Namen der Forward Lookup Zone Files ForwardZoneFiles=("/srv/fff-dns/db.fff.community") ReverseZoneFile="/var/lib/bind/db.50.10" #Temporäres Verzeichnis - muss pro Zone exclusiv sein! TempDir="/tmp/50.10.in-addr.arpa" -#TTL TTL=3600 -#refresh refresh=2000 -#retry retry=6400 -#expire expire=2419200 -#minimum minimum=86400 -#contact-mail -contact=franken.freifunk.net. -#responsible DNS Server by name (for reverseDNS your own) -responsible=aquarius.gw.fff.community. +contactemail=franken.freifunk.net. +reverseservername=aquarius.gw.fff.community. ################################################################# @@ -58,8 +49,8 @@ done Serials=( $( for i in ${Serials[@]}; do echo "$i"; done | sort -rn ) ) serial=${Serials[0]} -echo "$DomainZone $TTL IN SOA $responsible $contact $serial $refresh $retry $expire $minimum" > "$TempDir/$DomainZone" -echo "$DomainZone $TTL IN NS $responsible" >> "$TempDir/$DomainZone" +echo "$DomainZone $TTL IN SOA $reverseservername $contactemail $serial $refresh $retry $expire $minimum" > "$TempDir/$DomainZone" +echo "$DomainZone $TTL IN NS $reverseservername" >> "$TempDir/$DomainZone" for ForwardZoneFile in $(ls $TempDir) do Hosts=($(cat "$TempDir/$ForwardZoneFile" | grep -v SOA | awk '{ print $1 }')) From bc384423873253f76665beb9839d2d8831b2cf92 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 4 Jan 2021 20:53:39 +0100 Subject: [PATCH 02/56] ZoneName und Serial korrigiert Das fff.community zone File hat noch ein nicht RFC-konformes format (nur so funktionierte das hier) Dieser Commit ist mit dem falschen Format inkompatibel --- 10-50-reverse.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/10-50-reverse.sh b/10-50-reverse.sh index d067131..be1a518 100755 --- a/10-50-reverse.sh +++ b/10-50-reverse.sh @@ -10,8 +10,8 @@ refresh=2000 retry=6400 expire=2419200 minimum=86400 -contactemail=franken.freifunk.net. -reverseservername=aquarius.gw.fff.community. +ContactEMail=franken.freifunk.net. +ReverseServerName=aquarius.gw.fff.community. ################################################################# @@ -40,17 +40,17 @@ mkdir -p $TempDir Serials=() for ForwardZoneFile in "${ForwardZoneFiles[@]}" do - ZoneName=$(cat $ForwardZoneFile | grep SOA | awk '{ print $1 }' | head -n 1) + ZoneName=$(sed -ne 's/\(\S\+\)\s\+IN\s\+SOA\s\+\S\+.*/\1/p' "$ForwardZoneFile") named-compilezone -o "$TempDir/$ZoneName" $ZoneName $ForwardZoneFile >/dev/null 2>&1 - serial=$(cat "$TempDir/$ZoneName" | grep SOA | awk '{ print $7 }' | head -n 1) + serial=$(sed -e '/\S\+\s\+IN\s\+SOA\s/,$!d;:a;s/;.*$//g;:a;N;$!ba;s/\n//g;s/\S\+\s\+IN\s\+SOA\s\+\S\+\s\+\S\+\s\+(\?\s\+\([0-9]*\).*/\1/' "$TempDir/$ZoneName" ) Serials+=( "$serial" ) done Serials=( $( for i in ${Serials[@]}; do echo "$i"; done | sort -rn ) ) serial=${Serials[0]} -echo "$DomainZone $TTL IN SOA $reverseservername $contactemail $serial $refresh $retry $expire $minimum" > "$TempDir/$DomainZone" -echo "$DomainZone $TTL IN NS $reverseservername" >> "$TempDir/$DomainZone" +echo "$DomainZone $TTL IN SOA $ReverseServerName $ContactEMail $serial $refresh $retry $expire $minimum" > "$TempDir/$DomainZone" +echo "$DomainZone $TTL IN NS $ReverseServerName" >> "$TempDir/$DomainZone" for ForwardZoneFile in $(ls $TempDir) do Hosts=($(cat "$TempDir/$ForwardZoneFile" | grep -v SOA | awk '{ print $1 }')) From 038acaa2ebb58d1b7b57ea455d36008d3476481a Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 4 Jan 2021 20:53:39 +0100 Subject: [PATCH 03/56] Unter OpenWRT kein =~; IP-Adressvalidierung korrigiert; Optionale Nutzung von rndc -> Vorteil: nur eine Zone wird neu geladen; Refaktoring --- 10-50-reverse.sh | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/10-50-reverse.sh b/10-50-reverse.sh index be1a518..4ceec11 100755 --- a/10-50-reverse.sh +++ b/10-50-reverse.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh DomainZone="50.10.in-addr.arpa." ForwardZoneFiles=("/srv/fff-dns/db.fff.community") @@ -15,24 +15,27 @@ ReverseServerName=aquarius.gw.fff.community. ################################################################# -function dnsreload { - systemctl reload bind9 +function GetZoneFileSerial() { + local FirstSOALineAndFollowing="/\S\+\s\+IN\s\+SOA\s/,\$!d;" + local RemoveComments=":a;s/;.*$//g;" + local EleminateLineBreaks=":a;N;\$!ba;s/\n//g;" + local SearchPrintSerial="s/\S\+\s\+IN\s\+SOA\s\+\S\+\s\+\S\+\s\+(\?\s\+\([0-9]*\).*/\1/" + + local serial=$(sed -e "$FirstSOALineAndFollowing""$RemoveComments""$EleminateLineBreaks""$SearchPrintSerial" "$1") + echo "$serial" } -function validate_ip() { - local ip=$1 - local stat=1 - - if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then - OIFS=$IFS - IFS='.' - ip=($ip) - IFS=$OIFS - [[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \ - && ${ip[2]} -le 255 && ${ip[3]} -le 255 ]] - stat=$? +function dnsreload { + if [[ -n "$Usernc" ]]; then + rndc reload "$DomainZone" IN "icvpn-internal-view" + else + systemctl reload bind9 fi - return $stat +} + +function validate_ipv4() { + [[ -n "$(echo "$1" | sed -e '/^\(\(25[0-5]\|\(2[0-4]\|1[0-9]\|[1-9]\)\?[0-9]\)\.\)\{0,3\}\(25[0-5]\|\(2[0-4]\|1[0-9]\|[1-9]\)\?[0-9]\)$/!d')" ]] + return $? } @@ -42,7 +45,7 @@ for ForwardZoneFile in "${ForwardZoneFiles[@]}" do ZoneName=$(sed -ne 's/\(\S\+\)\s\+IN\s\+SOA\s\+\S\+.*/\1/p' "$ForwardZoneFile") named-compilezone -o "$TempDir/$ZoneName" $ZoneName $ForwardZoneFile >/dev/null 2>&1 - serial=$(sed -e '/\S\+\s\+IN\s\+SOA\s/,$!d;:a;s/;.*$//g;:a;N;$!ba;s/\n//g;s/\S\+\s\+IN\s\+SOA\s\+\S\+\s\+\S\+\s\+(\?\s\+\([0-9]*\).*/\1/' "$TempDir/$ZoneName" ) + serial="$(GetZoneFileSerial '$TempDir/$ZoneName')" Serials+=( "$serial" ) done @@ -58,7 +61,7 @@ do i=0 for IP in $IPs do - if validate_ip $IP + if validate_ipv4 $IP then echo $(echo $IP | awk 'BEGIN { FS = "." } ; { print $4 "." $3 "." $2 "." $1 }')".in-addr.arpa." $TTL IN PTR ${Hosts[$i]} >> "$TempDir/$DomainZone" fi @@ -66,13 +69,13 @@ do done done -if [ -f $ReverseZoneFile ]; then - oldSerial=$(grep SOA $ReverseZoneFile | awk 'NR==1{print $7}') +if [[ -f $ReverseZoneFile ]]; then + oldSerial="$(GetZoneFileSerial '$ReverseZoneFile')" else oldSerial=0 fi -if [ $serial -gt $oldSerial ] +if [[ $serial -gt $oldSerial ]] then named-compilezone -o $ReverseZoneFile $DomainZone "$TempDir/$DomainZone" >/dev/null 2>&1 dnsreload From a853e4fcab5a173b73dc500f66f22d21c007ae32 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 4 Jan 2021 20:53:39 +0100 Subject: [PATCH 04/56] =?UTF-8?q?Serial=20f=C3=BCr=20RZone=20korrigiert=20?= =?UTF-8?q?(bisher=20nur=20Update=20der=20h=C3=B6chsten=20Serial=20bei=20m?= =?UTF-8?q?ehreren=20Zones)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 10-50-reverse.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/10-50-reverse.sh b/10-50-reverse.sh index 4ceec11..c91725b 100755 --- a/10-50-reverse.sh +++ b/10-50-reverse.sh @@ -49,8 +49,8 @@ do Serials+=( "$serial" ) done -Serials=( $( for i in ${Serials[@]}; do echo "$i"; done | sort -rn ) ) -serial=${Serials[0]} +serial=0 +for i in ${Serials[@]}; do serial=$((serial+i)); done ) echo "$DomainZone $TTL IN SOA $ReverseServerName $ContactEMail $serial $refresh $retry $expire $minimum" > "$TempDir/$DomainZone" echo "$DomainZone $TTL IN NS $ReverseServerName" >> "$TempDir/$DomainZone" From 4ff8f549af2923cceb44bcca510f8a8253688d8c Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 4 Jan 2021 20:53:39 +0100 Subject: [PATCH 05/56] Namensschema --- 10-50-reverse.sh | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/10-50-reverse.sh b/10-50-reverse.sh index c91725b..e442781 100755 --- a/10-50-reverse.sh +++ b/10-50-reverse.sh @@ -21,11 +21,11 @@ function GetZoneFileSerial() { local EleminateLineBreaks=":a;N;\$!ba;s/\n//g;" local SearchPrintSerial="s/\S\+\s\+IN\s\+SOA\s\+\S\+\s\+\S\+\s\+(\?\s\+\([0-9]*\).*/\1/" - local serial=$(sed -e "$FirstSOALineAndFollowing""$RemoveComments""$EleminateLineBreaks""$SearchPrintSerial" "$1") - echo "$serial" + local Serial=$(sed -e "$FirstSOALineAndFollowing""$RemoveComments""$EleminateLineBreaks""$SearchPrintSerial" "$1") + echo "$Serial" } -function dnsreload { +function DNSReload { if [[ -n "$Usernc" ]]; then rndc reload "$DomainZone" IN "icvpn-internal-view" else @@ -33,26 +33,26 @@ function dnsreload { fi } -function validate_ipv4() { +function ValidateIPv4() { [[ -n "$(echo "$1" | sed -e '/^\(\(25[0-5]\|\(2[0-4]\|1[0-9]\|[1-9]\)\?[0-9]\)\.\)\{0,3\}\(25[0-5]\|\(2[0-4]\|1[0-9]\|[1-9]\)\?[0-9]\)$/!d')" ]] return $? } mkdir -p $TempDir -Serials=() +AllSerials=() for ForwardZoneFile in "${ForwardZoneFiles[@]}" do ZoneName=$(sed -ne 's/\(\S\+\)\s\+IN\s\+SOA\s\+\S\+.*/\1/p' "$ForwardZoneFile") named-compilezone -o "$TempDir/$ZoneName" $ZoneName $ForwardZoneFile >/dev/null 2>&1 - serial="$(GetZoneFileSerial '$TempDir/$ZoneName')" - Serials+=( "$serial" ) + Serial="$(GetZoneFileSerial '$TempDir/$ZoneName')" + AllSerials+=( "$Serial" ) done -serial=0 -for i in ${Serials[@]}; do serial=$((serial+i)); done ) +Serial=0 +for i in ${AllSerials[@]}; do Serial=$((Serial+i)); done ) -echo "$DomainZone $TTL IN SOA $ReverseServerName $ContactEMail $serial $refresh $retry $expire $minimum" > "$TempDir/$DomainZone" +echo "$DomainZone $TTL IN SOA $ReverseServerName $ContactEMail $Serial $refresh $retry $expire $minimum" > "$TempDir/$DomainZone" echo "$DomainZone $TTL IN NS $ReverseServerName" >> "$TempDir/$DomainZone" for ForwardZoneFile in $(ls $TempDir) do @@ -61,7 +61,7 @@ do i=0 for IP in $IPs do - if validate_ipv4 $IP + if ValidateIPv4 $IP then echo $(echo $IP | awk 'BEGIN { FS = "." } ; { print $4 "." $3 "." $2 "." $1 }')".in-addr.arpa." $TTL IN PTR ${Hosts[$i]} >> "$TempDir/$DomainZone" fi @@ -70,14 +70,14 @@ do done if [[ -f $ReverseZoneFile ]]; then - oldSerial="$(GetZoneFileSerial '$ReverseZoneFile')" + OldSerial="$(GetZoneFileSerial '$ReverseZoneFile')" else - oldSerial=0 + OldSerial=0 fi -if [[ $serial -gt $oldSerial ]] +if [[ $Serial -gt $OldSerial ]] then named-compilezone -o $ReverseZoneFile $DomainZone "$TempDir/$DomainZone" >/dev/null 2>&1 - dnsreload + DNSReload fi rm -r $TempDir From 1c69ceca015c17f7359ab75ce17c78e85012e538 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 4 Jan 2021 20:53:39 +0100 Subject: [PATCH 06/56] Korrektur Zeilenanfang bei Suche --- 10-50-reverse.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/10-50-reverse.sh b/10-50-reverse.sh index e442781..d5122c3 100755 --- a/10-50-reverse.sh +++ b/10-50-reverse.sh @@ -16,12 +16,12 @@ ReverseServerName=aquarius.gw.fff.community. ################################################################# function GetZoneFileSerial() { - local FirstSOALineAndFollowing="/\S\+\s\+IN\s\+SOA\s/,\$!d;" + local FirstSOALineAndFollowing="^/\S\+\s\+IN\s\+SOA\s/,\$!d;" local RemoveComments=":a;s/;.*$//g;" - local EleminateLineBreaks=":a;N;\$!ba;s/\n//g;" - local SearchPrintSerial="s/\S\+\s\+IN\s\+SOA\s\+\S\+\s\+\S\+\s\+(\?\s\+\([0-9]*\).*/\1/" + local RemoveLineBreaks=":a;N;\$!ba;s/\n//g;" + local SearchPrintSerial="s/^\S\+\s\+IN\s\+SOA\s\+\S\+\s\+\S\+\s\+(\?\s\+\([0-9]*\).*/\1/" - local Serial=$(sed -e "$FirstSOALineAndFollowing""$RemoveComments""$EleminateLineBreaks""$SearchPrintSerial" "$1") + local Serial=$(sed -e "$FirstSOALineAndFollowing""$RemoveComments""$RemoveLineBreaks""$SearchPrintSerial" "$1") echo "$Serial" } From 336e5ea0fa78bba54f5d33471cd75ccb06e41258 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 4 Jan 2021 20:53:39 +0100 Subject: [PATCH 07/56] Keinr Arrays in ash --- 10-50-reverse.sh | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/10-50-reverse.sh b/10-50-reverse.sh index d5122c3..296a55b 100755 --- a/10-50-reverse.sh +++ b/10-50-reverse.sh @@ -1,7 +1,7 @@ #!/bin/sh DomainZone="50.10.in-addr.arpa." -ForwardZoneFiles=("/srv/fff-dns/db.fff.community") +ForwardZoneFiles="/srv/fff-dns/db.fff.community" ReverseZoneFile="/var/lib/bind/db.50.10" #Temporäres Verzeichnis - muss pro Zone exclusiv sein! TempDir="/tmp/50.10.in-addr.arpa" @@ -40,17 +40,14 @@ function ValidateIPv4() { mkdir -p $TempDir -AllSerials=() -for ForwardZoneFile in "${ForwardZoneFiles[@]}" -do - ZoneName=$(sed -ne 's/\(\S\+\)\s\+IN\s\+SOA\s\+\S\+.*/\1/p' "$ForwardZoneFile") - named-compilezone -o "$TempDir/$ZoneName" $ZoneName $ForwardZoneFile >/dev/null 2>&1 - Serial="$(GetZoneFileSerial '$TempDir/$ZoneName')" - AllSerials+=( "$Serial" ) -done -Serial=0 -for i in ${AllSerials[@]}; do Serial=$((Serial+i)); done ) +for ForwardZoneFile in $ForwardZoneFiles +do + ZoneName="$DomainZone" #$(sed -ne 's/\(\S\+\)\s\+IN\s\+SOA\s\+\S\+.*/\1/p' "$ForwardZoneFile") + named-checkzone -o "$TempDir/$ZoneName" -D $ZoneName $ForwardZoneFile >/dev/null 2>&1 + Serial=$(GetZoneFileSerial "$TempDir/$ZoneName") + NewSerial=$((Serial+NewSerial)) +done echo "$DomainZone $TTL IN SOA $ReverseServerName $ContactEMail $Serial $refresh $retry $expire $minimum" > "$TempDir/$DomainZone" echo "$DomainZone $TTL IN NS $ReverseServerName" >> "$TempDir/$DomainZone" From 35ce035d8739ac3b30e1399720cda194179bcfe5 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 4 Jan 2021 20:53:39 +0100 Subject: [PATCH 08/56] Zone-Serial-Parsing auch bei vorangestellter TTL --- 10-50-reverse.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/10-50-reverse.sh b/10-50-reverse.sh index 296a55b..d6e2f94 100755 --- a/10-50-reverse.sh +++ b/10-50-reverse.sh @@ -16,10 +16,11 @@ ReverseServerName=aquarius.gw.fff.community. ################################################################# function GetZoneFileSerial() { - local FirstSOALineAndFollowing="^/\S\+\s\+IN\s\+SOA\s/,\$!d;" + local INSOAPrefix="^\s*\S\+\s\+\([0-9]*\s\)\?\s*IN\s\+SOA\s\+" + local FirstSOALineAndFollowing="/""$INSOAPrefix""/,\$!d;" local RemoveComments=":a;s/;.*$//g;" local RemoveLineBreaks=":a;N;\$!ba;s/\n//g;" - local SearchPrintSerial="s/^\S\+\s\+IN\s\+SOA\s\+\S\+\s\+\S\+\s\+(\?\s\+\([0-9]*\).*/\1/" + local SearchPrintSerial="s/""$INSOAPrefix""\S\+\s\+\S\+\s\+\((\s\)\?\s*\([0-9]*\).*/\3/i" local Serial=$(sed -e "$FirstSOALineAndFollowing""$RemoveComments""$RemoveLineBreaks""$SearchPrintSerial" "$1") echo "$Serial" From 6451a20eb545c218e3d45d1f355559c0dfb2d6a7 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 4 Jan 2021 20:53:39 +0100 Subject: [PATCH 09/56] NewSerial benutzen --- 10-50-reverse.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/10-50-reverse.sh b/10-50-reverse.sh index d6e2f94..3d2dcc4 100755 --- a/10-50-reverse.sh +++ b/10-50-reverse.sh @@ -50,7 +50,7 @@ do NewSerial=$((Serial+NewSerial)) done -echo "$DomainZone $TTL IN SOA $ReverseServerName $ContactEMail $Serial $refresh $retry $expire $minimum" > "$TempDir/$DomainZone" +echo "$DomainZone $TTL IN SOA $ReverseServerName $ContactEMail $NewSerial $refresh $retry $expire $minimum" > "$TempDir/$DomainZone" echo "$DomainZone $TTL IN NS $ReverseServerName" >> "$TempDir/$DomainZone" for ForwardZoneFile in $(ls $TempDir) do @@ -73,7 +73,7 @@ else OldSerial=0 fi -if [[ $Serial -gt $OldSerial ]] +if [[ $NewSerial -gt $OldSerial ]] then named-compilezone -o $ReverseZoneFile $DomainZone "$TempDir/$DomainZone" >/dev/null 2>&1 DNSReload From 5fd536d9393a030fba77f89831e005fe4e7347bc Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 4 Jan 2021 20:53:39 +0100 Subject: [PATCH 10/56] IPv6 ReverseIP, OpenWRT-Build hat kein sipcalc --- fd43-5602-29bd-reverse.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fd43-5602-29bd-reverse.sh b/fd43-5602-29bd-reverse.sh index 031fc87..f943623 100755 --- a/fd43-5602-29bd-reverse.sh +++ b/fd43-5602-29bd-reverse.sh @@ -43,6 +43,11 @@ function validate_ip() { fi return $stat } +function reverseIp6 { + echo "$1" | \ + awk -F: 'BEGIN {OFS=""}{ FillCount=9-NF; for(i=1;i<=NF;i++){if(length($i) == 0){if(i==NF) {$i="0000";} else {for(j=1;j<=FillCount;j++){$i=($i "0000");}}} else {$i=substr(("0000" $i), length($i)+1);}}; print}' | \ + awk '{ i=length; x=substr($0,i,1); for(i--;i!=0;i--)x=x "\." substr($0,i,1);}END{print x}' +} mkdir -p $TempDir From de895460870f41e01f2fddafef0c3ffab03b525c Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 4 Jan 2021 20:53:39 +0100 Subject: [PATCH 11/56] temporary use OpenWRT Files --- 10-50-reverse.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) mode change 100755 => 100644 10-50-reverse.sh diff --git a/10-50-reverse.sh b/10-50-reverse.sh old mode 100755 new mode 100644 index 3d2dcc4..e87dcf0 --- a/10-50-reverse.sh +++ b/10-50-reverse.sh @@ -1,10 +1,12 @@ #!/bin/sh DomainZone="50.10.in-addr.arpa." -ForwardZoneFiles="/srv/fff-dns/db.fff.community" -ReverseZoneFile="/var/lib/bind/db.50.10" +#ForwardZoneFiles="/srv/fff-dns/db.fff.community" +#ReverseZoneFile="/var/lib/bind/db.50.10" +ForwardZoneFiles="/etc/bind/db.herpf.fff.community" +ReverseZoneFile="/etc/bind/db.250.50.10" #Temporäres Verzeichnis - muss pro Zone exclusiv sein! -TempDir="/tmp/50.10.in-addr.arpa" +TempDir="/tmp/250.50.10.in-addr.arpa" TTL=3600 refresh=2000 retry=6400 From bf912faf189f081ca868c5687ee324b38748bfd1 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 4 Jan 2021 20:53:39 +0100 Subject: [PATCH 12/56] typo --- 10-50-reverse.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/10-50-reverse.sh b/10-50-reverse.sh index e87dcf0..e0a8ccb 100644 --- a/10-50-reverse.sh +++ b/10-50-reverse.sh @@ -29,7 +29,7 @@ function GetZoneFileSerial() { } function DNSReload { - if [[ -n "$Usernc" ]]; then + if [[ -n "$Userndc" ]]; then rndc reload "$DomainZone" IN "icvpn-internal-view" else systemctl reload bind9 From 15685409041d9ed265756ecfe907e0a72e14a2d9 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 4 Jan 2021 20:53:39 +0100 Subject: [PATCH 13/56] =?UTF-8?q?Umgestellt=20auf=20ash+posix;=20external-?= =?UTF-8?q?view=20m=C3=B6glich;=20Reload=20konfigurierbar=20nach=20System;?= =?UTF-8?q?=20Eigene=20Subdomain=20mit=20mehreren=20Subreversedomains=20m?= =?UTF-8?q?=C3=B6glich;=20Alles=20Zonefiles=20m=C3=BCssen=20in=20einem=20O?= =?UTF-8?q?rdner=20liegen=20(Forward&Reverse);=20Beschreibung=20aktualisie?= =?UTF-8?q?rt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 10-50-reverse.sh | 83 --------------------------- 10-83-reverse.sh | 89 ----------------------------- README.md | 114 ++++++++++++++++++++++++++++++++++---- dns-functions.sh | 22 ++++++++ fd43-5602-29bd-reverse.sh | 92 ------------------------------ update-dns.sh | 95 +++++++++++++++++++++++++++---- update-extzone.sh | 20 +++++++ update-rdnszone.sh | 93 +++++++++++++++++++++++++++++++ 8 files changed, 321 insertions(+), 287 deletions(-) delete mode 100644 10-50-reverse.sh delete mode 100755 10-83-reverse.sh create mode 100644 dns-functions.sh delete mode 100755 fd43-5602-29bd-reverse.sh mode change 100755 => 100644 update-dns.sh create mode 100644 update-extzone.sh create mode 100644 update-rdnszone.sh diff --git a/10-50-reverse.sh b/10-50-reverse.sh deleted file mode 100644 index e0a8ccb..0000000 --- a/10-50-reverse.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh - -DomainZone="50.10.in-addr.arpa." -#ForwardZoneFiles="/srv/fff-dns/db.fff.community" -#ReverseZoneFile="/var/lib/bind/db.50.10" -ForwardZoneFiles="/etc/bind/db.herpf.fff.community" -ReverseZoneFile="/etc/bind/db.250.50.10" -#Temporäres Verzeichnis - muss pro Zone exclusiv sein! -TempDir="/tmp/250.50.10.in-addr.arpa" -TTL=3600 -refresh=2000 -retry=6400 -expire=2419200 -minimum=86400 -ContactEMail=franken.freifunk.net. -ReverseServerName=aquarius.gw.fff.community. - -################################################################# - -function GetZoneFileSerial() { - local INSOAPrefix="^\s*\S\+\s\+\([0-9]*\s\)\?\s*IN\s\+SOA\s\+" - local FirstSOALineAndFollowing="/""$INSOAPrefix""/,\$!d;" - local RemoveComments=":a;s/;.*$//g;" - local RemoveLineBreaks=":a;N;\$!ba;s/\n//g;" - local SearchPrintSerial="s/""$INSOAPrefix""\S\+\s\+\S\+\s\+\((\s\)\?\s*\([0-9]*\).*/\3/i" - - local Serial=$(sed -e "$FirstSOALineAndFollowing""$RemoveComments""$RemoveLineBreaks""$SearchPrintSerial" "$1") - echo "$Serial" -} - -function DNSReload { - if [[ -n "$Userndc" ]]; then - rndc reload "$DomainZone" IN "icvpn-internal-view" - else - systemctl reload bind9 - fi -} - -function ValidateIPv4() { - [[ -n "$(echo "$1" | sed -e '/^\(\(25[0-5]\|\(2[0-4]\|1[0-9]\|[1-9]\)\?[0-9]\)\.\)\{0,3\}\(25[0-5]\|\(2[0-4]\|1[0-9]\|[1-9]\)\?[0-9]\)$/!d')" ]] - return $? -} - - -mkdir -p $TempDir - -for ForwardZoneFile in $ForwardZoneFiles -do - ZoneName="$DomainZone" #$(sed -ne 's/\(\S\+\)\s\+IN\s\+SOA\s\+\S\+.*/\1/p' "$ForwardZoneFile") - named-checkzone -o "$TempDir/$ZoneName" -D $ZoneName $ForwardZoneFile >/dev/null 2>&1 - Serial=$(GetZoneFileSerial "$TempDir/$ZoneName") - NewSerial=$((Serial+NewSerial)) -done - -echo "$DomainZone $TTL IN SOA $ReverseServerName $ContactEMail $NewSerial $refresh $retry $expire $minimum" > "$TempDir/$DomainZone" -echo "$DomainZone $TTL IN NS $ReverseServerName" >> "$TempDir/$DomainZone" -for ForwardZoneFile in $(ls $TempDir) -do - Hosts=($(cat "$TempDir/$ForwardZoneFile" | grep -v SOA | awk '{ print $1 }')) - IPs=$(cat "$TempDir/$ForwardZoneFile" | grep -v SOA | awk '{ print $5 }') - i=0 - for IP in $IPs - do - if ValidateIPv4 $IP - then - echo $(echo $IP | awk 'BEGIN { FS = "." } ; { print $4 "." $3 "." $2 "." $1 }')".in-addr.arpa." $TTL IN PTR ${Hosts[$i]} >> "$TempDir/$DomainZone" - fi - i=$((i+1)) - done -done - -if [[ -f $ReverseZoneFile ]]; then - OldSerial="$(GetZoneFileSerial '$ReverseZoneFile')" -else - OldSerial=0 -fi - -if [[ $NewSerial -gt $OldSerial ]] -then - named-compilezone -o $ReverseZoneFile $DomainZone "$TempDir/$DomainZone" >/dev/null 2>&1 - DNSReload -fi -rm -r $TempDir diff --git a/10-83-reverse.sh b/10-83-reverse.sh deleted file mode 100755 index c687b0e..0000000 --- a/10-83-reverse.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/bash - -#Name der Zone -DomainZone="83.10.in-addr.arpa." -#Positionen und Namen der Forward Lookup Zone Files -ForwardZoneFiles=("/srv/fff-dns/db.fff.community") -ReverseZoneFile="/var/lib/bind/db.83.10" -#Temporäres Verzeichnis - muss pro Zone exclusiv sein! -TempDir="/tmp/83.10.in-addr.arpa" -#TTL -TTL=3600 -#refresh -refresh=2000 -#retry -retry=6400 -#expire -expire=2419200 -#minimum -minimum=86400 -#contact-mail -contact=franken.freifunk.net. -#responsible DNS Server by name (for reverseDNS your own) -responsible=aquarius.gw.fff.community. - -################################################################# - -function dnsreload { - systemctl reload bind9 -} - -function validate_ip() { - local ip=$1 - local stat=1 - - if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then - OIFS=$IFS - IFS='.' - ip=($ip) - IFS=$OIFS - [[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \ - && ${ip[2]} -le 255 && ${ip[3]} -le 255 ]] - stat=$? - fi - return $stat -} - - -mkdir -p $TempDir -Serials=() -for ForwardZoneFile in "${ForwardZoneFiles[@]}" -do - ZoneName=$(cat $ForwardZoneFile | grep SOA | awk '{ print $1 }' | head -n 1) - named-compilezone -o "$TempDir/$ZoneName" $ZoneName $ForwardZoneFile >/dev/null 2>&1 - serial=$(cat "$TempDir/$ZoneName" | grep SOA | awk '{ print $7 }' | head -n 1) - Serials+=( "$serial" ) -done - -Serials=( $( for i in ${Serials[@]}; do echo "$i"; done | sort -rn ) ) -serial=${Serials[0]} - -echo "$DomainZone $TTL IN SOA $responsible $contact $serial $refresh $retry $expire $minimum" > "$TempDir/$DomainZone" -echo "$DomainZone $TTL IN NS $responsible" >> "$TempDir/$DomainZone" -for ForwardZoneFile in $(ls $TempDir) -do - Hosts=($(cat "$TempDir/$ForwardZoneFile" | grep -v SOA | awk '{ print $1 }')) - IPs=$(cat "$TempDir/$ForwardZoneFile" | grep -v SOA | awk '{ print $5 }') - i=0 - for IP in $IPs - do - if validate_ip $IP - then - echo $(echo $IP | awk 'BEGIN { FS = "." } ; { print $4 "." $3 "." $2 "." $1 }')".in-addr.arpa." $TTL IN PTR ${Hosts[$i]} >> "$TempDir/$DomainZone" - fi - i=$((i+1)) - done -done - -if [ -f $ReverseZoneFile ]; then - oldSerial=$(grep SOA $ReverseZoneFile | awk 'NR==1{print $7}') -else - oldSerial=0 -fi - -if [ $serial -gt $oldSerial ] -then - named-compilezone -o $ReverseZoneFile $DomainZone "$TempDir/$DomainZone" >/dev/null 2>&1 - dnsreload -fi -rm -r $TempDir diff --git a/README.md b/README.md index f7864b5..5f79f4f 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,36 @@ # fff-scripts -Dieses Git enthält eine Sammlung an Scripten zur Aktualisierung des Zone-git für fff.community. -Außerdem gibt es Skripte, die aus der Forward-Zone eine passende Reverse-Zone für unsere internen RFC 1918 und RFC 4193 Adressen erzeugen. +Dieses Git enthält eine Sammlung an Scripten zur Aktualisierung der Zonendatei für fff.community. +Außerdem gibt es Skripte, die aus der Forward-Zone und optional eigener Subdomain passende Reverse-Zones für unsere internen RFC 1918 und RFC 4193 Adressen erzeugen. ## Installation -#### Zone-git klonen -Zuerst muss das [dns-git](https://git.freifunk-franken.de/freifunk-franken/dns) geclont werden. Dieses enthält die Zonendatei für fff.community. Wohin dieses git geklont wird, ist egal. Der DNS Server muss Lesezugriff darauf haben. -``` -git clone https://git.freifunk-franken.de/freifunk-franken/dns.git /srv/fff-dns -``` + +#### Systemanforderungen + +curl +named-checkzone (z.B. bei bind oder bind-tools enthalten) + #### dns-scripts klonen -Dann können die Skripte geklont werden. Dabei ist aktuell noch die Position wichtig, da das Skript derzeit absolulte Pfade verwendet. +Die Scripte müssen geklont werden, oder anderweitig in einem Ordner auf dem Server abgelegt werden. Dabei ist aktuell noch die Position wichtig, da das Skript derzeit absolulte Pfade verwendet (oder den Pfad in update-dns.sh anpassen) ``` git clone https://git.freifunk-franken.de/freifunk-franken/dns-scripts.git /srv/fff-scripts ``` +#### konfigurieren +In der Datei update-dns.sh kann die Verwaltung einer Subdomain incl. Reversezone aktiviert werden. + + #### Cron anlegen -Schließlich muss noch ein Cron angelegt werden, der regelmäßig das Skript aufruft, welches das Zone-git aktualisiert und die Reverse-Skripte aufruft: +Schließlich muss noch ein Cron angelegt werden, der regelmäßig das Skript aufruft, welches die Zonendatei aktualisiert und die Reverse-Skripte aufruft: ``` -1-59/5 * * * * /srv/fff-scripts/update-dns.sh /srv/fff-dns +1-59/5 * * * * /srv/fff-scripts/update-dns.sh ``` #### DNS-Server konfigurieren Dann muss nur noch der DNS Server, z.B. `bind`, für die entsprechenden Zonen eingerichtet werden: + +Einfachste Konfiguration: ``` $ cat named.conf.local [..] @@ -51,4 +58,89 @@ zone "fff.community" { }; [..] -``` \ No newline at end of file +``` + +mit Split-View und eigener Subdomain: + +``` +$ cat named.conf.local +[..] + +acl icvpnlocal { + 10.0.0.0/8; + 172.16.0.0/12; + fd00::/8; +}; +acl icvpnrange { + icvpnlocal; + # Die via babel/bird verteilten IPv6-Netze mit src-prefix, diese sollten per Script as der fff-table aktuell gehalten werden + #z.B. 2a00:1aa0:ffff::/48; +}; + +[..] +view "icvpn-internal-view" { + match-clients { icvpnrange; localhost; }; + + [..] # eigene Optionen + + zone ".fff.community" { + type master; + file "/var/lib/bind/db..fff.community"; + }; + + zone ".50.10.in-addr.arpa" { + type master; + file "/var/lib/bind/db..50.10"; + }; + + zone ".d.b.9.2.2.0.6.5.3.4.d.f.ip6.arpa" { + type master; + file "/var/lib/bind/db.fd43-5602-29bd-"; + }; + + + zone "fff.community" { + type master; + file "/var/lib/bind/db.fff.community"; + }; + + zone "50.10.in-addr.arpa" { + type master; + file "/var/lib/bind/db.50.10"; + }; + + zone "83.10.in-addr.arpa" { + type master; + file "/var/lib/bind/db.83.10"; + }; + + zone "d.b.9.2.2.0.6.5.3.4.d.f.ip6.arpa" { + type master; + file "/var/lib/bind/db.fd43-5602-29bd"; + }; + + include "/var/lib/bind/icvpn-zones.conf"; # Nicht vergessen ;) + + [..] +}; + +view "external-view" { + match-clients { any; }; + [..] # eigene Optionen + + zone ".fff.community" { + type master; + file "/var/lib/bind/dbextern..fff.community"; + }; + + zone "fff.community" { + type master; + file "/var/lib/bind/dbextern.fff.community"; + }; + + [..] +}; + + +[..] +``` diff --git a/dns-functions.sh b/dns-functions.sh new file mode 100644 index 0000000..051928b --- /dev/null +++ b/dns-functions.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +GetZoneFileSerial() { + INSOASpec="^\s*\S\+\s\+\([0-9]*\s\)\?\s*IN\s\+SOA\s\+" + FirstSOALineAndFollowing="/""$INSOASpec""/,\$!d;" + RemoveComments=":a;s/;.*$//g;" + RemoveLineBreaks=":a;N;\$!ba;s/\n//g;" + SearchPrintSerial="s/""$INSOASpec""\S\+\s\+\S\+\s\+\((\s\)\?\s*\([0-9]*\).*/\3/i" + + ZoneSerial=$(sed -e "$FirstSOALineAndFollowing""$RemoveComments""$RemoveLineBreaks""$SearchPrintSerial" "$1") + echo "${ZoneSerial:-0}" +} + +ReloadZone() { + if [ $DNSSCRIPT_BIND_RELOAD_VER -eq 0 ]; then + systemctl reload bind9 + elif [ $DNSSCRIPT_BIND_RELOAD_VER -eq 1 ]; then + rndc reload "$1" IN "$2" + else + /etc/init.d/named reload + fi +} diff --git a/fd43-5602-29bd-reverse.sh b/fd43-5602-29bd-reverse.sh deleted file mode 100755 index f943623..0000000 --- a/fd43-5602-29bd-reverse.sh +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/bash - -#Name der Zone -DomainZone="d.b.9.2.2.0.6.5.3.4.d.f.ip6.arpa." -#Positionen und Namen der Forward Lookup Zone Files -ForwardZoneFiles=("/srv/fff-dns/db.fff.community") -ReverseZoneFile="/var/lib/bind/db.fd43-5602-29bd" -#Temporäres Verzeichnis - muss pro Zone exclusiv sein! -TempDir="/tmp/d.b.9.2.2.0.6.5.3.4.d.f.ip6.arpa" -#TTL -TTL=3600 -#refresh -refresh=2000 -#retry -retry=6400 -#expire -expire=2419200 -#minimum -minimum=86400 -#contact-mail -contact=franken.freifunk.net. -#responsible DNS Server by name (for reverseDNS your own) -responsible=aquarius.gw.fff.community. - -################################################################# - -function dnsreload { - systemctl reload bind9 -} - -function validate_ip() { - local ip=$1 - local stat=1 - - if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then - OIFS=$IFS - IFS='.' - ip=($ip) - IFS=$OIFS - [[ ${ip[0]} -le 255 && ${ip[1]} -le 255 \ - && ${ip[2]} -le 255 && ${ip[3]} -le 255 ]] - stat=$? - fi - return $stat -} -function reverseIp6 { - echo "$1" | \ - awk -F: 'BEGIN {OFS=""}{ FillCount=9-NF; for(i=1;i<=NF;i++){if(length($i) == 0){if(i==NF) {$i="0000";} else {for(j=1;j<=FillCount;j++){$i=($i "0000");}}} else {$i=substr(("0000" $i), length($i)+1);}}; print}' | \ - awk '{ i=length; x=substr($0,i,1); for(i--;i!=0;i--)x=x "\." substr($0,i,1);}END{print x}' -} - - -mkdir -p $TempDir -Serials=() -for ForwardZoneFile in "${ForwardZoneFiles[@]}" -do - ZoneName=$(cat $ForwardZoneFile | grep SOA | awk '{ print $1 }' | head -n 1) - named-compilezone -o "$TempDir/$ZoneName" $ZoneName $ForwardZoneFile >/dev/null 2>&1 - serial=$(cat "$TempDir/$ZoneName" | grep SOA | awk '{ print $7 }' | head -n 1) - Serials+=( "$serial" ) -done - -Serials=( $( for i in ${Serials[@]}; do echo "$i"; done | sort -rn ) ) -serial=${Serials[0]} - -echo "$DomainZone $TTL IN SOA $responsible $contact $serial $refresh $retry $expire $minimum" > "$TempDir/$DomainZone" -echo "$DomainZone $TTL IN NS $responsible" >> "$TempDir/$DomainZone" -for ForwardZoneFile in $(ls $TempDir) -do - Hosts=($(cat "$TempDir/$ForwardZoneFile" | grep -v SOA | grep -Fv "*" | awk '{ print $1 }')) - IPs=$(cat "$TempDir/$ForwardZoneFile" | grep -v SOA | grep -Fv "*" | awk '{ print $5 }') - i=0 - for IP in $IPs; do - if rdns=$(sipcalc -r "$IP" | grep -F "ip6.arpa."); then - echo "$rdns $TTL IN PTR ${Hosts[$i]}" >> "$TempDir/$DomainZone" - fi - i=$((i+1)) - done -done - -if [ -f $ReverseZoneFile ]; then - oldSerial=$(grep SOA $ReverseZoneFile | awk 'NR==1{print $7}') -else - oldSerial=0 -fi - -if [ $serial -gt $oldSerial ] -then - named-compilezone -o $ReverseZoneFile $DomainZone "$TempDir/$DomainZone" >/dev/null 2>&1 - dnsreload -fi -rm -r $TempDir diff --git a/update-dns.sh b/update-dns.sh old mode 100755 new mode 100644 index dadc1e2..a8cb75d --- a/update-dns.sh +++ b/update-dns.sh @@ -1,23 +1,94 @@ #!/bin/sh +. ./dns-functions.sh + # exit script when command fails set -e -if [ $# -ne 1 ]; then - echo "Usage: $0 " >&2 - exit 1 +export DNSSCRIPT_CONTACT_EMAIL=franken.freifunk.net. +export DNSSCRIPT_SERVER_NAME=fff-gw-herpf01.fff.community. +UpdateScriptsFolder="/srv/fff-scripts/" +ZoneFilesFolder="/var/lib/bind" +CommunityDomain="fff.community" + +# Einkommentieren und für eigene Hood setzen +#HoodSubDomain="herpf" # File unter "$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" +#HoodSubIPv4="250" # nur /24er Netze +#HoodSubIPv6="62" # nur /64er Netze + +# 0 -> Debian o.a. systemctl reload bind9 +# 1 -> rndc benutzen um nur die jeweilige Zone neu zu laden (empfohlen; rndc muss eingerichtet werden) +# 2 -> für OpenWRT /etc/init.d/named reload +# +export DNSSCRIPT_BIND_RELOAD_VER=1 + +# Wenn rndc benutzt wird den internen und externen View setzen +InternalView="icvpn-internal-view" +ExternalView="external-view" + +MasterFileRemoteLocation="https://git.freifunk-franken.de/freifunk-franken/dns/raw/branch/master/db.fff.community" + +# TTL Refresh Retry Expire Minimum +TTLReReExMi="3600 2000 6400 2419200 86400" + +# ForwardZones Schema: "/" ; optional mehrfach " ""/" Keine Leerzeichen im Ordner/File erlaubt +ForwardZones="$CommunityDomain""/""$ZoneFilesFolder""db.""$CommunityDomain" + + +############################################################# + +MasterFile="$ZoneFilesFolder""db.""$CommunityDomain" + + +PreFetchMasterSerial="$(GetZoneFileSerial "$MasterFile")" +curl "$MasterFileRemoteLocation" --output "$MasterFile" +PostFetchMasterSerial="$(GetZoneFileSerial "$MasterFile")" + +if [ $((PostFetchMasterSerial)) -gt $((PreFetchMasterSerial)) ]; then + ReloadZone "$CommunityDomain" "$InternalView" fi -# navigate to directory given as parameter -cd $1 -oldhash=$(git rev-parse HEAD) -git pull -q --ff-only +# Update für master-zones +RZone="50.10.in-addr.arpa." +RFile="$ZoneFilesFolder""db.50.10" +"$UpdateScriptsFolder"update-rdnszone.sh "$RZone" "$ForwardZones" "$RFile" "$TTLReReExMi" "$InternalView" -/srv/fff-scripts/10-50-reverse.sh -/srv/fff-scripts/10-83-reverse.sh -/srv/fff-scripts/fd43-5602-29bd-reverse.sh +RZone="83.10.in-addr.arpa." +RFile="$ZoneFilesFolder""db.83.10" +"$UpdateScriptsFolder"update-rdnszone.sh "$RZone" "$ForwardZones" "$RFile" "$TTLReReExMi" "$InternalView" -if [ "$oldhash" != "$(git rev-parse HEAD)" ]; then - /bin/systemctl reload bind9 +RZone="d.b.9.2.2.0.6.5.3.4.d.f.ip6.arpa." +RFile="$ZoneFilesFolder""db.fd43-5602-29bd" +"$UpdateScriptsFolder"update-rdnszone.sh "$RZone" "$ForwardZones" "$RFile" "$TTLReReExMi" "$InternalView" + +if [ -n "$ExternalView" ]; then + # Split-View + InternFile="$MasterFile" + ExternFile="$ZoneFilesFolder""dbextern.""$CommunityDomain" + Domain="$CommunityDomain" + "$UpdateScriptsFolder"update-extzone.sh "$InternFile" "$ExternFile" "$Domain" "$ExternalView" +fi + + +if [ -n "$HoodSubDomain" ]; then + # Update für lokale Zone; ForwardZones wird hier um die SubDomain erweitert + ForwardZones="$ForwardZones $HoodSubDomain"".""$CommunityDomain""/""$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" + + RZone="$HoodSubIPv4"".50.10.in-addr.arpa." + RFile="$ZoneFilesFolder""db.""$HoodSubIPv4"".50.10" + "$UpdateScriptsFolder"update-rdnszone.sh "$RZone" "$ForwardZones" "$RFile" "$TTLReReExMi" "$InternalView" + + HoodSubIPv6Reverse="$(echo "$HoodSubIPv6" | awk '{$i=substr(("0000" $i), length($i)+1); print}' | awk '{ i=length; x=substr($0,i,1); for(i--;i!=0;i--)x=x "." substr($0,i,1);}END{print x}')" + RZone="$HoodSubIPv6Reverse"".d.b.9.2.2.0.6.5.3.4.d.f.ip6.arpa." + RFile="$ZoneFilesFolder""db.fd43-5602-29bd-""$HoodSubIPv6" + "$UpdateScriptsFolder"update-rdnszone.sh "$RZone" "$ForwardZones" "$RFile" "$TTLReReExMi" "$InternalView" + + if [ -n "$ExternalView" ]; then + # Split-View + InternFile="$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" + ExternFile="$ZoneFilesFolder""dbextern.""$HoodSubDomain"".""$CommunityDomain" + Domain="$HoodSubDomain"".""$CommunityDomain" + "$UpdateScriptsFolder"update-extzone.sh "$InternFile" "$ExternFile" "$Domain" "$ExternalView" + fi fi diff --git a/update-extzone.sh b/update-extzone.sh new file mode 100644 index 0000000..ce10a3e --- /dev/null +++ b/update-extzone.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +. ./dns-functions.sh + +InternalZoneFile="$1" +ExternalZoneFile="$2" +ExternalZone="$3" +ExternalView="$4" + +SerialIntern="$(GetZoneFileSerial "$InternalZoneFile")" +if [ -f "$ExternalZoneFile" ]; then + SerialExtern="$(GetZoneFileSerial "$ExternalZoneFile")" +else + SerialExtern=0 +fi + +if [ $SerialIntern -gt $SerialExtern ]; then + sed '/.*\s\(10.\|[fF][cdCD][0-9a-fA-F]\{2\}:\)\S*\s*\(;.*\)\?/d' "$InternalZoneFile" > "$ExternalZoneFile" + ReloadZone "$ExternalZone" "$ExternalView" +fi diff --git a/update-rdnszone.sh b/update-rdnszone.sh new file mode 100644 index 0000000..d041638 --- /dev/null +++ b/update-rdnszone.sh @@ -0,0 +1,93 @@ +#!/bin/sh + +. ./dns-functions.sh + +ReverseDomain="$1" +ReverseZone="${ReverseDomain%*.}" +ForwardZones="$2" +ReverseZoneFile="$3" +TempDir="/tmp/""$ReverseZone" +TTL="${4%% *}" +ReReExMi="${4#* }" +View="$5" + +GetIPEntries() { + if [ -z "$RZoneIsIPv6" ]; then + IPPattern="[aA]\s\+\([0-9\.]\+\)" + else + IPPattern="[aA]\{4\}\s\+\([0-9a-f:]\+\)" + fi + + sed -ne "s/^\s*\(\S\+\)\s\+\([0-9]*\s\)\?\s*IN\s\+""$IPPattern"".*/\1\/\3/p" "$TempDir/$ForwardZoneFile" +} + +ReverseEntry() { + if [ -z "$RZoneIsIPv6" ]; then + echo "$(echo "$1" | awk 'BEGIN { FS = "." } ; { print $4 "." $3 "." $2 "." $1 }')"".in-addr.arpa." + else + echo "$(echo "$1" | \ + awk -F: 'BEGIN {OFS=""}{ FillCount=9-NF; for(i=1;i<=NF;i++){if(length($i) == 0){if(i==NF) {$i="0000";} else {for(j=1;j<=FillCount;j++){$i=($i "0000");}}} else {$i=substr(("0000" $i), length($i)+1);}}; print}' | \ + awk '{ i=length; x=substr($0,i,1); for(i--;i!=0;i--)x=x "." substr($0,i,1);}END{print x}')"".ip6.arpa." + fi +} + +if [ -z "${ReverseDomain##*.in-addr.arpa.}" ]; then + RZoneIsIPv6="" +elif [ -z "${ReverseDomain##*.ip6.arpa.}" ]; then + RZoneIsIPv6=1 +else + echo "No valid ReverseDomain" 1>&2 + exit 1 +fi + +mkdir -p "$TempDir" + +for ForwardZone in $ForwardZones; do + ZoneName="${ForwardZone%%/*}" + ZoneFile="${ForwardZone#*/}" + named-checkzone -f text -i local -o "$TempDir/$ZoneName" -D "$ZoneName" "$ZoneFile" >/dev/null 2>&1 + Serial="$(GetZoneFileSerial "$TempDir/$ZoneName")" + NewReverseSerial=$((Serial + NewReverseSerial)) + ZoneRevNS="$(sed -ne 's/^\s*\S\+\s\+\([0-9]*\s\)\?\s*IN\s\+NS\s\+\(\S\+\)\s*.*;\s*Reverse:\s*\([^;]*\)$/\2\/\3/p' "$ZoneFile")" + ZoneRevNS="$(echo "$ZoneRevNS" | sed -e 's/\(.*[^\.]\)\//\1\.'"$ZoneName"'\.\//' )" + SubNSEntries="$SubNSEntries""$ZoneRevNS" +done + +if [ -f "$ReverseZoneFile" ]; then + OldSerial=$(GetZoneFileSerial "$ReverseZoneFile") +else + OldSerial=0 +fi + +if [ $NewReverseSerial -gt $OldSerial ]; then + echo "$ReverseDomain $TTL IN SOA $DNSSCRIPT_SERVER_NAME $DNSSCRIPT_CONTACT_EMAIL $NewReverseSerial $ReReExMi" > "$TempDir/$ReverseZone" + echo "$ReverseDomain $TTL IN NS $DNSSCRIPT_SERVER_NAME" >> "$TempDir/$ReverseZone" + + echo "$SubNSEntries" | while read -r SubNSEntry; do + for SubReverseDomain in ${SubNSEntry#*/}; do + if [ -n "$SubReverseDomain" ] && [ -z "${SubReverseDomain##*$ReverseDomain}" ]; then + echo "$SubReverseDomain $TTL IN NS ${SubNSEntry%/*}" >> "$TempDir/$ReverseZone" + fi + done + done + + for ForwardZoneFile in $(ls $TempDir); do + + IPEntries="$(GetIPEntries)" + + for IPEntry in $IPEntries; do + IP="${IPEntry#*/}" + # Gültigkeit der IP-Adressen named-checkzone bereits geprüft + IP=$(ReverseEntry "$IP") + if [ -z "${IP##*$ReverseDomain}" ]; then + Host="${IPEntry%/*}" + echo "$IP $TTL IN PTR $Host" >> "$TempDir/$ReverseZone" + fi + done + done + + named-checkzone -o "$ReverseZoneFile" "$ReverseDomain" "$TempDir/$ReverseZone" # >/dev/null 2>&1 + ReloadZone "$ReverseDomain" "$View" +fi + +rm -r "$TempDir" From 3d901d71981d8e164f6873f34f1416183665e8b6 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 4 Jan 2021 20:53:39 +0100 Subject: [PATCH 14/56] =?UTF-8?q?External=20View=20standardm=C3=A4=C3=9Fig?= =?UTF-8?q?=20abgeschaltet;=20Ordner-typo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update-dns.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/update-dns.sh b/update-dns.sh index a8cb75d..f634b7a 100644 --- a/update-dns.sh +++ b/update-dns.sh @@ -8,7 +8,7 @@ set -e export DNSSCRIPT_CONTACT_EMAIL=franken.freifunk.net. export DNSSCRIPT_SERVER_NAME=fff-gw-herpf01.fff.community. UpdateScriptsFolder="/srv/fff-scripts/" -ZoneFilesFolder="/var/lib/bind" +ZoneFilesFolder="/var/lib/bind/" CommunityDomain="fff.community" # Einkommentieren und für eigene Hood setzen @@ -23,8 +23,8 @@ CommunityDomain="fff.community" export DNSSCRIPT_BIND_RELOAD_VER=1 # Wenn rndc benutzt wird den internen und externen View setzen -InternalView="icvpn-internal-view" -ExternalView="external-view" +#InternalView="icvpn-internal-view" +#ExternalView="external-view" # ExternalView steuert auch die Erstellung der externen Zone-Files MasterFileRemoteLocation="https://git.freifunk-franken.de/freifunk-franken/dns/raw/branch/master/db.fff.community" From 0a29a1274538c92159435dfdb57e26e4f1ddbc1d Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 4 Jan 2021 20:53:39 +0100 Subject: [PATCH 15/56] Ausgabe umgeleitet --- update-rdnszone.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-rdnszone.sh b/update-rdnszone.sh index d041638..895fe6e 100644 --- a/update-rdnszone.sh +++ b/update-rdnszone.sh @@ -86,7 +86,7 @@ if [ $NewReverseSerial -gt $OldSerial ]; then done done - named-checkzone -o "$ReverseZoneFile" "$ReverseDomain" "$TempDir/$ReverseZone" # >/dev/null 2>&1 + named-checkzone -o "$ReverseZoneFile" "$ReverseDomain" "$TempDir/$ReverseZone" >/dev/null 2>&1 ReloadZone "$ReverseDomain" "$View" fi From e17d68f25d39f609133d20b99993690569262da0 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Thu, 14 Jan 2021 20:46:10 +0100 Subject: [PATCH 16/56] parse hoods and reversezones from zonefile; new zonefile-filenames; --- README.md | 58 +++++++++++------- dns-functions.sh | 134 ++++++++++++++++++++++++++++++++++++++--- update-dns.sh | 109 ++++++++++++++++----------------- update-extzone.sh | 2 +- update-hoodzone.sh | 52 ++++++++++++++++ update-rdnszone.sh | 23 +++---- update-remotedns.sh | 9 +++ update-remoteleases.sh | 10 +++ 8 files changed, 298 insertions(+), 99 deletions(-) mode change 100644 => 100755 dns-functions.sh mode change 100644 => 100755 update-dns.sh mode change 100644 => 100755 update-extzone.sh create mode 100755 update-hoodzone.sh mode change 100644 => 100755 update-rdnszone.sh create mode 100755 update-remotedns.sh create mode 100755 update-remoteleases.sh diff --git a/README.md b/README.md index 5f79f4f..6bfe1bf 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # fff-scripts Dieses Git enthält eine Sammlung an Scripten zur Aktualisierung der Zonendatei für fff.community. -Außerdem gibt es Skripte, die aus der Forward-Zone und optional eigener Subdomain passende Reverse-Zones für unsere internen RFC 1918 und RFC 4193 Adressen erzeugen. +Außerdem gibt es Skripte, die aus der Forward-Zone und optional eigener Subdomain (durch community-Zonefile gesteuert) passende Reverse-Zones für unsere internen RFC 1918 und RFC 4193 Adressen erzeugen. ## Installation @@ -18,17 +18,19 @@ git clone https://git.freifunk-franken.de/freifunk-franken/dns-scripts.git /srv/ ``` #### konfigurieren -In der Datei update-dns.sh kann die Verwaltung einer Subdomain incl. Reversezone aktiviert werden. +In der Datei update-dns.sh die Konfigurationsparameter setzen. #### Cron anlegen Schließlich muss noch ein Cron angelegt werden, der regelmäßig das Skript aufruft, welches die Zonendatei aktualisiert und die Reverse-Skripte aufruft: ``` -1-59/5 * * * * /srv/fff-scripts/update-dns.sh +1-59/5 * * * * /usr/lib/ffdns/update-dns.sh ``` #### DNS-Server konfigurieren -Dann muss nur noch der DNS Server, z.B. `bind`, für die entsprechenden Zonen eingerichtet werden: +Dann muss nur noch der DNS Server, z.B. `bind`, für die entsprechenden Zonen eingerichtet werden, +die Zonenfiles werden durch die Scripte angelegt, für jedes Zonefile muss ein Eintrag in den entsprechenden +view: Einfachste Konfiguration: ``` @@ -37,17 +39,17 @@ $ cat named.conf.local zone "50.10.in-addr.arpa" { type master; - file "/var/lib/bind/db.50.10"; + file "/var/lib/bind/db.10.50"; allow-query { any; }; }; zone "83.10.in-addr.arpa" { type master; - file "/var/lib/bind/db.83.10"; + file "/var/lib/bind/db.10.83"; allow-query { any; }; }; zone "d.b.9.2.2.0.6.5.3.4.d.f.ip6.arpa" { type master; - file "/var/lib/bind/db.fd43-5602-29bd"; + file "/var/lib/bind/db.f.d.4.3.5.6.0.2.2.9.b.d"; allow-query { any; }; }; @@ -78,6 +80,14 @@ acl icvpnrange { }; [..] + +options { + [..] + check-names master warn; #Important for Hostnames with _ (example: HUAWEI_P30_lite ) +} + +[..] + view "icvpn-internal-view" { match-clients { icvpnrange; localhost; }; @@ -90,33 +100,35 @@ view "icvpn-internal-view" { zone ".50.10.in-addr.arpa" { type master; - file "/var/lib/bind/db..50.10"; - }; + file "/var/lib/bind/db.10.50."; + }; # Subnetz kann auch in 10.83 liegen zone ".d.b.9.2.2.0.6.5.3.4.d.f.ip6.arpa" { type master; - file "/var/lib/bind/db.fd43-5602-29bd-"; + file "/var/lib/bind/db.f.d.4.3.5.6.0.2.2.9.b.d."; }; - zone "fff.community" { - type master; - file "/var/lib/bind/db.fff.community"; - }; - zone "50.10.in-addr.arpa" { - type master; - file "/var/lib/bind/db.50.10"; + type master; + file "/var/lib/bind/db.10.50"; + allow-query { any; }; }; - zone "83.10.in-addr.arpa" { - type master; - file "/var/lib/bind/db.83.10"; + type master; + file "/var/lib/bind/db.10.83"; + allow-query { any; }; }; - zone "d.b.9.2.2.0.6.5.3.4.d.f.ip6.arpa" { - type master; - file "/var/lib/bind/db.fd43-5602-29bd"; + type master; + file "/var/lib/bind/db.f.d.4.3.5.6.0.2.2.9.b.d"; + allow-query { any; }; + }; + + zone "fff.community" { + type master; + file "/srv/fff-dns/db.fff.community"; + allow-query { any; }; }; include "/var/lib/bind/icvpn-zones.conf"; # Nicht vergessen ;) diff --git a/dns-functions.sh b/dns-functions.sh old mode 100644 new mode 100755 index 051928b..c6e36ec --- a/dns-functions.sh +++ b/dns-functions.sh @@ -1,21 +1,139 @@ #!/bin/sh GetZoneFileSerial() { - INSOASpec="^\s*\S\+\s\+\([0-9]*\s\)\?\s*IN\s\+SOA\s\+" - FirstSOALineAndFollowing="/""$INSOASpec""/,\$!d;" - RemoveComments=":a;s/;.*$//g;" - RemoveLineBreaks=":a;N;\$!ba;s/\n//g;" - SearchPrintSerial="s/""$INSOASpec""\S\+\s\+\S\+\s\+\((\s\)\?\s*\([0-9]*\).*/\3/i" - - ZoneSerial=$(sed -e "$FirstSOALineAndFollowing""$RemoveComments""$RemoveLineBreaks""$SearchPrintSerial" "$1") + if [ -f "$1" ]; then + INSOASpec="^\s*\S\+\s\+\([0-9]*\s\)\?\s*IN\s\+SOA\s\+" + FirstSOALineAndFollowing="/""$INSOASpec""/,\$!d;" + RemoveComments=":a;s/;.*$//g;" + RemoveLineBreaks=":a;N;\$!ba;s/\n//g;" + SearchPrintSerial="s/""$INSOASpec""\S\+\s\+\S\+\s\+\((\s\)\?\s*\([0-9]*\).*/\3/i" + + ZoneSerial=$(sed -e "$FirstSOALineAndFollowing""$RemoveComments""$RemoveLineBreaks""$SearchPrintSerial" "$1") + fi echo "${ZoneSerial:-0}" } +FillIPv4MissingBlocks() { + echo "$1" | sed -ne 's/^\([^.]\+\)\.\(\([^.]\+\)\.\)\?\(\([^.]\+\)\.\)\?\([^.]\+\)$/\1.\3.\5.\6/p' | sed -r 's/\.\./\.0\./g;s/\.\./\.0\./g' +} +GetReverseIPv4Domains() { + IPFilled="$(FillIPv4MissingBlocks "${1%/*}")" + Mask="${1##*/}" + Statics=$((Mask / 8)) + Filler=$((Mask % 8)) + RevDomain="$(echo "$IPFilled" | awk -F. '{for(i='"$Statics"';i>0;--i)printf "."$i}')"".in-addr.arpa." + if [ $Filler -eq 0 ]; then + echo "${RevDomain#.}" + else + Filler=$((8 - $Filler)) + Filler=$((1 << $Filler)) + Start=$(echo "$IPFilled" | awk -F. '{printf $'"$((Statics+1))"'}') + Start=$((Start - Start % Filler)) + for Sub in $(seq $Start $((Start + Filler - 1))); do + echo "$Sub""$RevDomain" + done + fi +} +FillIPv6Zeroes() { + echo "$1" | awk -F: 'BEGIN {OFS=""}{ FillCount=9-NF; for(i=1;i<=NF;i++){if(length($i) == 0){if(i==NF) {$i="0000";} else {for(j=1;j<=FillCount;j++){$i=($i "0000");}}} else {$i=substr(("0000" $i), length($i)+1);}}; print}' +} +GetReverseIPv6Domains() { + IPFilled="$(FillIPv6Zeroes "$(echo "${1%/*}" | awk '{print tolower($0)}')")" + Mask="${1##*/}" + Statics=$((Mask / 4)) + Filler=$((Mask % 4)) + RevDomain="$(echo "$IPFilled" | awk '{ for(i='"$Statics"';i>0;i--)x=x "." substr($0,i,1);}END{print x}')"".ip6.arpa." + if [ $Filler -eq 0 ]; then + echo "${RevDomain#.}" + else + Filler=$((4 - $Filler)) + Filler=$((1 << $Filler)) + Start="$(printf %d 0x"$(echo "$IPFilled" | awk 'BEGIN{FS=""}{printf $'"$((Statics+1))"'}')")" + Start=$((Start - Start % Filler)) + for Sub in $(seq $Start $((Start + Filler - 1))); do + echo "$(printf %x "$Sub")""$RevDomain" + done + fi +} +GetReverseDomains() { + Subnet="$1" + if IsValidIPv4Subnet "$Subnet"; then + GetReverseIPv4Domains "$Subnet" + elif IsValidIPv6Subnet "$Subnet"; then + GetReverseIPv6Domains "$Subnet" + fi +} +GetServernameSEDEntry() { + CommunityName="$1" + ServerName="$DNSSCRIPT_SERVER_NAME" + if [ -z "${ServerName##*$CommunityName}" ]; then + ServerName="\(""$ServerName"".\|""${ServerName%*.$CommunityName}""\)" + else + ServerName="\(""$ServerName"".\)" + fi + + echo "$ServerName" | sed -r 's/\./\\\./g' +} +GetOwnGlueRecords() { + ServerName="$DNSSCRIPT_SERVER_NAME" + if [ ! -z "${ServerName##*$1}" ]; then + ServerName="$ServerName""$1" + fi + ServerName="$ServerName""." + echo "$(sed -ne 's/^\s*'"$(GetServernameSEDEntry "$1")"'\(\s\+[Ii][Nn]\s\+\([Aa]\|[Aa]\{4\}\)\s\+.*\)$/'"$ServerName"'\2/p' "$2")" +} +GetOwnHoods() { + Entries="$(sed -ne "s/^\s*\(\S*\).*\s\+[Ii][Nn]\s\+[Nn][Ss]\s\+""$(GetServernameSEDEntry "$1")""\s*;\s*Subnets:\s*\([^;]*\)/\1 \3/p" "$2")" + Entries="$(echo "$Entries" | sed -r 's/\s+/#/g')" + + echo "$Entries" +} +IsValidIPv4Subnet() { + [ -n "$(echo "$1" | sed -e '/[^/]*\/\([12]\?[0-9]\|3[0-2]\)$/!d')" ] && IsValidIPv4 "${1%/*}" + return $? +} +IsValidIPv4() { + [ -n "$(echo "$1" | sed -e '/^\(\(25[0-5]\|\(2[0-4]\|1[0-9]\|[1-9]\)\?[0-9]\)\.\)\{0,3\}\(25[0-5]\|\(2[0-4]\|1[0-9]\|[1-9]\)\?[0-9]\)$/!d')" ] + return $? +} +IsValidIPv6Subnet() { + [ -n "$(echo "$1" | sed -e '/[^/]*\/\([1-9]\?[0-9]\|1\([01][0-9]\|2[0-8]\)\)$/!d')" ] && IsValidIPv6 "${1%/*}" + return $? +} +IsValidIPv6() { + Max8BlocksMax4Hex="/^\([0-9a-fA-F]\{0,4\}[:]\{1,2\}\)\{1,7\}[0-9a-fA-F]\{0,4\}$/!d;" + MaxOneDoubleColon="/^.*::.*::.*$/d;" + SingleColon8BlocksOrNoSingleColonBeginEnd="/^\(\([^:]\+:\)\{7\}[^:]\+\|\(\|[^:].*\)::\(\|.*[^:]\)\)$/!d" + [ -n "$(echo "$1" | sed -e "$Max8BlocksMax4Hex""$MaxOneDoubleColon""$SingleColon8BlocksOrNoSingleColonBeginEnd")" ] + return $? +} +IPv4IsInSubnet() { + IPFilled="$(FillIPv4MissingBlocks "$1")" + SubnetIPFilled="$(FillIPv4MissingBlocks "${2%/*}")" + Mask="${2##*/}" + Statics=$((Mask / 8)) + BlockMask=$((Mask % 8)) + IPStaticPart="$(echo "$IPFilled" | awk -F. '{for(i='"$Statics"';i>0;--i)printf "."$i}')" + SubnetStaticPart="$(echo "$SubnetIPFilled" | awk -F. '{for(i='"$Statics"';i>0;--i) printf "."$i}')" + AreEqual="$([ "$IPStaticPart" = "$SubnetStaticPart" ]; echo "$?")" + if [ $AreEqual -eq 0 ] && [ $BlockMask -ne 0 ]; then + BlockMask=$((8 - $BlockMask)) + BlockMask=$((-1 << $BlockMask)) + IPBlock=$(echo "$IPFilled" | awk -F. '{printf $'"$((Statics+1))"'}') + SubnetBlock=$(echo "$SubnetIPFilled" | awk -F. '{printf $'"$((Statics+1))"'}') + IPBlock=$(($IPBlock & $BlockMask)) + SubnetBlock=$(($SubnetBlock & $BlockMask)) + AreEqual="$([ $IPBlock -eq $SubnetBlock ]; echo "$?")" + fi + return $AreEqual +} ReloadZone() { if [ $DNSSCRIPT_BIND_RELOAD_VER -eq 0 ]; then systemctl reload bind9 elif [ $DNSSCRIPT_BIND_RELOAD_VER -eq 1 ]; then - rndc reload "$1" IN "$2" + for Zone in $2; do + rndc reload "$1" IN "$Zone" + done else /etc/init.d/named reload fi diff --git a/update-dns.sh b/update-dns.sh old mode 100644 new mode 100755 index f634b7a..01b2563 --- a/update-dns.sh +++ b/update-dns.sh @@ -1,94 +1,95 @@ #!/bin/sh -. ./dns-functions.sh - # exit script when command fails set -e -export DNSSCRIPT_CONTACT_EMAIL=franken.freifunk.net. -export DNSSCRIPT_SERVER_NAME=fff-gw-herpf01.fff.community. -UpdateScriptsFolder="/srv/fff-scripts/" -ZoneFilesFolder="/var/lib/bind/" +# Communityconfig CommunityDomain="fff.community" - -# Einkommentieren und für eigene Hood setzen -#HoodSubDomain="herpf" # File unter "$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" -#HoodSubIPv4="250" # nur /24er Netze -#HoodSubIPv6="62" # nur /64er Netze - -# 0 -> Debian o.a. systemctl reload bind9 -# 1 -> rndc benutzen um nur die jeweilige Zone neu zu laden (empfohlen; rndc muss eingerichtet werden) -# 2 -> für OpenWRT /etc/init.d/named reload -# -export DNSSCRIPT_BIND_RELOAD_VER=1 - -# Wenn rndc benutzt wird den internen und externen View setzen -#InternalView="icvpn-internal-view" -#ExternalView="external-view" # ExternalView steuert auch die Erstellung der externen Zone-Files - +CommunitySubnets="10.50.0/16 10.83.0/16 fd43:5602:29bd::/48" MasterFileRemoteLocation="https://git.freifunk-franken.de/freifunk-franken/dns/raw/branch/master/db.fff.community" +# Serverconfig +export DNSSCRIPT_CONTACT_EMAIL=info.freifunk-herpf.de. +# DNSSCRIPT_SERVER_NAME must be the server given in community zone files NS entry +export DNSSCRIPT_SERVER_NAME=dns.herpf.fff.community +UpdateScriptsFolder="/usr/lib/ffdns/" +ZoneFilesFolder="/etc/bind/fff/" + +# 0 -> Debian (and like) systemctl reload bind9 +# 1 -> use rndc to reload zone (recommended; rndc needs setup first) +# 2 -> OpenWRT /etc/init.d/named reload +# +export DNSSCRIPT_BIND_RELOAD_VER=0 + +# only necessary when rndc is used; sets the internal and external views +InternalViews="icvpn-internal-view icvpn-internal-dns64-view" +ExternalView="external-view" + # TTL Refresh Retry Expire Minimum TTLReReExMi="3600 2000 6400 2419200 86400" -# ForwardZones Schema: "/" ; optional mehrfach " ""/" Keine Leerzeichen im Ordner/File erlaubt +# ForwardZones: "/" ; optionaly multiple " ""/" no spaces in full filename ForwardZones="$CommunityDomain""/""$ZoneFilesFolder""db.""$CommunityDomain" ############################################################# +cd "$UpdateScriptsFolder" +. ./dns-functions.sh MasterFile="$ZoneFilesFolder""db.""$CommunityDomain" - PreFetchMasterSerial="$(GetZoneFileSerial "$MasterFile")" curl "$MasterFileRemoteLocation" --output "$MasterFile" PostFetchMasterSerial="$(GetZoneFileSerial "$MasterFile")" if [ $((PostFetchMasterSerial)) -gt $((PreFetchMasterSerial)) ]; then - ReloadZone "$CommunityDomain" "$InternalView" + ReloadZone "$CommunityDomain" "$InternalViews" fi - -# Update für master-zones -RZone="50.10.in-addr.arpa." -RFile="$ZoneFilesFolder""db.50.10" -"$UpdateScriptsFolder"update-rdnszone.sh "$RZone" "$ForwardZones" "$RFile" "$TTLReReExMi" "$InternalView" - -RZone="83.10.in-addr.arpa." -RFile="$ZoneFilesFolder""db.83.10" -"$UpdateScriptsFolder"update-rdnszone.sh "$RZone" "$ForwardZones" "$RFile" "$TTLReReExMi" "$InternalView" - -RZone="d.b.9.2.2.0.6.5.3.4.d.f.ip6.arpa." -RFile="$ZoneFilesFolder""db.fd43-5602-29bd" -"$UpdateScriptsFolder"update-rdnszone.sh "$RZone" "$ForwardZones" "$RFile" "$TTLReReExMi" "$InternalView" +for Subnet in $CommunitySubnets; do + ReverseDomains="$(GetReverseDomains "$Subnet")" + for RDomain in $ReverseDomains; do + ./update-rdnszone.sh "$RDomain" "$ForwardZones" "$ZoneFilesFolder" "$TTLReReExMi" "$InternalViews" + done +done if [ -n "$ExternalView" ]; then # Split-View InternFile="$MasterFile" ExternFile="$ZoneFilesFolder""dbextern.""$CommunityDomain" Domain="$CommunityDomain" - "$UpdateScriptsFolder"update-extzone.sh "$InternFile" "$ExternFile" "$Domain" "$ExternalView" + ./update-extzone.sh "$InternFile" "$ExternFile" "$Domain" "$ExternalView" fi -if [ -n "$HoodSubDomain" ]; then - # Update für lokale Zone; ForwardZones wird hier um die SubDomain erweitert - ForwardZones="$ForwardZones $HoodSubDomain"".""$CommunityDomain""/""$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" - - RZone="$HoodSubIPv4"".50.10.in-addr.arpa." - RFile="$ZoneFilesFolder""db.""$HoodSubIPv4"".50.10" - "$UpdateScriptsFolder"update-rdnszone.sh "$RZone" "$ForwardZones" "$RFile" "$TTLReReExMi" "$InternalView" - - HoodSubIPv6Reverse="$(echo "$HoodSubIPv6" | awk '{$i=substr(("0000" $i), length($i)+1); print}' | awk '{ i=length; x=substr($0,i,1); for(i--;i!=0;i--)x=x "." substr($0,i,1);}END{print x}')" - RZone="$HoodSubIPv6Reverse"".d.b.9.2.2.0.6.5.3.4.d.f.ip6.arpa." - RFile="$ZoneFilesFolder""db.fd43-5602-29bd-""$HoodSubIPv6" - "$UpdateScriptsFolder"update-rdnszone.sh "$RZone" "$ForwardZones" "$RFile" "$TTLReReExMi" "$InternalView" - +# set shorter TTL for Hoods +TTLReReExMi="420 360 180 1800 360" + +Hoods="$(GetOwnHoods "$CommunityDomain" "$MasterFile")" + +for Hood in $Hoods; do + HoodSubDomain="${Hood%%\#*}" + Subnets="$(echo "${Hood#*\#}" | sed -e 's/#/ /g')" + HoodZoneFile="$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" + if [ ! -f "$HoodZoneFile" ]; then + echo "\$TTL ${TTLReReExMi%% *}" > "$HoodZoneFile" + echo "$HoodSubDomain"".""$CommunityDomain"". ${TTLReReExMi%% *} IN SOA $DNSSCRIPT_SERVER_NAME""."" $DNSSCRIPT_CONTACT_EMAIL 1 ${TTLReReExMi#* }" >> "$HoodZoneFile" + echo "$HoodSubDomain"".""$CommunityDomain"". ${TTLReReExMi%% *} IN NS $DNSSCRIPT_SERVER_NAME"".""" >> "$HoodZoneFile" + echo "$(GetOwnGlueRecords "$CommunityDomain" "$MasterFile")" >> "$HoodZoneFile" + fi + ./update-hoodzone.sh "$HoodZoneFile" "$HoodSubDomain"".""$CommunityDomain" "$Subnets" "$InternalViews" + HoodForwardZones="$ForwardZones $HoodSubDomain"".""$CommunityDomain""/""$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" + for Subnet in $Subnets; do + ReverseDomains="$(GetReverseDomains "$Subnet")" + for RDomain in $ReverseDomains; do + ./update-rdnszone.sh "$RDomain" "$HoodForwardZones" "$ZoneFilesFolder" "$TTLReReExMi" "$InternalViews" + done + done if [ -n "$ExternalView" ]; then # Split-View InternFile="$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" ExternFile="$ZoneFilesFolder""dbextern.""$HoodSubDomain"".""$CommunityDomain" Domain="$HoodSubDomain"".""$CommunityDomain" - "$UpdateScriptsFolder"update-extzone.sh "$InternFile" "$ExternFile" "$Domain" "$ExternalView" + ./update-extzone.sh "$InternFile" "$ExternFile" "$Domain" "$ExternalView" fi -fi +done \ No newline at end of file diff --git a/update-extzone.sh b/update-extzone.sh old mode 100644 new mode 100755 index ce10a3e..74c5aef --- a/update-extzone.sh +++ b/update-extzone.sh @@ -15,6 +15,6 @@ else fi if [ $SerialIntern -gt $SerialExtern ]; then - sed '/.*\s\(10.\|[fF][cdCD][0-9a-fA-F]\{2\}:\)\S*\s*\(;.*\)\?/d' "$InternalZoneFile" > "$ExternalZoneFile" + sed '/^[^;]*\s\(10.\|[fF][cdCD][0-9a-fA-F]\{2\}:\)\S*\s*\(;.*\)\?$/d' "$InternalZoneFile" > "$ExternalZoneFile" ReloadZone "$ExternalZone" "$ExternalView" fi diff --git a/update-hoodzone.sh b/update-hoodzone.sh new file mode 100755 index 0000000..fbc053f --- /dev/null +++ b/update-hoodzone.sh @@ -0,0 +1,52 @@ +#!/bin/sh + +. ./dns-functions.sh + +HoodZoneFile="$1" +Domain="$2" +Subnets="$3" +View="$4" + + +DomainReg=".""$Domain" +DomainReg="$(echo "$DomainReg" | sed -e 's/\./\\\./g')" + +GetLeaseEntriesInSubnet() { + echo "$1" | while read -r LeaseLine; do + if IPv4IsInSubnet "${LeaseLine##* }" "$2";then + echo "$LeaseLine" + fi + done +} + +OldLeases="$(sed -e '/^;### Leases ###/,$!d' "$HoodZoneFile" | sed 1d)" + +if [ -f "/tmp/dhcp.leases" ]; then + DnsmasqLeases="$(sed -ne 's/^\s*\(\S\+\s\+\)\{2\}\(\S\+\)\s\+\([_0-9a-zA-Z-]\+\)\s\+.*/\3 IN A \2/p' "/tmp/dhcp.leases")" + for Subnet in $Subnets; do + IsValidIPv4Subnet "$Subnet" && NewLeases="$(echo "$NewLeases";echo "$(GetLeaseEntriesInSubnet "$DnsmasqLeases" "$Subnet")")" + done +fi + +for Leasefile in /tmp/hosts/*; do + if [ -n "${Leasefile##*/tmp/hosts/\*}" ]; then + NewLeases="$(echo "$NewLeases"; sed -ne 's/^\s*\([0-9.]*\)\s\+\([_0-9a-zA-Z-]\+\)'"$DomainReg"'.*/\2 IN A \1/p' "$Leasefile")" + NewLeases="$(echo "$NewLeases"; sed -ne 's/^\s*\([0-9a-fA-F:]*\)\s\+\([_0-9a-zA-Z-]\+\)'"$DomainReg"'.*/\2 IN AAAA \1/p' "$Leasefile")" + fi +done + +NewLeases="$(echo "$NewLeases" | + sed -ne 's/^\(\(\(\S\+\)'"$DomainReg"'\)\|\(\S\+\)\)\(.*\)$/\3\4\5/p' | + awk '!a[$0]++' | +# uncomment and duplicate to secure static DNS-Entries +# sed -e '/^dns\s\+.*/d' | + awk 'BEGIN{FS="\t"}{l=length($1);y=substr("\t\t\t\t\t\t", 1+length($1)/4);x=substr($0,length($1)+1); print $1 y x}' )" +if [ "$NewLeases" != "$OldLeases" ]; then + NewSerial="$(GetZoneFileSerial "$HoodZoneFile")" + NewSerial=$((NewSerial+1)) + sed -i -e 's/^\(\s*\)\(\S\+\)\(\s*;\s*Serial.*\)/\1'"$NewSerial"'\3/g' "$HoodZoneFile" + sed -i -e '/^;### Leases ###/,$d' "$HoodZoneFile" + echo ";### Leases ###" >> "$HoodZoneFile" + echo "$NewLeases" >> "$HoodZoneFile" + ReloadZone "$Domain" "$View" +fi diff --git a/update-rdnszone.sh b/update-rdnszone.sh old mode 100644 new mode 100755 index 895fe6e..180028f --- a/update-rdnszone.sh +++ b/update-rdnszone.sh @@ -5,7 +5,7 @@ ReverseDomain="$1" ReverseZone="${ReverseDomain%*.}" ForwardZones="$2" -ReverseZoneFile="$3" +ReverseZoneFile="$3""db.""$(echo "$ReverseZone" | awk -F. '{ printf $(NF-2);for(i=NF-3;i>0;--i) printf "."$i}')" TempDir="/tmp/""$ReverseZone" TTL="${4%% *}" ReReExMi="${4#* }" @@ -18,16 +18,14 @@ GetIPEntries() { IPPattern="[aA]\{4\}\s\+\([0-9a-f:]\+\)" fi - sed -ne "s/^\s*\(\S\+\)\s\+\([0-9]*\s\)\?\s*IN\s\+""$IPPattern"".*/\1\/\3/p" "$TempDir/$ForwardZoneFile" + sed -ne "s/^\s*\(\S\+\)\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+""$IPPattern"".*/\1\/\3/p" "$TempDir/$ForwardZoneFile" } ReverseEntry() { if [ -z "$RZoneIsIPv6" ]; then - echo "$(echo "$1" | awk 'BEGIN { FS = "." } ; { print $4 "." $3 "." $2 "." $1 }')"".in-addr.arpa." + echo "$(GetReverseDomains "$1""/32")" else - echo "$(echo "$1" | \ - awk -F: 'BEGIN {OFS=""}{ FillCount=9-NF; for(i=1;i<=NF;i++){if(length($i) == 0){if(i==NF) {$i="0000";} else {for(j=1;j<=FillCount;j++){$i=($i "0000");}}} else {$i=substr(("0000" $i), length($i)+1);}}; print}' | \ - awk '{ i=length; x=substr($0,i,1); for(i--;i!=0;i--)x=x "." substr($0,i,1);}END{print x}')"".ip6.arpa." + echo "$(GetReverseDomains "$1""/128")" fi } @@ -48,7 +46,7 @@ for ForwardZone in $ForwardZones; do named-checkzone -f text -i local -o "$TempDir/$ZoneName" -D "$ZoneName" "$ZoneFile" >/dev/null 2>&1 Serial="$(GetZoneFileSerial "$TempDir/$ZoneName")" NewReverseSerial=$((Serial + NewReverseSerial)) - ZoneRevNS="$(sed -ne 's/^\s*\S\+\s\+\([0-9]*\s\)\?\s*IN\s\+NS\s\+\(\S\+\)\s*.*;\s*Reverse:\s*\([^;]*\)$/\2\/\3/p' "$ZoneFile")" + ZoneRevNS="$(sed -ne 's/^\s*\S\+\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\s\+\(\S\+\)\s*.*;\s*Reverse:\s*\([^;]*\)$/\2\/\3/p' "$ZoneFile")" ZoneRevNS="$(echo "$ZoneRevNS" | sed -e 's/\(.*[^\.]\)\//\1\.'"$ZoneName"'\.\//' )" SubNSEntries="$SubNSEntries""$ZoneRevNS" done @@ -60,8 +58,8 @@ else fi if [ $NewReverseSerial -gt $OldSerial ]; then - echo "$ReverseDomain $TTL IN SOA $DNSSCRIPT_SERVER_NAME $DNSSCRIPT_CONTACT_EMAIL $NewReverseSerial $ReReExMi" > "$TempDir/$ReverseZone" - echo "$ReverseDomain $TTL IN NS $DNSSCRIPT_SERVER_NAME" >> "$TempDir/$ReverseZone" + echo "$ReverseDomain $TTL IN SOA $DNSSCRIPT_SERVER_NAME""."" $DNSSCRIPT_CONTACT_EMAIL $NewReverseSerial $ReReExMi" > "$TempDir/$ReverseZone" + echo "$ReverseDomain $TTL IN NS $DNSSCRIPT_SERVER_NAME"".""" >> "$TempDir/$ReverseZone" echo "$SubNSEntries" | while read -r SubNSEntry; do for SubReverseDomain in ${SubNSEntry#*/}; do @@ -69,16 +67,15 @@ if [ $NewReverseSerial -gt $OldSerial ]; then echo "$SubReverseDomain $TTL IN NS ${SubNSEntry%/*}" >> "$TempDir/$ReverseZone" fi done - done + done for ForwardZoneFile in $(ls $TempDir); do - IPEntries="$(GetIPEntries)" for IPEntry in $IPEntries; do IP="${IPEntry#*/}" - # Gültigkeit der IP-Adressen named-checkzone bereits geprüft - IP=$(ReverseEntry "$IP") + # IP syntax checked by named-checkzone + IP="$(ReverseEntry "$IP")" if [ -z "${IP##*$ReverseDomain}" ]; then Host="${IPEntry%/*}" echo "$IP $TTL IN PTR $Host" >> "$TempDir/$ReverseZone" diff --git a/update-remotedns.sh b/update-remotedns.sh new file mode 100755 index 0000000..e9b9561 --- /dev/null +++ b/update-remotedns.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +sed -ne 's/^\s*\(\S\+\s\+\)\{2\}\(\S\+\)\s\+\(\S\+\)\s\+.*/\2 \3/p' "/tmp/dhcp.leases" > "/tmp/upload-dns.leases" + +for Leasefile in /tmp/hosts/*; do + sed -ne 's/^\s*\([^#]\S*\)\s\+\(\S\+\).*/\1 \2/p' "$Leasefile" >> "/tmp/upload-dns.leases" +done + +curl -6 -u : --data-urlencode "@/tmp/upload-dns.leases" -X POST https:// \ No newline at end of file diff --git a/update-remoteleases.sh b/update-remoteleases.sh new file mode 100755 index 0000000..2dbb463 --- /dev/null +++ b/update-remoteleases.sh @@ -0,0 +1,10 @@ +#!/bin/sh + + +for File in /wwwup/*; do + LastFile="$File" +done + +cat "$LastFile" | sed -e 's/%\([0-9A-F][0-9A-F]\)/\\\\x\1/g' | xargs echo -e > /tmp/hosts/remote.leases + +rm /wwwup/* \ No newline at end of file From 041c98026df55f9f871ab6458b0f0e3b7e1f7bae Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Thu, 14 Jan 2021 23:50:36 +0100 Subject: [PATCH 17/56] fix: broken reverse delegation --- update-dns.sh | 2 +- update-rdnszone.sh | 22 ++++++++++------------ 2 files changed, 11 insertions(+), 13 deletions(-) mode change 100755 => 100644 update-rdnszone.sh diff --git a/update-dns.sh b/update-dns.sh index 01b2563..7aca584 100755 --- a/update-dns.sh +++ b/update-dns.sh @@ -21,7 +21,7 @@ ZoneFilesFolder="/etc/bind/fff/" # export DNSSCRIPT_BIND_RELOAD_VER=0 -# only necessary when rndc is used; sets the internal and external views +# only necessary when rndc is used InternalViews="icvpn-internal-view icvpn-internal-dns64-view" ExternalView="external-view" diff --git a/update-rdnszone.sh b/update-rdnszone.sh old mode 100755 new mode 100644 index 180028f..e86e687 --- a/update-rdnszone.sh +++ b/update-rdnszone.sh @@ -46,26 +46,24 @@ for ForwardZone in $ForwardZones; do named-checkzone -f text -i local -o "$TempDir/$ZoneName" -D "$ZoneName" "$ZoneFile" >/dev/null 2>&1 Serial="$(GetZoneFileSerial "$TempDir/$ZoneName")" NewReverseSerial=$((Serial + NewReverseSerial)) - ZoneRevNS="$(sed -ne 's/^\s*\S\+\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\s\+\(\S\+\)\s*.*;\s*Reverse:\s*\([^;]*\)$/\2\/\3/p' "$ZoneFile")" - ZoneRevNS="$(echo "$ZoneRevNS" | sed -e 's/\(.*[^\.]\)\//\1\.'"$ZoneName"'\.\//' )" - SubNSEntries="$SubNSEntries""$ZoneRevNS" + ZoneRevNSSubnets="$(sed -ne 's/^\s*\S\+\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\s\+\(\S\+\)\s*.*;\s*Subnets:\s*\([^;]*\)$/\2@\3/p' "$ZoneFile" | + sed -e 's/\(.*[^\.]\)@/\1\.'"$ZoneName"'\.@/;s/@/ /;s/\s\+/@/g')" done -if [ -f "$ReverseZoneFile" ]; then OldSerial=$(GetZoneFileSerial "$ReverseZoneFile") -else - OldSerial=0 -fi if [ $NewReverseSerial -gt $OldSerial ]; then echo "$ReverseDomain $TTL IN SOA $DNSSCRIPT_SERVER_NAME""."" $DNSSCRIPT_CONTACT_EMAIL $NewReverseSerial $ReReExMi" > "$TempDir/$ReverseZone" echo "$ReverseDomain $TTL IN NS $DNSSCRIPT_SERVER_NAME"".""" >> "$TempDir/$ReverseZone" - echo "$SubNSEntries" | while read -r SubNSEntry; do - for SubReverseDomain in ${SubNSEntry#*/}; do - if [ -n "$SubReverseDomain" ] && [ -z "${SubReverseDomain##*$ReverseDomain}" ]; then - echo "$SubReverseDomain $TTL IN NS ${SubNSEntry%/*}" >> "$TempDir/$ReverseZone" - fi + for NSSubnets in $ZoneRevNSSubnets; do + Subnets="$(echo "${NSSubnets#*@}" | sed -e 's/@/ /g')" + for Subnet in $Subnets; do + for ReverseNS in $(GetReverseDomains "$Subnet"); do + if [ -n "$ReverseNS" ] && [ -z "${ReverseNS##*$ReverseDomain}" ]; then + echo "$ReverseNS $TTL IN NS ${NSSubnets%%@*}" >> "$TempDir/$ReverseZone" + fi + done done done From a797b50fc445d3650f1904c9ece85aa35eeadb1f Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Fri, 15 Jan 2021 17:12:33 +0100 Subject: [PATCH 18/56] auto-generate include-files for bind --- README.md | 116 +++++++++---------------------------------- dns-functions.sh | 19 ++++++- update-dns.sh | 56 +++++++++++++++++---- update-public-acl.sh | 15 ++++++ update-rdnszone.sh | 0 5 files changed, 102 insertions(+), 104 deletions(-) create mode 100755 update-public-acl.sh mode change 100644 => 100755 update-rdnszone.sh diff --git a/README.md b/README.md index 6bfe1bf..049e96e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,11 @@ # fff-scripts -Dieses Git enthält eine Sammlung an Scripten zur Aktualisierung der Zonendatei für fff.community. -Außerdem gibt es Skripte, die aus der Forward-Zone und optional eigener Subdomain (durch community-Zonefile gesteuert) passende Reverse-Zones für unsere internen RFC 1918 und RFC 4193 Adressen erzeugen. +Dieses Git enthält eine Sammlung an Scripten zur Aktualisierung der Zonen für fff.community. +Dabei werden aus der Forward-Zone und optional eigener Subdomain (durch community-Zonefile gesteuert) auch passende Reverse-Zonen für unsere internen RFC 1918 und RFC 4193 Adressen erzeugen. + +Weiterhin werden bei eigener Subdomain die momentan vergebenen Adressen von dnsmasq und odhcpd (alles unter /tmp/hosts/) inkludiert. +Das ermöglicht eine Namensauflösung für Freifunk-Teilnehmer ohne manuelle Konfiguration. +Damit kann jeder Freifunk-Teilnehmer ein gültiges TLS-Zertifikat bekommen, sofern DHCPv6 am Gateway aktiviert ist. ## Installation @@ -10,11 +14,15 @@ Außerdem gibt es Skripte, die aus der Forward-Zone und optional eigener Subdoma curl named-checkzone (z.B. bei bind oder bind-tools enthalten) +der Befehl: +echo "dump" | nc ::1 33123 +muss die babel routen ausgeben, ansonsten muss update-public-acl.sh angepasst werden + #### dns-scripts klonen Die Scripte müssen geklont werden, oder anderweitig in einem Ordner auf dem Server abgelegt werden. Dabei ist aktuell noch die Position wichtig, da das Skript derzeit absolulte Pfade verwendet (oder den Pfad in update-dns.sh anpassen) ``` -git clone https://git.freifunk-franken.de/freifunk-franken/dns-scripts.git /srv/fff-scripts +git clone https://git.freifunk-franken.de/freifunk-franken/dns-scripts.git /usr/lib/ffdns ``` #### konfigurieren @@ -28,41 +36,10 @@ Schließlich muss noch ein Cron angelegt werden, der regelmäßig das Skript auf ``` #### DNS-Server konfigurieren -Dann muss nur noch der DNS Server, z.B. `bind`, für die entsprechenden Zonen eingerichtet werden, -die Zonenfiles werden durch die Scripte angelegt, für jedes Zonefile muss ein Eintrag in den entsprechenden -view: +Dann muss nur noch der DNS Server, z.B. `bind`, eingerichtet werden. +Für bind werden durch die Scripte die include-Dateien angelegt (fff.community-[in|ex]ternal.conf|icvpn-acl.conf): -Einfachste Konfiguration: -``` -$ cat named.conf.local -[..] - -zone "50.10.in-addr.arpa" { - type master; - file "/var/lib/bind/db.10.50"; - allow-query { any; }; -}; -zone "83.10.in-addr.arpa" { - type master; - file "/var/lib/bind/db.10.83"; - allow-query { any; }; -}; -zone "d.b.9.2.2.0.6.5.3.4.d.f.ip6.arpa" { - type master; - file "/var/lib/bind/db.f.d.4.3.5.6.0.2.2.9.b.d"; - allow-query { any; }; -}; - -zone "fff.community" { - type master; - file "/srv/fff-dns/db.fff.community"; - allow-query { any; }; -}; - -[..] -``` - -mit Split-View und eigener Subdomain: +Konfiguration: ``` $ cat named.conf.local @@ -71,67 +48,30 @@ $ cat named.conf.local acl icvpnlocal { 10.0.0.0/8; 172.16.0.0/12; - fd00::/8; -}; -acl icvpnrange { - icvpnlocal; - # Die via babel/bird verteilten IPv6-Netze mit src-prefix, diese sollten per Script as der fff-table aktuell gehalten werden - #z.B. 2a00:1aa0:ffff::/48; + fc00::/7; }; +include "/etc/bind/icvpn-acl.conf"; # auto-generated [..] options { - [..] - check-names master warn; #Important for Hostnames with _ (example: HUAWEI_P30_lite ) + [..] # eigene Optionen + + check-names master warn; # Wichtig, da sonst Hostnamen mit _ (z.B.: HUAWEI_P30_lite ) bind nicht laden lassen } [..] view "icvpn-internal-view" { match-clients { icvpnrange; localhost; }; + allow-query-cache { any; } [..] # eigene Optionen - zone ".fff.community" { - type master; - file "/var/lib/bind/db..fff.community"; - }; - - zone ".50.10.in-addr.arpa" { - type master; - file "/var/lib/bind/db.10.50."; - }; # Subnetz kann auch in 10.83 liegen - - zone ".d.b.9.2.2.0.6.5.3.4.d.f.ip6.arpa" { - type master; - file "/var/lib/bind/db.f.d.4.3.5.6.0.2.2.9.b.d."; - }; - - - zone "50.10.in-addr.arpa" { - type master; - file "/var/lib/bind/db.10.50"; - allow-query { any; }; - }; - zone "83.10.in-addr.arpa" { - type master; - file "/var/lib/bind/db.10.83"; - allow-query { any; }; - }; - zone "d.b.9.2.2.0.6.5.3.4.d.f.ip6.arpa" { - type master; - file "/var/lib/bind/db.f.d.4.3.5.6.0.2.2.9.b.d"; - allow-query { any; }; - }; - zone "fff.community" { - type master; - file "/srv/fff-dns/db.fff.community"; - allow-query { any; }; - }; - - include "/var/lib/bind/icvpn-zones.conf"; # Nicht vergessen ;) + include "/etc/bind/fff.community-internal.conf"; # auto-generated + + include "/etc/bind/icvpn-zones.conf"; # Nicht vergessen ;) [..] }; @@ -140,15 +80,7 @@ view "external-view" { match-clients { any; }; [..] # eigene Optionen - zone ".fff.community" { - type master; - file "/var/lib/bind/dbextern..fff.community"; - }; - - zone "fff.community" { - type master; - file "/var/lib/bind/dbextern.fff.community"; - }; + include "/etc/bind/fff.community-external.conf"; # auto-generated [..] }; diff --git a/dns-functions.sh b/dns-functions.sh index c6e36ec..6141583 100755 --- a/dns-functions.sh +++ b/dns-functions.sh @@ -12,6 +12,23 @@ GetZoneFileSerial() { fi echo "${ZoneSerial:-0}" } +InsertZoneToIncludeFile() { + if [ ! -f "$3" ]; then + echo "zone \"""$1""\" {" > "$3" + echo " type master;" >> "$3" + echo " file \"""$2""\";" >> "$3" + echo "};" >> "$3" + else + sed -i "1i\ +zone \"""$1""\" {\n\ + type master;\n\ + file \"""$2""\";\n\ +};" "$3" + fi +} +GetReverseZoneFileFromZone() { + echo "db.""$(echo "$1" | awk -F. '{ printf $(NF-2);for(i=NF-3;i>0;--i) printf "."$i}')" +} FillIPv4MissingBlocks() { echo "$1" | sed -ne 's/^\([^.]\+\)\.\(\([^.]\+\)\.\)\?\(\([^.]\+\)\.\)\?\([^.]\+\)$/\1.\3.\5.\6/p' | sed -r 's/\.\./\.0\./g;s/\.\./\.0\./g' } @@ -137,4 +154,4 @@ ReloadZone() { else /etc/init.d/named reload fi -} +} \ No newline at end of file diff --git a/update-dns.sh b/update-dns.sh index 7aca584..a885472 100755 --- a/update-dns.sh +++ b/update-dns.sh @@ -14,6 +14,7 @@ export DNSSCRIPT_CONTACT_EMAIL=info.freifunk-herpf.de. export DNSSCRIPT_SERVER_NAME=dns.herpf.fff.community UpdateScriptsFolder="/usr/lib/ffdns/" ZoneFilesFolder="/etc/bind/fff/" +BindIncludeFileFolder="/etc/bind/" # 0 -> Debian (and like) systemctl reload bind9 # 1 -> use rndc to reload zone (recommended; rndc needs setup first) @@ -37,6 +38,9 @@ cd "$UpdateScriptsFolder" . ./dns-functions.sh MasterFile="$ZoneFilesFolder""db.""$CommunityDomain" +BindInternalFile="$BindIncludeFileFolder""$CommunityDomain""-internal.conf" +BindExternalFile="$BindIncludeFileFolder""$CommunityDomain""-external.conf" +BindIcvpnAcl="$BindIncludeFileFolder""icvpn-acl.conf" PreFetchMasterSerial="$(GetZoneFileSerial "$MasterFile")" curl "$MasterFileRemoteLocation" --output "$MasterFile" @@ -46,21 +50,22 @@ if [ $((PostFetchMasterSerial)) -gt $((PreFetchMasterSerial)) ]; then ReloadZone "$CommunityDomain" "$InternalViews" fi +[ -f "$BindExternalFile"".tmp" ] && rm "$BindExternalFile"".tmp" +[ -f "$BindInternalFile"".tmp" ] && rm "$BindInternalFile"".tmp" +InsertZoneToIncludeFile "$CommunityDomain" "$ZoneFilesFolder""db.""$CommunityDomain" "$BindExternalFile"".tmp" + for Subnet in $CommunitySubnets; do ReverseDomains="$(GetReverseDomains "$Subnet")" for RDomain in $ReverseDomains; do ./update-rdnszone.sh "$RDomain" "$ForwardZones" "$ZoneFilesFolder" "$TTLReReExMi" "$InternalViews" + InsertZoneToIncludeFile "$RDomain" "$ZoneFilesFolder""$(GetReverseZoneFileFromZone "${RDomain%*.}")" "$BindInternalFile"".tmp" done done -if [ -n "$ExternalView" ]; then - # Split-View - InternFile="$MasterFile" - ExternFile="$ZoneFilesFolder""dbextern.""$CommunityDomain" - Domain="$CommunityDomain" - ./update-extzone.sh "$InternFile" "$ExternFile" "$Domain" "$ExternalView" -fi - +InternFile="$MasterFile" +ExternFile="$ZoneFilesFolder""dbextern.""$CommunityDomain" +Domain="$CommunityDomain" +./update-extzone.sh "$InternFile" "$ExternFile" "$Domain" "$ExternalView" # set shorter TTL for Hoods TTLReReExMi="420 360 180 1800 360" @@ -78,18 +83,47 @@ for Hood in $Hoods; do echo "$(GetOwnGlueRecords "$CommunityDomain" "$MasterFile")" >> "$HoodZoneFile" fi ./update-hoodzone.sh "$HoodZoneFile" "$HoodSubDomain"".""$CommunityDomain" "$Subnets" "$InternalViews" + InsertZoneToIncludeFile "$HoodSubDomain"".""$CommunityDomain" "$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" "$BindExternalFile"".tmp" + HoodForwardZones="$ForwardZones $HoodSubDomain"".""$CommunityDomain""/""$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" for Subnet in $Subnets; do ReverseDomains="$(GetReverseDomains "$Subnet")" for RDomain in $ReverseDomains; do ./update-rdnszone.sh "$RDomain" "$HoodForwardZones" "$ZoneFilesFolder" "$TTLReReExMi" "$InternalViews" + InsertZoneToIncludeFile "$RDomain" "$ZoneFilesFolder""$(GetReverseZoneFileFromZone "${RDomain%*.}")" "$BindInternalFile"".tmp" done done - if [ -n "$ExternalView" ]; then - # Split-View + InternFile="$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" ExternFile="$ZoneFilesFolder""dbextern.""$HoodSubDomain"".""$CommunityDomain" Domain="$HoodSubDomain"".""$CommunityDomain" ./update-extzone.sh "$InternFile" "$ExternFile" "$Domain" "$ExternalView" +done + +sed -i "1i include \"""$BindExternalFile""\";\n" "$BindInternalFile"".tmp" +./update-public-acl.sh "$BindIcvpnAcl"".tmp" + + +ReConfigBind=1 +UpdateBindConfig() { + if [ -f "$1"".tmp" ] && ! cmp -s "$1"".tmp" "$1"; then + mv "$1"".tmp" "$1" + ReConfigBind=0 + else + rm -f "$1"".tmp" fi -done \ No newline at end of file +} + +UpdateBindConfig "$BindIcvpnAcl" +UpdateBindConfig "$BindInternalFile" +UpdateBindConfig "$BindExternalFile" + +if [ $ReConfigBind -eq 0 ]; then + if [ $DNSSCRIPT_BIND_RELOAD_VER -eq 0 ]; then + systemctl restart bind9 + elif [ $DNSSCRIPT_BIND_RELOAD_VER -eq 1 ]; then + rndc reconfig + else + /etc/init.d/named restart + fi +fi diff --git a/update-public-acl.sh b/update-public-acl.sh new file mode 100755 index 0000000..3025aed --- /dev/null +++ b/update-public-acl.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +. ./dns-functions.sh + +IncludeFile="$1" + +rm -f "$IncludeFile" + +echo "acl icvpnrange {" > "$IncludeFile" +echo " icvpnlocal;" >> "$IncludeFile" + +echo "dump" | nc ::1 33123 | \ +sed -e '/add route/!d;/installed yes/!d;/\(from ::\/0\|from 0\.0\.\0\.0\/0\)/d;' | \ +sed -ne 's/^.*from \(\S\+\).*/\t\1;/p' >> "$IncludeFile" +echo "};" >> "$IncludeFile" diff --git a/update-rdnszone.sh b/update-rdnszone.sh old mode 100644 new mode 100755 From 2d0d225a0ec211970919fb3d2e81b8219cd69b5f Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Fri, 15 Jan 2021 17:20:50 +0100 Subject: [PATCH 19/56] minor fixes --- dns-functions.sh | 4 ++-- update-dns.sh | 22 +++++++++++----------- update-hoodzone.sh | 2 +- update-rdnszone.sh | 4 ++-- update-remoteleases.sh | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dns-functions.sh b/dns-functions.sh index 6141583..3ea2838 100755 --- a/dns-functions.sh +++ b/dns-functions.sh @@ -92,11 +92,11 @@ GetServernameSEDEntry() { } GetOwnGlueRecords() { ServerName="$DNSSCRIPT_SERVER_NAME" - if [ ! -z "${ServerName##*$1}" ]; then + if [ -n "${ServerName##*$1}" ]; then ServerName="$ServerName""$1" fi ServerName="$ServerName""." - echo "$(sed -ne 's/^\s*'"$(GetServernameSEDEntry "$1")"'\(\s\+[Ii][Nn]\s\+\([Aa]\|[Aa]\{4\}\)\s\+.*\)$/'"$ServerName"'\2/p' "$2")" + sed -ne 's/^\s*'"$(GetServernameSEDEntry "$1")"'\(\s\+[Ii][Nn]\s\+\([Aa]\|[Aa]\{4\}\)\s\+.*\)$/'"$ServerName"'\2/p' "$2" } GetOwnHoods() { Entries="$(sed -ne "s/^\s*\(\S*\).*\s\+[Ii][Nn]\s\+[Nn][Ss]\s\+""$(GetServernameSEDEntry "$1")""\s*;\s*Subnets:\s*\([^;]*\)/\1 \3/p" "$2")" diff --git a/update-dns.sh b/update-dns.sh index a885472..0e171e8 100755 --- a/update-dns.sh +++ b/update-dns.sh @@ -38,8 +38,8 @@ cd "$UpdateScriptsFolder" . ./dns-functions.sh MasterFile="$ZoneFilesFolder""db.""$CommunityDomain" -BindInternalFile="$BindIncludeFileFolder""$CommunityDomain""-internal.conf" -BindExternalFile="$BindIncludeFileFolder""$CommunityDomain""-external.conf" +BindInternalConf="$BindIncludeFileFolder""$CommunityDomain""-internal.conf" +BindExternalConf="$BindIncludeFileFolder""$CommunityDomain""-external.conf" BindIcvpnAcl="$BindIncludeFileFolder""icvpn-acl.conf" PreFetchMasterSerial="$(GetZoneFileSerial "$MasterFile")" @@ -50,15 +50,15 @@ if [ $((PostFetchMasterSerial)) -gt $((PreFetchMasterSerial)) ]; then ReloadZone "$CommunityDomain" "$InternalViews" fi -[ -f "$BindExternalFile"".tmp" ] && rm "$BindExternalFile"".tmp" -[ -f "$BindInternalFile"".tmp" ] && rm "$BindInternalFile"".tmp" -InsertZoneToIncludeFile "$CommunityDomain" "$ZoneFilesFolder""db.""$CommunityDomain" "$BindExternalFile"".tmp" +rm -f "$BindExternalConf"".tmp" +rm -f "$BindInternalConf"".tmp" +InsertZoneToIncludeFile "$CommunityDomain" "$ZoneFilesFolder""db.""$CommunityDomain" "$BindExternalConf"".tmp" for Subnet in $CommunitySubnets; do ReverseDomains="$(GetReverseDomains "$Subnet")" for RDomain in $ReverseDomains; do ./update-rdnszone.sh "$RDomain" "$ForwardZones" "$ZoneFilesFolder" "$TTLReReExMi" "$InternalViews" - InsertZoneToIncludeFile "$RDomain" "$ZoneFilesFolder""$(GetReverseZoneFileFromZone "${RDomain%*.}")" "$BindInternalFile"".tmp" + InsertZoneToIncludeFile "$RDomain" "$ZoneFilesFolder""$(GetReverseZoneFileFromZone "${RDomain%*.}")" "$BindInternalConf"".tmp" done done @@ -83,14 +83,14 @@ for Hood in $Hoods; do echo "$(GetOwnGlueRecords "$CommunityDomain" "$MasterFile")" >> "$HoodZoneFile" fi ./update-hoodzone.sh "$HoodZoneFile" "$HoodSubDomain"".""$CommunityDomain" "$Subnets" "$InternalViews" - InsertZoneToIncludeFile "$HoodSubDomain"".""$CommunityDomain" "$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" "$BindExternalFile"".tmp" + InsertZoneToIncludeFile "$HoodSubDomain"".""$CommunityDomain" "$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" "$BindExternalConf"".tmp" HoodForwardZones="$ForwardZones $HoodSubDomain"".""$CommunityDomain""/""$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" for Subnet in $Subnets; do ReverseDomains="$(GetReverseDomains "$Subnet")" for RDomain in $ReverseDomains; do ./update-rdnszone.sh "$RDomain" "$HoodForwardZones" "$ZoneFilesFolder" "$TTLReReExMi" "$InternalViews" - InsertZoneToIncludeFile "$RDomain" "$ZoneFilesFolder""$(GetReverseZoneFileFromZone "${RDomain%*.}")" "$BindInternalFile"".tmp" + InsertZoneToIncludeFile "$RDomain" "$ZoneFilesFolder""$(GetReverseZoneFileFromZone "${RDomain%*.}")" "$BindInternalConf"".tmp" done done @@ -100,7 +100,7 @@ for Hood in $Hoods; do ./update-extzone.sh "$InternFile" "$ExternFile" "$Domain" "$ExternalView" done -sed -i "1i include \"""$BindExternalFile""\";\n" "$BindInternalFile"".tmp" +sed -i "1i include \"""$BindExternalConf""\";\n" "$BindInternalConf"".tmp" ./update-public-acl.sh "$BindIcvpnAcl"".tmp" @@ -115,8 +115,8 @@ UpdateBindConfig() { } UpdateBindConfig "$BindIcvpnAcl" -UpdateBindConfig "$BindInternalFile" -UpdateBindConfig "$BindExternalFile" +UpdateBindConfig "$BindInternalConf" +UpdateBindConfig "$BindExternalConf" if [ $ReConfigBind -eq 0 ]; then if [ $DNSSCRIPT_BIND_RELOAD_VER -eq 0 ]; then diff --git a/update-hoodzone.sh b/update-hoodzone.sh index fbc053f..2318d9e 100755 --- a/update-hoodzone.sh +++ b/update-hoodzone.sh @@ -24,7 +24,7 @@ OldLeases="$(sed -e '/^;### Leases ###/,$!d' "$HoodZoneFile" | sed 1d)" if [ -f "/tmp/dhcp.leases" ]; then DnsmasqLeases="$(sed -ne 's/^\s*\(\S\+\s\+\)\{2\}\(\S\+\)\s\+\([_0-9a-zA-Z-]\+\)\s\+.*/\3 IN A \2/p' "/tmp/dhcp.leases")" for Subnet in $Subnets; do - IsValidIPv4Subnet "$Subnet" && NewLeases="$(echo "$NewLeases";echo "$(GetLeaseEntriesInSubnet "$DnsmasqLeases" "$Subnet")")" + IsValidIPv4Subnet "$Subnet" && NewLeases="$(echo "$NewLeases"; GetLeaseEntriesInSubnet "$DnsmasqLeases" "$Subnet")" done fi diff --git a/update-rdnszone.sh b/update-rdnszone.sh index e86e687..e9bbaab 100755 --- a/update-rdnszone.sh +++ b/update-rdnszone.sh @@ -23,9 +23,9 @@ GetIPEntries() { ReverseEntry() { if [ -z "$RZoneIsIPv6" ]; then - echo "$(GetReverseDomains "$1""/32")" + GetReverseDomains "$1""/32" else - echo "$(GetReverseDomains "$1""/128")" + GetReverseDomains "$1""/128" fi } diff --git a/update-remoteleases.sh b/update-remoteleases.sh index 2dbb463..31bbc08 100755 --- a/update-remoteleases.sh +++ b/update-remoteleases.sh @@ -5,6 +5,6 @@ for File in /wwwup/*; do LastFile="$File" done -cat "$LastFile" | sed -e 's/%\([0-9A-F][0-9A-F]\)/\\\\x\1/g' | xargs echo -e > /tmp/hosts/remote.leases +sed -e 's/%\([0-9A-F][0-9A-F]\)/\\\\x\1/g' "$LastFile" | xargs echo -e > /tmp/hosts/remote.leases rm /wwwup/* \ No newline at end of file From 22fe83fdb14d538950c11f5d41aece6b823105df Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Fri, 15 Jan 2021 21:26:07 +0100 Subject: [PATCH 20/56] formating changes --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 049e96e..75e0a6f 100644 --- a/README.md +++ b/README.md @@ -12,15 +12,17 @@ Damit kann jeder Freifunk-Teilnehmer ein gültiges TLS-Zertifikat bekommen, sofe #### Systemanforderungen curl + named-checkzone (z.B. bei bind oder bind-tools enthalten) -der Befehl: +``` echo "dump" | nc ::1 33123 +``` muss die babel routen ausgeben, ansonsten muss update-public-acl.sh angepasst werden #### dns-scripts klonen -Die Scripte müssen geklont werden, oder anderweitig in einem Ordner auf dem Server abgelegt werden. Dabei ist aktuell noch die Position wichtig, da das Skript derzeit absolulte Pfade verwendet (oder den Pfad in update-dns.sh anpassen) +Die Scripte müssen geklont werden, oder anderweitig in einem Ordner auf dem Server abgelegt werden. Dabei ist aktuell noch die Position wichtig, da das Skript derzeit absolute Pfade verwendet (oder den Pfad in update-dns.sh anpassen) ``` git clone https://git.freifunk-franken.de/freifunk-franken/dns-scripts.git /usr/lib/ffdns ``` @@ -37,6 +39,7 @@ Schließlich muss noch ein Cron angelegt werden, der regelmäßig das Skript auf #### DNS-Server konfigurieren Dann muss nur noch der DNS Server, z.B. `bind`, eingerichtet werden. + Für bind werden durch die Scripte die include-Dateien angelegt (fff.community-[in|ex]ternal.conf|icvpn-acl.conf): Konfiguration: From 9d1f07d97138bf30c8403a8f7da9f57a7e3d0e14 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Fri, 15 Jan 2021 23:35:14 +0100 Subject: [PATCH 21/56] fix escaping --- update-public-acl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-public-acl.sh b/update-public-acl.sh index 3025aed..ff660b6 100755 --- a/update-public-acl.sh +++ b/update-public-acl.sh @@ -10,6 +10,6 @@ echo "acl icvpnrange {" > "$IncludeFile" echo " icvpnlocal;" >> "$IncludeFile" echo "dump" | nc ::1 33123 | \ -sed -e '/add route/!d;/installed yes/!d;/\(from ::\/0\|from 0\.0\.\0\.0\/0\)/d;' | \ +sed -e '/add route/!d;/installed yes/!d;/\(from ::\/0\|from 0\.0\.0\.0\/0\)/d;' | \ sed -ne 's/^.*from \(\S\+\).*/\t\1;/p' >> "$IncludeFile" echo "};" >> "$IncludeFile" From 91824bee037ccff0ea419110b4947a883f3f3f2e Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Fri, 15 Jan 2021 23:35:47 +0100 Subject: [PATCH 22/56] change formatting of Leases to spaces --- update-hoodzone.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/update-hoodzone.sh b/update-hoodzone.sh index 2318d9e..54dc71b 100755 --- a/update-hoodzone.sh +++ b/update-hoodzone.sh @@ -22,7 +22,7 @@ GetLeaseEntriesInSubnet() { OldLeases="$(sed -e '/^;### Leases ###/,$!d' "$HoodZoneFile" | sed 1d)" if [ -f "/tmp/dhcp.leases" ]; then - DnsmasqLeases="$(sed -ne 's/^\s*\(\S\+\s\+\)\{2\}\(\S\+\)\s\+\([_0-9a-zA-Z-]\+\)\s\+.*/\3 IN A \2/p' "/tmp/dhcp.leases")" + DnsmasqLeases="$(sed -ne 's/^\s*\(\S\+\s\+\)\{2\}\(\S\+\)\s\+\([_0-9a-zA-Z-]\+\)\s\+.*/\3 IN A \2/p' "/tmp/dhcp.leases")" for Subnet in $Subnets; do IsValidIPv4Subnet "$Subnet" && NewLeases="$(echo "$NewLeases"; GetLeaseEntriesInSubnet "$DnsmasqLeases" "$Subnet")" done @@ -30,8 +30,8 @@ fi for Leasefile in /tmp/hosts/*; do if [ -n "${Leasefile##*/tmp/hosts/\*}" ]; then - NewLeases="$(echo "$NewLeases"; sed -ne 's/^\s*\([0-9.]*\)\s\+\([_0-9a-zA-Z-]\+\)'"$DomainReg"'.*/\2 IN A \1/p' "$Leasefile")" - NewLeases="$(echo "$NewLeases"; sed -ne 's/^\s*\([0-9a-fA-F:]*\)\s\+\([_0-9a-zA-Z-]\+\)'"$DomainReg"'.*/\2 IN AAAA \1/p' "$Leasefile")" + NewLeases="$(echo "$NewLeases"; sed -ne 's/^\s*\([0-9.]*\)\s\+\([_0-9a-zA-Z-]\+\)'"$DomainReg"'.*/\2 IN A \1/p' "$Leasefile")" + NewLeases="$(echo "$NewLeases"; sed -ne 's/^\s*\([0-9a-fA-F:]*\)\s\+\([_0-9a-zA-Z-]\+\)'"$DomainReg"'.*/\2 IN AAAA \1/p' "$Leasefile")" fi done @@ -40,7 +40,10 @@ NewLeases="$(echo "$NewLeases" | awk '!a[$0]++' | # uncomment and duplicate to secure static DNS-Entries # sed -e '/^dns\s\+.*/d' | - awk 'BEGIN{FS="\t"}{l=length($1);y=substr("\t\t\t\t\t\t", 1+length($1)/4);x=substr($0,length($1)+1); print $1 y x}' )" + awk 'BEGIN{FS="\t"}{l=length($1);f=substr(" ", 1+length($1)); + s=substr(" ", 1+length($2)); + x=substr($0,length($1)+length($2)+3); + print $1 f " " $2 s " " x}' )" if [ "$NewLeases" != "$OldLeases" ]; then NewSerial="$(GetZoneFileSerial "$HoodZoneFile")" NewSerial=$((NewSerial+1)) From fecc46aecda88e627081d585ec6e003ab0891f7b Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Tue, 19 Jan 2021 17:49:06 +0100 Subject: [PATCH 23/56] temp files to /tmp; optimisations --- dns-functions.sh | 43 ++++++++++++++++++++++++---------------- update-dns.sh | 47 ++++++++++++++++++++++++-------------------- update-extzone.sh | 8 ++------ update-hoodzone.sh | 10 ++++++---- update-public-acl.sh | 15 +++++++------- update-rdnszone.sh | 28 ++++++++++++++------------ 6 files changed, 83 insertions(+), 68 deletions(-) diff --git a/dns-functions.sh b/dns-functions.sh index 3ea2838..10b01b6 100755 --- a/dns-functions.sh +++ b/dns-functions.sh @@ -14,10 +14,12 @@ GetZoneFileSerial() { } InsertZoneToIncludeFile() { if [ ! -f "$3" ]; then - echo "zone \"""$1""\" {" > "$3" - echo " type master;" >> "$3" - echo " file \"""$2""\";" >> "$3" - echo "};" >> "$3" + { + echo "zone \"""$1""\" {" + echo " type master;" + echo " file \"""$2""\";" + echo "};" + } > "$3" else sed -i "1i\ zone \"""$1""\" {\n\ @@ -41,8 +43,8 @@ GetReverseIPv4Domains() { if [ $Filler -eq 0 ]; then echo "${RevDomain#.}" else - Filler=$((8 - $Filler)) - Filler=$((1 << $Filler)) + Filler=$((8 - Filler)) + Filler=$((1 << Filler)) Start=$(echo "$IPFilled" | awk -F. '{printf $'"$((Statics+1))"'}') Start=$((Start - Start % Filler)) for Sub in $(seq $Start $((Start + Filler - 1))); do @@ -51,20 +53,20 @@ GetReverseIPv4Domains() { fi } FillIPv6Zeroes() { - echo "$1" | awk -F: 'BEGIN {OFS=""}{ FillCount=9-NF; for(i=1;i<=NF;i++){if(length($i) == 0){if(i==NF) {$i="0000";} else {for(j=1;j<=FillCount;j++){$i=($i "0000");}}} else {$i=substr(("0000" $i), length($i)+1);}}; print}' + echo "$1" | awk -F: 'BEGIN{OFS=""}{FillCount=9-NF; for(i=1;i<=NF;i++){if(length($i)!=0||i==1||i==NF) {$i=substr(("0000" $i), length($i)+1);} else {for(j=1;j<=FillCount;j++){$i=($i "0000");}}}; print}' } GetReverseIPv6Domains() { IPFilled="$(FillIPv6Zeroes "$(echo "${1%/*}" | awk '{print tolower($0)}')")" Mask="${1##*/}" Statics=$((Mask / 4)) Filler=$((Mask % 4)) - RevDomain="$(echo "$IPFilled" | awk '{ for(i='"$Statics"';i>0;i--)x=x "." substr($0,i,1);}END{print x}')"".ip6.arpa." + RevDomain="$(echo "$IPFilled" | awk 'BEGIN{FS=""}{for(i='"$Statics"';i>0;i--) printf "." $i;}')"".ip6.arpa." if [ $Filler -eq 0 ]; then echo "${RevDomain#.}" else - Filler=$((4 - $Filler)) - Filler=$((1 << $Filler)) - Start="$(printf %d 0x"$(echo "$IPFilled" | awk 'BEGIN{FS=""}{printf $'"$((Statics+1))"'}')")" + Filler=$((4 - Filler)) + Filler=$((1 << Filler)) + Start="$(printf %d 0x"$(echo "$IPFilled" | awk 'BEGIN{FS=""}{printf $'"$((Statics+1))"'}')")" Start=$((Start - Start % Filler)) for Sub in $(seq $Start $((Start + Filler - 1))); do echo "$(printf %x "$Sub")""$RevDomain" @@ -77,6 +79,8 @@ GetReverseDomains() { GetReverseIPv4Domains "$Subnet" elif IsValidIPv6Subnet "$Subnet"; then GetReverseIPv6Domains "$Subnet" + else + TraceErrAndExit "$1"" is no valid Subnet" fi } GetServernameSEDEntry() { @@ -133,25 +137,30 @@ IPv4IsInSubnet() { SubnetStaticPart="$(echo "$SubnetIPFilled" | awk -F. '{for(i='"$Statics"';i>0;--i) printf "."$i}')" AreEqual="$([ "$IPStaticPart" = "$SubnetStaticPart" ]; echo "$?")" if [ $AreEqual -eq 0 ] && [ $BlockMask -ne 0 ]; then - BlockMask=$((8 - $BlockMask)) - BlockMask=$((-1 << $BlockMask)) + BlockMask=$((8 - BlockMask)) + BlockMask=$((-1 << BlockMask)) IPBlock=$(echo "$IPFilled" | awk -F. '{printf $'"$((Statics+1))"'}') SubnetBlock=$(echo "$SubnetIPFilled" | awk -F. '{printf $'"$((Statics+1))"'}') - IPBlock=$(($IPBlock & $BlockMask)) - SubnetBlock=$(($SubnetBlock & $BlockMask)) + IPBlock=$((IPBlock & BlockMask)) + SubnetBlock=$((SubnetBlock & BlockMask)) AreEqual="$([ $IPBlock -eq $SubnetBlock ]; echo "$?")" fi return $AreEqual } ReloadZone() { - if [ $DNSSCRIPT_BIND_RELOAD_VER -eq 0 ]; then + if [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 0 ]; then systemctl reload bind9 - elif [ $DNSSCRIPT_BIND_RELOAD_VER -eq 1 ]; then + elif [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 1 ]; then for Zone in $2; do rndc reload "$1" IN "$Zone" done else /etc/init.d/named reload fi +} + +TraceErrAndExit() { + echo "$1" 1>&2 + exit 1 } \ No newline at end of file diff --git a/update-dns.sh b/update-dns.sh index 0e171e8..f3cc597 100755 --- a/update-dns.sh +++ b/update-dns.sh @@ -38,27 +38,30 @@ cd "$UpdateScriptsFolder" . ./dns-functions.sh MasterFile="$ZoneFilesFolder""db.""$CommunityDomain" +BindInternalConfTmp="/tmp/""$CommunityDomain""-internal.conf" +BindExternalConfTmp="/tmp/""$CommunityDomain""-external.conf" +BindIcvpnAclTmp="/tmp/icvpn-acl.conf" BindInternalConf="$BindIncludeFileFolder""$CommunityDomain""-internal.conf" BindExternalConf="$BindIncludeFileFolder""$CommunityDomain""-external.conf" BindIcvpnAcl="$BindIncludeFileFolder""icvpn-acl.conf" PreFetchMasterSerial="$(GetZoneFileSerial "$MasterFile")" -curl "$MasterFileRemoteLocation" --output "$MasterFile" +curl -s -S "$MasterFileRemoteLocation" --output "$MasterFile" PostFetchMasterSerial="$(GetZoneFileSerial "$MasterFile")" if [ $((PostFetchMasterSerial)) -gt $((PreFetchMasterSerial)) ]; then ReloadZone "$CommunityDomain" "$InternalViews" fi -rm -f "$BindExternalConf"".tmp" -rm -f "$BindInternalConf"".tmp" -InsertZoneToIncludeFile "$CommunityDomain" "$ZoneFilesFolder""db.""$CommunityDomain" "$BindExternalConf"".tmp" +rm -f "$BindInternalConfTmp" +rm -f "$BindInternalConfTmp" +InsertZoneToIncludeFile "$CommunityDomain" "$ZoneFilesFolder""db.""$CommunityDomain" "$BindExternalConfTmp" for Subnet in $CommunitySubnets; do ReverseDomains="$(GetReverseDomains "$Subnet")" for RDomain in $ReverseDomains; do ./update-rdnszone.sh "$RDomain" "$ForwardZones" "$ZoneFilesFolder" "$TTLReReExMi" "$InternalViews" - InsertZoneToIncludeFile "$RDomain" "$ZoneFilesFolder""$(GetReverseZoneFileFromZone "${RDomain%*.}")" "$BindInternalConf"".tmp" + InsertZoneToIncludeFile "$RDomain" "$ZoneFilesFolder""$(GetReverseZoneFileFromZone "${RDomain%*.}")" "$BindInternalConfTmp" done done @@ -77,20 +80,22 @@ for Hood in $Hoods; do Subnets="$(echo "${Hood#*\#}" | sed -e 's/#/ /g')" HoodZoneFile="$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" if [ ! -f "$HoodZoneFile" ]; then - echo "\$TTL ${TTLReReExMi%% *}" > "$HoodZoneFile" - echo "$HoodSubDomain"".""$CommunityDomain"". ${TTLReReExMi%% *} IN SOA $DNSSCRIPT_SERVER_NAME""."" $DNSSCRIPT_CONTACT_EMAIL 1 ${TTLReReExMi#* }" >> "$HoodZoneFile" - echo "$HoodSubDomain"".""$CommunityDomain"". ${TTLReReExMi%% *} IN NS $DNSSCRIPT_SERVER_NAME"".""" >> "$HoodZoneFile" - echo "$(GetOwnGlueRecords "$CommunityDomain" "$MasterFile")" >> "$HoodZoneFile" + { + echo "\$TTL ${TTLReReExMi%% *}" + echo "$HoodSubDomain"".""$CommunityDomain"". ${TTLReReExMi%% *} IN SOA $DNSSCRIPT_SERVER_NAME""."" $DNSSCRIPT_CONTACT_EMAIL 1 ${TTLReReExMi#* }" + echo "$HoodSubDomain"".""$CommunityDomain"". ${TTLReReExMi%% *} IN NS $DNSSCRIPT_SERVER_NAME"".""" + GetOwnGlueRecords "$CommunityDomain" "$MasterFile" + } > "$HoodZoneFile" fi ./update-hoodzone.sh "$HoodZoneFile" "$HoodSubDomain"".""$CommunityDomain" "$Subnets" "$InternalViews" - InsertZoneToIncludeFile "$HoodSubDomain"".""$CommunityDomain" "$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" "$BindExternalConf"".tmp" + InsertZoneToIncludeFile "$HoodSubDomain"".""$CommunityDomain" "$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" "$BindExternalConfTmp" HoodForwardZones="$ForwardZones $HoodSubDomain"".""$CommunityDomain""/""$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" for Subnet in $Subnets; do ReverseDomains="$(GetReverseDomains "$Subnet")" for RDomain in $ReverseDomains; do ./update-rdnszone.sh "$RDomain" "$HoodForwardZones" "$ZoneFilesFolder" "$TTLReReExMi" "$InternalViews" - InsertZoneToIncludeFile "$RDomain" "$ZoneFilesFolder""$(GetReverseZoneFileFromZone "${RDomain%*.}")" "$BindInternalConf"".tmp" + InsertZoneToIncludeFile "$RDomain" "$ZoneFilesFolder""$(GetReverseZoneFileFromZone "${RDomain%*.}")" "$BindInternalConfTmp" done done @@ -100,28 +105,28 @@ for Hood in $Hoods; do ./update-extzone.sh "$InternFile" "$ExternFile" "$Domain" "$ExternalView" done -sed -i "1i include \"""$BindExternalConf""\";\n" "$BindInternalConf"".tmp" -./update-public-acl.sh "$BindIcvpnAcl"".tmp" +sed -i "1i include \"""$BindExternalConf""\";\n" "$BindInternalConfTmp" +./update-public-acl.sh "$BindIcvpnAclTmp" ReConfigBind=1 UpdateBindConfig() { - if [ -f "$1"".tmp" ] && ! cmp -s "$1"".tmp" "$1"; then - mv "$1"".tmp" "$1" + if [ -f "$1" ] && ! cmp -s "$1" "$2"; then + mv "$1" "$2" ReConfigBind=0 else - rm -f "$1"".tmp" + rm -f "$1" fi } -UpdateBindConfig "$BindIcvpnAcl" -UpdateBindConfig "$BindInternalConf" -UpdateBindConfig "$BindExternalConf" +UpdateBindConfig "$BindIcvpnAclTmp" "$BindIcvpnAcl" +UpdateBindConfig "$BindInternalConfTmp" "$BindInternalConf" +UpdateBindConfig "$BindExternalConfTmp" "$BindExternalConf" if [ $ReConfigBind -eq 0 ]; then - if [ $DNSSCRIPT_BIND_RELOAD_VER -eq 0 ]; then + if [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 0 ]; then systemctl restart bind9 - elif [ $DNSSCRIPT_BIND_RELOAD_VER -eq 1 ]; then + elif [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 1 ]; then rndc reconfig else /etc/init.d/named restart diff --git a/update-extzone.sh b/update-extzone.sh index 74c5aef..0925b8d 100755 --- a/update-extzone.sh +++ b/update-extzone.sh @@ -8,13 +8,9 @@ ExternalZone="$3" ExternalView="$4" SerialIntern="$(GetZoneFileSerial "$InternalZoneFile")" -if [ -f "$ExternalZoneFile" ]; then - SerialExtern="$(GetZoneFileSerial "$ExternalZoneFile")" -else - SerialExtern=0 -fi +SerialExtern="$(GetZoneFileSerial "$ExternalZoneFile")" -if [ $SerialIntern -gt $SerialExtern ]; then +if [ $((SerialIntern)) -gt $((SerialExtern)) ]; then sed '/^[^;]*\s\(10.\|[fF][cdCD][0-9a-fA-F]\{2\}:\)\S*\s*\(;.*\)\?$/d' "$InternalZoneFile" > "$ExternalZoneFile" ReloadZone "$ExternalZone" "$ExternalView" fi diff --git a/update-hoodzone.sh b/update-hoodzone.sh index 54dc71b..a08ed87 100755 --- a/update-hoodzone.sh +++ b/update-hoodzone.sh @@ -38,10 +38,10 @@ done NewLeases="$(echo "$NewLeases" | sed -ne 's/^\(\(\(\S\+\)'"$DomainReg"'\)\|\(\S\+\)\)\(.*\)$/\3\4\5/p' | awk '!a[$0]++' | -# uncomment and duplicate to secure static DNS-Entries +# uncomment and duplicate to secure static DNS-Entries # sed -e '/^dns\s\+.*/d' | awk 'BEGIN{FS="\t"}{l=length($1);f=substr(" ", 1+length($1)); - s=substr(" ", 1+length($2)); + s=substr(" ", 1+length($2)); x=substr($0,length($1)+length($2)+3); print $1 f " " $2 s " " x}' )" if [ "$NewLeases" != "$OldLeases" ]; then @@ -49,7 +49,9 @@ if [ "$NewLeases" != "$OldLeases" ]; then NewSerial=$((NewSerial+1)) sed -i -e 's/^\(\s*\)\(\S\+\)\(\s*;\s*Serial.*\)/\1'"$NewSerial"'\3/g' "$HoodZoneFile" sed -i -e '/^;### Leases ###/,$d' "$HoodZoneFile" - echo ";### Leases ###" >> "$HoodZoneFile" - echo "$NewLeases" >> "$HoodZoneFile" + { + echo ";### Leases ###" + echo "$NewLeases" + } >> "$HoodZoneFile" ReloadZone "$Domain" "$View" fi diff --git a/update-public-acl.sh b/update-public-acl.sh index ff660b6..446c556 100755 --- a/update-public-acl.sh +++ b/update-public-acl.sh @@ -6,10 +6,11 @@ IncludeFile="$1" rm -f "$IncludeFile" -echo "acl icvpnrange {" > "$IncludeFile" -echo " icvpnlocal;" >> "$IncludeFile" - -echo "dump" | nc ::1 33123 | \ -sed -e '/add route/!d;/installed yes/!d;/\(from ::\/0\|from 0\.0\.0\.0\/0\)/d;' | \ -sed -ne 's/^.*from \(\S\+\).*/\t\1;/p' >> "$IncludeFile" -echo "};" >> "$IncludeFile" +{ + echo "acl icvpnrange {" + echo " icvpnlocal;" + echo "dump" | nc ::1 33123 | \ + sed -e '/add route/!d;/installed yes/!d;/\(from ::\/0\|from 0\.0\.0\.0\/0\)/d;' | \ + sed -ne 's/^.*from \(\S\+\).*/\t\1;/p' + echo "};" +} > "$IncludeFile" diff --git a/update-rdnszone.sh b/update-rdnszone.sh index e9bbaab..a89ad8a 100755 --- a/update-rdnszone.sh +++ b/update-rdnszone.sh @@ -18,7 +18,7 @@ GetIPEntries() { IPPattern="[aA]\{4\}\s\+\([0-9a-f:]\+\)" fi - sed -ne "s/^\s*\(\S\+\)\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+""$IPPattern"".*/\1\/\3/p" "$TempDir/$ForwardZoneFile" + sed -ne "s/^\s*\(\S\+\)\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+""$IPPattern"".*/\1\/\3/p" "$ForwardZoneFile" } ReverseEntry() { @@ -34,8 +34,7 @@ if [ -z "${ReverseDomain##*.in-addr.arpa.}" ]; then elif [ -z "${ReverseDomain##*.ip6.arpa.}" ]; then RZoneIsIPv6=1 else - echo "No valid ReverseDomain" 1>&2 - exit 1 + TraceErrAndExit "$ReverseDomain"" is no valid reverse domain" fi mkdir -p "$TempDir" @@ -43,18 +42,20 @@ mkdir -p "$TempDir" for ForwardZone in $ForwardZones; do ZoneName="${ForwardZone%%/*}" ZoneFile="${ForwardZone#*/}" - named-checkzone -f text -i local -o "$TempDir/$ZoneName" -D "$ZoneName" "$ZoneFile" >/dev/null 2>&1 + named-checkzone -f text -i local -o "$TempDir/$ZoneName" -D "$ZoneName" "$ZoneFile" >/dev/null Serial="$(GetZoneFileSerial "$TempDir/$ZoneName")" NewReverseSerial=$((Serial + NewReverseSerial)) - ZoneRevNSSubnets="$(sed -ne 's/^\s*\S\+\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\s\+\(\S\+\)\s*.*;\s*Subnets:\s*\([^;]*\)$/\2@\3/p' "$ZoneFile" | - sed -e 's/\(.*[^\.]\)@/\1\.'"$ZoneName"'\.@/;s/@/ /;s/\s\+/@/g')" + ZoneRevNSSubnets="$(sed -ne 's/^\s*\S\+\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\s\+\(\S\+\).*;\s*Subnets:\s*\([^;]*\)$/\2@\3/p' "$ZoneFile" | + sed -e 's/\(.*[^\.]\)@/\1\.'"$ZoneName"'\.@/;s/@/ /;s/\s\+/@/g')" done - OldSerial=$(GetZoneFileSerial "$ReverseZoneFile") +OldSerial="$(GetZoneFileSerial "$ReverseZoneFile")" -if [ $NewReverseSerial -gt $OldSerial ]; then - echo "$ReverseDomain $TTL IN SOA $DNSSCRIPT_SERVER_NAME""."" $DNSSCRIPT_CONTACT_EMAIL $NewReverseSerial $ReReExMi" > "$TempDir/$ReverseZone" - echo "$ReverseDomain $TTL IN NS $DNSSCRIPT_SERVER_NAME"".""" >> "$TempDir/$ReverseZone" +if [ $((NewReverseSerial)) -gt $((OldSerial)) ]; then + { + echo "$ReverseDomain $TTL IN SOA $DNSSCRIPT_SERVER_NAME""."" $DNSSCRIPT_CONTACT_EMAIL $NewReverseSerial $ReReExMi" + echo "$ReverseDomain $TTL IN NS $DNSSCRIPT_SERVER_NAME"".""" + } > "$TempDir/$ReverseZone" for NSSubnets in $ZoneRevNSSubnets; do Subnets="$(echo "${NSSubnets#*@}" | sed -e 's/@/ /g')" @@ -66,8 +67,8 @@ if [ $NewReverseSerial -gt $OldSerial ]; then done done done - - for ForwardZoneFile in $(ls $TempDir); do + for ForwardZoneFile in "$TempDir"/*; do + if [ -n "${ForwardZoneFile##*$ReverseZone}" ]; then IPEntries="$(GetIPEntries)" for IPEntry in $IPEntries; do @@ -79,9 +80,10 @@ if [ $NewReverseSerial -gt $OldSerial ]; then echo "$IP $TTL IN PTR $Host" >> "$TempDir/$ReverseZone" fi done + fi done - named-checkzone -o "$ReverseZoneFile" "$ReverseDomain" "$TempDir/$ReverseZone" >/dev/null 2>&1 + named-checkzone -o "$ReverseZoneFile" "$ReverseDomain" "$TempDir/$ReverseZone" >/dev/null ReloadZone "$ReverseDomain" "$View" fi From 462f37dfebf064ea53d409f0012f1a8ecfa98271 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Tue, 19 Jan 2021 20:24:33 +0100 Subject: [PATCH 24/56] support for first run --- dns-functions.sh | 2 +- update-dns.sh | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dns-functions.sh b/dns-functions.sh index 10b01b6..48ad97f 100755 --- a/dns-functions.sh +++ b/dns-functions.sh @@ -155,7 +155,7 @@ ReloadZone() { for Zone in $2; do rndc reload "$1" IN "$Zone" done - else + elif [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 2 ]; then /etc/init.d/named reload fi } diff --git a/update-dns.sh b/update-dns.sh index f3cc597..844d72a 100755 --- a/update-dns.sh +++ b/update-dns.sh @@ -16,10 +16,13 @@ UpdateScriptsFolder="/usr/lib/ffdns/" ZoneFilesFolder="/etc/bind/fff/" BindIncludeFileFolder="/etc/bind/" -# 0 -> Debian (and like) systemctl reload bind9 -# 1 -> use rndc to reload zone (recommended; rndc needs setup first) -# 2 -> OpenWRT /etc/init.d/named reload -# +# -1 -> disable bind restarting/reloading +# 0 -> Debian (and like) systemctl [reload|restart] bind9 +# 1 -> use rndc to [reload zone|restart] (recommended; rndc needs setup first) +# 2 -> OpenWRT /etc/init.d/named [reload|restart] +# +# Set -1 for first run to prevent exiting on error and let the script generate the config and zonefiles +# after first run edit your config and set appropriate value export DNSSCRIPT_BIND_RELOAD_VER=0 # only necessary when rndc is used @@ -128,7 +131,7 @@ if [ $ReConfigBind -eq 0 ]; then systemctl restart bind9 elif [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 1 ]; then rndc reconfig - else + elif [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 2 ]; then /etc/init.d/named restart fi fi From c27453d55d0d946214ab3635ec98f6ea4f37ac33 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Tue, 19 Jan 2021 20:31:23 +0100 Subject: [PATCH 25/56] fix: external zone not completely renewed --- update-dns.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-dns.sh b/update-dns.sh index 844d72a..3fd66e1 100755 --- a/update-dns.sh +++ b/update-dns.sh @@ -57,7 +57,7 @@ if [ $((PostFetchMasterSerial)) -gt $((PreFetchMasterSerial)) ]; then fi rm -f "$BindInternalConfTmp" -rm -f "$BindInternalConfTmp" +rm -f "$BindExternalConfTmp" InsertZoneToIncludeFile "$CommunityDomain" "$ZoneFilesFolder""db.""$CommunityDomain" "$BindExternalConfTmp" for Subnet in $CommunitySubnets; do From f9a4228a031a3e0d5f5c2a9a1016d600bf04563e Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Thu, 21 Jan 2021 19:21:25 +0100 Subject: [PATCH 26/56] fix: external zone links to internal; fix: hood zonefile creation; support for reverse entries w/o forward entries; simplifications --- dns-functions.sh | 16 +++++++++-- update-dns.sh | 68 ++++++++++++++++++++++++++-------------------- update-hoodzone.sh | 5 +--- update-rdnszone.sh | 47 +++++++++++++++++--------------- 4 files changed, 78 insertions(+), 58 deletions(-) diff --git a/dns-functions.sh b/dns-functions.sh index 48ad97f..fd7396f 100755 --- a/dns-functions.sh +++ b/dns-functions.sh @@ -83,6 +83,11 @@ GetReverseDomains() { TraceErrAndExit "$1"" is no valid Subnet" fi } +ExpandHostname() { + Hostname="$1" + [ -n "${Hostname##*.}" ] && Hostname="$Hostname"".""$2" + echo "$Hostname" +} GetServernameSEDEntry() { CommunityName="$1" ServerName="$DNSSCRIPT_SERVER_NAME" @@ -94,13 +99,20 @@ GetServernameSEDEntry() { echo "$ServerName" | sed -r 's/\./\\\./g' } +NormalizeZoneFileFormatting() { + awk 'BEGIN{FS="\t"}{l=length($1);f=substr(" ", 1+length($1)); + s=substr(" ", 1+length($2)); + x=substr($0,length($1)+length($2)+3); + print $1 f " " $2 s " " x}' +} GetOwnGlueRecords() { ServerName="$DNSSCRIPT_SERVER_NAME" if [ -n "${ServerName##*$1}" ]; then ServerName="$ServerName""$1" fi ServerName="$ServerName""." - sed -ne 's/^\s*'"$(GetServernameSEDEntry "$1")"'\(\s\+[Ii][Nn]\s\+\([Aa]\|[Aa]\{4\}\)\s\+.*\)$/'"$ServerName"'\2/p' "$2" + sed -ne 's/^\s*'"$(GetServernameSEDEntry "$1")"'\s\+[Ii][Nn]\s\+\([Aa]\|[Aa]\{4\}\)\s\+\(.*\)$/'"$ServerName"'\tIN \2\t\3/p' "$2" | \ + NormalizeZoneFileFormatting } GetOwnHoods() { Entries="$(sed -ne "s/^\s*\(\S*\).*\s\+[Ii][Nn]\s\+[Nn][Ss]\s\+""$(GetServernameSEDEntry "$1")""\s*;\s*Subnets:\s*\([^;]*\)/\1 \3/p" "$2")" @@ -153,7 +165,7 @@ ReloadZone() { systemctl reload bind9 elif [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 1 ]; then for Zone in $2; do - rndc reload "$1" IN "$Zone" + rndc reload "$1" IN "$Zone" || touch "/tmp/dnsscript-forcereconf" done elif [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 2 ]; then /etc/init.d/named reload diff --git a/update-dns.sh b/update-dns.sh index 3fd66e1..a511619 100755 --- a/update-dns.sh +++ b/update-dns.sh @@ -6,7 +6,7 @@ set -e # Communityconfig CommunityDomain="fff.community" CommunitySubnets="10.50.0/16 10.83.0/16 fd43:5602:29bd::/48" -MasterFileRemoteLocation="https://git.freifunk-franken.de/freifunk-franken/dns/raw/branch/master/db.fff.community" +RemoteLocation="https://git.freifunk-franken.de/freifunk-franken/dns/raw/branch/master/" # Serverconfig export DNSSCRIPT_CONTACT_EMAIL=info.freifunk-herpf.de. @@ -16,13 +16,10 @@ UpdateScriptsFolder="/usr/lib/ffdns/" ZoneFilesFolder="/etc/bind/fff/" BindIncludeFileFolder="/etc/bind/" -# -1 -> disable bind restarting/reloading +# -1 -> disable bind [restart|reload] # 0 -> Debian (and like) systemctl [reload|restart] bind9 -# 1 -> use rndc to [reload zone|restart] (recommended; rndc needs setup first) +# 1 -> use rndc to [reload zone|reconfig] (recommended; rndc needs setup first) # 2 -> OpenWRT /etc/init.d/named [reload|restart] -# -# Set -1 for first run to prevent exiting on error and let the script generate the config and zonefiles -# after first run edit your config and set appropriate value export DNSSCRIPT_BIND_RELOAD_VER=0 # only necessary when rndc is used @@ -38,6 +35,7 @@ ForwardZones="$CommunityDomain""/""$ZoneFilesFolder""db.""$CommunityDomain" ############################################################# cd "$UpdateScriptsFolder" + . ./dns-functions.sh MasterFile="$ZoneFilesFolder""db.""$CommunityDomain" @@ -49,7 +47,7 @@ BindExternalConf="$BindIncludeFileFolder""$CommunityDomain""-external.conf" BindIcvpnAcl="$BindIncludeFileFolder""icvpn-acl.conf" PreFetchMasterSerial="$(GetZoneFileSerial "$MasterFile")" -curl -s -S "$MasterFileRemoteLocation" --output "$MasterFile" +curl -s -S -f "$RemoteLocation""db.""$CommunityDomain" --output "$MasterFile" PostFetchMasterSerial="$(GetZoneFileSerial "$MasterFile")" if [ $((PostFetchMasterSerial)) -gt $((PreFetchMasterSerial)) ]; then @@ -58,20 +56,23 @@ fi rm -f "$BindInternalConfTmp" rm -f "$BindExternalConfTmp" -InsertZoneToIncludeFile "$CommunityDomain" "$ZoneFilesFolder""db.""$CommunityDomain" "$BindExternalConfTmp" +InsertZoneToIncludeFile "$CommunityDomain" "$MasterFile" "$BindInternalConfTmp" +InsertZoneToIncludeFile "$CommunityDomain" "$ZoneFilesFolder""dbextern.""$CommunityDomain" "$BindExternalConfTmp" for Subnet in $CommunitySubnets; do ReverseDomains="$(GetReverseDomains "$Subnet")" for RDomain in $ReverseDomains; do - ./update-rdnszone.sh "$RDomain" "$ForwardZones" "$ZoneFilesFolder" "$TTLReReExMi" "$InternalViews" - InsertZoneToIncludeFile "$RDomain" "$ZoneFilesFolder""$(GetReverseZoneFileFromZone "${RDomain%*.}")" "$BindInternalConfTmp" + ReverseZoneFile="$(GetReverseZoneFileFromZone "${RDomain%*.}")" + ! curl -s -f "$RemoteLocation""static.""$ReverseZoneFile" \ + --output "$ZoneFilesFolder""static.""$ReverseZoneFile" && \ + rm -f "$ZoneFilesFolder""static.""$ReverseZoneFile" + ./update-rdnszone.sh "$RDomain" "$ForwardZones" "$ZoneFilesFolder""$ReverseZoneFile" "$TTLReReExMi" "$InternalViews" + InsertZoneToIncludeFile "$RDomain" "$ZoneFilesFolder""$ReverseZoneFile" "$BindInternalConfTmp" done done -InternFile="$MasterFile" ExternFile="$ZoneFilesFolder""dbextern.""$CommunityDomain" -Domain="$CommunityDomain" -./update-extzone.sh "$InternFile" "$ExternFile" "$Domain" "$ExternalView" +./update-extzone.sh "$MasterFile" "$ExternFile" "$CommunityDomain" "$ExternalView" # set shorter TTL for Hoods TTLReReExMi="420 360 180 1800 360" @@ -79,39 +80,45 @@ TTLReReExMi="420 360 180 1800 360" Hoods="$(GetOwnHoods "$CommunityDomain" "$MasterFile")" for Hood in $Hoods; do - HoodSubDomain="${Hood%%\#*}" + HoodDomain="${Hood%%\#*}"".""$CommunityDomain" Subnets="$(echo "${Hood#*\#}" | sed -e 's/#/ /g')" - HoodZoneFile="$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" + HoodZoneFile="$ZoneFilesFolder""db.""$HoodDomain" if [ ! -f "$HoodZoneFile" ]; then { echo "\$TTL ${TTLReReExMi%% *}" - echo "$HoodSubDomain"".""$CommunityDomain"". ${TTLReReExMi%% *} IN SOA $DNSSCRIPT_SERVER_NAME""."" $DNSSCRIPT_CONTACT_EMAIL 1 ${TTLReReExMi#* }" - echo "$HoodSubDomain"".""$CommunityDomain"". ${TTLReReExMi%% *} IN NS $DNSSCRIPT_SERVER_NAME"".""" + echo "@ IN SOA $DNSSCRIPT_SERVER_NAME""."" $DNSSCRIPT_CONTACT_EMAIL (" + echo " 1 ; Serial" + echo " ""$(echo "$TTLReReExMi" | awk '{print $2}')"" ; Refresh" + echo " ""$(echo "$TTLReReExMi" | awk '{print $3}')"" ; Retry" + echo " ""$(echo "$TTLReReExMi" | awk '{print $4}')"" ; Expire" + echo " ""$(echo "$TTLReReExMi" | awk '{print $5}')"" ) ; Negative Cache TTL" + echo ";" + echo "@ IN NS $DNSSCRIPT_SERVER_NAME"".""" GetOwnGlueRecords "$CommunityDomain" "$MasterFile" + echo ";" } > "$HoodZoneFile" fi - ./update-hoodzone.sh "$HoodZoneFile" "$HoodSubDomain"".""$CommunityDomain" "$Subnets" "$InternalViews" - InsertZoneToIncludeFile "$HoodSubDomain"".""$CommunityDomain" "$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" "$BindExternalConfTmp" + ./update-hoodzone.sh "$HoodZoneFile" "$HoodDomain" "$Subnets" "$InternalViews" - HoodForwardZones="$ForwardZones $HoodSubDomain"".""$CommunityDomain""/""$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" + InsertZoneToIncludeFile "$HoodDomain" "$HoodZoneFile" "$BindInternalConfTmp" + InsertZoneToIncludeFile "$HoodDomain" "$ZoneFilesFolder""dbextern.""$HoodDomain" "$BindExternalConfTmp" + + HoodForwardZones="$ForwardZones $HoodDomain""/""$HoodZoneFile" for Subnet in $Subnets; do ReverseDomains="$(GetReverseDomains "$Subnet")" for RDomain in $ReverseDomains; do - ./update-rdnszone.sh "$RDomain" "$HoodForwardZones" "$ZoneFilesFolder" "$TTLReReExMi" "$InternalViews" - InsertZoneToIncludeFile "$RDomain" "$ZoneFilesFolder""$(GetReverseZoneFileFromZone "${RDomain%*.}")" "$BindInternalConfTmp" + ReverseZoneFileFullPath="$ZoneFilesFolder""$(GetReverseZoneFileFromZone "${RDomain%*.}")" + ./update-rdnszone.sh "$RDomain" "$HoodForwardZones" "$ReverseZoneFileFullPath" "$TTLReReExMi" "$InternalViews" + InsertZoneToIncludeFile "$RDomain" "$ReverseZoneFileFullPath" "$BindInternalConfTmp" done done - InternFile="$ZoneFilesFolder""db.""$HoodSubDomain"".""$CommunityDomain" - ExternFile="$ZoneFilesFolder""dbextern.""$HoodSubDomain"".""$CommunityDomain" - Domain="$HoodSubDomain"".""$CommunityDomain" - ./update-extzone.sh "$InternFile" "$ExternFile" "$Domain" "$ExternalView" + ExternFile="$ZoneFilesFolder""dbextern.""$HoodDomain" + ./update-extzone.sh "$HoodZoneFile" "$ExternFile" "$HoodDomain" "$ExternalView" done -sed -i "1i include \"""$BindExternalConf""\";\n" "$BindInternalConfTmp" ./update-public-acl.sh "$BindIcvpnAclTmp" - ReConfigBind=1 UpdateBindConfig() { if [ -f "$1" ] && ! cmp -s "$1" "$2"; then @@ -126,7 +133,7 @@ UpdateBindConfig "$BindIcvpnAclTmp" "$BindIcvpnAcl" UpdateBindConfig "$BindInternalConfTmp" "$BindInternalConf" UpdateBindConfig "$BindExternalConfTmp" "$BindExternalConf" -if [ $ReConfigBind -eq 0 ]; then +if [ $ReConfigBind -eq 0 ] || [ -f "/tmp/dnsscript-forcereconf" ]; then if [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 0 ]; then systemctl restart bind9 elif [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 1 ]; then @@ -134,4 +141,5 @@ if [ $ReConfigBind -eq 0 ]; then elif [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 2 ]; then /etc/init.d/named restart fi -fi + rm -f "/tmp/dnsscript-forcereconf" +fi \ No newline at end of file diff --git a/update-hoodzone.sh b/update-hoodzone.sh index a08ed87..e285038 100755 --- a/update-hoodzone.sh +++ b/update-hoodzone.sh @@ -40,10 +40,7 @@ NewLeases="$(echo "$NewLeases" | awk '!a[$0]++' | # uncomment and duplicate to secure static DNS-Entries # sed -e '/^dns\s\+.*/d' | - awk 'BEGIN{FS="\t"}{l=length($1);f=substr(" ", 1+length($1)); - s=substr(" ", 1+length($2)); - x=substr($0,length($1)+length($2)+3); - print $1 f " " $2 s " " x}' )" + NormalizeZoneFileFormatting)" if [ "$NewLeases" != "$OldLeases" ]; then NewSerial="$(GetZoneFileSerial "$HoodZoneFile")" NewSerial=$((NewSerial+1)) diff --git a/update-rdnszone.sh b/update-rdnszone.sh index a89ad8a..77c00ed 100755 --- a/update-rdnszone.sh +++ b/update-rdnszone.sh @@ -5,7 +5,7 @@ ReverseDomain="$1" ReverseZone="${ReverseDomain%*.}" ForwardZones="$2" -ReverseZoneFile="$3""db.""$(echo "$ReverseZone" | awk -F. '{ printf $(NF-2);for(i=NF-3;i>0;--i) printf "."$i}')" +ReverseZoneFile="$3" TempDir="/tmp/""$ReverseZone" TTL="${4%% *}" ReReExMi="${4#* }" @@ -18,7 +18,7 @@ GetIPEntries() { IPPattern="[aA]\{4\}\s\+\([0-9a-f:]\+\)" fi - sed -ne "s/^\s*\(\S\+\)\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+""$IPPattern"".*/\1\/\3/p" "$ForwardZoneFile" + sed -ne "s/^\s*\(\S\+\)\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+""$IPPattern"".*/\1\/\3/p" "$1" } ReverseEntry() { @@ -40,13 +40,9 @@ fi mkdir -p "$TempDir" for ForwardZone in $ForwardZones; do - ZoneName="${ForwardZone%%/*}" ZoneFile="${ForwardZone#*/}" - named-checkzone -f text -i local -o "$TempDir/$ZoneName" -D "$ZoneName" "$ZoneFile" >/dev/null - Serial="$(GetZoneFileSerial "$TempDir/$ZoneName")" + Serial="$(GetZoneFileSerial "$ZoneFile")" NewReverseSerial=$((Serial + NewReverseSerial)) - ZoneRevNSSubnets="$(sed -ne 's/^\s*\S\+\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\s\+\(\S\+\).*;\s*Subnets:\s*\([^;]*\)$/\2@\3/p' "$ZoneFile" | - sed -e 's/\(.*[^\.]\)@/\1\.'"$ZoneName"'\.@/;s/@/ /;s/\s\+/@/g')" done OldSerial="$(GetZoneFileSerial "$ReverseZoneFile")" @@ -55,36 +51,43 @@ if [ $((NewReverseSerial)) -gt $((OldSerial)) ]; then { echo "$ReverseDomain $TTL IN SOA $DNSSCRIPT_SERVER_NAME""."" $DNSSCRIPT_CONTACT_EMAIL $NewReverseSerial $ReReExMi" echo "$ReverseDomain $TTL IN NS $DNSSCRIPT_SERVER_NAME"".""" + Static="/""$ReverseZoneFile" + Static="${Static%/*}""/static.""${Static##*/}" + Static="${Static#*/}" + [ -f "$Static" ] && cat "$Static" + echo } > "$TempDir/$ReverseZone" - for NSSubnets in $ZoneRevNSSubnets; do - Subnets="$(echo "${NSSubnets#*@}" | sed -e 's/@/ /g')" - for Subnet in $Subnets; do - for ReverseNS in $(GetReverseDomains "$Subnet"); do - if [ -n "$ReverseNS" ] && [ -z "${ReverseNS##*$ReverseDomain}" ]; then - echo "$ReverseNS $TTL IN NS ${NSSubnets%%@*}" >> "$TempDir/$ReverseZone" - fi + for ForwardZone in $ForwardZones; do + ZoneName="${ForwardZone%%/*}" + ZoneFile="${ForwardZone#*/}" + ZoneRevNSSubnets="$(sed -ne 's/^\s*\S\+\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\s\+\(\S\+\).*;\s*Subnets:\s*\([^;]*\)\s*\(;[^;]*\s*\)$/\2@\3/p' "$ZoneFile" | + sed -e 's/\(.*[^\.]\)@/\1\.'"$ZoneName"'\.@/;s/@/ /;s/\s\+/@/g')" + for NSSubnets in $ZoneRevNSSubnets; do + Subnets="$(echo "${NSSubnets#*@}" | sed -e 's/@/ /g')" + for Subnet in $Subnets; do + for ReverseNS in $(GetReverseDomains "$Subnet"); do + if [ -n "$ReverseNS" ] && [ -z "${ReverseNS##*$ReverseDomain}" ]; then + echo "$ReverseNS $TTL IN NS ${NSSubnets%%@*}" >> "$TempDir/$ReverseZone" + fi + done done done - done - for ForwardZoneFile in "$TempDir"/*; do - if [ -n "${ForwardZoneFile##*$ReverseZone}" ]; then - IPEntries="$(GetIPEntries)" + + IPEntries="$(GetIPEntries "$ZoneFile")" for IPEntry in $IPEntries; do IP="${IPEntry#*/}" - # IP syntax checked by named-checkzone IP="$(ReverseEntry "$IP")" if [ -z "${IP##*$ReverseDomain}" ]; then - Host="${IPEntry%/*}" + Host="$(ExpandHostname "${IPEntry%%/*}" "$ZoneName"".")" echo "$IP $TTL IN PTR $Host" >> "$TempDir/$ReverseZone" fi done - fi done named-checkzone -o "$ReverseZoneFile" "$ReverseDomain" "$TempDir/$ReverseZone" >/dev/null ReloadZone "$ReverseDomain" "$View" fi -rm -r "$TempDir" +rm -r "$TempDir" \ No newline at end of file From 9b57cc55874a66c82454a3cdf4cdef83bf3fd812 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Sat, 23 Jan 2021 23:37:49 +0100 Subject: [PATCH 27/56] include more babel and statics to acl --- README.md | 2 +- update-dns.sh | 2 +- update-public-acl.sh | 18 ++++++++++++++---- update-rdnszone.sh | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 75e0a6f..9493340 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ In der Datei update-dns.sh die Konfigurationsparameter setzen. #### Cron anlegen -Schließlich muss noch ein Cron angelegt werden, der regelmäßig das Skript aufruft, welches die Zonendatei aktualisiert und die Reverse-Skripte aufruft: +Schließlich muss noch ein Cron angelegt werden, der regelmäßig das Skript aufruft: ``` 1-59/5 * * * * /usr/lib/ffdns/update-dns.sh ``` diff --git a/update-dns.sh b/update-dns.sh index a511619..41cd7bc 100755 --- a/update-dns.sh +++ b/update-dns.sh @@ -117,7 +117,7 @@ for Hood in $Hoods; do ./update-extzone.sh "$HoodZoneFile" "$ExternFile" "$HoodDomain" "$ExternalView" done -./update-public-acl.sh "$BindIcvpnAclTmp" +./update-public-acl.sh "$BindIcvpnAclTmp" "$RemoteLocation" ReConfigBind=1 UpdateBindConfig() { diff --git a/update-public-acl.sh b/update-public-acl.sh index 446c556..9e8ad90 100755 --- a/update-public-acl.sh +++ b/update-public-acl.sh @@ -3,14 +3,24 @@ . ./dns-functions.sh IncludeFile="$1" +RemoteLocation="$2" rm -f "$IncludeFile" +InstalledRoutes="$(echo "dump" | nc ::1 33123 | \ + sed -e '/\(add route .* installed yes\|add xroute\)/!d')" +PublicSubs="$(echo "$InstalledRoutes" | \ + sed -e '/\( from ::\/0\| from 0\.0\.0\.0\/0\)/d;s/.* from \(\S\+\).*/\t\1;/g')" +PrivatePrefix="\(192\.168\.\|172\.\(1[6-9]\|2[0-9]\|3[01]\)\.\|10\.\|[fF][cCdD][0-9a-fA-F]\{2\}:\)" +PublicSingles="$(echo "$InstalledRoutes" | \ + sed -e '/\( from ::\/0\| from 0\.0\.0\.0\/0\)/!d;s/.* prefix \(\S\+\) .*/\1/g;'" \ + "'/^'"$PrivatePrefix"'/d;/^\(0\.\|::\|64:ff9b::\)/d;s/^/\t/g;s/$/;/g')" + { echo "acl icvpnrange {" echo " icvpnlocal;" - echo "dump" | nc ::1 33123 | \ - sed -e '/add route/!d;/installed yes/!d;/\(from ::\/0\|from 0\.0\.0\.0\/0\)/d;' | \ - sed -ne 's/^.*from \(\S\+\).*/\t\1;/p' + echo "$PublicSubs" + echo "$(curl -s -S -f "$RemoteLocation""external.dnsserverips" | sed -e 's/^/\t/g;s/$/;/g')" + echo "$PublicSingles" echo "};" -} > "$IncludeFile" +} > "$IncludeFile" \ No newline at end of file diff --git a/update-rdnszone.sh b/update-rdnszone.sh index 77c00ed..7831943 100755 --- a/update-rdnszone.sh +++ b/update-rdnszone.sh @@ -54,7 +54,7 @@ if [ $((NewReverseSerial)) -gt $((OldSerial)) ]; then Static="/""$ReverseZoneFile" Static="${Static%/*}""/static.""${Static##*/}" Static="${Static#*/}" - [ -f "$Static" ] && cat "$Static" + [ -f "$Static" ] && echo "$(cat "$Static")" echo } > "$TempDir/$ReverseZone" From 6ac04bef02863fd59fe218f5d59536a3e51f40c8 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 25 Jan 2021 21:01:07 +0100 Subject: [PATCH 28/56] remove unused remote-scripts --- update-remotedns.sh | 9 --------- update-remoteleases.sh | 10 ---------- 2 files changed, 19 deletions(-) delete mode 100755 update-remotedns.sh delete mode 100755 update-remoteleases.sh diff --git a/update-remotedns.sh b/update-remotedns.sh deleted file mode 100755 index e9b9561..0000000 --- a/update-remotedns.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -sed -ne 's/^\s*\(\S\+\s\+\)\{2\}\(\S\+\)\s\+\(\S\+\)\s\+.*/\2 \3/p' "/tmp/dhcp.leases" > "/tmp/upload-dns.leases" - -for Leasefile in /tmp/hosts/*; do - sed -ne 's/^\s*\([^#]\S*\)\s\+\(\S\+\).*/\1 \2/p' "$Leasefile" >> "/tmp/upload-dns.leases" -done - -curl -6 -u : --data-urlencode "@/tmp/upload-dns.leases" -X POST https:// \ No newline at end of file diff --git a/update-remoteleases.sh b/update-remoteleases.sh deleted file mode 100755 index 31bbc08..0000000 --- a/update-remoteleases.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - - -for File in /wwwup/*; do - LastFile="$File" -done - -sed -e 's/%\([0-9A-F][0-9A-F]\)/\\\\x\1/g' "$LastFile" | xargs echo -e > /tmp/hosts/remote.leases - -rm /wwwup/* \ No newline at end of file From 11c105e6f02a6cce110a61d7d18d0198f834c999 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Tue, 26 Jan 2021 22:50:27 +0100 Subject: [PATCH 29/56] fix hood parsing --- dns-functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dns-functions.sh b/dns-functions.sh index fd7396f..3f03de7 100755 --- a/dns-functions.sh +++ b/dns-functions.sh @@ -115,7 +115,7 @@ GetOwnGlueRecords() { NormalizeZoneFileFormatting } GetOwnHoods() { - Entries="$(sed -ne "s/^\s*\(\S*\).*\s\+[Ii][Nn]\s\+[Nn][Ss]\s\+""$(GetServernameSEDEntry "$1")""\s*;\s*Subnets:\s*\([^;]*\)/\1 \3/p" "$2")" + Entries="$(sed -ne "s/^\s*\(\S*\)[^;]*\s\+[Ii][Nn]\s\+[Nn][Ss]\s\+""$(GetServernameSEDEntry "$1")""\s*;\s*Subnets:\s*\([^;]*\)/\1 \3/p" "$2")" Entries="$(echo "$Entries" | sed -r 's/\s+/#/g')" echo "$Entries" From 16bc1203f8003491b31bcb03c4e2d27aa79cc62a Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Tue, 26 Jan 2021 22:53:02 +0100 Subject: [PATCH 30/56] changed acl-list from babel to routing tables --- update-dns.sh | 3 ++- update-public-acl.sh | 20 +++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/update-dns.sh b/update-dns.sh index 41cd7bc..f46d91a 100755 --- a/update-dns.sh +++ b/update-dns.sh @@ -15,6 +15,7 @@ export DNSSCRIPT_SERVER_NAME=dns.herpf.fff.community UpdateScriptsFolder="/usr/lib/ffdns/" ZoneFilesFolder="/etc/bind/fff/" BindIncludeFileFolder="/etc/bind/" +RoutingTables="10" # -1 -> disable bind [restart|reload] # 0 -> Debian (and like) systemctl [reload|restart] bind9 @@ -117,7 +118,7 @@ for Hood in $Hoods; do ./update-extzone.sh "$HoodZoneFile" "$ExternFile" "$HoodDomain" "$ExternalView" done -./update-public-acl.sh "$BindIcvpnAclTmp" "$RemoteLocation" +./update-public-acl.sh "$BindIcvpnAclTmp" "$RemoteLocation" "$RoutingTables" ReConfigBind=1 UpdateBindConfig() { diff --git a/update-public-acl.sh b/update-public-acl.sh index 9e8ad90..7a871ec 100755 --- a/update-public-acl.sh +++ b/update-public-acl.sh @@ -4,17 +4,23 @@ IncludeFile="$1" RemoteLocation="$2" +Tables="$3" rm -f "$IncludeFile" -InstalledRoutes="$(echo "dump" | nc ::1 33123 | \ - sed -e '/\(add route .* installed yes\|add xroute\)/!d')" -PublicSubs="$(echo "$InstalledRoutes" | \ - sed -e '/\( from ::\/0\| from 0\.0\.0\.0\/0\)/d;s/.* from \(\S\+\).*/\t\1;/g')" +Installed4Routes="" +Installed6Routes="" +for Table in $Tables; do + Installed4Routes="$(echo "$Installed4Routes" && ip -4 ro sh ta "$Table")" + Installed6Routes="$(echo "$Installed6Routes" && ip -6 ro sh ta "$Table")" +done +PublicSubs="$(echo "$Installed6Routes" | \ + sed -e '/^default from/!d;s/.* from \(\S\+\).*/\t\1;/g')" PrivatePrefix="\(192\.168\.\|172\.\(1[6-9]\|2[0-9]\|3[01]\)\.\|10\.\|[fF][cCdD][0-9a-fA-F]\{2\}:\)" -PublicSingles="$(echo "$InstalledRoutes" | \ - sed -e '/\( from ::\/0\| from 0\.0\.0\.0\/0\)/!d;s/.* prefix \(\S\+\) .*/\1/g;'" \ - "'/^'"$PrivatePrefix"'/d;/^\(0\.\|::\|64:ff9b::\)/d;s/^/\t/g;s/$/;/g')" +PublicSingles="$(echo "$Installed4Routes" | \ + sed -e 's/^\(\S\+\)\s.*/\t\1;/g;/^\t'"$PrivatePrefix"'\|^\t\(default\|0\.\)\|^$/d' \ + && echo "$Installed6Routes" | \ + sed -e 's/^\(\S\+\)\s.*/\t\1;/g;/^\t'"$PrivatePrefix"'\|^\t\(default\|::\|64:ff9b::\)\|^$/d')" { echo "acl icvpnrange {" From fbd2c603aee170275d4174fe82da1655e9624d6b Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 1 Feb 2021 20:59:32 +0100 Subject: [PATCH 31/56] routing tables fallback; external zone for direct access to external addresses --- dns-functions.sh | 5 +-- update-dns.sh | 10 ++++- update-extzone.sh | 9 ++++- update-public-acl.sh | 93 ++++++++++++++++++++++++++++++++++---------- 4 files changed, 90 insertions(+), 27 deletions(-) mode change 100755 => 100644 dns-functions.sh mode change 100755 => 100644 update-dns.sh mode change 100755 => 100644 update-extzone.sh mode change 100755 => 100644 update-public-acl.sh diff --git a/dns-functions.sh b/dns-functions.sh old mode 100755 new mode 100644 index 3f03de7..fda1365 --- a/dns-functions.sh +++ b/dns-functions.sh @@ -115,9 +115,8 @@ GetOwnGlueRecords() { NormalizeZoneFileFormatting } GetOwnHoods() { - Entries="$(sed -ne "s/^\s*\(\S*\)[^;]*\s\+[Ii][Nn]\s\+[Nn][Ss]\s\+""$(GetServernameSEDEntry "$1")""\s*;\s*Subnets:\s*\([^;]*\)/\1 \3/p" "$2")" - Entries="$(echo "$Entries" | sed -r 's/\s+/#/g')" - + Entries="$(sed -ne "s/^\s*\(\S*\).*\s\+[Ii][Nn]\s\+[Nn][Ss]\s\+""$(GetServernameSEDEntry "$1")""\s*;\s*Subnets:\s*\([^;]*\)/\1 \3/p" "$2")" + Entries="$(echo "$Entries" | sed -e '/^[eE][xX][tT][eE][rR][nN]\s/d' | sed -r 's/\s+/#/g')" echo "$Entries" } IsValidIPv4Subnet() { diff --git a/update-dns.sh b/update-dns.sh old mode 100755 new mode 100644 index f46d91a..78d936d --- a/update-dns.sh +++ b/update-dns.sh @@ -15,6 +15,8 @@ export DNSSCRIPT_SERVER_NAME=dns.herpf.fff.community UpdateScriptsFolder="/usr/lib/ffdns/" ZoneFilesFolder="/etc/bind/fff/" BindIncludeFileFolder="/etc/bind/" +# specify the bird/babel or other routing table[s] +# if RoutingTables is empty, the ICVPN-ACL-List will be fetched remotely (for servers that are no gateways) RoutingTables="10" # -1 -> disable bind [restart|reload] @@ -58,7 +60,9 @@ fi rm -f "$BindInternalConfTmp" rm -f "$BindExternalConfTmp" InsertZoneToIncludeFile "$CommunityDomain" "$MasterFile" "$BindInternalConfTmp" +InsertZoneToIncludeFile "extern.""$CommunityDomain" "$ZoneFilesFolder""dbextern.""$CommunityDomain" "$BindInternalConfTmp" InsertZoneToIncludeFile "$CommunityDomain" "$ZoneFilesFolder""dbextern.""$CommunityDomain" "$BindExternalConfTmp" +InsertZoneToIncludeFile "extern.""$CommunityDomain" "$ZoneFilesFolder""dbextern.""$CommunityDomain" "$BindExternalConfTmp" for Subnet in $CommunitySubnets; do ReverseDomains="$(GetReverseDomains "$Subnet")" @@ -68,7 +72,7 @@ for Subnet in $CommunitySubnets; do --output "$ZoneFilesFolder""static.""$ReverseZoneFile" && \ rm -f "$ZoneFilesFolder""static.""$ReverseZoneFile" ./update-rdnszone.sh "$RDomain" "$ForwardZones" "$ZoneFilesFolder""$ReverseZoneFile" "$TTLReReExMi" "$InternalViews" - InsertZoneToIncludeFile "$RDomain" "$ZoneFilesFolder""$ReverseZoneFile" "$BindInternalConfTmp" + InsertZoneToIncludeFile "${RDomain%*.}" "$ZoneFilesFolder""$ReverseZoneFile" "$BindInternalConfTmp" done done @@ -102,7 +106,9 @@ for Hood in $Hoods; do ./update-hoodzone.sh "$HoodZoneFile" "$HoodDomain" "$Subnets" "$InternalViews" InsertZoneToIncludeFile "$HoodDomain" "$HoodZoneFile" "$BindInternalConfTmp" + InsertZoneToIncludeFile "${Hood%%\#*}"".extern.""$CommunityDomain" "$ZoneFilesFolder""dbextern.""$HoodDomain" "$BindInternalConfTmp" InsertZoneToIncludeFile "$HoodDomain" "$ZoneFilesFolder""dbextern.""$HoodDomain" "$BindExternalConfTmp" + InsertZoneToIncludeFile "${Hood%%\#*}"".extern.""$CommunityDomain" "$ZoneFilesFolder""dbextern.""$HoodDomain" "$BindExternalConfTmp" HoodForwardZones="$ForwardZones $HoodDomain""/""$HoodZoneFile" for Subnet in $Subnets; do @@ -110,7 +116,7 @@ for Hood in $Hoods; do for RDomain in $ReverseDomains; do ReverseZoneFileFullPath="$ZoneFilesFolder""$(GetReverseZoneFileFromZone "${RDomain%*.}")" ./update-rdnszone.sh "$RDomain" "$HoodForwardZones" "$ReverseZoneFileFullPath" "$TTLReReExMi" "$InternalViews" - InsertZoneToIncludeFile "$RDomain" "$ReverseZoneFileFullPath" "$BindInternalConfTmp" + InsertZoneToIncludeFile "${RDomain%*.}" "$ReverseZoneFileFullPath" "$BindInternalConfTmp" done done diff --git a/update-extzone.sh b/update-extzone.sh old mode 100755 new mode 100644 index 0925b8d..4e35b0c --- a/update-extzone.sh +++ b/update-extzone.sh @@ -11,6 +11,13 @@ SerialIntern="$(GetZoneFileSerial "$InternalZoneFile")" SerialExtern="$(GetZoneFileSerial "$ExternalZoneFile")" if [ $((SerialIntern)) -gt $((SerialExtern)) ]; then - sed '/^[^;]*\s\(10.\|[fF][cdCD][0-9a-fA-F]\{2\}:\)\S*\s*\(;.*\)\?$/d' "$InternalZoneFile" > "$ExternalZoneFile" + ZoneContent="$(sed -e '/^[^;]*\s\(10.\|[fF][cdCD][0-9a-fA-F]\{2\}:\)\S*\s*\(;.*\)\?$/d; \ + s/^[^;^@]*\s\+\([^;]*\)\s[Ii][Nn]\s\+[Ss][Oo][Aa]\s/@ \1 IN SOA /g' "$InternalZoneFile")" + + [ -n "$( echo "$ZoneContent" | sed -e '/^[eE][xX][tT][eE][rR][nN]\s[^;]*\s[Ii][Nn]\s\+[Nn][Ss]/!d')" ] \ + && ZoneContent="$(echo "$ZoneContent" | sed -e '/^@\s[^;]*\s[Ii][Nn]\s\+[Nn][Ss]\s/d; \ + s/^[eE][xX][tT][eE][rR][nN]\s\([^;]*\s[Ii][Nn]\s\+[Nn][Ss]\s.*\)/@ \1/g; \ + s/^\(@ [^;]* IN SOA\)\s\+\S\+\s\+\S\+\s/\1 '"$DNSSCRIPT_SERVER_NAME"'. '"$DNSSCRIPT_CONTACT_EMAIL"' /g')" + echo "$ZoneContent" > "$ExternalZoneFile" ReloadZone "$ExternalZone" "$ExternalView" fi diff --git a/update-public-acl.sh b/update-public-acl.sh old mode 100755 new mode 100644 index 7a871ec..3628bed --- a/update-public-acl.sh +++ b/update-public-acl.sh @@ -8,25 +8,76 @@ Tables="$3" rm -f "$IncludeFile" -Installed4Routes="" -Installed6Routes="" -for Table in $Tables; do - Installed4Routes="$(echo "$Installed4Routes" && ip -4 ro sh ta "$Table")" - Installed6Routes="$(echo "$Installed6Routes" && ip -6 ro sh ta "$Table")" -done -PublicSubs="$(echo "$Installed6Routes" | \ - sed -e '/^default from/!d;s/.* from \(\S\+\).*/\t\1;/g')" -PrivatePrefix="\(192\.168\.\|172\.\(1[6-9]\|2[0-9]\|3[01]\)\.\|10\.\|[fF][cCdD][0-9a-fA-F]\{2\}:\)" -PublicSingles="$(echo "$Installed4Routes" | \ - sed -e 's/^\(\S\+\)\s.*/\t\1;/g;/^\t'"$PrivatePrefix"'\|^\t\(default\|0\.\)\|^$/d' \ - && echo "$Installed6Routes" | \ - sed -e 's/^\(\S\+\)\s.*/\t\1;/g;/^\t'"$PrivatePrefix"'\|^\t\(default\|::\|64:ff9b::\)\|^$/d')" +if [ -z "$Tables" ]; then + # this is only a rude fallback and not recommended + # create your own file on a gateway with the community routing tables and use this one + RemoteFile="$(curl -s -S -f "https://gw01.herpf.fff.community/ffdns/icvpn-acl.conf")" + if [ -n "$RemoteFile" ]; then + echo "$RemoteFile" > "$IncludeFile" + fi +else + Installed4Routes="" + Installed6Routes="" + for Table in $Tables; do + Installed4Routes="$(echo "$Installed4Routes" && ip -4 ro sh ta "$Table")" + Installed6Routes="$(echo "$Installed6Routes" && ip -6 ro sh ta "$Table")" + done + PublicSubs="$(echo "$Installed6Routes" | \ + sed -e '/^default from/!d;s/.* from \(\S\+\).*/\1/g')" + Privatev4Prefix="\(192\.168\.\|172\.\(1[6-9]\|2[0-9]\|3[01]\)\.\|10\.\)" + Privatev6Prefix="\([fF][cCdD][0-9a-fA-F]\{2\}:\)" + Publicv4Singles="$(echo "$Installed4Routes" | \ + sed -e 's/^\(\S\+\)\s.*/\t\1;/g;/^\t'"$Privatev4Prefix"'\|^\t\(unreachable\|default\|0\.\)\|^$/d')" + Publicv6Singles="$(echo "$Installed6Routes" | \ + sed -e 's/^\(\S\+\)\s.*/\1/g;/^'"$Privatev6Prefix"'\|^\(unreachable\|default\|::\|64:ff9b::\)\|^$/d')" + + # the following code is not well optimized yet and may take a bit to process + # therefore it is not recommended to activate it on hardware-routers + # even in other environments it did not speed up bind9 measurable, its just for a smaller acl-file, e.g. for redistribution -{ - echo "acl icvpnrange {" - echo " icvpnlocal;" - echo "$PublicSubs" - echo "$(curl -s -S -f "$RemoteLocation""external.dnsserverips" | sed -e 's/^/\t/g;s/$/;/g')" - echo "$PublicSingles" - echo "};" -} > "$IncludeFile" \ No newline at end of file + #for Subnet in $PublicSubs; do + # SubnetIPFilled="$(FillIPv6Zeroes "$(echo "${Subnet%/*}" | awk '{print tolower($0)}')")" + # Mask="${Subnet##*/}" + # Statics=$((Mask / 4)) + # BlockMask=$((Mask % 4)) + # if [ $BlockMask -ne 0 ]; then + # BlockMask=$((4 - BlockMask)) + # BlockMask=$((-1 << $BlockMask)) + # SubnetBlock="$(printf %d 0x"$(echo "$SubnetIPFilled" | awk 'BEGIN{FS=""}{printf $'"$((Statics+1))"'}')")" + # SubnetBlock=$((SubnetBlock & BlockMask)) + # fi + # + # SubnetStaticPart="$(echo "$SubnetIPFilled" | awk 'BEGIN{FS=""}{for(i='"$Statics"';i>0;i--) printf $i;}')" + # + # for Single in $Publicv6Singles; do + # IPFilled="$(FillIPv6Zeroes "$(echo "${Single%/*}" | awk '{print tolower($0)}')")" + # MaskIP="$( echo "$Single" | sed -e 's/^[^/]*\(\/\)\?//g')" + # MaskIP="${MaskIP:-128}" + # IsInSub="$([ $((Mask)) -le $((MaskIP)) ]; echo "$?")" + # if [ $IsInSub -eq 0 ]; then + # IPStaticPart="$(echo "$IPFilled" | awk 'BEGIN{FS=""}{for(i='"$Statics"';i>0;i--) printf $i;}')" + # IsInSub="$([ "$IPStaticPart" = "$SubnetStaticPart" ]; echo "$?")" + # fi + # if [ $IsInSub -eq 0 ] && [ $BlockMask -ne 0 ]; then + # IPBlock="$(printf %d 0x"$(echo "$IPFilled" | awk 'BEGIN{FS=""}{printf $'"$((Statics+1))"'}')")" + # IPBlock=$((IPBlock & BlockMask)) + # IsInSub="$([ $IPBlock -eq $SubnetBlock ]; echo "$?")" + # fi + # + # ! [ $IsInSub -eq 0 ] \ + # && NewSingles="$( [ -n "$NewSingles" ] && echo "$NewSingles"; echo "$Single")" + # done + # Publicv6Singles="$NewSingles" + # NewSingles="" + #done + + { + echo "acl icvpnrange {" + echo " icvpnlocal;" + echo "$PublicSubs" | sed -e 's/\(.*\)/\t\1;/g' + echo "$(curl -s -S -f "$RemoteLocation""external.dnsserverips" | sed -e 's/^/\t/g;s/$/;/g')" + echo "$Publicv4Singles" + echo "$Publicv6Singles" | sed -e 's/\(.*\)/\t\1;/g' + echo "};" + } > "$IncludeFile" +fi From 298c353968652e1406268a904fe386b9b723c9eb Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 8 Feb 2021 01:34:03 +0100 Subject: [PATCH 32/56] option to exclude master-zone; support DNSSEC; fix GlueRecords Signed-off-by: Blackyfff --- dns-functions.sh | 14 +++-- update-dns.sh | 129 +++++++++++++++++++++++++++---------------- update-extzone.sh | 0 update-public-acl.sh | 0 4 files changed, 90 insertions(+), 53 deletions(-) mode change 100644 => 100755 dns-functions.sh mode change 100644 => 100755 update-dns.sh mode change 100644 => 100755 update-extzone.sh mode change 100644 => 100755 update-public-acl.sh diff --git a/dns-functions.sh b/dns-functions.sh old mode 100644 new mode 100755 index fda1365..b0b59c5 --- a/dns-functions.sh +++ b/dns-functions.sh @@ -17,13 +17,16 @@ InsertZoneToIncludeFile() { { echo "zone \"""$1""\" {" echo " type master;" + [ -n "$4" ] && echo " dnssec-policy $4"";" echo " file \"""$2""\";" echo "};" } > "$3" else + [ -n "$4" ] && Extra=" dnssec-policy $4"";\n" || Extra="" + sed -i "1i\ zone \"""$1""\" {\n\ - type master;\n\ + type master;\n""$Extra\ file \"""$2""\";\n\ };" "$3" fi @@ -107,12 +110,11 @@ NormalizeZoneFileFormatting() { } GetOwnGlueRecords() { ServerName="$DNSSCRIPT_SERVER_NAME" - if [ -n "${ServerName##*$1}" ]; then - ServerName="$ServerName""$1" + if [ -z "${ServerName##*$2}" ]; then + ServerName="${ServerName%.$2}" + sed -ne 's/^\s*'"$(GetServernameSEDEntry "$1")"'\s\+[Ii][Nn]\s\+\([Aa]\|[Aa]\{4\}\)\s\+\(.*\)$/'"$ServerName"'\tIN \2\t\3/p' "$3" | \ + NormalizeZoneFileFormatting fi - ServerName="$ServerName""." - sed -ne 's/^\s*'"$(GetServernameSEDEntry "$1")"'\s\+[Ii][Nn]\s\+\([Aa]\|[Aa]\{4\}\)\s\+\(.*\)$/'"$ServerName"'\tIN \2\t\3/p' "$2" | \ - NormalizeZoneFileFormatting } GetOwnHoods() { Entries="$(sed -ne "s/^\s*\(\S*\).*\s\+[Ii][Nn]\s\+[Nn][Ss]\s\+""$(GetServernameSEDEntry "$1")""\s*;\s*Subnets:\s*\([^;]*\)/\1 \3/p" "$2")" diff --git a/update-dns.sh b/update-dns.sh old mode 100644 new mode 100755 index 78d936d..4be7277 --- a/update-dns.sh +++ b/update-dns.sh @@ -5,12 +5,15 @@ set -e # Communityconfig CommunityDomain="fff.community" +CommunityExternDomain="extern.fff.community" CommunitySubnets="10.50.0/16 10.83.0/16 fd43:5602:29bd::/48" RemoteLocation="https://git.freifunk-franken.de/freifunk-franken/dns/raw/branch/master/" +DNSSECPolicy="" +ServeMasterZone=0 # Serverconfig export DNSSCRIPT_CONTACT_EMAIL=info.freifunk-herpf.de. -# DNSSCRIPT_SERVER_NAME must be the server given in community zone files NS entry +# DNSSCRIPT_SERVER_NAME must be the server given in community zone files NS entry (Full Hostname, w/o trailing dot) export DNSSCRIPT_SERVER_NAME=dns.herpf.fff.community UpdateScriptsFolder="/usr/lib/ffdns/" ZoneFilesFolder="/etc/bind/fff/" @@ -33,7 +36,7 @@ ExternalView="external-view" TTLReReExMi="3600 2000 6400 2419200 86400" # ForwardZones: "/" ; optionaly multiple " ""/" no spaces in full filename -ForwardZones="$CommunityDomain""/""$ZoneFilesFolder""db.""$CommunityDomain" +ForwardZones="$CommunityDomain""/""$ZoneFilesFolder""db.icvpn-internal-view.""$CommunityDomain" ############################################################# @@ -41,43 +44,58 @@ cd "$UpdateScriptsFolder" . ./dns-functions.sh -MasterFile="$ZoneFilesFolder""db.""$CommunityDomain" -BindInternalConfTmp="/tmp/""$CommunityDomain""-internal.conf" -BindExternalConfTmp="/tmp/""$CommunityDomain""-external.conf" +FirstInternal="$( echo "$InternalViews" | sed -ne 's/^\(\S\+\)\s.*$/\1/p')" +MasterFile="$ZoneFilesFolder""db.""$FirstInternal"".""$CommunityDomain" BindIcvpnAclTmp="/tmp/icvpn-acl.conf" -BindInternalConf="$BindIncludeFileFolder""$CommunityDomain""-internal.conf" -BindExternalConf="$BindIncludeFileFolder""$CommunityDomain""-external.conf" BindIcvpnAcl="$BindIncludeFileFolder""icvpn-acl.conf" +for IView in $InternalViews; do + rm -f "/tmp/""$IView"".conf" +done +rm -f "/tmp/""$ExternalView"".conf" + PreFetchMasterSerial="$(GetZoneFileSerial "$MasterFile")" curl -s -S -f "$RemoteLocation""db.""$CommunityDomain" --output "$MasterFile" -PostFetchMasterSerial="$(GetZoneFileSerial "$MasterFile")" -if [ $((PostFetchMasterSerial)) -gt $((PreFetchMasterSerial)) ]; then - ReloadZone "$CommunityDomain" "$InternalViews" -fi - -rm -f "$BindInternalConfTmp" -rm -f "$BindExternalConfTmp" -InsertZoneToIncludeFile "$CommunityDomain" "$MasterFile" "$BindInternalConfTmp" -InsertZoneToIncludeFile "extern.""$CommunityDomain" "$ZoneFilesFolder""dbextern.""$CommunityDomain" "$BindInternalConfTmp" -InsertZoneToIncludeFile "$CommunityDomain" "$ZoneFilesFolder""dbextern.""$CommunityDomain" "$BindExternalConfTmp" -InsertZoneToIncludeFile "extern.""$CommunityDomain" "$ZoneFilesFolder""dbextern.""$CommunityDomain" "$BindExternalConfTmp" - -for Subnet in $CommunitySubnets; do - ReverseDomains="$(GetReverseDomains "$Subnet")" - for RDomain in $ReverseDomains; do - ReverseZoneFile="$(GetReverseZoneFileFromZone "${RDomain%*.}")" - ! curl -s -f "$RemoteLocation""static.""$ReverseZoneFile" \ - --output "$ZoneFilesFolder""static.""$ReverseZoneFile" && \ - rm -f "$ZoneFilesFolder""static.""$ReverseZoneFile" - ./update-rdnszone.sh "$RDomain" "$ForwardZones" "$ZoneFilesFolder""$ReverseZoneFile" "$TTLReReExMi" "$InternalViews" - InsertZoneToIncludeFile "${RDomain%*.}" "$ZoneFilesFolder""$ReverseZoneFile" "$BindInternalConfTmp" +if [ $ServeMasterZone -ne 0 ]; then + PostFetchMasterSerial="$(GetZoneFileSerial "$MasterFile")" + if [ $((PostFetchMasterSerial)) -gt $((PreFetchMasterSerial)) ]; then + ReloadZone "$CommunityDomain" "$InternalViews" + fi + + for Subnet in $CommunitySubnets; do + ReverseDomains="$(GetReverseDomains "$Subnet")" + for RDomain in $ReverseDomains; do + ReverseZoneFile="$(GetReverseZoneFileFromZone "${RDomain%*.}")" + ! curl -s -f "$RemoteLocation""static.""$ReverseZoneFile" \ + --output "$ZoneFilesFolder""static.""$ReverseZoneFile" && \ + rm -f "$ZoneFilesFolder""static.""$ReverseZoneFile" + ./update-rdnszone.sh "$RDomain" "$ForwardZones" "$ZoneFilesFolder""$ReverseZoneFile" "$TTLReReExMi" "$InternalViews" + for IView in $InternalViews; do + InsertZoneToIncludeFile "${RDomain%*.}" "$ZoneFilesFolder""$ReverseZoneFile" "/tmp/""$IView"".conf" + done + done done -done - -ExternFile="$ZoneFilesFolder""dbextern.""$CommunityDomain" -./update-extzone.sh "$MasterFile" "$ExternFile" "$CommunityDomain" "$ExternalView" + ExternFile="$ZoneFilesFolder""db.""$ExternalView"".""$CommunityDomain" + ./update-extzone.sh "$MasterFile" "$ExternFile" "$CommunityDomain" "$ExternalView" + + for IView in $InternalViews; do + InternViewMasterZone="$ZoneFilesFolder""db.""$IView"".""$CommunityDomain" + [ -f "$InternViewMasterZone" ] || ln -s "$MasterFile" "$InternViewMasterZone" + InsertZoneToIncludeFile "$CommunityDomain" "$InternViewMasterZone" "/tmp/""$IView"".conf" "$DNSSECPolicy" + done + InsertZoneToIncludeFile "$CommunityDomain" "$ExternFile" "/tmp/""$ExternalView"".conf" "$DNSSECPolicy" + if [ -n "$CommunityExternDomain" ]; then + for IView in $InternalViews; do + InternViewExternZone="$ZoneFilesFolder""db.""$IView"".""$CommunityExternDomain" + [ -f "$InternViewExternZone" ] || ln -s "$ExternFile" "$InternViewExternZone" + InsertZoneToIncludeFile "$CommunityExternDomain" "$InternViewExternZone" "/tmp/""$IView"".conf" "$DNSSECPolicy" + done + ExternViewExternZone="$ZoneFilesFolder""db.""$ExternalView"".""$CommunityExternDomain" + [ -f "$ExternViewExternZone" ] || ln -s "$ExternFile" "$ExternViewExternZone" + InsertZoneToIncludeFile "$CommunityExternDomain" "$ExternViewExternZone" "/tmp/""$ExternalView"".conf" "$DNSSECPolicy" + fi +fi # set shorter TTL for Hoods TTLReReExMi="420 360 180 1800 360" @@ -87,7 +105,7 @@ Hoods="$(GetOwnHoods "$CommunityDomain" "$MasterFile")" for Hood in $Hoods; do HoodDomain="${Hood%%\#*}"".""$CommunityDomain" Subnets="$(echo "${Hood#*\#}" | sed -e 's/#/ /g')" - HoodZoneFile="$ZoneFilesFolder""db.""$HoodDomain" + HoodZoneFile="$ZoneFilesFolder""db.""$FirstInternal"".""$HoodDomain" if [ ! -f "$HoodZoneFile" ]; then { echo "\$TTL ${TTLReReExMi%% *}" @@ -99,48 +117,65 @@ for Hood in $Hoods; do echo " ""$(echo "$TTLReReExMi" | awk '{print $5}')"" ) ; Negative Cache TTL" echo ";" echo "@ IN NS $DNSSCRIPT_SERVER_NAME"".""" - GetOwnGlueRecords "$CommunityDomain" "$MasterFile" + GetOwnGlueRecords "$CommunityDomain" "$HoodDomain" "$MasterFile" echo ";" } > "$HoodZoneFile" fi ./update-hoodzone.sh "$HoodZoneFile" "$HoodDomain" "$Subnets" "$InternalViews" - InsertZoneToIncludeFile "$HoodDomain" "$HoodZoneFile" "$BindInternalConfTmp" - InsertZoneToIncludeFile "${Hood%%\#*}"".extern.""$CommunityDomain" "$ZoneFilesFolder""dbextern.""$HoodDomain" "$BindInternalConfTmp" - InsertZoneToIncludeFile "$HoodDomain" "$ZoneFilesFolder""dbextern.""$HoodDomain" "$BindExternalConfTmp" - InsertZoneToIncludeFile "${Hood%%\#*}"".extern.""$CommunityDomain" "$ZoneFilesFolder""dbextern.""$HoodDomain" "$BindExternalConfTmp" - HoodForwardZones="$ForwardZones $HoodDomain""/""$HoodZoneFile" for Subnet in $Subnets; do ReverseDomains="$(GetReverseDomains "$Subnet")" for RDomain in $ReverseDomains; do ReverseZoneFileFullPath="$ZoneFilesFolder""$(GetReverseZoneFileFromZone "${RDomain%*.}")" ./update-rdnszone.sh "$RDomain" "$HoodForwardZones" "$ReverseZoneFileFullPath" "$TTLReReExMi" "$InternalViews" - InsertZoneToIncludeFile "${RDomain%*.}" "$ReverseZoneFileFullPath" "$BindInternalConfTmp" + for IView in $InternalViews; do + InsertZoneToIncludeFile "${RDomain%*.}" "$ReverseZoneFileFullPath" "/tmp/""$IView"".conf" + done done done - - ExternFile="$ZoneFilesFolder""dbextern.""$HoodDomain" + ExternFile="$ZoneFilesFolder""db.""$ExternalView"".""$HoodDomain" ./update-extzone.sh "$HoodZoneFile" "$ExternFile" "$HoodDomain" "$ExternalView" + + for IView in $InternalViews; do + InternViewMasterZone="$ZoneFilesFolder""db.""$IView"".""$HoodDomain" + [ -f "$InternViewMasterZone" ] || ln -s "$HoodZoneFile" "$InternViewMasterZone" + InsertZoneToIncludeFile "$HoodDomain" "$InternViewMasterZone" "/tmp/""$IView"".conf" "$DNSSECPolicy" + done + InsertZoneToIncludeFile "$HoodDomain" "$ExternFile" "/tmp/""$ExternalView"".conf" "$DNSSECPolicy" + + if [ -n "$CommunityExternDomain" ]; then + HoodExternDomain="${Hood%%\#*}"".""$CommunityExternDomain" + for IView in $InternalViews; do + InternViewExternZone="$ZoneFilesFolder""db.""$IView"".""$HoodExternDomain" + [ -f "$InternViewExternZone" ] || ln -s "$ExternFile" "$InternViewExternZone" + InsertZoneToIncludeFile "$HoodExternDomain" "$InternViewExternZone" "/tmp/""$IView"".conf" "$DNSSECPolicy" + done + ExternViewExternZone="$ZoneFilesFolder""db.""$ExternalView"".""$HoodExternDomain" + [ -f "$ExternViewExternZone" ] || ln -s "$ExternFile" "$ExternViewExternZone" + InsertZoneToIncludeFile "$HoodExternDomain" "$ExternViewExternZone" "/tmp/""$ExternalView"".conf" "$DNSSECPolicy" + fi done ./update-public-acl.sh "$BindIcvpnAclTmp" "$RemoteLocation" "$RoutingTables" -ReConfigBind=1 +ReConfigBind=0 UpdateBindConfig() { if [ -f "$1" ] && ! cmp -s "$1" "$2"; then mv "$1" "$2" - ReConfigBind=0 + ReConfigBind=1 else rm -f "$1" fi } UpdateBindConfig "$BindIcvpnAclTmp" "$BindIcvpnAcl" -UpdateBindConfig "$BindInternalConfTmp" "$BindInternalConf" -UpdateBindConfig "$BindExternalConfTmp" "$BindExternalConf" +for IView in $InternalViews; do + UpdateBindConfig "/tmp/""$IView"".conf" "$BindIncludeFileFolder""$IView"".conf" +done +UpdateBindConfig "/tmp/""$ExternalView"".conf" "$BindIncludeFileFolder""$ExternalView"".conf" -if [ $ReConfigBind -eq 0 ] || [ -f "/tmp/dnsscript-forcereconf" ]; then +if [ $ReConfigBind -ne 0 ] || [ -f "/tmp/dnsscript-forcereconf" ]; then if [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 0 ]; then systemctl restart bind9 elif [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 1 ]; then diff --git a/update-extzone.sh b/update-extzone.sh old mode 100644 new mode 100755 diff --git a/update-public-acl.sh b/update-public-acl.sh old mode 100644 new mode 100755 From 092e2f9994160194576321bca1dab834dd925f7b Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 8 Feb 2021 21:23:15 +0100 Subject: [PATCH 33/56] Reload external subdomain on change Signed-off-by: Blackyfff --- update-dns.sh | 12 ++++++++---- update-extzone.sh | 5 ++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/update-dns.sh b/update-dns.sh index 4be7277..8c67d60 100755 --- a/update-dns.sh +++ b/update-dns.sh @@ -77,7 +77,7 @@ if [ $ServeMasterZone -ne 0 ]; then done done ExternFile="$ZoneFilesFolder""db.""$ExternalView"".""$CommunityDomain" - ./update-extzone.sh "$MasterFile" "$ExternFile" "$CommunityDomain" "$ExternalView" + ./update-extzone.sh "$MasterFile" "$ExternFile" "$CommunityDomain" "$ExternalView" "$CommunityExternDomain" "$InternalViews" for IView in $InternalViews; do InternViewMasterZone="$ZoneFilesFolder""db.""$IView"".""$CommunityDomain" @@ -134,8 +134,13 @@ for Hood in $Hoods; do done done done + if [ -n "$CommunityExternDomain" ]; then + HoodExternDomain="${Hood%%\#*}"".""$CommunityExternDomain" + else + HoodExternDomain="" + fi ExternFile="$ZoneFilesFolder""db.""$ExternalView"".""$HoodDomain" - ./update-extzone.sh "$HoodZoneFile" "$ExternFile" "$HoodDomain" "$ExternalView" + ./update-extzone.sh "$HoodZoneFile" "$ExternFile" "$HoodDomain" "$ExternalView" "$HoodExternDomain" "$InternalViews" for IView in $InternalViews; do InternViewMasterZone="$ZoneFilesFolder""db.""$IView"".""$HoodDomain" @@ -144,8 +149,7 @@ for Hood in $Hoods; do done InsertZoneToIncludeFile "$HoodDomain" "$ExternFile" "/tmp/""$ExternalView"".conf" "$DNSSECPolicy" - if [ -n "$CommunityExternDomain" ]; then - HoodExternDomain="${Hood%%\#*}"".""$CommunityExternDomain" + if [ -n "$HoodExternDomain" ]; then for IView in $InternalViews; do InternViewExternZone="$ZoneFilesFolder""db.""$IView"".""$HoodExternDomain" [ -f "$InternViewExternZone" ] || ln -s "$ExternFile" "$InternViewExternZone" diff --git a/update-extzone.sh b/update-extzone.sh index 4e35b0c..24244a6 100755 --- a/update-extzone.sh +++ b/update-extzone.sh @@ -6,6 +6,8 @@ InternalZoneFile="$1" ExternalZoneFile="$2" ExternalZone="$3" ExternalView="$4" +CommunityExternal="$5" +InternalViews="$6" SerialIntern="$(GetZoneFileSerial "$InternalZoneFile")" SerialExtern="$(GetZoneFileSerial "$ExternalZoneFile")" @@ -20,4 +22,5 @@ if [ $((SerialIntern)) -gt $((SerialExtern)) ]; then s/^\(@ [^;]* IN SOA\)\s\+\S\+\s\+\S\+\s/\1 '"$DNSSCRIPT_SERVER_NAME"'. '"$DNSSCRIPT_CONTACT_EMAIL"' /g')" echo "$ZoneContent" > "$ExternalZoneFile" ReloadZone "$ExternalZone" "$ExternalView" -fi + [ -z "$CommunityExternal" ] || ReloadZone "$CommunityExternal" "$InternalViews" +fi \ No newline at end of file From 2a5069d0b1f47296eb47b99e9b948347663f98e3 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Wed, 10 Mar 2021 00:02:15 +0100 Subject: [PATCH 34/56] configurable Temp-Folder; DNSSEC for master-zone with multiple synchronising servers Signed-off-by: Blackyfff --- README.md | 6 +- dns-functions.sh | 83 ++++++++++++++++++++++- update-dns.sh | 169 ++++++++++++++++++++++++++++++++++++----------- 3 files changed, 217 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 9493340..634a062 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ Weiterhin werden bei eigener Subdomain die momentan vergebenen Adressen von dnsm Das ermöglicht eine Namensauflösung für Freifunk-Teilnehmer ohne manuelle Konfiguration. Damit kann jeder Freifunk-Teilnehmer ein gültiges TLS-Zertifikat bekommen, sofern DHCPv6 am Gateway aktiviert ist. +DNSSEC wird für jede Zone unterstützt, allerdings nur für die Hauptzone mit mehreren Servern. Für Subdomainserver darf mit DNSSEC nur jeweils ein Server authorativ sein. + ## Installation #### Systemanforderungen @@ -72,7 +74,7 @@ view "icvpn-internal-view" { [..] # eigene Optionen - include "/etc/bind/fff.community-internal.conf"; # auto-generated + include "/etc/bind/icvpn-internal-view.conf"; # auto-generated include "/etc/bind/icvpn-zones.conf"; # Nicht vergessen ;) @@ -83,7 +85,7 @@ view "external-view" { match-clients { any; }; [..] # eigene Optionen - include "/etc/bind/fff.community-external.conf"; # auto-generated + include "/etc/bind/external-view.conf"; # auto-generated [..] }; diff --git a/dns-functions.sh b/dns-functions.sh index b0b59c5..2699186 100755 --- a/dns-functions.sh +++ b/dns-functions.sh @@ -31,6 +31,17 @@ zone \"""$1""\" {\n\ };" "$3" fi } +GetAllSubNameservers() { + Domain="$(echo "$1" | sed -e 's/\./\\\./g')" + SubDomain="$(echo "$2" | sed -e 's/\./\\\./g')" + sed -ne 's/^\s*'"$SubDomain"'\(\.'"$Domain"'\.\)\?\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\s\+\(\S\+\)/\3/p' "$3" | \ + sed -e 's/\([^.]\)$/\1\.'"$1"'\./g;s/\.$//g' +} +GetAllZoneNameservers() { + Domain="""$(echo "$1" | sed -e 's/\./\\\./g')" + sed -ne 's/^\s*\(@\|'"$Domain"'\.\)\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\s\+\(\S\+\)/\3/p' "$2" | \ + sed -e 's/\([^.]\)$/\1\.'"$1"'\./g;s/\.$//g' +} GetReverseZoneFileFromZone() { echo "db.""$(echo "$1" | awk -F. '{ printf $(NF-2);for(i=NF-3;i>0;--i) printf "."$i}')" } @@ -103,7 +114,7 @@ GetServernameSEDEntry() { echo "$ServerName" | sed -r 's/\./\\\./g' } NormalizeZoneFileFormatting() { - awk 'BEGIN{FS="\t"}{l=length($1);f=substr(" ", 1+length($1)); + awk 'BEGIN{FS="\t"}{l=length($1);f=substr(" ", 1+length($1)); s=substr(" ", 1+length($2)); x=substr($0,length($1)+length($2)+3); print $1 f " " $2 s " " x}' @@ -160,6 +171,76 @@ IPv4IsInSubnet() { fi return $AreEqual + +} +GetOwnKeysForZone () { + DNSSECKeyFolder="$1" + Domain="$2" + if [ -n "$DNSSECKeyFolder" ];then + for OwnKeyFile in "$DNSSECKeyFolder""K""$Domain"".+"*".key"; do + sed -ne '/^;/d;s/^'"$Domain"'\.\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Dd][Nn][Ss][Kk][Ee][Yy]\s\+\(.*\)$/_dnsseckeys\.'"$Domain"'\.\tIN TXT\t\"\2\"/p' "$OwnKeyFile" | \ + NormalizeZoneFileFormatting + done + fi +} +UpdateDNSSECEntryCache () { + Domain="$1" + ZoneTempFolder="$2" + CachedZoneFile="$3" + DNSSECKeyFolder="$4" + UpdateMaster=0 + + Nameservers="$(GetAllZoneNameservers "$Domain" "$CachedZoneFile")" + + mkdir -p "$ZoneTempFolder" + for KeyFile in "$ZoneTempFolder"*; do + [ "$KeyFile" = "$ZoneTempFolder""*" ] || \ + mv "$KeyFile" "$ZoneTempFolder""Old""${KeyFile##*"$ZoneTempFolder"}" + done + for Nameserver in $Nameservers; do + if [ "$Nameserver" = "$DNSSCRIPT_SERVER_NAME" ]; then + DNSKEYS="$( GetOwnKeysForZone "$DNSSECKeyFolder" "$Domain" )" + else + DNSKEYS="$(delv @"$Nameserver" _dnsseckeys."$Domain" TXT 2>/dev/null | \ + sed -ne '/^;/d;s/^.*\sIN\s\+TXT\s\+"\(.*\)"$/'"$Domain"'.\tIN DNSKEY\t\1/p' | \ + NormalizeZoneFileFormatting )" + fi + if [ -n "$DNSKEYS" ] && [ "$DNSKEYS" != "$(cat "$ZoneTempFolder""OldKeys.""$Nameserver" 2>/dev/null)" ]; then + echo "$DNSKEYS" > "$ZoneTempFolder""Keys.""$Nameserver" + UpdateMaster=1 + elif [ -f "$ZoneTempFolder""OldKeys.""$Nameserver" ]; then + mv "$ZoneTempFolder""OldKeys.""$Nameserver" "$ZoneTempFolder""Keys.""$Nameserver" + fi + done + + SEDDomain="$(echo "$Domain" | sed -e 's/\./\\\./g')" + ChildServers="$( sed -ne '/^\s*\(@\|'"$SEDDomain"'\.\)\s/!s/^\s*\(\S\+\)\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\s\+\(\S\+\);\?.*$/\1#\3/p' "$CachedZoneFile" | \ + sed -e 's/\([^.]\)$/\1\.'"$Domain"'\./g;s/\.$//g;s/\([^.]\)#/\1\.'"$Domain"'\.#/g;s/\.#/#/g' )" + for ChildServer in $ChildServers; do + DNSKEYS="$(delv @"${ChildServer##*\#}" "${ChildServer%%\#*}" CDS 2>/dev/null | \ + sed -ne '/^;/d;s/^.*\sIN\s\+CDS\s\+\(.*\)$/'"${ChildServer%%\#*}"'.\tIN DS\t\1/p' | \ + NormalizeZoneFileFormatting )" + + if [ -n "$DNSKEYS" ]; then + DNSKEYS="$(echo "$DNSKEYS" | sed -e '/\sIN\s\+DS\s\+0\s\+0\s\+0\s\+0/d')" + if [ "$DNSKEYS" != "$(cat "$ZoneTempFolder""OldChildKeys.""$ChildServer" 2>/dev/null)" ]; then + [ -z "$DNSKEYS" ] || echo "$DNSKEYS" > "$ZoneTempFolder""ChildKeys.""$ChildServer" + UpdateMaster=1 + elif [ -n "$DNSKEYS" ]; then + mv "$ZoneTempFolder""OldChildKeys.""$ChildServer" "$ZoneTempFolder""ChildKeys.""$ChildServer" + elif [ -f "$ZoneTempFolder""OldKeys.""$Nameserver" ]; then + UpdateMaster=1 + fi + elif [ -f "$ZoneTempFolder""OldChildKeys.""$Nameserver" ]; then + mv "$ZoneTempFolder""OldChildKeys.""$ChildServer" "$ZoneTempFolder""ChildKeys.""$ChildServer" + fi + done + + for KeyFile in "$ZoneTempFolder""Old"*; do + [ "$KeyFile" = "$ZoneTempFolder""Old*" ] || \ + rm -f "$KeyFile" + done + echo "$UpdateMaster" } ReloadZone() { if [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 0 ]; then diff --git a/update-dns.sh b/update-dns.sh index 8c67d60..6aec388 100755 --- a/update-dns.sh +++ b/update-dns.sh @@ -5,11 +5,10 @@ set -e # Communityconfig CommunityDomain="fff.community" -CommunityExternDomain="extern.fff.community" +CommunityExternPrefix="extern" CommunitySubnets="10.50.0/16 10.83.0/16 fd43:5602:29bd::/48" RemoteLocation="https://git.freifunk-franken.de/freifunk-franken/dns/raw/branch/master/" -DNSSECPolicy="" -ServeMasterZone=0 +DNSSECPolicy="herpf" # Serverconfig export DNSSCRIPT_CONTACT_EMAIL=info.freifunk-herpf.de. @@ -18,8 +17,10 @@ export DNSSCRIPT_SERVER_NAME=dns.herpf.fff.community UpdateScriptsFolder="/usr/lib/ffdns/" ZoneFilesFolder="/etc/bind/fff/" BindIncludeFileFolder="/etc/bind/" +DNSSECKeyFolder="/etc/bind/keys/" +TempFolder="/tmp/dnsscripts/" # specify the bird/babel or other routing table[s] -# if RoutingTables is empty, the ICVPN-ACL-List will be fetched remotely (for servers that are no gateways) +# if RoutingTables is empty, the ICVPN-ACL-List will be fetched remotely (for servers that are no gateway) RoutingTables="10" # -1 -> disable bind [restart|reload] @@ -28,7 +29,6 @@ RoutingTables="10" # 2 -> OpenWRT /etc/init.d/named [reload|restart] export DNSSCRIPT_BIND_RELOAD_VER=0 -# only necessary when rndc is used InternalViews="icvpn-internal-view icvpn-internal-dns64-view" ExternalView="external-view" @@ -45,24 +45,74 @@ cd "$UpdateScriptsFolder" . ./dns-functions.sh FirstInternal="$( echo "$InternalViews" | sed -ne 's/^\(\S\+\)\s.*$/\1/p')" -MasterFile="$ZoneFilesFolder""db.""$FirstInternal"".""$CommunityDomain" -BindIcvpnAclTmp="/tmp/icvpn-acl.conf" +BindIcvpnAclTmp="$TempFolder""icvpn-acl.conf" BindIcvpnAcl="$BindIncludeFileFolder""icvpn-acl.conf" +[ -z "$CommunityExternPrefix" ] || CommunityExternDomain="$CommunityExternPrefix"".""$CommunityDomain" + +mkdir -p "$TempFolder""cache" for IView in $InternalViews; do - rm -f "/tmp/""$IView"".conf" + rm -f "$TempFolder""$IView"".conf" done -rm -f "/tmp/""$ExternalView"".conf" +rm -f "$TempFolder""$ExternalView"".conf" -PreFetchMasterSerial="$(GetZoneFileSerial "$MasterFile")" -curl -s -S -f "$RemoteLocation""db.""$CommunityDomain" --output "$MasterFile" - -if [ $ServeMasterZone -ne 0 ]; then - PostFetchMasterSerial="$(GetZoneFileSerial "$MasterFile")" - if [ $((PostFetchMasterSerial)) -gt $((PreFetchMasterSerial)) ]; then - ReloadZone "$CommunityDomain" "$InternalViews" +CachedMasterFile="$TempFolder""cache/db.""$CommunityDomain" +PreFetchMasterSerial="$(GetZoneFileSerial "$CachedMasterFile")" +curl -s -S -f "$RemoteLocation""db.""$CommunityDomain" --output "$CachedMasterFile" +PostFetchMasterSerial="$(GetZoneFileSerial "$CachedMasterFile")" +ServeMasterZone="$( GetAllZoneNameservers "$CommunityDomain" "$CachedMasterFile" | awk '{for(i=NF;i>0;--i) if($i=="'"$DNSSCRIPT_SERVER_NAME"'") {printf 1}}')" +if [ -n "$CommunityExternDomain" ]; then + if [ -n "$ServeMasterZone" ]; then + ServeExtZone="1" + else + ServeExtZone="$( GetAllSubNameservers "$CommunityDomain" "$CommunityExternPrefix" "$CachedMasterFile" | awk '{for(i=NF;i>0;--i) if($i=="'"$DNSSCRIPT_SERVER_NAME"'") {printf 1}}')" fi +else + ServeExtZone="" +fi + +if [ -n "$ServeMasterZone" ] || [ -n "$ServeExtZone" ]; then + sed -i -e '/^\s*_dnsseckeys\./d' "$CachedMasterFile" + FileForExternGeneration="$CachedMasterFile" + if [ -n "$ExternalView" ]; then + ExternFile="$ZoneFilesFolder""db.""$ExternalView"".""$CommunityDomain" + else + ExternFile="$ZoneFilesFolder""db.""$CommunityExternDomain" + fi + LocalMasterSerial=$((PostFetchMasterSerial)) + if [ -n "$ServeMasterZone" ]; then + MasterFile="$ZoneFilesFolder""db.""$FirstInternal"".""$CommunityDomain" + FileForExternGeneration="$MasterFile" + UpdateMaster=0 + ZoneTempFolder="$TempFolder""cache/""$CommunityDomain""/" + UpdateMaster="$(UpdateDNSSECEntryCache "$CommunityDomain" "$ZoneTempFolder" "$CachedMasterFile" "$DNSSECKeyFolder")" + [ $((PostFetchMasterSerial)) -le $((PreFetchMasterSerial)) ] || UpdateMaster=1 + + if [ $UpdateMaster -ne 0 ]; then + cp -f "$CachedMasterFile" "$CachedMasterFile""I" + for KeyFile in "$ZoneTempFolder"*; do + [ "$KeyFile" = "$ZoneTempFolder""*" ] || \ + cat "$KeyFile" >> "$CachedMasterFile""I" + done + LocalMasterSerial="$(GetZoneFileSerial "$MasterFile")" + + if [ $((PostFetchMasterSerial)) -le $((LocalMasterSerial)) ]; then + LocalMasterSerial=$((LocalMasterSerial+1)) + sed -i -e 's/^\(\s*\)'"$PostFetchMasterSerial"'\(\s*;\s*[Ss]erial.*\)$/\1'"$LocalMasterSerial"'\3/g' "$CachedMasterFile""I" + sed -i -e 's/^\(\s*\S\+\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Ss][Oo][Aa]\s\+\S\+\s\+\S\+\s\+\)'"$PostFetchMasterSerial"'\(\s\+.*\)$/\1'"$LocalMasterSerial"'\3/g' "$CachedMasterFile""I" + else + LocalMasterSerial=$((PostFetchMasterSerial)) + fi + mv "$CachedMasterFile""I" "$MasterFile" + ReloadZone "$CommunityDomain" "$InternalViews" + + for IView in $InternalViews; do + InternViewMasterZone="$ZoneFilesFolder""db.""$IView"".""$CommunityDomain" + [ -f "$InternViewMasterZone" ] || ln -s "$MasterFile" "$InternViewMasterZone" + InsertZoneToIncludeFile "$CommunityDomain" "$InternViewMasterZone" "$TempFolder""$IView"".conf" "$DNSSECPolicy" + done + fi for Subnet in $CommunitySubnets; do ReverseDomains="$(GetReverseDomains "$Subnet")" for RDomain in $ReverseDomains; do @@ -72,29 +122,72 @@ if [ $ServeMasterZone -ne 0 ]; then rm -f "$ZoneFilesFolder""static.""$ReverseZoneFile" ./update-rdnszone.sh "$RDomain" "$ForwardZones" "$ZoneFilesFolder""$ReverseZoneFile" "$TTLReReExMi" "$InternalViews" for IView in $InternalViews; do - InsertZoneToIncludeFile "${RDomain%*.}" "$ZoneFilesFolder""$ReverseZoneFile" "/tmp/""$IView"".conf" + InsertZoneToIncludeFile "${RDomain%*.}" "$ZoneFilesFolder""$ReverseZoneFile" "$TempFolder""$IView"".conf" done done done - ExternFile="$ZoneFilesFolder""db.""$ExternalView"".""$CommunityDomain" - ./update-extzone.sh "$MasterFile" "$ExternFile" "$CommunityDomain" "$ExternalView" "$CommunityExternDomain" "$InternalViews" + if [ -n "$ExternalView" ]; then + InsertZoneToIncludeFile "$CommunityDomain" "$ExternFile" "$TempFolder""$ExternalView"".conf" "$DNSSECPolicy" + fi + fi - for IView in $InternalViews; do - InternViewMasterZone="$ZoneFilesFolder""db.""$IView"".""$CommunityDomain" - [ -f "$InternViewMasterZone" ] || ln -s "$MasterFile" "$InternViewMasterZone" - InsertZoneToIncludeFile "$CommunityDomain" "$InternViewMasterZone" "/tmp/""$IView"".conf" "$DNSSECPolicy" + UpdateExternView=0 + if [ -n "$ExternalView" ] || [ -n "$ServeExtZone" ]; then + SerialExtern="$(GetZoneFileSerial "$ExternFile")" + if [ $((LocalMasterSerial)) -gt $((SerialExtern)) ]; then + sed -e '/^[^;]*\s\(10.\|[fF][cdCD][0-9a-fA-F]\{2\}:\)\S*\s*\(;.*\)\?$/d; \ + s/^[^;^@]*\s\+\([^;]*\)\s[Ii][Nn]\s\+[Ss][Oo][Aa]\s/@ \1 IN SOA /g' "$FileForExternGeneration" \ + > "$ExternFile" + UpdateExternView=1 + [ -z "$ExternalView" ] || ReloadZone "$CommunityExternDomain" "$ExternalView" + fi + fi + + UpdateExternDomain=0 + if [ -n "$ServeExtZone" ]; then + MasterExtDomainFile="$ZoneFilesFolder""db.""$FirstInternal"".""$CommunityExternDomain" + ZoneTempFolder="$TempFolder""cache/""$CommunityExternDomain""/" + cp -f "$ExternFile" "$CachedMasterFile""E" + sed -i -e '/^\s*_dnsseckeys\./d' "$CachedMasterFile""E" + [ -n "$(sed -e '/^\s*\(@\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\)\s/!d' "$CachedMasterFile""E")" ] || \ + sed -i -e 's/^\s*\(@\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Ss][Oo][Aa]\)\s\+\S\+\s\+\S\+\s/\1 '"$DNSSCRIPT_SERVER_NAME"'. '"$DNSSCRIPT_CONTACT_EMAIL"' /g' "$CachedMasterFile""E" + + sed -i -e 's/^\s*'"$CommunityExternPrefix"'\s/@ /g;/^\s*@\s\+[Ii][Nn]\s\+[Dd][Ss]\s/d' "$CachedMasterFile""E" + + UpdateExternDomain="$(UpdateDNSSECEntryCache "$CommunityExternDomain" "$ZoneTempFolder" "$CachedMasterFile""E" "$DNSSECKeyFolder")" + [ $UpdateExternView -eq 0 ] || UpdateExternDomain=1 + + if [ $UpdateExternDomain -ne 0 ]; then + for KeyFile in "$ZoneTempFolder"*; do + [ "$KeyFile" = "$ZoneTempFolder""*" ] || \ + cat "$KeyFile" >> "$CachedMasterFile""E" done - InsertZoneToIncludeFile "$CommunityDomain" "$ExternFile" "/tmp/""$ExternalView"".conf" "$DNSSECPolicy" - if [ -n "$CommunityExternDomain" ]; then + LocalExtDomainMasterSerial="$(GetZoneFileSerial "$MasterExtDomainFile")" + + if [ $((LocalMasterSerial)) -le $((LocalExtDomainMasterSerial)) ]; then + LocalExtDomainMasterSerial=$((LocalExtDomainMasterSerial+1)) + sed -i -e 's/^\(\s*\)'"$LocalMasterSerial"'\(\s*;\s*[Ss]erial.*\)$/\1'"$LocalExtDomainMasterSerial"'\3/g' "$CachedMasterFile""E" + sed -i -e 's/^\(\s*\S\+\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Ss][Oo][Aa]\s\+\S\+\s\+\S\+\s\+\)'"$LocalMasterSerial"'\(\s\+.*\)$/\1'"$LocalExtDomainMasterSerial"'\3/g' "$CachedMasterFile""E" + fi + mv "$CachedMasterFile""E" "$MasterExtDomainFile" + ReloadZone "$CommunityExternDomain" "$InternalViews" + fi for IView in $InternalViews; do InternViewExternZone="$ZoneFilesFolder""db.""$IView"".""$CommunityExternDomain" - [ -f "$InternViewExternZone" ] || ln -s "$ExternFile" "$InternViewExternZone" - InsertZoneToIncludeFile "$CommunityExternDomain" "$InternViewExternZone" "/tmp/""$IView"".conf" "$DNSSECPolicy" + [ -f "$InternViewExternZone" ] || ln -s "$MasterExtDomainFile" "$InternViewExternZone" + InsertZoneToIncludeFile "$CommunityExternDomain" "$InternViewExternZone" "$TempFolder""$IView"".conf" "$DNSSECPolicy" done + if [ -n "$ExternalView" ]; then ExternViewExternZone="$ZoneFilesFolder""db.""$ExternalView"".""$CommunityExternDomain" - [ -f "$ExternViewExternZone" ] || ln -s "$ExternFile" "$ExternViewExternZone" - InsertZoneToIncludeFile "$CommunityExternDomain" "$ExternViewExternZone" "/tmp/""$ExternalView"".conf" "$DNSSECPolicy" + [ -f "$ExternViewExternZone" ] || ln -s "$MasterExtDomainFile" "$ExternViewExternZone" + InsertZoneToIncludeFile "$CommunityExternDomain" "$ExternViewExternZone" "$TempFolder""$ExternalView"".conf" "$DNSSECPolicy" fi + fi +fi + +if [ -z "$MasterFile" ]; then + MasterFile="$ZoneFilesFolder""db.""$FirstInternal"".""$CommunityDomain" + cp -f "$CachedMasterFile" "$MasterFile" fi # set shorter TTL for Hoods @@ -130,7 +223,7 @@ for Hood in $Hoods; do ReverseZoneFileFullPath="$ZoneFilesFolder""$(GetReverseZoneFileFromZone "${RDomain%*.}")" ./update-rdnszone.sh "$RDomain" "$HoodForwardZones" "$ReverseZoneFileFullPath" "$TTLReReExMi" "$InternalViews" for IView in $InternalViews; do - InsertZoneToIncludeFile "${RDomain%*.}" "$ReverseZoneFileFullPath" "/tmp/""$IView"".conf" + InsertZoneToIncludeFile "${RDomain%*.}" "$ReverseZoneFileFullPath" "$TempFolder""$IView"".conf" done done done @@ -145,19 +238,19 @@ for Hood in $Hoods; do for IView in $InternalViews; do InternViewMasterZone="$ZoneFilesFolder""db.""$IView"".""$HoodDomain" [ -f "$InternViewMasterZone" ] || ln -s "$HoodZoneFile" "$InternViewMasterZone" - InsertZoneToIncludeFile "$HoodDomain" "$InternViewMasterZone" "/tmp/""$IView"".conf" "$DNSSECPolicy" + InsertZoneToIncludeFile "$HoodDomain" "$InternViewMasterZone" "$TempFolder""$IView"".conf" "$DNSSECPolicy" done - InsertZoneToIncludeFile "$HoodDomain" "$ExternFile" "/tmp/""$ExternalView"".conf" "$DNSSECPolicy" + InsertZoneToIncludeFile "$HoodDomain" "$ExternFile" "$TempFolder""$ExternalView"".conf" "$DNSSECPolicy" if [ -n "$HoodExternDomain" ]; then for IView in $InternalViews; do - InternViewExternZone="$ZoneFilesFolder""db.""$IView"".""$HoodExternDomain" + InternViewExternZone="$ZoneFilesFolder""db.""$IView"".""${Hood%%\#*}"".""$CommunityExternDomain" [ -f "$InternViewExternZone" ] || ln -s "$ExternFile" "$InternViewExternZone" - InsertZoneToIncludeFile "$HoodExternDomain" "$InternViewExternZone" "/tmp/""$IView"".conf" "$DNSSECPolicy" + InsertZoneToIncludeFile "${Hood%%\#*}"".""$CommunityExternDomain" "$InternViewExternZone" "$TempFolder""$IView"".conf" "$DNSSECPolicy" done - ExternViewExternZone="$ZoneFilesFolder""db.""$ExternalView"".""$HoodExternDomain" + ExternViewExternZone="$ZoneFilesFolder""db.""$ExternalView"".""${Hood%%\#*}"".""$CommunityExternDomain" [ -f "$ExternViewExternZone" ] || ln -s "$ExternFile" "$ExternViewExternZone" - InsertZoneToIncludeFile "$HoodExternDomain" "$ExternViewExternZone" "/tmp/""$ExternalView"".conf" "$DNSSECPolicy" + InsertZoneToIncludeFile "${Hood%%\#*}"".""$CommunityExternDomain" "$ExternViewExternZone" "$TempFolder""$ExternalView"".conf" "$DNSSECPolicy" fi done @@ -175,9 +268,9 @@ UpdateBindConfig() { UpdateBindConfig "$BindIcvpnAclTmp" "$BindIcvpnAcl" for IView in $InternalViews; do - UpdateBindConfig "/tmp/""$IView"".conf" "$BindIncludeFileFolder""$IView"".conf" + UpdateBindConfig "$TempFolder""$IView"".conf" "$BindIncludeFileFolder""$IView"".conf" done -UpdateBindConfig "/tmp/""$ExternalView"".conf" "$BindIncludeFileFolder""$ExternalView"".conf" +UpdateBindConfig "$TempFolder""$ExternalView"".conf" "$BindIncludeFileFolder""$ExternalView"".conf" if [ $ReConfigBind -ne 0 ] || [ -f "/tmp/dnsscript-forcereconf" ]; then if [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 0 ]; then From 2cb6ea5ade83d98cfe0b284273d2ce12f0caec42 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Sun, 27 Jun 2021 22:51:24 +0200 Subject: [PATCH 35/56] Refactoring; Bug-Fix: Don't execute external when not set, Keyfile comparison Signed-off-by: Blackyfff --- dns-functions.sh | 56 ++++++++++++++++++++----------- update-dns.sh | 87 ++++++++++++++++++++---------------------------- 2 files changed, 73 insertions(+), 70 deletions(-) mode change 100755 => 100644 dns-functions.sh mode change 100755 => 100644 update-dns.sh diff --git a/dns-functions.sh b/dns-functions.sh old mode 100755 new mode 100644 index 2699186..209385e --- a/dns-functions.sh +++ b/dns-functions.sh @@ -12,6 +12,19 @@ GetZoneFileSerial() { fi echo "${ZoneSerial:-0}" } +InsertZoneToViews() { + Views="$1" + ZoneFilesFolder="$2" + Domain="$3" + SourceFile="$4" + TempFolder="$5" + DNSSECPolicy="$6" + for View in $Views; do + ZoneFile="$ZoneFilesFolder""db.""$View"".""$Domain" + [ -f "$ZoneFile" ] || ln -s "$SourceFile" "$ZoneFile" + InsertZoneToIncludeFile "$Domain" "$ZoneFile" "$TempFolder""$View"".conf" "$DNSSECPolicy" + done +} InsertZoneToIncludeFile() { if [ ! -f "$3" ]; then { @@ -31,16 +44,18 @@ zone \"""$1""\" {\n\ };" "$3" fi } -GetAllSubNameservers() { - Domain="$(echo "$1" | sed -e 's/\./\\\./g')" - SubDomain="$(echo "$2" | sed -e 's/\./\\\./g')" - sed -ne 's/^\s*'"$SubDomain"'\(\.'"$Domain"'\.\)\?\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\s\+\(\S\+\)/\3/p' "$3" | \ +GetAllNameservers() { + sed -ne 's/^\s*'"$2"'\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\s\+\(\S\+\)/\3/p' "$3" | \ sed -e 's/\([^.]\)$/\1\.'"$1"'\./g;s/\.$//g' } +GetAllSubNameservers() { + Domain="$(SEDifyHostname "$1")" + SubDomain="$(SEDifyHostname "$2")" + GetAllNameservers "$1" "$SubDomain""\(\.""$Domain""\.\)\?" "$3" +} GetAllZoneNameservers() { - Domain="""$(echo "$1" | sed -e 's/\./\\\./g')" - sed -ne 's/^\s*\(@\|'"$Domain"'\.\)\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\s\+\(\S\+\)/\3/p' "$2" | \ - sed -e 's/\([^.]\)$/\1\.'"$1"'\./g;s/\.$//g' + Domain="""$(SEDifyHostname "$1")" + GetAllNameservers "$1" "\(@\|""$Domain""\.\)" "$2" } GetReverseZoneFileFromZone() { echo "db.""$(echo "$1" | awk -F. '{ printf $(NF-2);for(i=NF-3;i>0;--i) printf "."$i}')" @@ -58,7 +73,7 @@ GetReverseIPv4Domains() { echo "${RevDomain#.}" else Filler=$((8 - Filler)) - Filler=$((1 << Filler)) + Filler=$((1 << $Filler)) Start=$(echo "$IPFilled" | awk -F. '{printf $'"$((Statics+1))"'}') Start=$((Start - Start % Filler)) for Sub in $(seq $Start $((Start + Filler - 1))); do @@ -79,7 +94,7 @@ GetReverseIPv6Domains() { echo "${RevDomain#.}" else Filler=$((4 - Filler)) - Filler=$((1 << Filler)) + Filler=$((1 << $Filler)) Start="$(printf %d 0x"$(echo "$IPFilled" | awk 'BEGIN{FS=""}{printf $'"$((Statics+1))"'}')")" Start=$((Start - Start % Filler)) for Sub in $(seq $Start $((Start + Filler - 1))); do @@ -102,6 +117,9 @@ ExpandHostname() { [ -n "${Hostname##*.}" ] && Hostname="$Hostname"".""$2" echo "$Hostname" } +SEDifyHostname() { + echo "$1" | sed -r 's/\./\\\./g' +} GetServernameSEDEntry() { CommunityName="$1" ServerName="$DNSSCRIPT_SERVER_NAME" @@ -111,7 +129,7 @@ GetServernameSEDEntry() { ServerName="\(""$ServerName"".\)" fi - echo "$ServerName" | sed -r 's/\./\\\./g' + SEDifyHostname "$ServerName" } NormalizeZoneFileFormatting() { awk 'BEGIN{FS="\t"}{l=length($1);f=substr(" ", 1+length($1)); @@ -162,7 +180,7 @@ IPv4IsInSubnet() { AreEqual="$([ "$IPStaticPart" = "$SubnetStaticPart" ]; echo "$?")" if [ $AreEqual -eq 0 ] && [ $BlockMask -ne 0 ]; then BlockMask=$((8 - BlockMask)) - BlockMask=$((-1 << BlockMask)) + BlockMask=$((-1 << $BlockMask)) IPBlock=$(echo "$IPFilled" | awk -F. '{printf $'"$((Statics+1))"'}') SubnetBlock=$(echo "$SubnetIPFilled" | awk -F. '{printf $'"$((Statics+1))"'}') IPBlock=$((IPBlock & BlockMask)) @@ -194,11 +212,11 @@ UpdateDNSSECEntryCache () { mkdir -p "$ZoneTempFolder" for KeyFile in "$ZoneTempFolder"*; do - [ "$KeyFile" = "$ZoneTempFolder""*" ] || \ - mv "$KeyFile" "$ZoneTempFolder""Old""${KeyFile##*"$ZoneTempFolder"}" + [ "$KeyFile" == "$ZoneTempFolder""*" ] || \ + mv "$KeyFile" "$ZoneTempFolder""Old""${KeyFile##*""$ZoneTempFolder""}" done for Nameserver in $Nameservers; do - if [ "$Nameserver" = "$DNSSCRIPT_SERVER_NAME" ]; then + if [ "$Nameserver" == "$DNSSCRIPT_SERVER_NAME" ]; then DNSKEYS="$( GetOwnKeysForZone "$DNSSECKeyFolder" "$Domain" )" else DNSKEYS="$(delv @"$Nameserver" _dnsseckeys."$Domain" TXT 2>/dev/null | \ @@ -213,7 +231,7 @@ UpdateDNSSECEntryCache () { fi done - SEDDomain="$(echo "$Domain" | sed -e 's/\./\\\./g')" + SEDDomain="$(SEDifyHostname "$Domain")" ChildServers="$( sed -ne '/^\s*\(@\|'"$SEDDomain"'\.\)\s/!s/^\s*\(\S\+\)\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\s\+\(\S\+\);\?.*$/\1#\3/p' "$CachedZoneFile" | \ sed -e 's/\([^.]\)$/\1\.'"$Domain"'\./g;s/\.$//g;s/\([^.]\)#/\1\.'"$Domain"'\.#/g;s/\.#/#/g' )" for ChildServer in $ChildServers; do @@ -237,20 +255,20 @@ UpdateDNSSECEntryCache () { done for KeyFile in "$ZoneTempFolder""Old"*; do - [ "$KeyFile" = "$ZoneTempFolder""Old*" ] || \ + [ "$KeyFile" == "$ZoneTempFolder""Old*" ] || \ rm -f "$KeyFile" done echo "$UpdateMaster" } ReloadZone() { if [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 0 ]; then - systemctl reload bind9 + systemctl reload bind9 >/dev/null elif [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 1 ]; then for Zone in $2; do - rndc reload "$1" IN "$Zone" || touch "/tmp/dnsscript-forcereconf" + rndc reload "$1" IN "$Zone" >/dev/null || touch "/tmp/dnsscript-forcereconf" done elif [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 2 ]; then - /etc/init.d/named reload + /etc/init.d/named reload >/dev/null fi } diff --git a/update-dns.sh b/update-dns.sh old mode 100755 new mode 100644 index 6aec388..40a33c3 --- a/update-dns.sh +++ b/update-dns.sh @@ -58,7 +58,7 @@ rm -f "$TempFolder""$ExternalView"".conf" CachedMasterFile="$TempFolder""cache/db.""$CommunityDomain" PreFetchMasterSerial="$(GetZoneFileSerial "$CachedMasterFile")" -curl -s -S -f "$RemoteLocation""db.""$CommunityDomain" --output "$CachedMasterFile" +$(curl -s -S -f "$RemoteLocation""db.""$CommunityDomain" --output "$CachedMasterFile") PostFetchMasterSerial="$(GetZoneFileSerial "$CachedMasterFile")" ServeMasterZone="$( GetAllZoneNameservers "$CommunityDomain" "$CachedMasterFile" | awk '{for(i=NF;i>0;--i) if($i=="'"$DNSSCRIPT_SERVER_NAME"'") {printf 1}}')" if [ -n "$CommunityExternDomain" ]; then @@ -83,16 +83,13 @@ if [ -n "$ServeMasterZone" ] || [ -n "$ServeExtZone" ]; then if [ -n "$ServeMasterZone" ]; then MasterFile="$ZoneFilesFolder""db.""$FirstInternal"".""$CommunityDomain" FileForExternGeneration="$MasterFile" - UpdateMaster=0 ZoneTempFolder="$TempFolder""cache/""$CommunityDomain""/" - UpdateMaster="$(UpdateDNSSECEntryCache "$CommunityDomain" "$ZoneTempFolder" "$CachedMasterFile" "$DNSSECKeyFolder")" - [ $((PostFetchMasterSerial)) -le $((PreFetchMasterSerial)) ] || UpdateMaster=1 - - if [ $UpdateMaster -ne 0 ]; then + UpdateMaster="$(UpdateDNSSECEntryCache "$CommunityDomain" "$ZoneTempFolder" "$CachedMasterFile" "$DNSSECKeyFolder")" + if [ $((PostFetchMasterSerial)) -gt $((PreFetchMasterSerial)) ] || [ $UpdateMaster -ne 0 ]; then cp -f "$CachedMasterFile" "$CachedMasterFile""I" for KeyFile in "$ZoneTempFolder"*; do - [ "$KeyFile" = "$ZoneTempFolder""*" ] || \ + [ "$KeyFile" == "$ZoneTempFolder""*" ] || \ cat "$KeyFile" >> "$CachedMasterFile""I" done LocalMasterSerial="$(GetZoneFileSerial "$MasterFile")" @@ -107,11 +104,7 @@ if [ -n "$ServeMasterZone" ] || [ -n "$ServeExtZone" ]; then mv "$CachedMasterFile""I" "$MasterFile" ReloadZone "$CommunityDomain" "$InternalViews" - for IView in $InternalViews; do - InternViewMasterZone="$ZoneFilesFolder""db.""$IView"".""$CommunityDomain" - [ -f "$InternViewMasterZone" ] || ln -s "$MasterFile" "$InternViewMasterZone" - InsertZoneToIncludeFile "$CommunityDomain" "$InternViewMasterZone" "$TempFolder""$IView"".conf" "$DNSSECPolicy" - done + InsertZoneToViews "$InternalViews" "$ZoneFilesFolder" "$CommunityDomain" "$MasterFile" "$TempFolder" "$DNSSECPolicy" fi for Subnet in $CommunitySubnets; do ReverseDomains="$(GetReverseDomains "$Subnet")" @@ -143,7 +136,6 @@ if [ -n "$ServeMasterZone" ] || [ -n "$ServeExtZone" ]; then fi fi - UpdateExternDomain=0 if [ -n "$ServeExtZone" ]; then MasterExtDomainFile="$ZoneFilesFolder""db.""$FirstInternal"".""$CommunityExternDomain" ZoneTempFolder="$TempFolder""cache/""$CommunityExternDomain""/" @@ -152,14 +144,12 @@ if [ -n "$ServeMasterZone" ] || [ -n "$ServeExtZone" ]; then [ -n "$(sed -e '/^\s*\(@\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\)\s/!d' "$CachedMasterFile""E")" ] || \ sed -i -e 's/^\s*\(@\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Ss][Oo][Aa]\)\s\+\S\+\s\+\S\+\s/\1 '"$DNSSCRIPT_SERVER_NAME"'. '"$DNSSCRIPT_CONTACT_EMAIL"' /g' "$CachedMasterFile""E" - sed -i -e 's/^\s*'"$CommunityExternPrefix"'\s/@ /g;/^\s*@\s\+[Ii][Nn]\s\+[Dd][Ss]\s/d' "$CachedMasterFile""E" + sed -i -e 's/^\s*'"$CommunityExternPrefix"'\s/@ /g' "$CachedMasterFile""E" UpdateExternDomain="$(UpdateDNSSECEntryCache "$CommunityExternDomain" "$ZoneTempFolder" "$CachedMasterFile""E" "$DNSSECKeyFolder")" - [ $UpdateExternView -eq 0 ] || UpdateExternDomain=1 - - if [ $UpdateExternDomain -ne 0 ]; then + if [ $UpdateExternView -ne 0 ] || [ $UpdateExternDomain -ne 0 ]; then for KeyFile in "$ZoneTempFolder"*; do - [ "$KeyFile" = "$ZoneTempFolder""*" ] || \ + [ "$KeyFile" == "$ZoneTempFolder""*" ] || \ cat "$KeyFile" >> "$CachedMasterFile""E" done LocalExtDomainMasterSerial="$(GetZoneFileSerial "$MasterExtDomainFile")" @@ -172,16 +162,9 @@ if [ -n "$ServeMasterZone" ] || [ -n "$ServeExtZone" ]; then mv "$CachedMasterFile""E" "$MasterExtDomainFile" ReloadZone "$CommunityExternDomain" "$InternalViews" fi - for IView in $InternalViews; do - InternViewExternZone="$ZoneFilesFolder""db.""$IView"".""$CommunityExternDomain" - [ -f "$InternViewExternZone" ] || ln -s "$MasterExtDomainFile" "$InternViewExternZone" - InsertZoneToIncludeFile "$CommunityExternDomain" "$InternViewExternZone" "$TempFolder""$IView"".conf" "$DNSSECPolicy" - done - if [ -n "$ExternalView" ]; then - ExternViewExternZone="$ZoneFilesFolder""db.""$ExternalView"".""$CommunityExternDomain" - [ -f "$ExternViewExternZone" ] || ln -s "$MasterExtDomainFile" "$ExternViewExternZone" - InsertZoneToIncludeFile "$CommunityExternDomain" "$ExternViewExternZone" "$TempFolder""$ExternalView"".conf" "$DNSSECPolicy" - fi + + InsertZoneToViews "$InternalViews" "$ZoneFilesFolder" "$CommunityExternDomain" "$MasterExtDomainFile" "$TempFolder" "$DNSSECPolicy" + InsertZoneToViews "$ExternalView" "$ZoneFilesFolder" "$CommunityExternDomain" "$MasterExtDomainFile" "$TempFolder" "$DNSSECPolicy" fi fi @@ -202,14 +185,14 @@ for Hood in $Hoods; do if [ ! -f "$HoodZoneFile" ]; then { echo "\$TTL ${TTLReReExMi%% *}" - echo "@ IN SOA $DNSSCRIPT_SERVER_NAME""."" $DNSSCRIPT_CONTACT_EMAIL (" - echo " 1 ; Serial" - echo " ""$(echo "$TTLReReExMi" | awk '{print $2}')"" ; Refresh" - echo " ""$(echo "$TTLReReExMi" | awk '{print $3}')"" ; Retry" - echo " ""$(echo "$TTLReReExMi" | awk '{print $4}')"" ; Expire" - echo " ""$(echo "$TTLReReExMi" | awk '{print $5}')"" ) ; Negative Cache TTL" + echo "@ IN SOA $DNSSCRIPT_SERVER_NAME""."" $DNSSCRIPT_CONTACT_EMAIL (" + echo " 1 ; Serial" + echo " ""$(echo "$TTLReReExMi" | awk '{print $2}')"" ; Refresh" + echo " ""$(echo "$TTLReReExMi" | awk '{print $3}')"" ; Retry" + echo " ""$(echo "$TTLReReExMi" | awk '{print $4}')"" ; Expire" + echo " ""$(echo "$TTLReReExMi" | awk '{print $5}')"" ) ; Negative Cache TTL" echo ";" - echo "@ IN NS $DNSSCRIPT_SERVER_NAME"".""" + echo "@ IN NS $DNSSCRIPT_SERVER_NAME"".""" GetOwnGlueRecords "$CommunityDomain" "$HoodDomain" "$MasterFile" echo ";" } > "$HoodZoneFile" @@ -232,25 +215,25 @@ for Hood in $Hoods; do else HoodExternDomain="" fi - ExternFile="$ZoneFilesFolder""db.""$ExternalView"".""$HoodDomain" - ./update-extzone.sh "$HoodZoneFile" "$ExternFile" "$HoodDomain" "$ExternalView" "$HoodExternDomain" "$InternalViews" - for IView in $InternalViews; do - InternViewMasterZone="$ZoneFilesFolder""db.""$IView"".""$HoodDomain" - [ -f "$InternViewMasterZone" ] || ln -s "$HoodZoneFile" "$InternViewMasterZone" - InsertZoneToIncludeFile "$HoodDomain" "$InternViewMasterZone" "$TempFolder""$IView"".conf" "$DNSSECPolicy" - done - InsertZoneToIncludeFile "$HoodDomain" "$ExternFile" "$TempFolder""$ExternalView"".conf" "$DNSSECPolicy" + if [ -n "$ExternalView" ]; then + ExternFile="$ZoneFilesFolder""db.""$ExternalView"".""$HoodDomain" + elif [ -n "$HoodExternDomain" ]; then + ExternFile="$ZoneFilesFolder""db.""$HoodExternDomain" + else + ExternFile="" + fi + + if [ -n "$ExternFile" ]; then + ./update-extzone.sh "$HoodZoneFile" "$ExternFile" "$HoodDomain" "$ExternalView" "$HoodExternDomain" "$InternalViews" + fi + + InsertZoneToViews "$InternalViews" "$ZoneFilesFolder" "$HoodDomain" "$HoodZoneFile" "$TempFolder" "$DNSSECPolicy" + InsertZoneToViews "$ExternalView" "$ZoneFilesFolder" "$HoodDomain" "$ExternFile" "$TempFolder" "$DNSSECPolicy" if [ -n "$HoodExternDomain" ]; then - for IView in $InternalViews; do - InternViewExternZone="$ZoneFilesFolder""db.""$IView"".""${Hood%%\#*}"".""$CommunityExternDomain" - [ -f "$InternViewExternZone" ] || ln -s "$ExternFile" "$InternViewExternZone" - InsertZoneToIncludeFile "${Hood%%\#*}"".""$CommunityExternDomain" "$InternViewExternZone" "$TempFolder""$IView"".conf" "$DNSSECPolicy" - done - ExternViewExternZone="$ZoneFilesFolder""db.""$ExternalView"".""${Hood%%\#*}"".""$CommunityExternDomain" - [ -f "$ExternViewExternZone" ] || ln -s "$ExternFile" "$ExternViewExternZone" - InsertZoneToIncludeFile "${Hood%%\#*}"".""$CommunityExternDomain" "$ExternViewExternZone" "$TempFolder""$ExternalView"".conf" "$DNSSECPolicy" + InsertZoneToViews "$InternalViews" "$ZoneFilesFolder" "${Hood%%\#*}"".""$CommunityExternDomain" "$ExternFile" "$TempFolder" "$DNSSECPolicy" + InsertZoneToViews "$ExternalView" "$ZoneFilesFolder" "${Hood%%\#*}"".""$CommunityExternDomain" "$ExternFile" "$TempFolder" "$DNSSECPolicy" fi done @@ -270,7 +253,9 @@ UpdateBindConfig "$BindIcvpnAclTmp" "$BindIcvpnAcl" for IView in $InternalViews; do UpdateBindConfig "$TempFolder""$IView"".conf" "$BindIncludeFileFolder""$IView"".conf" done +if [ -n "$ExternalView" ]; then UpdateBindConfig "$TempFolder""$ExternalView"".conf" "$BindIncludeFileFolder""$ExternalView"".conf" +fi if [ $ReConfigBind -ne 0 ] || [ -f "/tmp/dnsscript-forcereconf" ]; then if [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 0 ]; then From 59eb00bc49f86b61b24263c1b96e4c4f77ee4630 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Sun, 27 Jun 2021 22:55:27 +0200 Subject: [PATCH 36/56] Bug-Fix: Fix Sed recognition of 10.* IP-Range Signed-off-by: Blackyfff --- update-dns.sh | 2 +- update-extzone.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/update-dns.sh b/update-dns.sh index 40a33c3..3379dd2 100644 --- a/update-dns.sh +++ b/update-dns.sh @@ -128,7 +128,7 @@ if [ -n "$ServeMasterZone" ] || [ -n "$ServeExtZone" ]; then if [ -n "$ExternalView" ] || [ -n "$ServeExtZone" ]; then SerialExtern="$(GetZoneFileSerial "$ExternFile")" if [ $((LocalMasterSerial)) -gt $((SerialExtern)) ]; then - sed -e '/^[^;]*\s\(10.\|[fF][cdCD][0-9a-fA-F]\{2\}:\)\S*\s*\(;.*\)\?$/d; \ + sed -e '/^[^;]*\s\(10\.\|[fF][cdCD][0-9a-fA-F]\{2\}:\)\S*\s*\(;.*\)\?$/d; \ s/^[^;^@]*\s\+\([^;]*\)\s[Ii][Nn]\s\+[Ss][Oo][Aa]\s/@ \1 IN SOA /g' "$FileForExternGeneration" \ > "$ExternFile" UpdateExternView=1 diff --git a/update-extzone.sh b/update-extzone.sh index 24244a6..2acd077 100755 --- a/update-extzone.sh +++ b/update-extzone.sh @@ -13,7 +13,7 @@ SerialIntern="$(GetZoneFileSerial "$InternalZoneFile")" SerialExtern="$(GetZoneFileSerial "$ExternalZoneFile")" if [ $((SerialIntern)) -gt $((SerialExtern)) ]; then - ZoneContent="$(sed -e '/^[^;]*\s\(10.\|[fF][cdCD][0-9a-fA-F]\{2\}:\)\S*\s*\(;.*\)\?$/d; \ + ZoneContent="$(sed -e '/^[^;]*\s\(10\.\|[fF][cdCD][0-9a-fA-F]\{2\}:\)\S*\s*\(;.*\)\?$/d; \ s/^[^;^@]*\s\+\([^;]*\)\s[Ii][Nn]\s\+[Ss][Oo][Aa]\s/@ \1 IN SOA /g' "$InternalZoneFile")" [ -n "$( echo "$ZoneContent" | sed -e '/^[eE][xX][tT][eE][rR][nN]\s[^;]*\s[Ii][Nn]\s\+[Nn][Ss]/!d')" ] \ From 9d02689d626b436d343d9c279d3f34529a3cf61f Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Sun, 27 Jun 2021 23:17:53 +0200 Subject: [PATCH 37/56] Buf-Fix: Force the zonefile to have after download a linebreak at the end, to ensure proper processing Signed-off-by: Blackyfff --- update-dns.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-dns.sh b/update-dns.sh index 3379dd2..6b71140 100644 --- a/update-dns.sh +++ b/update-dns.sh @@ -58,7 +58,7 @@ rm -f "$TempFolder""$ExternalView"".conf" CachedMasterFile="$TempFolder""cache/db.""$CommunityDomain" PreFetchMasterSerial="$(GetZoneFileSerial "$CachedMasterFile")" -$(curl -s -S -f "$RemoteLocation""db.""$CommunityDomain" --output "$CachedMasterFile") +$(curl -s -S -f "$RemoteLocation""db.""$CommunityDomain" --output "$CachedMasterFile" && [ -f $CachedMasterFile" ] && echo "" >> $CachedMasterFile") PostFetchMasterSerial="$(GetZoneFileSerial "$CachedMasterFile")" ServeMasterZone="$( GetAllZoneNameservers "$CommunityDomain" "$CachedMasterFile" | awk '{for(i=NF;i>0;--i) if($i=="'"$DNSSCRIPT_SERVER_NAME"'") {printf 1}}')" if [ -n "$CommunityExternDomain" ]; then From dcc5bd2530045fe3f3da27fb587bf16fea0ab445 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 28 Jun 2021 00:47:14 +0200 Subject: [PATCH 38/56] Update Readme Signed-off-by: Blackyfff --- README.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 634a062..33d8541 100644 --- a/README.md +++ b/README.md @@ -17,10 +17,7 @@ curl named-checkzone (z.B. bei bind oder bind-tools enthalten) -``` -echo "dump" | nc ::1 33123 -``` -muss die babel routen ausgeben, ansonsten muss update-public-acl.sh angepasst werden +für DNSSEC: delv #### dns-scripts klonen @@ -42,7 +39,7 @@ Schließlich muss noch ein Cron angelegt werden, der regelmäßig das Skript auf #### DNS-Server konfigurieren Dann muss nur noch der DNS Server, z.B. `bind`, eingerichtet werden. -Für bind werden durch die Scripte die include-Dateien angelegt (fff.community-[in|ex]ternal.conf|icvpn-acl.conf): +Für bind werden durch die Scripte für jeden view include-Dateien angelegt (z.B. icvpn-internal-view.conf) und zusätzlich eine icvpn-acl.conf: Konfiguration: From d239c93c26bfaf796c3952695705f44798581f97 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 28 Jun 2021 00:47:45 +0200 Subject: [PATCH 39/56] If no DNSSECPolicy is set, ignore DNSSECKeyFolder Signed-off-by: Blackyfff --- update-dns.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/update-dns.sh b/update-dns.sh index 6b71140..be4b3e2 100644 --- a/update-dns.sh +++ b/update-dns.sh @@ -48,6 +48,7 @@ FirstInternal="$( echo "$InternalViews" | sed -ne 's/^\(\S\+\)\s.*$/\1/p')" BindIcvpnAclTmp="$TempFolder""icvpn-acl.conf" BindIcvpnAcl="$BindIncludeFileFolder""icvpn-acl.conf" [ -z "$CommunityExternPrefix" ] || CommunityExternDomain="$CommunityExternPrefix"".""$CommunityDomain" +[ -n "$DNSSECPolicy" ] || DNSSECKeyFolder="" mkdir -p "$TempFolder""cache" From 90a6a208fa41fc1bad258309a84291e655287012 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 28 Jun 2021 00:51:49 +0200 Subject: [PATCH 40/56] fix: CP-Error Signed-off-by: Blackyfff --- update-dns.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-dns.sh b/update-dns.sh index be4b3e2..c686097 100644 --- a/update-dns.sh +++ b/update-dns.sh @@ -59,7 +59,7 @@ rm -f "$TempFolder""$ExternalView"".conf" CachedMasterFile="$TempFolder""cache/db.""$CommunityDomain" PreFetchMasterSerial="$(GetZoneFileSerial "$CachedMasterFile")" -$(curl -s -S -f "$RemoteLocation""db.""$CommunityDomain" --output "$CachedMasterFile" && [ -f $CachedMasterFile" ] && echo "" >> $CachedMasterFile") +$(curl -s -S -f "$RemoteLocation""db.""$CommunityDomain" --output "$CachedMasterFile" && [ -f "$CachedMasterFile" ] && echo "" >> "$CachedMasterFile") PostFetchMasterSerial="$(GetZoneFileSerial "$CachedMasterFile")" ServeMasterZone="$( GetAllZoneNameservers "$CommunityDomain" "$CachedMasterFile" | awk '{for(i=NF;i>0;--i) if($i=="'"$DNSSCRIPT_SERVER_NAME"'") {printf 1}}')" if [ -n "$CommunityExternDomain" ]; then From 620bc782ba70411740d17515f6fda6a1e7dbb385 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Thu, 8 Jul 2021 00:39:48 +0200 Subject: [PATCH 41/56] License the files; in coordination with mayosemmel and fbl Signed-off-by: Blackyfff --- LICENSE.md | 690 +++++++++++++++++++++++++++++++++++++++++++ dns-functions.sh | 3 + update-dns.sh | 5 + update-extzone.sh | 3 + update-hoodzone.sh | 4 + update-public-acl.sh | 4 + update-rdnszone.sh | 4 + 7 files changed, 713 insertions(+) create mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..9212ece --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,690 @@ +Valid-License-Identifier: GPL-3.0-only +Valid-License-Identifier: GPL-3.0 +Valid-License-Identifier: GPL-3.0-or-later +Valid-License-Identifier: GPL-3.0+ +SPDX-URL: https://spdx.org/licenses/GPL-3.0-only.html +SPDX-URL: https://spdx.org/licenses/GPL-3.0-or-later.html +Usage-Guide: + To use this license in source code, put one of the following SPDX + tag/value pairs into a comment according to the placement + guidelines in the licensing rules documentation. + For 'GNU General Public License (GPL) version 3 only' use: + SPDX-License-Identifier: GPL-3.0-only + For 'GNU General Public License (GPL) version 3 or any later version' use: + SPDX-License-Identifier: GPL-3.0-or-later +License-Text: + + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/dns-functions.sh b/dns-functions.sh index 209385e..9fdbd63 100644 --- a/dns-functions.sh +++ b/dns-functions.sh @@ -1,4 +1,7 @@ #!/bin/sh +# SPDX-License-Identifier: GPL-3.0 +# +# freifunk-franken dns-scipts (c) 2021 Blackyfff GetZoneFileSerial() { if [ -f "$1" ]; then diff --git a/update-dns.sh b/update-dns.sh index c686097..387732b 100644 --- a/update-dns.sh +++ b/update-dns.sh @@ -1,4 +1,9 @@ #!/bin/sh +# SPDX-License-Identifier: GPL-3.0 +# +# freifunk-franken dns-scipts (c) 2016 mayosemmel +# (c) 2020-2021 Fabian Bläse +# (c) 2021 Blackyfff # exit script when command fails set -e diff --git a/update-extzone.sh b/update-extzone.sh index 2acd077..75509a2 100755 --- a/update-extzone.sh +++ b/update-extzone.sh @@ -1,4 +1,7 @@ #!/bin/sh +# SPDX-License-Identifier: GPL-3.0 +# +# freifunk-franken dns-scipts (c) 2021 Blackyfff . ./dns-functions.sh diff --git a/update-hoodzone.sh b/update-hoodzone.sh index e285038..b75fbc2 100755 --- a/update-hoodzone.sh +++ b/update-hoodzone.sh @@ -1,4 +1,8 @@ #!/bin/sh +# SPDX-License-Identifier: GPL-3.0 +# +# freifunk-franken dns-scipts (c) 2021 Blackyfff + . ./dns-functions.sh diff --git a/update-public-acl.sh b/update-public-acl.sh index 3628bed..e1ca7fd 100755 --- a/update-public-acl.sh +++ b/update-public-acl.sh @@ -1,4 +1,8 @@ #!/bin/sh +# SPDX-License-Identifier: GPL-3.0 +# +# freifunk-franken dns-scipts (c) 2021 Blackyfff + . ./dns-functions.sh diff --git a/update-rdnszone.sh b/update-rdnszone.sh index 7831943..5e366cd 100755 --- a/update-rdnszone.sh +++ b/update-rdnszone.sh @@ -1,4 +1,8 @@ #!/bin/sh +# SPDX-License-Identifier: GPL-3.0 +# +# freifunk-franken dns-scipts (c) 2021 Blackyfff + . ./dns-functions.sh From 09127c2bfd536d270c661752c06adc8809fe868d Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Thu, 8 Jul 2021 08:15:02 +0200 Subject: [PATCH 42/56] Remove DS for extern zone (bind handles that) Signed-off-by: Blackyfff --- update-dns.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-dns.sh b/update-dns.sh index 387732b..9c856fd 100644 --- a/update-dns.sh +++ b/update-dns.sh @@ -150,7 +150,7 @@ if [ -n "$ServeMasterZone" ] || [ -n "$ServeExtZone" ]; then [ -n "$(sed -e '/^\s*\(@\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\)\s/!d' "$CachedMasterFile""E")" ] || \ sed -i -e 's/^\s*\(@\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Ss][Oo][Aa]\)\s\+\S\+\s\+\S\+\s/\1 '"$DNSSCRIPT_SERVER_NAME"'. '"$DNSSCRIPT_CONTACT_EMAIL"' /g' "$CachedMasterFile""E" - sed -i -e 's/^\s*'"$CommunityExternPrefix"'\s/@ /g' "$CachedMasterFile""E" + sed -i -e 's/^\s*'"$CommunityExternPrefix"'\s/@ /g;/^\s*@\s\+[Ii][Nn]\s\+[Dd][Ss]\s/d' "$CachedMasterFile""E" UpdateExternDomain="$(UpdateDNSSECEntryCache "$CommunityExternDomain" "$ZoneTempFolder" "$CachedMasterFile""E" "$DNSSECKeyFolder")" if [ $UpdateExternView -ne 0 ] || [ $UpdateExternDomain -ne 0 ]; then From 7093b0bde7391df34df71349d93e180089330a9e Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Thu, 8 Jul 2021 21:08:18 +0200 Subject: [PATCH 43/56] change file extension license --- LICENSE.md => LICENSE.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename LICENSE.md => LICENSE.txt (100%) diff --git a/LICENSE.md b/LICENSE.txt similarity index 100% rename from LICENSE.md rename to LICENSE.txt From a45960e9b7f39f4f01361e300cff707862df19f0 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Thu, 8 Jul 2021 21:35:16 +0200 Subject: [PATCH 44/56] Update Readme Signed-off-by: Blackyfff --- README.md | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 33d8541..61da13a 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,11 @@ DNSSEC wird für jede Zone unterstützt, allerdings nur für die Hauptzone mit m curl +bind9 + named-checkzone (z.B. bei bind oder bind-tools enthalten) -für DNSSEC: delv +für DNSSEC: delv; bind9 >= 9.16.18 #### dns-scripts klonen @@ -60,7 +62,7 @@ options { [..] # eigene Optionen check-names master warn; # Wichtig, da sonst Hostnamen mit _ (z.B.: HUAWEI_P30_lite ) bind nicht laden lassen -} +}; [..] @@ -88,5 +90,26 @@ view "external-view" { }; +[..] +``` + +Beispielkonfiguration mit DNSSEC: + +``` +[..] + +options { + [..] # eigene Optionen +}; + +dnssec-policy { # Name muss in der config gesetzt werden + keys { + ksk key-directory lifetime unlimited algorithm ECDSAP384SHA384; # Alle Server einer Domain müssen den gleichen Algorithmus für ksk wählen + zsk key-directory lifetime P30D algorithm ECDSAP384SHA384; # Alle Server einer Domain müssen den gleichen Algorithmus für zsk wählen + }; + max-zone-ttl 3600; + nsec3param; +}; + [..] ``` From a1476d914a46d6b392e5dd6d381219be4170256e Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Thu, 8 Jul 2021 21:37:48 +0200 Subject: [PATCH 45/56] change folder structure Signed-off-by: Blackyfff --- dns-functions.sh => usr/lib/ffdns/dns-functions.sh | 0 update-dns.sh => usr/lib/ffdns/update-dns.sh | 0 update-extzone.sh => usr/lib/ffdns/update-extzone.sh | 0 update-hoodzone.sh => usr/lib/ffdns/update-hoodzone.sh | 0 update-public-acl.sh => usr/lib/ffdns/update-public-acl.sh | 0 update-rdnszone.sh => usr/lib/ffdns/update-rdnszone.sh | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename dns-functions.sh => usr/lib/ffdns/dns-functions.sh (100%) rename update-dns.sh => usr/lib/ffdns/update-dns.sh (100%) rename update-extzone.sh => usr/lib/ffdns/update-extzone.sh (100%) rename update-hoodzone.sh => usr/lib/ffdns/update-hoodzone.sh (100%) rename update-public-acl.sh => usr/lib/ffdns/update-public-acl.sh (100%) rename update-rdnszone.sh => usr/lib/ffdns/update-rdnszone.sh (100%) diff --git a/dns-functions.sh b/usr/lib/ffdns/dns-functions.sh similarity index 100% rename from dns-functions.sh rename to usr/lib/ffdns/dns-functions.sh diff --git a/update-dns.sh b/usr/lib/ffdns/update-dns.sh similarity index 100% rename from update-dns.sh rename to usr/lib/ffdns/update-dns.sh diff --git a/update-extzone.sh b/usr/lib/ffdns/update-extzone.sh similarity index 100% rename from update-extzone.sh rename to usr/lib/ffdns/update-extzone.sh diff --git a/update-hoodzone.sh b/usr/lib/ffdns/update-hoodzone.sh similarity index 100% rename from update-hoodzone.sh rename to usr/lib/ffdns/update-hoodzone.sh diff --git a/update-public-acl.sh b/usr/lib/ffdns/update-public-acl.sh similarity index 100% rename from update-public-acl.sh rename to usr/lib/ffdns/update-public-acl.sh diff --git a/update-rdnszone.sh b/usr/lib/ffdns/update-rdnszone.sh similarity index 100% rename from update-rdnszone.sh rename to usr/lib/ffdns/update-rdnszone.sh From 89c9416d922c5ee1ecd767517c35b42d3046059a Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Sat, 10 Jul 2021 01:13:29 +0200 Subject: [PATCH 46/56] Move configuration to community and local config files Signed-off-by: Blackyfff --- etc/ffdns/community.conf | 13 +++++++++++ etc/ffdns/local.conf | 38 +++++++++++++++++++++++++++++++ usr/lib/ffdns/update-dns.sh | 45 +++++++------------------------------ 3 files changed, 59 insertions(+), 37 deletions(-) create mode 100644 etc/ffdns/community.conf create mode 100644 etc/ffdns/local.conf diff --git a/etc/ffdns/community.conf b/etc/ffdns/community.conf new file mode 100644 index 0000000..b15cf98 --- /dev/null +++ b/etc/ffdns/community.conf @@ -0,0 +1,13 @@ +### The community domain; must be set even if it is not served by this server +CommunityDomain="fff.community" + +### Subdomain for CommunityDomain only serving non RFC 1918/4193 addresses, otherwise leave empty +CommunityExternPrefix="extern" + +CommunitySubnets="10.50.0/16 10.83.0/16 fd43:5602:29bd::/48" + +### master file in remote needs to be named: db.$CommunityDomain +RemoteLocation="https://git.freifunk-franken.de/freifunk-franken/dns/raw/branch/master/" + +### TTL Refresh Retry Expire Minimum +TTLReReExMi="3600 2000 6400 2419200 86400" \ No newline at end of file diff --git a/etc/ffdns/local.conf b/etc/ffdns/local.conf new file mode 100644 index 0000000..78e13c2 --- /dev/null +++ b/etc/ffdns/local.conf @@ -0,0 +1,38 @@ +### DNSSCRIPT_CONTACT_EMAIL the responsible person can be contacted there; needs zone-file format +#DNSSCRIPT_CONTACT_EMAIL="info.freifunk-herpf.de." +DNSSCRIPT_CONTACT_EMAIL="" + +### DNSSCRIPT_SERVER_NAME must be this server given in community zone files NS entry and/or subdomain entries +### Full Hostname, w/o trailing dot +#DNSSCRIPT_SERVER_NAME="dns.herpf.fff.community" +DNSSCRIPT_SERVER_NAME="" + +ZoneFilesFolder="/etc/bind/fff/" +BindIncludeFileFolder="/etc/bind/" +TempFolder="/tmp/ffdns/" + +### specify the bird/babel or other routing table[s] +### if RoutingTables is empty, the ICVPN-ACL-List will be fetched remotely (for servers that are no gateway) +RoutingTables="10" + +### -1 -> disable bind [restart|reload] +### 0 -> Debian (and like) systemctl [reload|restart] bind9 +### 1 -> use rndc to [reload zone|reconfig] (recommended; rndc needs setup first) +### 2 -> OpenWRT /etc/init.d/named [reload|restart] +DNSSCRIPT_BIND_RELOAD_VER=0 + +# the views specified in named.conf + +### must have at least one entry +InternalViews="icvpn-internal-view icvpn-internal-dns64-view" + +### can be empty +ExternalView="external-view" + +#DNSSEC + +### DNSSECPolicy and Folder specified in named.conf; if no DNSSEC is used leave empty +#DNSSECPolicy="herpf" +DNSSECPolicy="" +#DNSSECKeyFolder="/etc/bind/keys/" +DNSSECKeyFolder="" diff --git a/usr/lib/ffdns/update-dns.sh b/usr/lib/ffdns/update-dns.sh index 9c856fd..056db4f 100644 --- a/usr/lib/ffdns/update-dns.sh +++ b/usr/lib/ffdns/update-dns.sh @@ -8,48 +8,19 @@ # exit script when command fails set -e -# Communityconfig -CommunityDomain="fff.community" -CommunityExternPrefix="extern" -CommunitySubnets="10.50.0/16 10.83.0/16 fd43:5602:29bd::/48" -RemoteLocation="https://git.freifunk-franken.de/freifunk-franken/dns/raw/branch/master/" -DNSSECPolicy="herpf" +. /etc/ffdns/community.conf +. /etc/ffdns/local.conf -# Serverconfig -export DNSSCRIPT_CONTACT_EMAIL=info.freifunk-herpf.de. -# DNSSCRIPT_SERVER_NAME must be the server given in community zone files NS entry (Full Hostname, w/o trailing dot) -export DNSSCRIPT_SERVER_NAME=dns.herpf.fff.community -UpdateScriptsFolder="/usr/lib/ffdns/" -ZoneFilesFolder="/etc/bind/fff/" -BindIncludeFileFolder="/etc/bind/" -DNSSECKeyFolder="/etc/bind/keys/" -TempFolder="/tmp/dnsscripts/" -# specify the bird/babel or other routing table[s] -# if RoutingTables is empty, the ICVPN-ACL-List will be fetched remotely (for servers that are no gateway) -RoutingTables="10" - -# -1 -> disable bind [restart|reload] -# 0 -> Debian (and like) systemctl [reload|restart] bind9 -# 1 -> use rndc to [reload zone|reconfig] (recommended; rndc needs setup first) -# 2 -> OpenWRT /etc/init.d/named [reload|restart] -export DNSSCRIPT_BIND_RELOAD_VER=0 - -InternalViews="icvpn-internal-view icvpn-internal-dns64-view" -ExternalView="external-view" - -# TTL Refresh Retry Expire Minimum -TTLReReExMi="3600 2000 6400 2419200 86400" - -# ForwardZones: "/" ; optionaly multiple " ""/" no spaces in full filename -ForwardZones="$CommunityDomain""/""$ZoneFilesFolder""db.icvpn-internal-view.""$CommunityDomain" - - -############################################################# -cd "$UpdateScriptsFolder" +export DNSSCRIPT_CONTACT_EMAIL +export DNSSCRIPT_SERVER_NAME +export DNSSCRIPT_BIND_RELOAD_VER +cd /usr/lib/ffdns/ . ./dns-functions.sh FirstInternal="$( echo "$InternalViews" | sed -ne 's/^\(\S\+\)\s.*$/\1/p')" +# ForwardZones: "/" ; optionaly multiple " ""/" no spaces in full filename +ForwardZones="$CommunityDomain""/""$ZoneFilesFolder""db.""$FirstInternal"".""$CommunityDomain" BindIcvpnAclTmp="$TempFolder""icvpn-acl.conf" BindIcvpnAcl="$BindIncludeFileFolder""icvpn-acl.conf" [ -z "$CommunityExternPrefix" ] || CommunityExternDomain="$CommunityExternPrefix"".""$CommunityDomain" From 330fa156c7d6dacec282a4eb4e39933ef64164f8 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Sat, 10 Jul 2021 01:20:50 +0200 Subject: [PATCH 47/56] Re-add Support for subsequent subdomain Signed-off-by: Blackyfff --- etc/ffdns/local.conf | 7 ++++ usr/lib/ffdns/update-dns.sh | 66 ++++++++++++++++++++----------------- 2 files changed, 43 insertions(+), 30 deletions(-) diff --git a/etc/ffdns/local.conf b/etc/ffdns/local.conf index 78e13c2..4b9e44d 100644 --- a/etc/ffdns/local.conf +++ b/etc/ffdns/local.conf @@ -7,6 +7,13 @@ DNSSCRIPT_CONTACT_EMAIL="" #DNSSCRIPT_SERVER_NAME="dns.herpf.fff.community" DNSSCRIPT_SERVER_NAME="" +### If you are a root for $CommunityDomain or a first level Hood: do not specify +### If serving a subsequent subdomain, specify Remote and all Subdomains excluding the own +### For example if you are serving ... then specify . +### master file in remote needs to be named: db... +#RemoteLocation="https://gw01.herpf.fff.community/ffdns/" +#SubCommunityDomain="herpf" + ZoneFilesFolder="/etc/bind/fff/" BindIncludeFileFolder="/etc/bind/" TempFolder="/tmp/ffdns/" diff --git a/usr/lib/ffdns/update-dns.sh b/usr/lib/ffdns/update-dns.sh index 056db4f..d2589ff 100644 --- a/usr/lib/ffdns/update-dns.sh +++ b/usr/lib/ffdns/update-dns.sh @@ -18,12 +18,18 @@ export DNSSCRIPT_BIND_RELOAD_VER cd /usr/lib/ffdns/ . ./dns-functions.sh +MasterDomain="$CommunityDomain" +[ -z "$SubCommunityDomain" ] || MasterDomain="$SubCommunityDomain"".""$MasterDomain" +if [ -n "$CommunityExternPrefix" ];then + MasterExternDomain="$CommunityExternPrefix"".""$CommunityDomain" + [ -z "$SubCommunityDomain" ] || MasterExternDomain="$SubCommunityDomain"".""$MasterExternDomain" +fi + FirstInternal="$( echo "$InternalViews" | sed -ne 's/^\(\S\+\)\s.*$/\1/p')" # ForwardZones: "/" ; optionaly multiple " ""/" no spaces in full filename -ForwardZones="$CommunityDomain""/""$ZoneFilesFolder""db.""$FirstInternal"".""$CommunityDomain" +ForwardZones="$MasterDomain""/""$ZoneFilesFolder""db.""$FirstInternal"".""$MasterDomain" BindIcvpnAclTmp="$TempFolder""icvpn-acl.conf" BindIcvpnAcl="$BindIncludeFileFolder""icvpn-acl.conf" -[ -z "$CommunityExternPrefix" ] || CommunityExternDomain="$CommunityExternPrefix"".""$CommunityDomain" [ -n "$DNSSECPolicy" ] || DNSSECKeyFolder="" mkdir -p "$TempFolder""cache" @@ -33,12 +39,12 @@ for IView in $InternalViews; do done rm -f "$TempFolder""$ExternalView"".conf" -CachedMasterFile="$TempFolder""cache/db.""$CommunityDomain" +CachedMasterFile="$TempFolder""cache/db.""$MasterDomain" PreFetchMasterSerial="$(GetZoneFileSerial "$CachedMasterFile")" -$(curl -s -S -f "$RemoteLocation""db.""$CommunityDomain" --output "$CachedMasterFile" && [ -f "$CachedMasterFile" ] && echo "" >> "$CachedMasterFile") +$(curl -s -S -f "$RemoteLocation""db.""$MasterDomain" --output "$CachedMasterFile" && [ -f "$CachedMasterFile" ] && echo "" >> "$CachedMasterFile") PostFetchMasterSerial="$(GetZoneFileSerial "$CachedMasterFile")" -ServeMasterZone="$( GetAllZoneNameservers "$CommunityDomain" "$CachedMasterFile" | awk '{for(i=NF;i>0;--i) if($i=="'"$DNSSCRIPT_SERVER_NAME"'") {printf 1}}')" -if [ -n "$CommunityExternDomain" ]; then +[ -n "$SubCommunityDomain" ] || ServeMasterZone="$( GetAllZoneNameservers "$MasterDomain" "$CachedMasterFile" | awk '{for(i=NF;i>0;--i) if($i=="'"$DNSSCRIPT_SERVER_NAME"'") {printf 1}}')" +if [ -n "$MasterExternDomain" ]; then if [ -n "$ServeMasterZone" ]; then ServeExtZone="1" else @@ -52,17 +58,17 @@ if [ -n "$ServeMasterZone" ] || [ -n "$ServeExtZone" ]; then sed -i -e '/^\s*_dnsseckeys\./d' "$CachedMasterFile" FileForExternGeneration="$CachedMasterFile" if [ -n "$ExternalView" ]; then - ExternFile="$ZoneFilesFolder""db.""$ExternalView"".""$CommunityDomain" + ExternFile="$ZoneFilesFolder""db.""$ExternalView"".""$MasterDomain" else - ExternFile="$ZoneFilesFolder""db.""$CommunityExternDomain" + ExternFile="$ZoneFilesFolder""db.""$MasterExternDomain" fi LocalMasterSerial=$((PostFetchMasterSerial)) if [ -n "$ServeMasterZone" ]; then - MasterFile="$ZoneFilesFolder""db.""$FirstInternal"".""$CommunityDomain" + MasterFile="$ZoneFilesFolder""db.""$FirstInternal"".""$MasterDomain" FileForExternGeneration="$MasterFile" - ZoneTempFolder="$TempFolder""cache/""$CommunityDomain""/" + ZoneTempFolder="$TempFolder""cache/""$MasterDomain""/" - UpdateMaster="$(UpdateDNSSECEntryCache "$CommunityDomain" "$ZoneTempFolder" "$CachedMasterFile" "$DNSSECKeyFolder")" + UpdateMaster="$(UpdateDNSSECEntryCache "$MasterDomain" "$ZoneTempFolder" "$CachedMasterFile" "$DNSSECKeyFolder")" if [ $((PostFetchMasterSerial)) -gt $((PreFetchMasterSerial)) ] || [ $UpdateMaster -ne 0 ]; then cp -f "$CachedMasterFile" "$CachedMasterFile""I" for KeyFile in "$ZoneTempFolder"*; do @@ -79,9 +85,9 @@ if [ -n "$ServeMasterZone" ] || [ -n "$ServeExtZone" ]; then LocalMasterSerial=$((PostFetchMasterSerial)) fi mv "$CachedMasterFile""I" "$MasterFile" - ReloadZone "$CommunityDomain" "$InternalViews" + ReloadZone "$MasterDomain" "$InternalViews" - InsertZoneToViews "$InternalViews" "$ZoneFilesFolder" "$CommunityDomain" "$MasterFile" "$TempFolder" "$DNSSECPolicy" + InsertZoneToViews "$InternalViews" "$ZoneFilesFolder" "$MasterDomain" "$MasterFile" "$TempFolder" "$DNSSECPolicy" fi for Subnet in $CommunitySubnets; do ReverseDomains="$(GetReverseDomains "$Subnet")" @@ -97,7 +103,7 @@ if [ -n "$ServeMasterZone" ] || [ -n "$ServeExtZone" ]; then done done if [ -n "$ExternalView" ]; then - InsertZoneToIncludeFile "$CommunityDomain" "$ExternFile" "$TempFolder""$ExternalView"".conf" "$DNSSECPolicy" + InsertZoneToIncludeFile "$MasterDomain" "$ExternFile" "$TempFolder""$ExternalView"".conf" "$DNSSECPolicy" fi fi @@ -109,13 +115,13 @@ if [ -n "$ServeMasterZone" ] || [ -n "$ServeExtZone" ]; then s/^[^;^@]*\s\+\([^;]*\)\s[Ii][Nn]\s\+[Ss][Oo][Aa]\s/@ \1 IN SOA /g' "$FileForExternGeneration" \ > "$ExternFile" UpdateExternView=1 - [ -z "$ExternalView" ] || ReloadZone "$CommunityExternDomain" "$ExternalView" + [ -z "$ExternalView" ] || ReloadZone "$MasterExternDomain" "$ExternalView" fi fi if [ -n "$ServeExtZone" ]; then - MasterExtDomainFile="$ZoneFilesFolder""db.""$FirstInternal"".""$CommunityExternDomain" - ZoneTempFolder="$TempFolder""cache/""$CommunityExternDomain""/" + MasterExtDomainFile="$ZoneFilesFolder""db.""$FirstInternal"".""$MasterExternDomain" + ZoneTempFolder="$TempFolder""cache/""$MasterExternDomain""/" cp -f "$ExternFile" "$CachedMasterFile""E" sed -i -e '/^\s*_dnsseckeys\./d' "$CachedMasterFile""E" [ -n "$(sed -e '/^\s*\(@\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\)\s/!d' "$CachedMasterFile""E")" ] || \ @@ -123,12 +129,12 @@ if [ -n "$ServeMasterZone" ] || [ -n "$ServeExtZone" ]; then sed -i -e 's/^\s*'"$CommunityExternPrefix"'\s/@ /g;/^\s*@\s\+[Ii][Nn]\s\+[Dd][Ss]\s/d' "$CachedMasterFile""E" - UpdateExternDomain="$(UpdateDNSSECEntryCache "$CommunityExternDomain" "$ZoneTempFolder" "$CachedMasterFile""E" "$DNSSECKeyFolder")" + UpdateExternDomain="$(UpdateDNSSECEntryCache "$MasterExternDomain" "$ZoneTempFolder" "$CachedMasterFile""E" "$DNSSECKeyFolder")" if [ $UpdateExternView -ne 0 ] || [ $UpdateExternDomain -ne 0 ]; then for KeyFile in "$ZoneTempFolder"*; do [ "$KeyFile" == "$ZoneTempFolder""*" ] || \ cat "$KeyFile" >> "$CachedMasterFile""E" - done + done LocalExtDomainMasterSerial="$(GetZoneFileSerial "$MasterExtDomainFile")" if [ $((LocalMasterSerial)) -le $((LocalExtDomainMasterSerial)) ]; then @@ -137,26 +143,26 @@ if [ -n "$ServeMasterZone" ] || [ -n "$ServeExtZone" ]; then sed -i -e 's/^\(\s*\S\+\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Ss][Oo][Aa]\s\+\S\+\s\+\S\+\s\+\)'"$LocalMasterSerial"'\(\s\+.*\)$/\1'"$LocalExtDomainMasterSerial"'\3/g' "$CachedMasterFile""E" fi mv "$CachedMasterFile""E" "$MasterExtDomainFile" - ReloadZone "$CommunityExternDomain" "$InternalViews" + ReloadZone "$MasterExternDomain" "$InternalViews" fi - InsertZoneToViews "$InternalViews" "$ZoneFilesFolder" "$CommunityExternDomain" "$MasterExtDomainFile" "$TempFolder" "$DNSSECPolicy" - InsertZoneToViews "$ExternalView" "$ZoneFilesFolder" "$CommunityExternDomain" "$MasterExtDomainFile" "$TempFolder" "$DNSSECPolicy" + InsertZoneToViews "$InternalViews" "$ZoneFilesFolder" "$MasterExternDomain" "$MasterExtDomainFile" "$TempFolder" "$DNSSECPolicy" + InsertZoneToViews "$ExternalView" "$ZoneFilesFolder" "$MasterExternDomain" "$MasterExtDomainFile" "$TempFolder" "$DNSSECPolicy" fi fi if [ -z "$MasterFile" ]; then - MasterFile="$ZoneFilesFolder""db.""$FirstInternal"".""$CommunityDomain" + MasterFile="$ZoneFilesFolder""db.""$FirstInternal"".""$MasterDomain" cp -f "$CachedMasterFile" "$MasterFile" fi # set shorter TTL for Hoods TTLReReExMi="420 360 180 1800 360" -Hoods="$(GetOwnHoods "$CommunityDomain" "$MasterFile")" +Hoods="$(GetOwnHoods "$MasterDomain" "$MasterFile")" for Hood in $Hoods; do - HoodDomain="${Hood%%\#*}"".""$CommunityDomain" + HoodDomain="${Hood%%\#*}"".""$MasterDomain" Subnets="$(echo "${Hood#*\#}" | sed -e 's/#/ /g')" HoodZoneFile="$ZoneFilesFolder""db.""$FirstInternal"".""$HoodDomain" if [ ! -f "$HoodZoneFile" ]; then @@ -170,7 +176,7 @@ for Hood in $Hoods; do echo " ""$(echo "$TTLReReExMi" | awk '{print $5}')"" ) ; Negative Cache TTL" echo ";" echo "@ IN NS $DNSSCRIPT_SERVER_NAME"".""" - GetOwnGlueRecords "$CommunityDomain" "$HoodDomain" "$MasterFile" + GetOwnGlueRecords "$MasterDomain" "$HoodDomain" "$MasterFile" echo ";" } > "$HoodZoneFile" fi @@ -187,8 +193,8 @@ for Hood in $Hoods; do done done done - if [ -n "$CommunityExternDomain" ]; then - HoodExternDomain="${Hood%%\#*}"".""$CommunityExternDomain" + if [ -n "$MasterExternDomain" ]; then + HoodExternDomain="${Hood%%\#*}"".""$MasterExternDomain" else HoodExternDomain="" fi @@ -209,8 +215,8 @@ for Hood in $Hoods; do InsertZoneToViews "$ExternalView" "$ZoneFilesFolder" "$HoodDomain" "$ExternFile" "$TempFolder" "$DNSSECPolicy" if [ -n "$HoodExternDomain" ]; then - InsertZoneToViews "$InternalViews" "$ZoneFilesFolder" "${Hood%%\#*}"".""$CommunityExternDomain" "$ExternFile" "$TempFolder" "$DNSSECPolicy" - InsertZoneToViews "$ExternalView" "$ZoneFilesFolder" "${Hood%%\#*}"".""$CommunityExternDomain" "$ExternFile" "$TempFolder" "$DNSSECPolicy" + InsertZoneToViews "$InternalViews" "$ZoneFilesFolder" "${Hood%%\#*}"".""$MasterExternDomain" "$ExternFile" "$TempFolder" "$DNSSECPolicy" + InsertZoneToViews "$ExternalView" "$ZoneFilesFolder" "${Hood%%\#*}"".""$MasterExternDomain" "$ExternFile" "$TempFolder" "$DNSSECPolicy" fi done From 44dfd87e58a45291eda28f248b612057c6d171fe Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Tue, 13 Jul 2021 20:30:15 +0200 Subject: [PATCH 48/56] Update Readme Signed-off-by: Blackyfff --- README.md | 50 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 61da13a..6568572 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,14 @@ -# fff-scripts +# dns-scripts Dieses Git enthält eine Sammlung an Scripten zur Aktualisierung der Zonen für fff.community. Dabei werden aus der Forward-Zone und optional eigener Subdomain (durch community-Zonefile gesteuert) auch passende Reverse-Zonen für unsere internen RFC 1918 und RFC 4193 Adressen erzeugen. -Weiterhin werden bei eigener Subdomain die momentan vergebenen Adressen von dnsmasq und odhcpd (alles unter /tmp/hosts/) inkludiert. +Es werden bei eigener Subdomain die momentan vergebenen Adressen von dnsmasq und odhcpd (alles unter /tmp/hosts/) inkludiert. Das ermöglicht eine Namensauflösung für Freifunk-Teilnehmer ohne manuelle Konfiguration. Damit kann jeder Freifunk-Teilnehmer ein gültiges TLS-Zertifikat bekommen, sofern DHCPv6 am Gateway aktiviert ist. +Unterstützt wird Split-DNS für Freifunk-interne und -externe Anfragen, dabei kann auch eine Subdomain angelegt werden unter welcher nur extern erreichbare IPs herausgegeben werden. + DNSSEC wird für jede Zone unterstützt, allerdings nur für die Hauptzone mit mehreren Servern. Für Subdomainserver darf mit DNSSEC nur jeweils ein Server authorativ sein. ## Installation @@ -23,14 +25,17 @@ für DNSSEC: delv; bind9 >= 9.16.18 #### dns-scripts klonen -Die Scripte müssen geklont werden, oder anderweitig in einem Ordner auf dem Server abgelegt werden. Dabei ist aktuell noch die Position wichtig, da das Skript derzeit absolute Pfade verwendet (oder den Pfad in update-dns.sh anpassen) +Die Scripte müssen geklont werden, oder anderweitig auf dem Server abgelegt werden. Die Ordner sind im Git vorgegeben. /usr/lib/ffdns für die Scripte und /etc/ffdns für die Konfigurationsdateien. ``` -git clone https://git.freifunk-franken.de/freifunk-franken/dns-scripts.git /usr/lib/ffdns +git clone https://git.freifunk-franken.de/freifunk-franken/dns-scripts.git ``` #### konfigurieren -In der Datei update-dns.sh die Konfigurationsparameter setzen. +Die Datei /etc/ffdns/community.conf wird für eine Community konfiguriert(vorzugsweise im Git), und sollte nicht lokal geändert werden. +Die Datei /etc/ffdns/local.conf muss serverspezifisch konfiguriert werden. + +Für die Konfiguration der Zonendatei siehe https://git.freifunk-franken/freifunk-franken/dns #### Cron anlegen Schließlich muss noch ein Cron angelegt werden, der regelmäßig das Skript aufruft: @@ -39,7 +44,7 @@ Schließlich muss noch ein Cron angelegt werden, der regelmäßig das Skript auf ``` #### DNS-Server konfigurieren -Dann muss nur noch der DNS Server, z.B. `bind`, eingerichtet werden. +Dann muss noch der DNS Server `bind` eingerichtet werden. Andere Distributionen sind auch möglich, aber DNSSEC und automatische Konfiguration der verschiedenen Zonen müssen dann selbst gelöst werden. Für bind werden durch die Scripte für jeden view include-Dateien angelegt (z.B. icvpn-internal-view.conf) und zusätzlich eine icvpn-acl.conf: @@ -113,3 +118,36 @@ dnssec-policy { # Name muss in der config gesetzt werden [..] ``` +## Konfiguration der Zonendatei +### Einträge generell +Alle Einträge sollten im relativen Schema vorliegen, also ohne die Rootdomain und ohne abschließenden Punkt. + +### Subdomains + +Subdomains der Rootzone können von Root-Servern selbst oder auch von jedem anderen Server gehostet werden. + +Subdomains sollten im folgenden Format angelegt werden +``` + IN NS [ ; Subnets:[ /| /]+]? + +``` +z.B.: +``` +herpf IN NS dns.herpf.fff.community. ; Subnets: 10.50.250.0/24 fd43:5602:29bd:62::/64 +``` + +Serverhostname muss mit der Konfiguration in local.conf übereinstimmen und muss absolut sein (mit abschließendem Punkt). + +Die Subnetzparameter sind für die Delegierung und Erstellung der Reversezonen notwendig. + +Sofern noch nicht vorhanden wird dann eine neue Zonendatei für diese Subdomain erstellt. Diese darf dann auch oberhalb der Zeile +``` +;### Leases ### +``` +wie die Rootzonendatei editiert werden. + +### Subsubdomains + +Auch unterhalb von bereits delegierten Subdomains können beliebig viele weitere Subdomains bedient werden. + +Dazu muss in local.conf angegeben werden wo die Zonendatei der nächst höheren Zone zu erreichen ist. \ No newline at end of file From 8f24ca4f9639effaa12a9962a52103868ceb6920 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Thu, 22 Jul 2021 23:48:43 +0200 Subject: [PATCH 49/56] fix: extern domain reload Signed-off-by: Blackyfff --- usr/lib/ffdns/update-dns.sh | 3 ++- usr/lib/ffdns/update-extzone.sh | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/usr/lib/ffdns/update-dns.sh b/usr/lib/ffdns/update-dns.sh index d2589ff..0f6d21b 100644 --- a/usr/lib/ffdns/update-dns.sh +++ b/usr/lib/ffdns/update-dns.sh @@ -115,7 +115,7 @@ if [ -n "$ServeMasterZone" ] || [ -n "$ServeExtZone" ]; then s/^[^;^@]*\s\+\([^;]*\)\s[Ii][Nn]\s\+[Ss][Oo][Aa]\s/@ \1 IN SOA /g' "$FileForExternGeneration" \ > "$ExternFile" UpdateExternView=1 - [ -z "$ExternalView" ] || ReloadZone "$MasterExternDomain" "$ExternalView" + [ -z "$ExternalView" ] || ReloadZone "$MasterDomain" "$ExternalView" fi fi @@ -144,6 +144,7 @@ if [ -n "$ServeMasterZone" ] || [ -n "$ServeExtZone" ]; then fi mv "$CachedMasterFile""E" "$MasterExtDomainFile" ReloadZone "$MasterExternDomain" "$InternalViews" + [ -z "$ExternalView" ] || ReloadZone "$MasterExternDomain" "$ExternalView" fi InsertZoneToViews "$InternalViews" "$ZoneFilesFolder" "$MasterExternDomain" "$MasterExtDomainFile" "$TempFolder" "$DNSSECPolicy" diff --git a/usr/lib/ffdns/update-extzone.sh b/usr/lib/ffdns/update-extzone.sh index 75509a2..b4933be 100755 --- a/usr/lib/ffdns/update-extzone.sh +++ b/usr/lib/ffdns/update-extzone.sh @@ -24,6 +24,9 @@ if [ $((SerialIntern)) -gt $((SerialExtern)) ]; then s/^[eE][xX][tT][eE][rR][nN]\s\([^;]*\s[Ii][Nn]\s\+[Nn][Ss]\s.*\)/@ \1/g; \ s/^\(@ [^;]* IN SOA\)\s\+\S\+\s\+\S\+\s/\1 '"$DNSSCRIPT_SERVER_NAME"'. '"$DNSSCRIPT_CONTACT_EMAIL"' /g')" echo "$ZoneContent" > "$ExternalZoneFile" - ReloadZone "$ExternalZone" "$ExternalView" - [ -z "$CommunityExternal" ] || ReloadZone "$CommunityExternal" "$InternalViews" + [ -z "$ExternalView" ] || ReloadZone "$ExternalZone" "$ExternalView" + if [ -n "$CommunityExternal" ]; then + ReloadZone "$CommunityExternal" "$InternalViews" + [ -z "$ExternalView" ] || ReloadZone "$CommunityExternal" "$ExternalView" + fi fi \ No newline at end of file From 8fb4e6b8a2ce46acad0eb051b216854446529671 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Fri, 23 Jul 2021 00:14:10 +0200 Subject: [PATCH 50/56] Refactoring; don't populate keys obsoloted more than 2 days; delete bind journal when out-of-sync (only with rndc); populate DS Entries for sub-sub-domains Signed-off-by: Blackyfff --- usr/lib/ffdns/dns-functions.sh | 75 ++++++++------ usr/lib/ffdns/update-dns.sh | 161 +++++++++++++++++-------------- usr/lib/ffdns/update-extzone.sh | 32 ------ usr/lib/ffdns/update-hoodzone.sh | 19 +++- 4 files changed, 149 insertions(+), 138 deletions(-) delete mode 100755 usr/lib/ffdns/update-extzone.sh mode change 100755 => 100644 usr/lib/ffdns/update-hoodzone.sh diff --git a/usr/lib/ffdns/dns-functions.sh b/usr/lib/ffdns/dns-functions.sh index 9fdbd63..f548d7c 100644 --- a/usr/lib/ffdns/dns-functions.sh +++ b/usr/lib/ffdns/dns-functions.sh @@ -199,8 +199,18 @@ GetOwnKeysForZone () { Domain="$2" if [ -n "$DNSSECKeyFolder" ];then for OwnKeyFile in "$DNSSECKeyFolder""K""$Domain"".+"*".key"; do - sed -ne '/^;/d;s/^'"$Domain"'\.\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Dd][Nn][Ss][Kk][Ee][Yy]\s\+\(.*\)$/_dnsseckeys\.'"$Domain"'\.\tIN TXT\t\"\2\"/p' "$OwnKeyFile" | \ - NormalizeZoneFileFormatting + Removed="$(sed -ne 's/^; Delete: \(\S\{12\}\).*/\1/p' "$OwnKeyFile")" + if [ -n "$Removed" ]; then + Removed="$(date -u -d "$Removed" '+%s')" + CurDate="$(date -u '+%s')" + if [ $((CurDate - Removed)) -le 172800 ]; then + Removed="" + fi + fi + if [ -z "$Removed" ]; then + sed -ne '/^;/d;s/^'"$Domain"'\.\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Dd][Nn][Ss][Kk][Ee][Yy]\s\+\(.*\)$/_dnsseckeys\.'"$Domain"'\.\tIN TXT\t\"\2\"/p' "$OwnKeyFile" | \ + NormalizeZoneFileFormatting + fi done fi } @@ -215,24 +225,26 @@ UpdateDNSSECEntryCache () { mkdir -p "$ZoneTempFolder" for KeyFile in "$ZoneTempFolder"*; do - [ "$KeyFile" == "$ZoneTempFolder""*" ] || \ - mv "$KeyFile" "$ZoneTempFolder""Old""${KeyFile##*""$ZoneTempFolder""}" - done - for Nameserver in $Nameservers; do - if [ "$Nameserver" == "$DNSSCRIPT_SERVER_NAME" ]; then - DNSKEYS="$( GetOwnKeysForZone "$DNSSECKeyFolder" "$Domain" )" - else - DNSKEYS="$(delv @"$Nameserver" _dnsseckeys."$Domain" TXT 2>/dev/null | \ - sed -ne '/^;/d;s/^.*\sIN\s\+TXT\s\+"\(.*\)"$/'"$Domain"'.\tIN DNSKEY\t\1/p' | \ - NormalizeZoneFileFormatting )" - fi - if [ -n "$DNSKEYS" ] && [ "$DNSKEYS" != "$(cat "$ZoneTempFolder""OldKeys.""$Nameserver" 2>/dev/null)" ]; then - echo "$DNSKEYS" > "$ZoneTempFolder""Keys.""$Nameserver" - UpdateMaster=1 - elif [ -f "$ZoneTempFolder""OldKeys.""$Nameserver" ]; then - mv "$ZoneTempFolder""OldKeys.""$Nameserver" "$ZoneTempFolder""Keys.""$Nameserver" - fi + [ "$KeyFile" = "$ZoneTempFolder""*" ] || \ + mv "$KeyFile" "$ZoneTempFolder""Old""${KeyFile##*$ZoneTempFolder}" done + if [ -n "$DNSSECKeyFolder" ]; then + for Nameserver in $Nameservers; do + if [ "$Nameserver" = "$DNSSCRIPT_SERVER_NAME" ]; then + DNSKEYS="$( GetOwnKeysForZone "$DNSSECKeyFolder" "$Domain" )" + else + DNSKEYS="$(delv @"$Nameserver" _dnsseckeys."$Domain" TXT 2>/dev/null | \ + sed -ne '/^;/d;s/^.*\sIN\s\+TXT\s\+"\(.*\)"$/'"$Domain"'.\tIN DNSKEY\t\1/p' | \ + NormalizeZoneFileFormatting )" + fi + if [ -n "$DNSKEYS" ] && [ "$DNSKEYS" != "$(cat "$ZoneTempFolder""OldKeys.""$Nameserver" 2>/dev/null)" ]; then + echo "$DNSKEYS" > "$ZoneTempFolder""Keys.""$Nameserver" + UpdateMaster=1 + elif [ -f "$ZoneTempFolder""OldKeys.""$Nameserver" ]; then + mv "$ZoneTempFolder""OldKeys.""$Nameserver" "$ZoneTempFolder""Keys.""$Nameserver" + fi + done + fi SEDDomain="$(SEDifyHostname "$Domain")" ChildServers="$( sed -ne '/^\s*\(@\|'"$SEDDomain"'\.\)\s/!s/^\s*\(\S\+\)\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\s\+\(\S\+\);\?.*$/\1#\3/p' "$CachedZoneFile" | \ @@ -258,20 +270,27 @@ UpdateDNSSECEntryCache () { done for KeyFile in "$ZoneTempFolder""Old"*; do - [ "$KeyFile" == "$ZoneTempFolder""Old*" ] || \ + [ "$KeyFile" = "$ZoneTempFolder""Old*" ] || \ rm -f "$KeyFile" done echo "$UpdateMaster" } ReloadZone() { - if [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 0 ]; then - systemctl reload bind9 >/dev/null - elif [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 1 ]; then - for Zone in $2; do - rndc reload "$1" IN "$Zone" >/dev/null || touch "/tmp/dnsscript-forcereconf" - done - elif [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 2 ]; then - /etc/init.d/named reload >/dev/null + if [ -n "$2" ]; then + if [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 0 ]; then + systemctl reload bind9 >/dev/null + elif [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 1 ]; then + for Zone in $2; do + rndc reload "$1" IN "$Zone" 2>"/tmp/dnsscript_rndcerr" >/dev/null || \ + touch "/tmp/dnsscript-forcereconf" + if [ -n "$3" ] && grep -q "failed: out of range" "/tmp/dnsscript_rndcerr"; then + rm -f "$3""db.""$Zone"".""$1".* + fi + rm -f "/tmp/dnsscript_rndcerr" + done + elif [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 2 ]; then + /etc/init.d/named reload >/dev/null + fi fi } diff --git a/usr/lib/ffdns/update-dns.sh b/usr/lib/ffdns/update-dns.sh index 0f6d21b..fd3c05b 100644 --- a/usr/lib/ffdns/update-dns.sh +++ b/usr/lib/ffdns/update-dns.sh @@ -41,7 +41,7 @@ rm -f "$TempFolder""$ExternalView"".conf" CachedMasterFile="$TempFolder""cache/db.""$MasterDomain" PreFetchMasterSerial="$(GetZoneFileSerial "$CachedMasterFile")" -$(curl -s -S -f "$RemoteLocation""db.""$MasterDomain" --output "$CachedMasterFile" && [ -f "$CachedMasterFile" ] && echo "" >> "$CachedMasterFile") +curl -s -S -f "$RemoteLocation""db.""$MasterDomain" --output "$CachedMasterFile" && [ -f "$CachedMasterFile" ] && echo "" >> "$CachedMasterFile" || : PostFetchMasterSerial="$(GetZoneFileSerial "$CachedMasterFile")" [ -n "$SubCommunityDomain" ] || ServeMasterZone="$( GetAllZoneNameservers "$MasterDomain" "$CachedMasterFile" | awk '{for(i=NF;i>0;--i) if($i=="'"$DNSSCRIPT_SERVER_NAME"'") {printf 1}}')" if [ -n "$MasterExternDomain" ]; then @@ -54,13 +54,61 @@ else ServeExtZone="" fi +UpdateExternal() { + CachedZoneFile="$TempFolder""cache/db.""$InternalDomain""E" + + UpdateExternView=0 + if [ -n "$ExternalView" ] || [ -n "$ExternDomain" ]; then + SerialExtern="$(GetZoneFileSerial "$ExternalZoneFile")" + if [ $((SerialIntern)) -gt $((SerialExtern)) ]; then + sed -e '/^[^;]*\s\(10\.\|[fF][cdCD][0-9a-fA-F]\{2\}:\)\S*\s*\(;.*\)\?$/d; \ + s/^[^;^@]*\s\+\([^;]*\)\s[Ii][Nn]\s\+[Ss][Oo][Aa]\s/@ \1 IN SOA /g' "$InternalZoneFile" \ + > "$ExternalZoneFile" + UpdateExternView=1 + ReloadZone "$InternalDomain" "$ExternalView" "$ZoneFilesFolder" + fi + fi + + if [ -n "$ExternDomain" ]; then + ExtDomainFile="$ZoneFilesFolder""db.""$FirstInternal"".""$ExternDomain" + ZoneTempFolder="$TempFolder""cache/""$ExternDomain""/" + cp -f "$ExternalZoneFile" "$CachedZoneFile" + [ -z "$DNSSECKeyFolder" ] || sed -i -e '/^\s*_dnsseckeys\./d' "$CachedZoneFile" + [ -n "$(sed -e '/^\s*\(@\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\)\s/!d' "$CachedZoneFile")" ] || \ + sed -i -e 's/^\s*\(@\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Ss][Oo][Aa]\)\s\+\S\+\s\+\S\+\s/\1 '"$DNSSCRIPT_SERVER_NAME"'. '"$DNSSCRIPT_CONTACT_EMAIL"' /g' "$CachedZoneFile" + + sed -i -e '/^\s*\S\+\.\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Dd][Ss]\s/d' "$CachedZoneFile" + + UpdateExternDomain="$(UpdateDNSSECEntryCache "$ExternDomain" "$ZoneTempFolder" "$CachedZoneFile" "$DNSSECKeyFolder")" + if [ $UpdateExternView -ne 0 ] || [ $UpdateExternDomain -ne 0 ]; then + for KeyFile in "$ZoneTempFolder"*; do + [ "$KeyFile" = "$ZoneTempFolder""*" ] || \ + cat "$KeyFile" >> "$CachedZoneFile" + done + LocalExtDomainMasterSerial="$(GetZoneFileSerial "$ExtDomainFile")" + + if [ $((SerialIntern)) -le $((LocalExtDomainMasterSerial)) ]; then + LocalExtDomainMasterSerial=$((LocalExtDomainMasterSerial+1)) + sed -i -e 's/^\(\s*\)'"$SerialIntern"'\(\s*;\s*[Ss]erial.*\)$/\1'"$LocalExtDomainMasterSerial"'\3/g' "$CachedZoneFile" + sed -i -e 's/^\(\s*\S\+\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Ss][Oo][Aa]\s\+\S\+\s\+\S\+\s\+\)'"$SerialIntern"'\(\s\+.*\)$/\1'"$LocalExtDomainMasterSerial"'\3/g' "$CachedZoneFile" + fi + mv "$CachedZoneFile" "$ExtDomainFile" + ReloadZone "$ExternDomain" "$InternalViews" "$ZoneFilesFolder" + ReloadZone "$ExternDomain" "$ExternalView" "$ZoneFilesFolder" + fi + + InsertZoneToViews "$InternalViews" "$ZoneFilesFolder" "$ExternDomain" "$ExtDomainFile" "$TempFolder" "$DNSSECPolicy" + InsertZoneToViews "$ExternalView" "$ZoneFilesFolder" "$ExternDomain" "$ExtDomainFile" "$TempFolder" "$DNSSECPolicy" + fi +} + if [ -n "$ServeMasterZone" ] || [ -n "$ServeExtZone" ]; then sed -i -e '/^\s*_dnsseckeys\./d' "$CachedMasterFile" FileForExternGeneration="$CachedMasterFile" if [ -n "$ExternalView" ]; then ExternFile="$ZoneFilesFolder""db.""$ExternalView"".""$MasterDomain" else - ExternFile="$ZoneFilesFolder""db.""$MasterExternDomain" + ExternFile="$ZoneFilesFolder""db.extern.""$MasterDomain" fi LocalMasterSerial=$((PostFetchMasterSerial)) if [ -n "$ServeMasterZone" ]; then @@ -72,7 +120,7 @@ if [ -n "$ServeMasterZone" ] || [ -n "$ServeExtZone" ]; then if [ $((PostFetchMasterSerial)) -gt $((PreFetchMasterSerial)) ] || [ $UpdateMaster -ne 0 ]; then cp -f "$CachedMasterFile" "$CachedMasterFile""I" for KeyFile in "$ZoneTempFolder"*; do - [ "$KeyFile" == "$ZoneTempFolder""*" ] || \ + [ "$KeyFile" = "$ZoneTempFolder""*" ] || \ cat "$KeyFile" >> "$CachedMasterFile""I" done LocalMasterSerial="$(GetZoneFileSerial "$MasterFile")" @@ -85,71 +133,21 @@ if [ -n "$ServeMasterZone" ] || [ -n "$ServeExtZone" ]; then LocalMasterSerial=$((PostFetchMasterSerial)) fi mv "$CachedMasterFile""I" "$MasterFile" - ReloadZone "$MasterDomain" "$InternalViews" + ReloadZone "$MasterDomain" "$InternalViews" "$ZoneFilesFolder" InsertZoneToViews "$InternalViews" "$ZoneFilesFolder" "$MasterDomain" "$MasterFile" "$TempFolder" "$DNSSECPolicy" fi - for Subnet in $CommunitySubnets; do - ReverseDomains="$(GetReverseDomains "$Subnet")" - for RDomain in $ReverseDomains; do - ReverseZoneFile="$(GetReverseZoneFileFromZone "${RDomain%*.}")" - ! curl -s -f "$RemoteLocation""static.""$ReverseZoneFile" \ - --output "$ZoneFilesFolder""static.""$ReverseZoneFile" && \ - rm -f "$ZoneFilesFolder""static.""$ReverseZoneFile" - ./update-rdnszone.sh "$RDomain" "$ForwardZones" "$ZoneFilesFolder""$ReverseZoneFile" "$TTLReReExMi" "$InternalViews" - for IView in $InternalViews; do - InsertZoneToIncludeFile "${RDomain%*.}" "$ZoneFilesFolder""$ReverseZoneFile" "$TempFolder""$IView"".conf" - done - done - done if [ -n "$ExternalView" ]; then InsertZoneToIncludeFile "$MasterDomain" "$ExternFile" "$TempFolder""$ExternalView"".conf" "$DNSSECPolicy" fi fi - UpdateExternView=0 - if [ -n "$ExternalView" ] || [ -n "$ServeExtZone" ]; then - SerialExtern="$(GetZoneFileSerial "$ExternFile")" - if [ $((LocalMasterSerial)) -gt $((SerialExtern)) ]; then - sed -e '/^[^;]*\s\(10\.\|[fF][cdCD][0-9a-fA-F]\{2\}:\)\S*\s*\(;.*\)\?$/d; \ - s/^[^;^@]*\s\+\([^;]*\)\s[Ii][Nn]\s\+[Ss][Oo][Aa]\s/@ \1 IN SOA /g' "$FileForExternGeneration" \ - > "$ExternFile" - UpdateExternView=1 - [ -z "$ExternalView" ] || ReloadZone "$MasterDomain" "$ExternalView" - fi - fi - - if [ -n "$ServeExtZone" ]; then - MasterExtDomainFile="$ZoneFilesFolder""db.""$FirstInternal"".""$MasterExternDomain" - ZoneTempFolder="$TempFolder""cache/""$MasterExternDomain""/" - cp -f "$ExternFile" "$CachedMasterFile""E" - sed -i -e '/^\s*_dnsseckeys\./d' "$CachedMasterFile""E" - [ -n "$(sed -e '/^\s*\(@\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\)\s/!d' "$CachedMasterFile""E")" ] || \ - sed -i -e 's/^\s*\(@\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Ss][Oo][Aa]\)\s\+\S\+\s\+\S\+\s/\1 '"$DNSSCRIPT_SERVER_NAME"'. '"$DNSSCRIPT_CONTACT_EMAIL"' /g' "$CachedMasterFile""E" - - sed -i -e 's/^\s*'"$CommunityExternPrefix"'\s/@ /g;/^\s*@\s\+[Ii][Nn]\s\+[Dd][Ss]\s/d' "$CachedMasterFile""E" - - UpdateExternDomain="$(UpdateDNSSECEntryCache "$MasterExternDomain" "$ZoneTempFolder" "$CachedMasterFile""E" "$DNSSECKeyFolder")" - if [ $UpdateExternView -ne 0 ] || [ $UpdateExternDomain -ne 0 ]; then - for KeyFile in "$ZoneTempFolder"*; do - [ "$KeyFile" == "$ZoneTempFolder""*" ] || \ - cat "$KeyFile" >> "$CachedMasterFile""E" - done - LocalExtDomainMasterSerial="$(GetZoneFileSerial "$MasterExtDomainFile")" - - if [ $((LocalMasterSerial)) -le $((LocalExtDomainMasterSerial)) ]; then - LocalExtDomainMasterSerial=$((LocalExtDomainMasterSerial+1)) - sed -i -e 's/^\(\s*\)'"$LocalMasterSerial"'\(\s*;\s*[Ss]erial.*\)$/\1'"$LocalExtDomainMasterSerial"'\3/g' "$CachedMasterFile""E" - sed -i -e 's/^\(\s*\S\+\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Ss][Oo][Aa]\s\+\S\+\s\+\S\+\s\+\)'"$LocalMasterSerial"'\(\s\+.*\)$/\1'"$LocalExtDomainMasterSerial"'\3/g' "$CachedMasterFile""E" - fi - mv "$CachedMasterFile""E" "$MasterExtDomainFile" - ReloadZone "$MasterExternDomain" "$InternalViews" - [ -z "$ExternalView" ] || ReloadZone "$MasterExternDomain" "$ExternalView" - fi - - InsertZoneToViews "$InternalViews" "$ZoneFilesFolder" "$MasterExternDomain" "$MasterExtDomainFile" "$TempFolder" "$DNSSECPolicy" - InsertZoneToViews "$ExternalView" "$ZoneFilesFolder" "$MasterExternDomain" "$MasterExtDomainFile" "$TempFolder" "$DNSSECPolicy" - fi + InternalZoneFile="$FileForExternGeneration" + ExternalZoneFile="$ExternFile" + InternalDomain="$MasterDomain" + ExternDomain="$MasterExternDomain" + SerialIntern="$LocalMasterSerial" + UpdateExternal fi if [ -z "$MasterFile" ]; then @@ -157,11 +155,25 @@ if [ -z "$MasterFile" ]; then cp -f "$CachedMasterFile" "$MasterFile" fi +for Subnet in $CommunitySubnets; do + ReverseDomains="$(GetReverseDomains "$Subnet")" + for RDomain in $ReverseDomains; do + ReverseZoneFile="$(GetReverseZoneFileFromZone "${RDomain%*.}")" + ! curl -s -f "$RemoteLocation""static.""$ReverseZoneFile" \ + --output "$ZoneFilesFolder""static.""$ReverseZoneFile" && \ + rm -f "$ZoneFilesFolder""static.""$ReverseZoneFile" + ./update-rdnszone.sh "$RDomain" "$ForwardZones" "$ZoneFilesFolder""$ReverseZoneFile" "$TTLReReExMi" "$InternalViews" + for IView in $InternalViews; do + InsertZoneToIncludeFile "${RDomain%*.}" "$ZoneFilesFolder""$ReverseZoneFile" "$TempFolder""$IView"".conf" + done + done +done + # set shorter TTL for Hoods TTLReReExMi="420 360 180 1800 360" Hoods="$(GetOwnHoods "$MasterDomain" "$MasterFile")" - +DNSSECKeyFolder="" for Hood in $Hoods; do HoodDomain="${Hood%%\#*}"".""$MasterDomain" Subnets="$(echo "${Hood#*\#}" | sed -e 's/#/ /g')" @@ -181,7 +193,10 @@ for Hood in $Hoods; do echo ";" } > "$HoodZoneFile" fi - ./update-hoodzone.sh "$HoodZoneFile" "$HoodDomain" "$Subnets" "$InternalViews" + ZoneTempFolder="$TempFolder""cache/""$HoodDomain""/" + ./update-hoodzone.sh "$HoodZoneFile" "$HoodDomain" "$Subnets" "$InternalViews" "$ZoneTempFolder" "$ZoneFilesFolder" + + InsertZoneToViews "$InternalViews" "$ZoneFilesFolder" "$HoodDomain" "$HoodZoneFile" "$TempFolder" "$DNSSECPolicy" HoodForwardZones="$ForwardZones $HoodDomain""/""$HoodZoneFile" for Subnet in $Subnets; do @@ -201,7 +216,7 @@ for Hood in $Hoods; do fi if [ -n "$ExternalView" ]; then - ExternFile="$ZoneFilesFolder""db.""$ExternalView"".""$HoodDomain" + ExternFile="$ZoneFilesFolder""db.""$ExternalView"".""$HoodDomain" elif [ -n "$HoodExternDomain" ]; then ExternFile="$ZoneFilesFolder""db.""$HoodExternDomain" else @@ -209,15 +224,15 @@ for Hood in $Hoods; do fi if [ -n "$ExternFile" ]; then - ./update-extzone.sh "$HoodZoneFile" "$ExternFile" "$HoodDomain" "$ExternalView" "$HoodExternDomain" "$InternalViews" - fi - - InsertZoneToViews "$InternalViews" "$ZoneFilesFolder" "$HoodDomain" "$HoodZoneFile" "$TempFolder" "$DNSSECPolicy" - InsertZoneToViews "$ExternalView" "$ZoneFilesFolder" "$HoodDomain" "$ExternFile" "$TempFolder" "$DNSSECPolicy" - - if [ -n "$HoodExternDomain" ]; then - InsertZoneToViews "$InternalViews" "$ZoneFilesFolder" "${Hood%%\#*}"".""$MasterExternDomain" "$ExternFile" "$TempFolder" "$DNSSECPolicy" - InsertZoneToViews "$ExternalView" "$ZoneFilesFolder" "${Hood%%\#*}"".""$MasterExternDomain" "$ExternFile" "$TempFolder" "$DNSSECPolicy" + if [ -n "$ExternalView" ]; then + InsertZoneToIncludeFile "$HoodDomain" "$ExternFile" "$TempFolder""$ExternalView"".conf" "$DNSSECPolicy" + fi + InternalZoneFile="$HoodZoneFile" + ExternalZoneFile="$ExternFile" + InternalDomain="$HoodDomain" + ExternDomain="$HoodExternDomain" + SerialIntern="$(GetZoneFileSerial "$InternalZoneFile")" + UpdateExternal fi done @@ -238,7 +253,7 @@ for IView in $InternalViews; do UpdateBindConfig "$TempFolder""$IView"".conf" "$BindIncludeFileFolder""$IView"".conf" done if [ -n "$ExternalView" ]; then -UpdateBindConfig "$TempFolder""$ExternalView"".conf" "$BindIncludeFileFolder""$ExternalView"".conf" + UpdateBindConfig "$TempFolder""$ExternalView"".conf" "$BindIncludeFileFolder""$ExternalView"".conf" fi if [ $ReConfigBind -ne 0 ] || [ -f "/tmp/dnsscript-forcereconf" ]; then diff --git a/usr/lib/ffdns/update-extzone.sh b/usr/lib/ffdns/update-extzone.sh deleted file mode 100755 index b4933be..0000000 --- a/usr/lib/ffdns/update-extzone.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-3.0 -# -# freifunk-franken dns-scipts (c) 2021 Blackyfff - -. ./dns-functions.sh - -InternalZoneFile="$1" -ExternalZoneFile="$2" -ExternalZone="$3" -ExternalView="$4" -CommunityExternal="$5" -InternalViews="$6" - -SerialIntern="$(GetZoneFileSerial "$InternalZoneFile")" -SerialExtern="$(GetZoneFileSerial "$ExternalZoneFile")" - -if [ $((SerialIntern)) -gt $((SerialExtern)) ]; then - ZoneContent="$(sed -e '/^[^;]*\s\(10\.\|[fF][cdCD][0-9a-fA-F]\{2\}:\)\S*\s*\(;.*\)\?$/d; \ - s/^[^;^@]*\s\+\([^;]*\)\s[Ii][Nn]\s\+[Ss][Oo][Aa]\s/@ \1 IN SOA /g' "$InternalZoneFile")" - - [ -n "$( echo "$ZoneContent" | sed -e '/^[eE][xX][tT][eE][rR][nN]\s[^;]*\s[Ii][Nn]\s\+[Nn][Ss]/!d')" ] \ - && ZoneContent="$(echo "$ZoneContent" | sed -e '/^@\s[^;]*\s[Ii][Nn]\s\+[Nn][Ss]\s/d; \ - s/^[eE][xX][tT][eE][rR][nN]\s\([^;]*\s[Ii][Nn]\s\+[Nn][Ss]\s.*\)/@ \1/g; \ - s/^\(@ [^;]* IN SOA\)\s\+\S\+\s\+\S\+\s/\1 '"$DNSSCRIPT_SERVER_NAME"'. '"$DNSSCRIPT_CONTACT_EMAIL"' /g')" - echo "$ZoneContent" > "$ExternalZoneFile" - [ -z "$ExternalView" ] || ReloadZone "$ExternalZone" "$ExternalView" - if [ -n "$CommunityExternal" ]; then - ReloadZone "$CommunityExternal" "$InternalViews" - [ -z "$ExternalView" ] || ReloadZone "$CommunityExternal" "$ExternalView" - fi -fi \ No newline at end of file diff --git a/usr/lib/ffdns/update-hoodzone.sh b/usr/lib/ffdns/update-hoodzone.sh old mode 100755 new mode 100644 index b75fbc2..cd42d44 --- a/usr/lib/ffdns/update-hoodzone.sh +++ b/usr/lib/ffdns/update-hoodzone.sh @@ -10,7 +10,8 @@ HoodZoneFile="$1" Domain="$2" Subnets="$3" View="$4" - +ZoneTempFolder="$5" +ZoneFilesFolder="$6" DomainReg=".""$Domain" DomainReg="$(echo "$DomainReg" | sed -e 's/\./\\\./g')" @@ -33,7 +34,7 @@ if [ -f "/tmp/dhcp.leases" ]; then fi for Leasefile in /tmp/hosts/*; do - if [ -n "${Leasefile##*/tmp/hosts/\*}" ]; then + if [ -n "${Leasefile##*/tmp/hosts/\*}" ] && [ -n "${Leasefile##*fffmanage}" ]; then NewLeases="$(echo "$NewLeases"; sed -ne 's/^\s*\([0-9.]*\)\s\+\([_0-9a-zA-Z-]\+\)'"$DomainReg"'.*/\2 IN A \1/p' "$Leasefile")" NewLeases="$(echo "$NewLeases"; sed -ne 's/^\s*\([0-9a-fA-F:]*\)\s\+\([_0-9a-zA-Z-]\+\)'"$DomainReg"'.*/\2 IN AAAA \1/p' "$Leasefile")" fi @@ -43,9 +44,13 @@ NewLeases="$(echo "$NewLeases" | sed -ne 's/^\(\(\(\S\+\)'"$DomainReg"'\)\|\(\S\+\)\)\(.*\)$/\3\4\5/p' | awk '!a[$0]++' | # uncomment and duplicate to secure static DNS-Entries -# sed -e '/^dns\s\+.*/d' | + sed -e '/^dns\s\+.*/d' | + sed -e '/^gw01\s\+.*/d' | NormalizeZoneFileFormatting)" -if [ "$NewLeases" != "$OldLeases" ]; then + +UpdateZone="$(UpdateDNSSECEntryCache "$Domain" "$ZoneTempFolder" "$HoodZoneFile")" + +if [ "$NewLeases" != "$OldLeases" ] || [ $UpdateZone -ne 0 ]; then NewSerial="$(GetZoneFileSerial "$HoodZoneFile")" NewSerial=$((NewSerial+1)) sed -i -e 's/^\(\s*\)\(\S\+\)\(\s*;\s*Serial.*\)/\1'"$NewSerial"'\3/g' "$HoodZoneFile" @@ -54,5 +59,9 @@ if [ "$NewLeases" != "$OldLeases" ]; then echo ";### Leases ###" echo "$NewLeases" } >> "$HoodZoneFile" - ReloadZone "$Domain" "$View" + for KeyFile in "$ZoneTempFolder"*; do + [ "$KeyFile" = "$ZoneTempFolder""*" ] || \ + cat "$KeyFile" >> "$HoodZoneFile" + done + ReloadZone "$Domain" "$View" "$ZoneFilesFolder" fi From 22d2eb0cda58cd364567795dd9db3d05097a7129 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Fri, 23 Jul 2021 00:21:18 +0200 Subject: [PATCH 51/56] fix: rechange extern prefixes Signed-off-by: Blackyfff --- usr/lib/ffdns/update-dns.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/lib/ffdns/update-dns.sh b/usr/lib/ffdns/update-dns.sh index fd3c05b..d56f4f9 100644 --- a/usr/lib/ffdns/update-dns.sh +++ b/usr/lib/ffdns/update-dns.sh @@ -77,7 +77,7 @@ UpdateExternal() { [ -n "$(sed -e '/^\s*\(@\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\)\s/!d' "$CachedZoneFile")" ] || \ sed -i -e 's/^\s*\(@\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Ss][Oo][Aa]\)\s\+\S\+\s\+\S\+\s/\1 '"$DNSSCRIPT_SERVER_NAME"'. '"$DNSSCRIPT_CONTACT_EMAIL"' /g' "$CachedZoneFile" - sed -i -e '/^\s*\S\+\.\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Dd][Ss]\s/d' "$CachedZoneFile" + sed -i -e 's/^\s*'"$CommunityExternPrefix"'\s/@ /g;/^\s*\S\+\.\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Dd][Ss]\s/d' "$CachedZoneFile" UpdateExternDomain="$(UpdateDNSSECEntryCache "$ExternDomain" "$ZoneTempFolder" "$CachedZoneFile" "$DNSSECKeyFolder")" if [ $UpdateExternView -ne 0 ] || [ $UpdateExternDomain -ne 0 ]; then From 232ca12b48601a37343bbe06c31f1f5ab16bb582 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Sat, 24 Jul 2021 01:45:46 +0200 Subject: [PATCH 52/56] use Tempfile instead of folder; fix Reverse NS Signed-off-by: Blackyfff --- usr/lib/ffdns/update-rdnszone.sh | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) mode change 100755 => 100644 usr/lib/ffdns/update-rdnszone.sh diff --git a/usr/lib/ffdns/update-rdnszone.sh b/usr/lib/ffdns/update-rdnszone.sh old mode 100755 new mode 100644 index 5e366cd..ebec235 --- a/usr/lib/ffdns/update-rdnszone.sh +++ b/usr/lib/ffdns/update-rdnszone.sh @@ -10,10 +10,10 @@ ReverseDomain="$1" ReverseZone="${ReverseDomain%*.}" ForwardZones="$2" ReverseZoneFile="$3" -TempDir="/tmp/""$ReverseZone" TTL="${4%% *}" ReReExMi="${4#* }" View="$5" +TempFile="/tmp/""$ReverseZone" GetIPEntries() { if [ -z "$RZoneIsIPv6" ]; then @@ -41,8 +41,6 @@ else TraceErrAndExit "$ReverseDomain"" is no valid reverse domain" fi -mkdir -p "$TempDir" - for ForwardZone in $ForwardZones; do ZoneFile="${ForwardZone#*/}" Serial="$(GetZoneFileSerial "$ZoneFile")" @@ -60,19 +58,19 @@ if [ $((NewReverseSerial)) -gt $((OldSerial)) ]; then Static="${Static#*/}" [ -f "$Static" ] && echo "$(cat "$Static")" echo - } > "$TempDir/$ReverseZone" + } > "$TempFile" for ForwardZone in $ForwardZones; do ZoneName="${ForwardZone%%/*}" ZoneFile="${ForwardZone#*/}" - ZoneRevNSSubnets="$(sed -ne 's/^\s*\S\+\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\s\+\(\S\+\).*;\s*Subnets:\s*\([^;]*\)\s*\(;[^;]*\s*\)$/\2@\3/p' "$ZoneFile" | + ZoneRevNSSubnets="$(sed -ne 's/^\s*\S\+\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\s\+\(\S\+\).*;\s*Subnets:\s*\([^;]\+\)\s*\(;.*\)\?$/\2@\3/p' "$ZoneFile" | \ sed -e 's/\(.*[^\.]\)@/\1\.'"$ZoneName"'\.@/;s/@/ /;s/\s\+/@/g')" for NSSubnets in $ZoneRevNSSubnets; do Subnets="$(echo "${NSSubnets#*@}" | sed -e 's/@/ /g')" for Subnet in $Subnets; do for ReverseNS in $(GetReverseDomains "$Subnet"); do if [ -n "$ReverseNS" ] && [ -z "${ReverseNS##*$ReverseDomain}" ]; then - echo "$ReverseNS $TTL IN NS ${NSSubnets%%@*}" >> "$TempDir/$ReverseZone" + echo "$ReverseNS $TTL IN NS ${NSSubnets%%@*}" >> "$TempFile" fi done done @@ -85,13 +83,12 @@ if [ $((NewReverseSerial)) -gt $((OldSerial)) ]; then IP="$(ReverseEntry "$IP")" if [ -z "${IP##*$ReverseDomain}" ]; then Host="$(ExpandHostname "${IPEntry%%/*}" "$ZoneName"".")" - echo "$IP $TTL IN PTR $Host" >> "$TempDir/$ReverseZone" + echo "$IP $TTL IN PTR $Host" >> "$TempFile" fi done done - named-checkzone -o "$ReverseZoneFile" "$ReverseDomain" "$TempDir/$ReverseZone" >/dev/null + named-checkzone -o "$ReverseZoneFile" "$ReverseDomain" "$TempFile" >/dev/null ReloadZone "$ReverseDomain" "$View" -fi - -rm -r "$TempDir" \ No newline at end of file + rm -r "$TempFile" +fi \ No newline at end of file From 4cd2f0a44ca32cd9ced70ba3c8ce87c051af1f5b Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Mon, 26 Jul 2021 19:23:34 +0200 Subject: [PATCH 53/56] Insert version information Signed-off-by: Blackyfff --- usr/lib/ffdns/update-dns.sh | 11 +++++++++-- usr/lib/ffdns/update-hoodzone.sh | 9 +++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/usr/lib/ffdns/update-dns.sh b/usr/lib/ffdns/update-dns.sh index d56f4f9..81e9d18 100644 --- a/usr/lib/ffdns/update-dns.sh +++ b/usr/lib/ffdns/update-dns.sh @@ -8,6 +8,8 @@ # exit script when command fails set -e +export DNSSCRIPT_VERSION="0.8" + . /etc/ffdns/community.conf . /etc/ffdns/local.conf @@ -41,7 +43,12 @@ rm -f "$TempFolder""$ExternalView"".conf" CachedMasterFile="$TempFolder""cache/db.""$MasterDomain" PreFetchMasterSerial="$(GetZoneFileSerial "$CachedMasterFile")" -curl -s -S -f "$RemoteLocation""db.""$MasterDomain" --output "$CachedMasterFile" && [ -f "$CachedMasterFile" ] && echo "" >> "$CachedMasterFile" || : +curl -s -S -f "$RemoteLocation""db.""$MasterDomain" --output "$CachedMasterFile" && \ + [ -f "$CachedMasterFile" ] && \ + { + echo "" + echo "_dnsscript_version IN TXT ""$DNSSCRIPT_VERSION" | NormalizeZoneFileFormatting + } >> "$CachedMasterFile" || : PostFetchMasterSerial="$(GetZoneFileSerial "$CachedMasterFile")" [ -n "$SubCommunityDomain" ] || ServeMasterZone="$( GetAllZoneNameservers "$MasterDomain" "$CachedMasterFile" | awk '{for(i=NF;i>0;--i) if($i=="'"$DNSSCRIPT_SERVER_NAME"'") {printf 1}}')" if [ -n "$MasterExternDomain" ]; then @@ -77,7 +84,7 @@ UpdateExternal() { [ -n "$(sed -e '/^\s*\(@\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\)\s/!d' "$CachedZoneFile")" ] || \ sed -i -e 's/^\s*\(@\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Ss][Oo][Aa]\)\s\+\S\+\s\+\S\+\s/\1 '"$DNSSCRIPT_SERVER_NAME"'. '"$DNSSCRIPT_CONTACT_EMAIL"' /g' "$CachedZoneFile" - sed -i -e 's/^\s*'"$CommunityExternPrefix"'\s/@ /g;/^\s*\S\+\.\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Dd][Ss]\s/d' "$CachedZoneFile" + sed -i -e 's/^\s*'"$CommunityExternPrefix"'\s/@ /g;/^\s*\(@|\S\+\.\)\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Dd][Ss]\s/d' "$CachedZoneFile" UpdateExternDomain="$(UpdateDNSSECEntryCache "$ExternDomain" "$ZoneTempFolder" "$CachedZoneFile" "$DNSSECKeyFolder")" if [ $UpdateExternView -ne 0 ] || [ $UpdateExternDomain -ne 0 ]; then diff --git a/usr/lib/ffdns/update-hoodzone.sh b/usr/lib/ffdns/update-hoodzone.sh index cd42d44..48622d6 100644 --- a/usr/lib/ffdns/update-hoodzone.sh +++ b/usr/lib/ffdns/update-hoodzone.sh @@ -24,7 +24,7 @@ GetLeaseEntriesInSubnet() { done } -OldLeases="$(sed -e '/^;### Leases ###/,$!d' "$HoodZoneFile" | sed 1d)" +OldLeases="$(sed -e '/^;### Leases ###/,$!d;/^\s*\S\+\.\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Dd][Ss]\s/d' "$HoodZoneFile" | sed 1d)" if [ -f "/tmp/dhcp.leases" ]; then DnsmasqLeases="$(sed -ne 's/^\s*\(\S\+\s\+\)\{2\}\(\S\+\)\s\+\([_0-9a-zA-Z-]\+\)\s\+.*/\3 IN A \2/p' "/tmp/dhcp.leases")" @@ -44,9 +44,10 @@ NewLeases="$(echo "$NewLeases" | sed -ne 's/^\(\(\(\S\+\)'"$DomainReg"'\)\|\(\S\+\)\)\(.*\)$/\3\4\5/p' | awk '!a[$0]++' | # uncomment and duplicate to secure static DNS-Entries - sed -e '/^dns\s\+.*/d' | - sed -e '/^gw01\s\+.*/d' | - NormalizeZoneFileFormatting)" +# sed -e '/^dns\s\+.*/d' | +# sed -e '/^gw01\s\+.*/d' | + NormalizeZoneFileFormatting; \ + echo "_dnsscript_version IN TXT ""$DNSSCRIPT_VERSION" | NormalizeZoneFileFormatting)" UpdateZone="$(UpdateDNSSECEntryCache "$Domain" "$ZoneTempFolder" "$HoodZoneFile")" From 8d0a681806655df74760ac22c237dd59c82461d7 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Tue, 27 Jul 2021 01:47:31 +0200 Subject: [PATCH 54/56] fix escaping Signed-off-by: Blackyfff --- usr/lib/ffdns/update-dns.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr/lib/ffdns/update-dns.sh b/usr/lib/ffdns/update-dns.sh index 81e9d18..581ab4f 100644 --- a/usr/lib/ffdns/update-dns.sh +++ b/usr/lib/ffdns/update-dns.sh @@ -8,7 +8,7 @@ # exit script when command fails set -e -export DNSSCRIPT_VERSION="0.8" +export DNSSCRIPT_VERSION="0.8.1" . /etc/ffdns/community.conf . /etc/ffdns/local.conf @@ -84,7 +84,7 @@ UpdateExternal() { [ -n "$(sed -e '/^\s*\(@\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Nn][Ss]\)\s/!d' "$CachedZoneFile")" ] || \ sed -i -e 's/^\s*\(@\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Ss][Oo][Aa]\)\s\+\S\+\s\+\S\+\s/\1 '"$DNSSCRIPT_SERVER_NAME"'. '"$DNSSCRIPT_CONTACT_EMAIL"' /g' "$CachedZoneFile" - sed -i -e 's/^\s*'"$CommunityExternPrefix"'\s/@ /g;/^\s*\(@|\S\+\.\)\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Dd][Ss]\s/d' "$CachedZoneFile" + sed -i -e 's/^\s*'"$CommunityExternPrefix"'\s/@ /g;/^\s*\(@\|\S\+\.\)\s\+\([0-9]*\s\)\?\s*[Ii][Nn]\s\+[Dd][Ss]\s/d' "$CachedZoneFile" UpdateExternDomain="$(UpdateDNSSECEntryCache "$ExternDomain" "$ZoneTempFolder" "$CachedZoneFile" "$DNSSECKeyFolder")" if [ $UpdateExternView -ne 0 ] || [ $UpdateExternDomain -ne 0 ]; then From c8f327ae70d1fbd10eba71ce8451436d63f9094a Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Tue, 27 Jul 2021 01:47:58 +0200 Subject: [PATCH 55/56] don't delete journal, let bind repair it Signed-off-by: Blackyfff --- usr/lib/ffdns/dns-functions.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/usr/lib/ffdns/dns-functions.sh b/usr/lib/ffdns/dns-functions.sh index f548d7c..f8cc7b0 100644 --- a/usr/lib/ffdns/dns-functions.sh +++ b/usr/lib/ffdns/dns-functions.sh @@ -282,10 +282,9 @@ ReloadZone() { elif [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 1 ]; then for Zone in $2; do rndc reload "$1" IN "$Zone" 2>"/tmp/dnsscript_rndcerr" >/dev/null || \ - touch "/tmp/dnsscript-forcereconf" - if [ -n "$3" ] && grep -q "failed: out of range" "/tmp/dnsscript_rndcerr"; then - rm -f "$3""db.""$Zone"".""$1".* - fi + [ -n "$3" ] && grep -q "failed: out of range" "/tmp/dnsscript_rndcerr" && \ + rndc sync -clean "$1" IN "$Zone" >/dev/null || \ + touch "/tmp/dnsscript-forcereconf" rm -f "/tmp/dnsscript_rndcerr" done elif [ $((DNSSCRIPT_BIND_RELOAD_VER)) -eq 2 ]; then From cd0ae2f041927a2b205ba950ce75625f974410b6 Mon Sep 17 00:00:00 2001 From: Blackyfff Date: Tue, 27 Jul 2021 01:48:18 +0200 Subject: [PATCH 56/56] Move Remote-ACL to config file Signed-off-by: Blackyfff --- etc/ffdns/community.conf | 2 ++ usr/lib/ffdns/update-public-acl.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) mode change 100755 => 100644 usr/lib/ffdns/update-public-acl.sh diff --git a/etc/ffdns/community.conf b/etc/ffdns/community.conf index b15cf98..9d7cb17 100644 --- a/etc/ffdns/community.conf +++ b/etc/ffdns/community.conf @@ -9,5 +9,7 @@ CommunitySubnets="10.50.0/16 10.83.0/16 fd43:5602:29bd::/48" ### master file in remote needs to be named: db.$CommunityDomain RemoteLocation="https://git.freifunk-franken.de/freifunk-franken/dns/raw/branch/master/" +RemoteACL="https://gw01.herpf.fff.community/ffdns/icvpn-acl.conf" + ### TTL Refresh Retry Expire Minimum TTLReReExMi="3600 2000 6400 2419200 86400" \ No newline at end of file diff --git a/usr/lib/ffdns/update-public-acl.sh b/usr/lib/ffdns/update-public-acl.sh old mode 100755 new mode 100644 index e1ca7fd..c825183 --- a/usr/lib/ffdns/update-public-acl.sh +++ b/usr/lib/ffdns/update-public-acl.sh @@ -15,7 +15,7 @@ rm -f "$IncludeFile" if [ -z "$Tables" ]; then # this is only a rude fallback and not recommended # create your own file on a gateway with the community routing tables and use this one - RemoteFile="$(curl -s -S -f "https://gw01.herpf.fff.community/ffdns/icvpn-acl.conf")" + RemoteFile="$(curl -s -S -f "$RemoteACL")" if [ -n "$RemoteFile" ]; then echo "$RemoteFile" > "$IncludeFile" fi