launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/canonical-mojo-specs/webhooks-proxy-bsi into lp:~canonical-launchpad-branches/canonical-mojo-specs/trunk.

Commit message:
Blacklist the newish Canonical network 185.125.188.0/22.  Whitelist build.staging.snapcraft.io and build.snapcraft.io.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/canonical-mojo-specs/webhooks-proxy-bsi/+merge/321180

We're going to need to deliver webhooks to build.snapcraft.io soon (initially for collecting metrics, later perhaps to avoid polling), so let's whitelist it so that we can.

While I was here, I noticed that our list of Canonical networks was slightly out of date, and added the missing one.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/canonical-mojo-specs/webhooks-proxy-bsi into lp:~canonical-launchpad-branches/canonical-mojo-specs/trunk.

=== modified file 'lp/mojo-lp-webhooks-proxy/devel/deploy'
--- lp/mojo-lp-webhooks-proxy/devel/deploy	2016-03-30 14:13:40 +0000
+++ lp/mojo-lp-webhooks-proxy/devel/deploy	2017-03-28 14:31:52 +0000
@@ -16,6 +16,10 @@
                       dst: [
                         # ppa.launchpad.net, a benign host for nagios checks.
                         91.189.95.83,
+                        # build.staging.snapcraft.io.
+                        185.125.191.207, 185.125.191.208,
+                        # build.snapcraft.io.
+                        162.213.33.209, 162.213.33.210,
                         ],
                       http_access: allow},
                      # Forbid internal networks since a lot of systems
@@ -29,7 +33,7 @@
                         172.16.0.0/12, 192.168.0.0/16, 127.0.0.0/8,
                         224.0.0.0/4, 240.0.0.0/4,
                         # Canonical networks.
-                        91.189.88.0/21, 162.213.32.0/22,
+                        91.189.88.0/21, 162.213.32.0/22, 185.125.188.0/22,
                         "2001:67c:1360::/48", "2001:67c:1560::/46",
                         "2620:2d:4000::/44",
                         ],

=== modified file 'lp/mojo-lp-webhooks-proxy/production/deploy'
--- lp/mojo-lp-webhooks-proxy/production/deploy	2016-03-31 15:32:23 +0000
+++ lp/mojo-lp-webhooks-proxy/production/deploy	2017-03-28 14:31:52 +0000
@@ -19,6 +19,10 @@
                       dst: [
                         # blog.launchpad.net, a benign host for nagios checks.
                         91.189.94.159, 162.213.33.232,
+                        # build.staging.snapcraft.io.
+                        185.125.191.207, 185.125.191.208,
+                        # build.snapcraft.io.
+                        162.213.33.209, 162.213.33.210,
                         ],
                       http_access: allow},
                      # Forbid internal networks since a lot of systems
@@ -32,7 +36,7 @@
                         172.16.0.0/12, 192.168.0.0/16, 127.0.0.0/8,
                         224.0.0.0/4, 240.0.0.0/4,
                         # Canonical networks.
-                        91.189.88.0/21, 162.213.32.0/22,
+                        91.189.88.0/21, 162.213.32.0/22, 185.125.188.0/22,
                         "2001:67c:1360::/48", "2001:67c:1560::/46",
                         "2620:2d:4000::/44",
                         ],

=== modified file 'lp/mojo-lp-webhooks-proxy/qastaging/deploy'
--- lp/mojo-lp-webhooks-proxy/qastaging/deploy	2016-03-31 15:32:23 +0000
+++ lp/mojo-lp-webhooks-proxy/qastaging/deploy	2017-03-28 14:31:52 +0000
@@ -19,6 +19,10 @@
                       dst: [
                         # blog.launchpad.net, a benign host for nagios checks.
                         91.189.94.159, 162.213.33.232,
+                        # build.staging.snapcraft.io.
+                        185.125.191.207, 185.125.191.208,
+                        # build.snapcraft.io.
+                        162.213.33.209, 162.213.33.210,
                         ],
                       http_access: allow},
                      # Forbid internal networks since a lot of systems
@@ -32,7 +36,7 @@
                         172.16.0.0/12, 192.168.0.0/16, 127.0.0.0/8,
                         224.0.0.0/4, 240.0.0.0/4,
                         # Canonical networks.
-                        91.189.88.0/21, 162.213.32.0/22,
+                        91.189.88.0/21, 162.213.32.0/22, 185.125.188.0/22,
                         "2001:67c:1360::/48", "2001:67c:1560::/46",
                         "2620:2d:4000::/44",
                         ],