[PATCH] toaster: show https proxy in error output

[PATCH] toaster: show https proxy in error output

[Elliot Smith]

urllib2 automatically uses any http_proxy and https_proxy
settings from the environment. Now that the layer index is
available over https, there is a possibility that a user
may experience an error while fetching the layer index via
HTTPS. In this situation, show the https_proxy setting as
well as the http_proxy setting in the error.

[YOCTO #9439]

Signed-off-by: Elliot Smith <elliot.smith@intel.com>
---
 bitbake/lib/toaster/orm/models.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 61737c7..8f5e0f5 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -1196,7 +1196,11 @@ class LayerIndexLayerSource(LayerSource):
             from urllib2 import urlopen, URLError
             from urlparse import urlparse
 
-        proxy_settings = os.environ.get("http_proxy", None)
+        proxy_settings = (
+            os.environ.get("http_proxy"),
+            os.environ.get("https_proxy")
+        )
+
         oe_core_layer = 'openembedded-core'
 
         def _get_json_response(apiurl = self.apiurl):
@@ -1215,8 +1219,7 @@ class LayerIndexLayerSource(LayerSource):
             apilinks = _get_json_response()
         except Exception as e:
             import traceback
-            if proxy_settings is not None:
-                logger.info("EE: Using proxy %s" % proxy_settings)
+            logger.info("EE: Using HTTP proxy %s and HTTPS proxy %s" % proxy_settings)
             logger.warning("EE: could not connect to %s, skipping update: %s\n%s" % (self.apiurl, e, traceback.format_exc()))
             return
 
-- 
2.7.4

Re: [PATCH] toaster: show https proxy in error output

[Michael Wood]

For the benefit of the mailing list - Suggested we hold this off until 
it can be rebased on the database clean up branch

Michael

On 30/06/16 11:21, Elliot Smith wrote:
> urllib2 automatically uses any http_proxy and https_proxy
> settings from the environment. Now that the layer index is
> available over https, there is a possibility that a user
> may experience an error while fetching the layer index via
> HTTPS. In this situation, show the https_proxy setting as
> well as the http_proxy setting in the error.
>
> [YOCTO #9439]
>
> Signed-off-by: Elliot Smith <elliot.smith@intel.com>
> ---
>   bitbake/lib/toaster/orm/models.py | 9 ++++++---
>   1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
> index 61737c7..8f5e0f5 100644
> --- a/bitbake/lib/toaster/orm/models.py
> +++ b/bitbake/lib/toaster/orm/models.py
> @@ -1196,7 +1196,11 @@ class LayerIndexLayerSource(LayerSource):
>               from urllib2 import urlopen, URLError
>               from urlparse import urlparse
>   
> -        proxy_settings = os.environ.get("http_proxy", None)
> +        proxy_settings = (
> +            os.environ.get("http_proxy"),
> +            os.environ.get("https_proxy")
> +        )
> +
>           oe_core_layer = 'openembedded-core'
>   
>           def _get_json_response(apiurl = self.apiurl):
> @@ -1215,8 +1219,7 @@ class LayerIndexLayerSource(LayerSource):
>               apilinks = _get_json_response()
>           except Exception as e:
>               import traceback
> -            if proxy_settings is not None:
> -                logger.info("EE: Using proxy %s" % proxy_settings)
> +            logger.info("EE: Using HTTP proxy %s and HTTPS proxy %s" % proxy_settings)
>               logger.warning("EE: could not connect to %s, skipping update: %s\n%s" % (self.apiurl, e, traceback.format_exc()))
>               return
>   

[PATCH] toaster: show https proxy in error output

[Elliot Smith]

urllib2 automatically uses any http_proxy and https_proxy
settings from the environment. Now that the layer index is
available over https, there is a possibility that a user
may experience an error while fetching layer index. In this
situation, show the https_proxy setting as well as the
http_proxy setting in the error.

[YOCTO #9439]

Signed-off-by: Elliot Smith <elliot.smith@intel.com>
---
 bitbake/lib/toaster/orm/models.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 68c3072..90e3f6a 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -1096,7 +1096,10 @@ class LayerIndexLayerSource(LayerSource):
 
         import urllib2, urlparse, json
         import os
-        proxy_settings = os.environ.get("http_proxy", None)
+        proxy_settings = (
+            os.environ.get("http_proxy", None),
+            os.environ.get("https_proxy", None)
+        )
         oe_core_layer = 'openembedded-core'
 
         def _get_json_response(apiurl = self.apiurl):
@@ -1116,7 +1119,7 @@ class LayerIndexLayerSource(LayerSource):
         except Exception as e:
             import traceback
             if proxy_settings is not None:
-                logger.info("EE: Using proxy %s" % proxy_settings)
+                logger.info("EE: Using HTTP proxy %s and HTTPS proxy %s" % proxy_settings)
             logger.warning("EE: could not connect to %s, skipping update: %s\n%s" % (self.apiurl, e, traceback.format_exc(e)))
             return
 
-- 
1.9.3

---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

Re: [PATCH] toaster: show https proxy in error output

[Michael Wood]

On 19/04/16 13:19, Elliot Smith wrote:
> urllib2 automatically uses any http_proxy and https_proxy
> settings from the environment. Now that the layer index is
> available over https, there is a possibility that a user
> may experience an error while fetching layer index. In this
> situation, show the https_proxy setting as well as the
> http_proxy setting in the error.
>
> [YOCTO #9439]
>
> Signed-off-by: Elliot Smith <elliot.smith@intel.com>
> ---
>   bitbake/lib/toaster/orm/models.py | 7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
> index 68c3072..90e3f6a 100644
> --- a/bitbake/lib/toaster/orm/models.py
> +++ b/bitbake/lib/toaster/orm/models.py
> @@ -1096,7 +1096,10 @@ class LayerIndexLayerSource(LayerSource):
>   
>           import urllib2, urlparse, json
>           import os
> -        proxy_settings = os.environ.get("http_proxy", None)
> +        proxy_settings = (
> +            os.environ.get("http_proxy", None),
> +            os.environ.get("https_proxy", None)

You don't need to specify None as the default value to return if there 
is no value for those keys as this is already the default

> +        )
>           oe_core_layer = 'openembedded-core'
>   
>           def _get_json_response(apiurl = self.apiurl):
> @@ -1116,7 +1119,7 @@ class LayerIndexLayerSource(LayerSource):
>           except Exception as e:
>               import traceback
>               if proxy_settings is not None:


proxy_settings will always be True as it can be an tuple with 2x "None" 
in it, maybe use "if None not in proxy_settings"

> -                logger.info("EE: Using proxy %s" % proxy_settings)
> +                logger.info("EE: Using HTTP proxy %s and HTTPS proxy %s" % proxy_settings)
>               logger.warning("EE: could not connect to %s, skipping update: %s\n%s" % (self.apiurl, e, traceback.format_exc(e)))
>               return
>