[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2138/8267] bitbake: wget: allow basic http auth for SSTATE_MIRRORS

[Emmanuele Bassi <ebassi src gnome org>]

commit 46bad463ef99db9f237723614c5de01f89d5e54f
Author: Stephano Cetola <stephano cetola linux intel com>
Date:   Fri Aug 26 10:41:43 2016 -0700

    bitbake: wget: allow basic http auth for SSTATE_MIRRORS
    
    If http basic auth creds were added to sstate mirrors like so:
    
    https://foo.com/sstate/PATH;user=foo:bar;downloadfilename=PATH
    
    The sstate mirror check would silently fail with 401 unauthorized.
    This patch allows both the check, and the wget download to succeed by
    checking for user credentials and if present adding the correct
    headers, or wget params as needed.
    
    [ YOCTO #9815 ]
    
    (Bitbake rev: cea8113d14da9e12db80a5b6b5811a47a7dfdeef)
    
    Signed-off-by: Stephano Cetola <stephano cetola linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/fetch2/wget.py |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py
index 6b60d9b..ecb946a 100644
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/bitbake/lib/bb/fetch2/wget.py
@@ -108,6 +108,10 @@ class Wget(FetchMethod):
             bb.utils.mkdirhier(os.path.dirname(dldir + os.sep + ud.localfile))
             fetchcmd += " -O " + dldir + os.sep + ud.localfile
 
+        if ud.user:
+            up = ud.user.split(":")
+            fetchcmd += " --user=%s --password=%s --auth-no-challenge" % (up[0],up[1])
+
         uri = ud.url.split(";")[0]
         if os.path.exists(ud.localpath):
             # file exists, but we didnt complete it.. trying again..
@@ -300,6 +304,13 @@ class Wget(FetchMethod):
             uri = ud.url.split(";")[0]
             r = urllib.request.Request(uri)
             r.get_method = lambda: "HEAD"
+
+            if ud.user:
+                import base64
+                encodeuser = base64.b64encode(ud.user.encode('utf-8')).decode("utf-8")
+                authheader =  "Basic %s" % encodeuser
+                r.add_header("Authorization", authheader)
+
             opener.open(r)
         except urllib.error.URLError as e:
             if try_again: