netravnen/dn42-roagen
1
0
Fork 0
Code Releases Activity

Compare commits

base: netravnen:412f8a06471954a2367d2ef4b007b189f86cc77e
Branches Tags
netravnen:master
..
compare: netravnen:f8d989485a6fd03de2f59b4455eaa6d18890d0a4
Branches Tags
netravnen:master

2 commits
412f8a0647 ... f8d989485a

Author SHA1 Message Date
netravnen f8d989485a Ensure *.ext is quoted in git add operation 2023-07-30 12:21:30 +00:00
netravnen 9a5f9e6a52 Update roagenerator, check if ASN & prefix is not zero 2023-07-30 12:21:11 +00:00
3 changed files with 44 additions and 32 deletions
Show stats Expand all files Collapse all files

30
rfc8416.php
View file

@ -103,13 +103,16 @@ foreach ($raw_array as $sub_array)
// Extract ASxxxxx from string. // Extract ASxxxxx from string.
preg_match ("/AS[0-9]+/", explode (":", $asn)[1], $_asn); preg_match ("/AS[0-9]+/", explode (":", $asn)[1], $_asn);
$roas["locallyAddedAssertions"]["prefixAssertions"][$k]["asn"] = trim ($_asn[0], "AS"); // Catch if ASN is actually an integer and larger than zero
$roas["locallyAddedAssertions"]["prefixAssertions"][$k]["prefix"] = $_prefix; if (strlen ($_asn[0]) > 0 && strlen ($_prefix) > 0) {
$roas["locallyAddedAssertions"]["prefixAssertions"][$k]["maxPrefixLength"] = ($_asn[0] != "AS0" ? $_maxlength : MAX_LEN_IPV6_AS0); $roas["locallyAddedAssertions"]["prefixAssertions"][$k]["asn"] = trim ($_asn[0], "AS");
$roas["locallyAddedAssertions"]["prefixAssertions"][$k]["source"] = "$_ta"; $roas["locallyAddedAssertions"]["prefixAssertions"][$k]["prefix"] = $_prefix;
$roas["locallyAddedAssertions"]["prefixAssertions"][$k]["mnt-by"] = "$_mnt"; $roas["locallyAddedAssertions"]["prefixAssertions"][$k]["maxPrefixLength"] = ($_asn[0] != "AS0" ? $_maxlength : MAX_LEN_IPV6_AS0);
$roas["locallyAddedAssertions"]["prefixAssertions"][$k]["source"] = "$_ta";
$roas["locallyAddedAssertions"]["prefixAssertions"][$k]["mnt-by"] = "$_mnt";
$k++; $k++;
}
} }
} }
@ -203,13 +206,16 @@ foreach ($raw_array as $sub_array)
// Extract ASxxxxx from string. // Extract ASxxxxx from string.
preg_match ("/AS[0-9]+/", explode (":", $asn)[1], $_asn); preg_match ("/AS[0-9]+/", explode (":", $asn)[1], $_asn);
$roas["locallyAddedAssertions"]["prefixAssertions"][$k]["asn"] = trim ($_asn[0], "AS"); // Catch if ASN is actually an integer and larger than zero
$roas["locallyAddedAssertions"]["prefixAssertions"][$k]["prefix"] = $_prefix; if (strlen ($_asn[0]) > 0 && strlen ($_prefix) > 0) {
$roas["locallyAddedAssertions"]["prefixAssertions"][$k]["maxPrefixLength"] = ($_asn[0] != "AS0" ? $_maxlength : MAX_LEN_IPV4_AS0); $roas["locallyAddedAssertions"]["prefixAssertions"][$k]["asn"] = trim ($_asn[0], "AS");
$roas["locallyAddedAssertions"]["prefixAssertions"][$k]["source"] = "$_ta"; $roas["locallyAddedAssertions"]["prefixAssertions"][$k]["prefix"] = $_prefix;
$roas["locallyAddedAssertions"]["prefixAssertions"][$k]["mnt-by"] = "$_mnt"; $roas["locallyAddedAssertions"]["prefixAssertions"][$k]["maxPrefixLength"] = ($_asn[0] != "AS0" ? $_maxlength : MAX_LEN_IPV4_AS0);
$roas["locallyAddedAssertions"]["prefixAssertions"][$k]["source"] = "$_ta";
$roas["locallyAddedAssertions"]["prefixAssertions"][$k]["mnt-by"] = "$_mnt";
$k++; $k++;
}
} }
} }

38
roagen.php
View file

