v0.8.0

pierky · Jun 13, 2017 · 3aa0e06 · 3aa0e06
1 parent 397813d
commit 3aa0e06
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 70 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -3,8 +3,8 @@ Change log
 
 .. note:: **Upgrade notes**: after upgrading, run the ``arouteserver setup-templates`` command to sync the local templates with those distributed with the new version. More details on the `Upgrading <https://arouteserver.readthedocs.io/en/latest/INSTALLATION.html#upgrading>`_ section of the documentation.
 
-next release
-------------
+v0.8.0
+------
 
 - New feature: `reject policy <https://arouteserver.readthedocs.io/en/latest/CONFIG.html#reject-policy>`_ configuration option, to control how invalid routes must be treated: immediately discarded or kept for troubleshooting purposes, analysis or statistic reporting.
 

diff --git a/README.rst b/README.rst
@@ -95,6 +95,10 @@ Features
   - `integration <https://arouteserver.readthedocs.io/en/latest/USAGE.html#ixp-manager-integration>`_ with **IXP-Manager**;
   - `fetch lists <https://arouteserver.readthedocs.io/en/latest/USAGE.html#automatic-clients>`_ from **PeeringDB** records and **Euro-IX member list JSON** files.
 
+- Built-in tools:
+
+  - `Invalid routes reporter <https://arouteserver.readthedocs.io/en/latest/TOOLS.html>`_, to log or report rejected routes and the reject reason.
+
 A comprehensive list of features can be found within the comments of the distributed configuration file on `GitHub <https://github.com/pierky/arouteserver/blob/master/config.d/general.yml>`_.
 
 More feature are already planned: see the `Future work <https://arouteserver.readthedocs.io/en/latest/FUTUREWORK.html>`_ section for more details.

diff --git a/docs/_static/examples_rich.html b/docs/_static/examples_rich.html
@@ -262,21 +262,6 @@ <h3>Rejected prefixes</h3>
       <td>any more specific prefix</td>
       <td>RFC 6598 - Shared Address Space</td>
     </tr>
-    <tr>
-      <td>193.239.116.0/22</td>
-      <td>any more specific prefix</td>
-      <td>IXP: NL-IX Public Peering LAN</td>
-    </tr>
-    <tr>
-      <td>80.249.208.0/21</td>
-      <td>any more specific prefix</td>
-      <td>IXP: AMS-IX Public Peering LAN</td>
-    </tr>
-    <tr>
-      <td>164.138.24.80/29</td>
-      <td>any more specific prefix</td>
-      <td>Tilaa OOB</td>
-    </tr>
     <tr>
       <td>::/0</td>
       <td>only the exact prefix</td>

diff --git a/examples/bird_hooks/bird4.conf b/examples/bird_hooks/bird4.conf
@@ -67,16 +67,7 @@ prefix set bogons;
 		224.0.0.0/3{3,32},
 
 		# RFC 6598 - Shared Address Space
-		100.64.0.0/10{10,32},
-
-		# IXP: NL-IX Public Peering LAN
-		193.239.116.0/22{22,32},
-
-		# IXP: AMS-IX Public Peering LAN
-		80.249.208.0/21{21,32},
-
-		# Tilaa OOB
-		164.138.24.80/29{29,32}
+		100.64.0.0/10{10,32}
 	];
 
 	if net ~ bogons then return true;

diff --git a/examples/default/bird4.conf b/examples/default/bird4.conf
@@ -64,16 +64,7 @@ prefix set bogons;
 		224.0.0.0/3{3,32},
 
 		# RFC 6598 - Shared Address Space
-		100.64.0.0/10{10,32},
-
-		# IXP: NL-IX Public Peering LAN
-		193.239.116.0/22{22,32},
-
-		# IXP: AMS-IX Public Peering LAN
-		80.249.208.0/21{21,32},
-
-		# Tilaa OOB
-		164.138.24.80/29{29,32}
+		100.64.0.0/10{10,32}
 	];
 
 	if net ~ bogons then return true;

