Merge ~andreserl/maas:2.3_lp1778710 into maas:2.3

[Andres Rodriguez]

Backport cf12161 - LP: 1778710 - Add 'boot_images_no_proxy' setting

Allows setting no_proxy for the host of the MAAS image repo if it is
behind a proxy.

[Andres Rodriguez (andreserl)]

selfie!

review: Approve

diff --git a/src/maasserver/api/tests/test_maas.py b/src/maasserver/api/tests/test_maas.py
index b1f3342..fbf89d5 100644
--- a/src/maasserver/api/tests/test_maas.py
+++ b/src/maasserver/api/tests/test_maas.py
@@ -292,3 +292,14 @@ class MAASHandlerAPITest(APITestCase.ForUser):
             })
         self.assertEqual(http.client.OK, response.status_code)
         self.assertTrue(Config.objects.get_config("use_peer_proxy"))
+
+    def test_set_config_boot_images_no_proxy(self):
+        self.become_admin()
+        response = self.client.post(
+            reverse('maas_handler'), {
+                "op": "set_config",
+                "name": "boot_images_no_proxy",
+                "value": True,
+            })
+        self.assertEqual(http.client.OK, response.status_code)
+        self.assertTrue(Config.objects.get_config("boot_images_no_proxy"))
diff --git a/src/maasserver/bootsources.py b/src/maasserver/bootsources.py
index c5fd77d..ea1bde4 100644
--- a/src/maasserver/bootsources.py
+++ b/src/maasserver/bootsources.py
@@ -12,6 +12,7 @@ __all__ = [
 
 import html
 import os
+from urllib.parse import urlparse
 
 from maasserver.components import (
     discard_persistent_error,
@@ -91,7 +92,20 @@ def get_simplestreams_env():
             # entire process, including controller refresh. When the region
             # needs to refresh itself it sends itself results over HTTP to
             # 127.0.0.1.
-            env['no_proxy'] = '127.0.0.1,localhost'
+            no_proxy_hosts = '127.0.0.1,localhost'
+            # When using a proxy and using an image mirror, we may not want
+            # to use the proxy to download the images, as they could be
+            # localted in the local network, hence it makes no sense to use
+            # it. With this, we add the image mirror localtion(s) to the
+            # no proxy variable, which ensures MAAS contacts the mirror
+            # directly instead of through the proxy.
+            no_proxy = Config.objects.get_config('boot_images_no_proxy')
+            if no_proxy:
+                sources = get_boot_sources()
+                for source in sources:
+                    host = urlparse(source["url"]).netloc.split(':')[0]
+                    no_proxy_hosts = ",".join((no_proxy_hosts, host))
+            env['no_proxy'] = no_proxy_hosts
     return env
 
 
diff --git a/src/maasserver/forms/settings.py b/src/maasserver/forms/settings.py
index e659d0b..ce47aad 100644
--- a/src/maasserver/forms/settings.py
+++ b/src/maasserver/forms/settings.py
@@ -465,6 +465,25 @@ CONFIG_ITEMS = {
                 (IMPORT_RESOURCES_SERVICE_PERIOD.total_seconds() / 60.0))
         }
     },
+    'boot_images_no_proxy': {
+        'default': False,
+        'form': forms.BooleanField,
+        'form_kwargs': {
+            'required': False,
+            'label': (
+                "Set no_proxy with the image repository address when MAAS "
+                "is behind (or set with) a proxy."),
+            'help_text': (
+                "By default, when MAAS is behind (and set with) a proxy, it "
+                "is used to download images from the image repository. In "
+                "some situations (e.g. when using a local image repository) "
+                "it doesn't make sense for MAAS to use the proxy to download "
+                "images because it can access them directly. Setting this "
+                "option allows MAAS to access the (local) image repository "
+                "directly by setting the no_proxy variable for the MAAS env "
+                "with the address of the image repository.")
+        }
+    },
     'curtin_verbose': {
         'default': False,
         'form': forms.BooleanField,
diff --git a/src/maasserver/models/config.py b/src/maasserver/models/config.py
index 756b17b..f5837dc 100644
--- a/src/maasserver/models/config.py
+++ b/src/maasserver/models/config.py
@@ -86,6 +86,7 @@ def get_default_config():
         'uuid': None,
         # Images.
         'boot_images_auto_import': True,
+        'boot_images_no_proxy': False,
         # Third Party
         'enable_third_party_drivers': True,
         # Disk erasing.
diff --git a/src/maasserver/tests/test_bootsources.py b/src/maasserver/tests/test_bootsources.py
index 3679ff8..5a1f313 100644
--- a/src/maasserver/tests/test_bootsources.py
+++ b/src/maasserver/tests/test_bootsources.py
@@ -258,6 +258,23 @@ class TestPrivateCacheBootSources(MAASTransactionServerTestCase):
                 capture.env['http_proxy'], capture.env['https_proxy'],
                 capture.env['no_proxy']))
 
+    def test__has_env_http_and_https_proxy_set_with_custom_no_proxy(self):
+        proxy_address = factory.make_name('proxy')
+        Config.objects.set_config('http_proxy', proxy_address)
+        Config.objects.set_config('boot_images_no_proxy', True)
+        capture = (
+            patch_and_capture_env_for_download_all_image_descriptions(self))
+        factory.make_BootSource(
+            keyring_data=b'1234',
+            url=b'http://192.168.1.100:8080/ephemeral-v3/')
+        cache_boot_sources()
+        no_proxy_hosts = '127.0.0.1,localhost,192.168.1.100'
+        self.assertEqual(
+            (proxy_address, proxy_address, no_proxy_hosts),
+            (
+                capture.env['http_proxy'], capture.env['https_proxy'],
+                capture.env['no_proxy']))
+
     def test__passes_user_agent_with_maas_version(self):
         mock_download = self.patch(
             bootsources, 'download_all_image_descriptions')