@ -97,15 +97,18 @@ foreach ($raw_array as $sub_array)
// Extract ASxxxxx from string. // Extract ASxxxxx from string.
preg_match ("/AS[0-9]+/", explode (":", $asn)[1], $_asn); preg_match ("/AS[0-9]+/", explode (":", $asn)[1], $_asn);
$roas["roas"][$k]["asn"] = trim ($_asn[0], "AS"); // Catch if ASN is actually an integer and larger than zero
$roas["roas"][$k]["prefix"] = $_prefix; if (strlen ($_asn[0]) > 0 && strlen ($_prefix) > 0) {
$roas["roas"][$k]["maxLength"] = ($_asn[0] != "AS0" ? $_maxlength : MAX_LEN_IPV6_AS0); $roas["roas"][$k]["asn"] = trim ($_asn[0], "AS");
//$roas["roas"][$k]["url"]["inetnum"] = "$web_registry_url/data/inet6num/$prefix[1]_$prefix[2]"; $roas["roas"][$k]["prefix"] = $_prefix;
//$roas["roas"][$k]["url"]["route"] = "$web_registry_url/data/route6/$prefix[1]_$prefix[2]"; $roas["roas"][$k]["maxLength"] = ($_asn[0] != "AS0" ? $_maxlength : MAX_LEN_IPV6_AS0);
$roas["roas"][$k]["ta"] = $_ta; //$roas["roas"][$k]["url"]["inetnum"] = "$web_registry_url/data/inet6num/$prefix[1]_$prefix[2]";
$roas["roas"][$k]["mnt-by"] = $_mnt; //$roas["roas"][$k]["url"]["route"] = "$web_registry_url/data/route6/$prefix[1]_$prefix[2]";
$roas["roas"][$k]["ta"] = $_ta;
$roas["roas"][$k]["mnt-by"] = $_mnt;
$k++; $k++;
}
} }
} }
@ -199,15 +202,18 @@ foreach ($raw_array as $sub_array)
// Extract ASxxxxx from string. // Extract ASxxxxx from string.
preg_match ("/AS[0-9]+/", explode (":", $asn)[1], $_asn); preg_match ("/AS[0-9]+/", explode (":", $asn)[1], $_asn);
$roas["roas"][$k]["asn"] = trim ($_asn[0], "AS"); // Catch if ASN is actually an integer and larger than zero
$roas["roas"][$k]["prefix"] = $_prefix; if (strlen ($_asn[0]) > 0 && strlen ($_prefix) > 0) {
$roas["roas"][$k]["maxLength"] = ($_asn[0] != "AS0" ? $_maxlength : MAX_LEN_IPV4_AS0); $roas["roas"][$k]["asn"] = trim ($_asn[0], "AS");
//$roas["roas"][$k]["url"]["inetnum"] = "$web_registry_url/data/inetnum/$prefix[1]_$prefix[2]"; $roas["roas"][$k]["prefix"] = $_prefix;
//$roas["roas"][$k]["url"]["route"] = "$web_registry_url/data/route/$prefix[1]_$prefix[2]"; $roas["roas"][$k]["maxLength"] = ($_asn[0] != "AS0" ? $_maxlength : MAX_LEN_IPV4_AS0);
$roas["roas"][$k]["ta"] = $_ta; //$roas["roas"][$k]["url"]["inetnum"] = "$web_registry_url/data/inetnum/$prefix[1]_$prefix[2]";
$roas["roas"][$k]["mnt-by"] = $_mnt; //$roas["roas"][$k]["url"]["route"] = "$web_registry_url/data/route/$prefix[1]_$prefix[2]";
$roas["roas"][$k]["ta"] = $_ta;
$roas["roas"][$k]["mnt-by"] = $_mnt;
$k++; $k++;
}
} }
} }

8
update.sh
View file

@ -98,12 +98,12 @@ for FILE in $(ls -1 roa/{bird*.conf,export*.json,README.md} | sed -e 's_roa/__g'
done done
# Commit latest version of ROA files # Commit latest version of ROA files
git -C roa/ add README.md *.conf *.json *.sha256 git -C roa/ add README.md "*.conf" "*.json" "*.sha256"
git -C roa/ commit -m "Updated ROA files - $ISO_DATE" --quiet git -C roa/ commit -m "Updated ROA files - $ISO_DATE" --quiet
# Push ROA repository to every remote configured # Push ROA repository to every remote configured, except github
if [ $(git -C roa/ remote | grep -vi upstream | wc -l) > 0 ] ; then if [ $(git -C roa/ remote | grep -viP '(github|upstream)' | wc -l) > 0 ] ; then
for REMOTE in $(git -C roa/ remote | grep -vi upstream | paste -sd " " -) ; do for REMOTE in $(git -C roa/ remote | grep -vi github | paste -sd " " -) ; do
git -C roa/ push $REMOTE master:master --quiet git -C roa/ push $REMOTE master:master --quiet
done done
fi fi