diff --git a/examples/default/openbgpd.conf b/examples/default/openbgpd.conf
@@ -91,7 +91,7 @@ group "clients" {
 
 
 
-bogons="{ 0.0.0.0/0, 0.0.0.0/8 prefixlen 8 - 32, 10.0.0.0/8 prefixlen 8 - 32, 127.0.0.0/8 prefixlen 8 - 32, 169.254.0.0/16 prefixlen 16 - 32, 172.16.0.0/12 prefixlen 12 - 32, 192.0.2.0/24 prefixlen 24 - 32, 192.168.0.0/16 prefixlen 16 - 32, 198.18.0.0/15 prefixlen 15 - 32, 198.51.100.0/24 prefixlen 24 - 32, 203.0.113.0/24 prefixlen 24 - 32, 224.0.0.0/3 prefixlen 3 - 32, 100.64.0.0/10 prefixlen 10 - 32, 193.239.116.0/22 prefixlen 22 - 32, 80.249.208.0/21 prefixlen 21 - 32, 164.138.24.80/29 prefixlen 29 - 32, ::/0, ::/8 prefixlen 8 - 128, 64:ff9b::/96 prefixlen 96 - 128, 100::/8 prefixlen 8 - 128, 200::/7 prefixlen 7 - 128, 400::/6 prefixlen 6 - 128, 800::/5 prefixlen 5 - 128, 1000::/4 prefixlen 4 - 128, 2001::/33 prefixlen 33 - 128, 2001:0:8000::/33 prefixlen 33 - 128, 2001:2::/48 prefixlen 48 - 128, 2001:3::/32 prefixlen 32 - 128, 2001:10::/28 prefixlen 28 - 128, 2001:20::/28 prefixlen 28 - 128, 2001:db8::/32 prefixlen 32 - 128, 2002::/16 prefixlen 16 - 128, 3ffe::/16 prefixlen 16 - 128, 4000::/3 prefixlen 3 - 128, 5f00::/8 prefixlen 8 - 128, 6000::/3 prefixlen 3 - 128, 8000::/3 prefixlen 3 - 128, a000::/3 prefixlen 3 - 128, c000::/3 prefixlen 3 - 128, e000::/4 prefixlen 4 - 128, f000::/5 prefixlen 5 - 128, f800::/6 prefixlen 6 - 128, fc00::/7 prefixlen 7 - 128, fe80::/10 prefixlen 10 - 128, fec0::/10 prefixlen 10 - 128, ff00::/8 prefixlen 8 - 128 }"
+bogons="{ 0.0.0.0/0, 0.0.0.0/8 prefixlen 8 - 32, 10.0.0.0/8 prefixlen 8 - 32, 127.0.0.0/8 prefixlen 8 - 32, 169.254.0.0/16 prefixlen 16 - 32, 172.16.0.0/12 prefixlen 12 - 32, 192.0.2.0/24 prefixlen 24 - 32, 192.168.0.0/16 prefixlen 16 - 32, 198.18.0.0/15 prefixlen 15 - 32, 198.51.100.0/24 prefixlen 24 - 32, 203.0.113.0/24 prefixlen 24 - 32, 224.0.0.0/3 prefixlen 3 - 32, 100.64.0.0/10 prefixlen 10 - 32, ::/0, ::/8 prefixlen 8 - 128, 64:ff9b::/96 prefixlen 96 - 128, 100::/8 prefixlen 8 - 128, 200::/7 prefixlen 7 - 128, 400::/6 prefixlen 6 - 128, 800::/5 prefixlen 5 - 128, 1000::/4 prefixlen 4 - 128, 2001::/33 prefixlen 33 - 128, 2001:0:8000::/33 prefixlen 33 - 128, 2001:2::/48 prefixlen 48 - 128, 2001:3::/32 prefixlen 32 - 128, 2001:10::/28 prefixlen 28 - 128, 2001:20::/28 prefixlen 28 - 128, 2001:db8::/32 prefixlen 32 - 128, 2002::/16 prefixlen 16 - 128, 3ffe::/16 prefixlen 16 - 128, 4000::/3 prefixlen 3 - 128, 5f00::/8 prefixlen 8 - 128, 6000::/3 prefixlen 3 - 128, 8000::/3 prefixlen 3 - 128, a000::/3 prefixlen 3 - 128, c000::/3 prefixlen 3 - 128, e000::/4 prefixlen 4 - 128, f000::/5 prefixlen 5 - 128, f800::/6 prefixlen 6 - 128, fc00::/7 prefixlen 7 - 128, fe80::/10 prefixlen 10 - 128, fec0::/10 prefixlen 10 - 128, ff00::/8 prefixlen 8 - 128 }"
 
 
 # Scrub communities from inbound routes

diff --git a/examples/rich/bird4.conf b/examples/rich/bird4.conf
@@ -65,16 +65,7 @@ prefix set bogons;
 		224.0.0.0/3{3,32},
 
 		# RFC 6598 - Shared Address Space
-		100.64.0.0/10{10,32},
-
-		# IXP: NL-IX Public Peering LAN
-		193.239.116.0/22{22,32},
-
-		# IXP: AMS-IX Public Peering LAN
-		80.249.208.0/21{21,32},
-
-		# Tilaa OOB
-		164.138.24.80/29{29,32}
+		100.64.0.0/10{10,32}
 	];
 
 	if net ~ bogons then return true;

diff --git a/examples/rich/description.html b/examples/rich/description.html
@@ -262,21 +262,6 @@ <h3>Rejected prefixes</h3>
       <td>any more specific prefix</td>
       <td>RFC 6598 - Shared Address Space</td>
     </tr>
-    <tr>
-      <td>193.239.116.0/22</td>
-      <td>any more specific prefix</td>
-      <td>IXP: NL-IX Public Peering LAN</td>
-    </tr>
-    <tr>
-      <td>80.249.208.0/21</td>
-      <td>any more specific prefix</td>
-      <td>IXP: AMS-IX Public Peering LAN</td>
-    </tr>
-    <tr>
-      <td>164.138.24.80/29</td>
-      <td>any more specific prefix</td>
-      <td>Tilaa OOB</td>
-    </tr>
     <tr>
       <td>::/0</td>
       <td>only the exact prefix</td>

diff --git a/examples/rich/openbgpd.conf b/examples/rich/openbgpd.conf
@@ -95,7 +95,7 @@ group "clients" {
 
 global_black_list_pref="{ 192.0.2.0/24 prefixlen 24 - 32, 2001:db8:1:1::/64 prefixlen 64 - 128 }"
 
-bogons="{ 0.0.0.0/0, 0.0.0.0/8 prefixlen 8 - 32, 10.0.0.0/8 prefixlen 8 - 32, 127.0.0.0/8 prefixlen 8 - 32, 169.254.0.0/16 prefixlen 16 - 32, 172.16.0.0/12 prefixlen 12 - 32, 192.0.2.0/24 prefixlen 24 - 32, 192.168.0.0/16 prefixlen 16 - 32, 198.18.0.0/15 prefixlen 15 - 32, 198.51.100.0/24 prefixlen 24 - 32, 203.0.113.0/24 prefixlen 24 - 32, 224.0.0.0/3 prefixlen 3 - 32, 100.64.0.0/10 prefixlen 10 - 32, 193.239.116.0/22 prefixlen 22 - 32, 80.249.208.0/21 prefixlen 21 - 32, 164.138.24.80/29 prefixlen 29 - 32, ::/0, ::/8 prefixlen 8 - 128, 64:ff9b::/96 prefixlen 96 - 128, 100::/8 prefixlen 8 - 128, 200::/7 prefixlen 7 - 128, 400::/6 prefixlen 6 - 128, 800::/5 prefixlen 5 - 128, 1000::/4 prefixlen 4 - 128, 2001::/33 prefixlen 33 - 128, 2001:0:8000::/33 prefixlen 33 - 128, 2001:2::/48 prefixlen 48 - 128, 2001:3::/32 prefixlen 32 - 128, 2001:10::/28 prefixlen 28 - 128, 2001:20::/28 prefixlen 28 - 128, 2001:db8::/32 prefixlen 32 - 128, 2002::/16 prefixlen 16 - 128, 3ffe::/16 prefixlen 16 - 128, 4000::/3 prefixlen 3 - 128, 5f00::/8 prefixlen 8 - 128, 6000::/3 prefixlen 3 - 128, 8000::/3 prefixlen 3 - 128, a000::/3 prefixlen 3 - 128, c000::/3 prefixlen 3 - 128, e000::/4 prefixlen 4 - 128, f000::/5 prefixlen 5 - 128, f800::/6 prefixlen 6 - 128, fc00::/7 prefixlen 7 - 128, fe80::/10 prefixlen 10 - 128, fec0::/10 prefixlen 10 - 128, ff00::/8 prefixlen 8 - 128 }"
+bogons="{ 0.0.0.0/0, 0.0.0.0/8 prefixlen 8 - 32, 10.0.0.0/8 prefixlen 8 - 32, 127.0.0.0/8 prefixlen 8 - 32, 169.254.0.0/16 prefixlen 16 - 32, 172.16.0.0/12 prefixlen 12 - 32, 192.0.2.0/24 prefixlen 24 - 32, 192.168.0.0/16 prefixlen 16 - 32, 198.18.0.0/15 prefixlen 15 - 32, 198.51.100.0/24 prefixlen 24 - 32, 203.0.113.0/24 prefixlen 24 - 32, 224.0.0.0/3 prefixlen 3 - 32, 100.64.0.0/10 prefixlen 10 - 32, ::/0, ::/8 prefixlen 8 - 128, 64:ff9b::/96 prefixlen 96 - 128, 100::/8 prefixlen 8 - 128, 200::/7 prefixlen 7 - 128, 400::/6 prefixlen 6 - 128, 800::/5 prefixlen 5 - 128, 1000::/4 prefixlen 4 - 128, 2001::/33 prefixlen 33 - 128, 2001:0:8000::/33 prefixlen 33 - 128, 2001:2::/48 prefixlen 48 - 128, 2001:3::/32 prefixlen 32 - 128, 2001:10::/28 prefixlen 28 - 128, 2001:20::/28 prefixlen 28 - 128, 2001:db8::/32 prefixlen 32 - 128, 2002::/16 prefixlen 16 - 128, 3ffe::/16 prefixlen 16 - 128, 4000::/3 prefixlen 3 - 128, 5f00::/8 prefixlen 8 - 128, 6000::/3 prefixlen 3 - 128, 8000::/3 prefixlen 3 - 128, a000::/3 prefixlen 3 - 128, c000::/3 prefixlen 3 - 128, e000::/4 prefixlen 4 - 128, f000::/5 prefixlen 5 - 128, f800::/6 prefixlen 6 - 128, fc00::/7 prefixlen 7 - 128, fe80::/10 prefixlen 10 - 128, fec0::/10 prefixlen 10 - 128, ff00::/8 prefixlen 8 - 128 }"
 
 transit_free_asns="{ 174, 209, 286, 701, 1239, 1299, 2828, 2914, 3257, 3320, 3356, 3549, 5511, 6453, 6461, 6762, 6830, 7018, 12956 }"
 

diff --git a/pierky/arouteserver/version.py b/pierky/arouteserver/version.py
@@ -13,5 +13,5 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-__version__ = "0.7.0"
+__version__ = "0.8.0"
 COPYRIGHT_YEAR = 2017
diff --git a/templates/fingerprints.yml b/templates/fingerprints.yml
@@ -1,20 +1,20 @@
 bird:
-  clients.j2: ad2cdf0b27278f2d1d0e4bb8633cf264d3943833eb8db2bb541c783d51c6b738bb43dcf09a748263d24018bb3586db4f778d34dfa47f7617662b60892cd112e8
-  common.j2: bf0d920e0661b52c26975a9ff3031b445da95df7da58c2888f2f61ba6b29f97fcbdedb91e380aa5a686decd205724a9ccd82e4f6bff05d654e80d6114f2d614a
+  clients.j2: e2e8a5509703408d29ddc5d3743bf78a80d249b44543ee19e55f4ad124a18817d3ad1af7cf523978570ec4dfb57468be848173d7d271a76be017cfc5d2cdb650
+  common.j2: 6bc594b2b0383da11a2161d6332449a7d11be7ff7633318e5f30decf2ef6458dd0425013ff33e0d42126e0d84dd451ea65440b6153f10996303afeb1c93e4854
   header.j2: 3757ac8c70d5ae19ae5faed1f641d3caac80d962cd7cffe49740f69532233f0761315136f31d316289cd4162ffff43d653760f209dfa035d49b981fc8c999ca1
   irrdb.j2: 9b7534a07eddbb77b17a223eac2135f9ef1656dab7e8d9cfa0e5c3aef4d7a367a7b3cd328f3106bf0d02a771ca27bef9cdbadf9d7f14471fea7c1baaa4e0a68e
-  macros.j2: 1a92490e7e59176e5869c54cdd299b998399da7e4f51d11ccbf8116525c98a9071af3843c046c4f567bd37586a10dd256fc58e40c402fcecf8569ace51b54f2f
+  macros.j2: bf4db1105ddc7ac88b2b5b292f4afbf0066a60473d3d75c2ad68c61a8e8aa5051e88a8f945e74387141ad2a282cd9633b7bb6084b47eec59aa2c1627343ef50e
   main.j2: 9595d94d9850cef38adc60aa5b679d704d1b3d252fcc1147214e489867f151b194c434bf81212cadcd9b0d80ddadd6ff6f1c73e60372ee2c73e49b18fc65a8e4
   rpki.j2: 90e27c965acaf5ce44b3ad5589c9c190d2236bbf1a0f7f278462a50cb432fb683797fc6519d8e5570a9416a2abd3556ee1d2fd14c059c9f8be71cb993ea6ad3c
 html:
   macros.j2: c3e8ececdce82eb9010f1e160eaffec004592ce709753095c10881e6c1666b1780cfefd7f113002f08fdc38703482e8d8c2f2ea0495757ac3f8e1c8eb3694342
   main.j2: 5694b5ad05492f924ea43ee8fc5cb8a37e5e58f5cccdd0756350ed783df744209d0ee725161ca200e048526237640e135a49be0bcbc20734395b6cace001014f
 openbgpd:
   clients.j2: afb5ff83d074867f60f332f9d709dfae3fc5ba74f0eb5f55a05ee82efbc3b7697b7198c65baa3af802cc855555142aae8f68869bf505bba77111d2dabc90bd13
-  filters.j2: 3dcbb89febe1f2c1e6d4c1f05053d70a564950a0212f5fdd54d8459a471c965a14977a610e7fc3f4788150f133521de12db85d231f170c309660735971e9661b
+  filters.j2: 2c4bee464e243be34050a41bc2416e0af47fbc34bc092a30ded0abe31424b6814cd14ff6e3d700c1e7236459280fc6a01a6bfeba236175e14a4e6aa417704104
   header.j2: 9514f6c829ac719ff5217855a4ecef973aa386e6adec7a1bb5f4bcce7cd305194488811f6dcbb65d269d56ef27b6f2ba0b0954edba21a9124eeb3af0bf991819
   irrdb.j2: c0221952244b2ca91314a4b5f37206ea1a1ed4bb31544c48c8b450b3ec84ffb4ef18c4df4fdcf78e3c940d330b635628051ebfc1af40f877cddba028274ca023
-  macros.j2: 93839a89737e2aa2e5a19df06c85bb2b9964076bffe230355be22175ebadae56ebcbe181d252ae196e36940deacd9b62009f967def0933c9b1a17e287d18a25e
+  macros.j2: bd26cb5a124b27506b12df0402b3f30845b98f1b3a95e309f8c0899dc03586a2d8debe43ab7436cf611b47244ad694f20e30c267458bf46a01cecbc960d7c354
   main.j2: c81d8a3d4052a440f3d404ebdadeeae181966447463f9733768d8d9da4304cd6ea1505a9fdb58e3df55521c44bd03174efa3d3f35b5b79b8d7dda17ee9589061
 template-context:
   main.j2: 2d9508bdb1f2414ec1be04a0f578f573f7c7fff2d7a06aa23c1e3585a6ff02f928de01943f1ddfc2afac53018a96f4d36c1793e05b2dea6b62374611d5a02fc8