Enable github private repos.

ros-infrastructure · Jun 16, 2017 · 9b32ab6 · 9b32ab6
1 parent 9ea33a7
commit 9b32ab6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/bloom/commands/.release.py.swp b/bloom/commands/.release.py.swp
diff --git a/bloom/github.py b/bloom/github.py
@@ -41,10 +41,14 @@
 import datetime
 import json
 import socket
+import os
 
 from urlparse import urlunsplit
 from urllib import urlencode
 
+GITHUB_USER = os.getenv('GITHUB_USER', None)
+GITHUB_PASSWORD = os.getenv('GITHUB_PASSWORD', None)
+
 try:
     # Python2
     from urllib2 import HTTPError
@@ -88,6 +92,10 @@ def do_github_post_req(path, data=None, auth=None, site='api.github.com'):
     else:
         request = Request(url, data=json.dumps(data), headers=headers)  # POST
 
+    if GITHUB_USER and GITHUB_PASSWORD:
+        authheader = 'Basic %s' % base64.b64encode('%s:%s' % (GITHUB_USER, GITHUB_PASSWORD))
+        request.add_header('Authorization', authheader)
+
     try:
         response = urlopen(request, timeout=120)
     except HTTPError as e:

diff --git a/bloom/util.py b/bloom/util.py
@@ -38,22 +38,26 @@
 
 import argparse
 import os
+import base64
 import shutil
 import socket
 import sys
 import tempfile
 import time
 
+GITHUB_USER = os.getenv('GITHUB_USER', None)
+GITHUB_PASSWORD = os.getenv('GITHUB_PASSWORD', None)
+
 try:
     # Python2
     from urllib2 import HTTPError
     from urllib2 import URLError
-    from urllib2 import urlopen
+    from urllib2 import urlopen, Request
 except ImportError:
     # Python3
     from urllib.error import HTTPError
     from urllib.error import URLError
-    from urllib.request import urlopen
+    from urllib.request import urlopen, Request
 
 from email.utils import formatdate
 
@@ -195,8 +199,13 @@ def load_url_to_file_handle(url, retry=2, retry_period=1, timeout=10):
     :param timeout: timeout for opening the URL in seconds
     :type timeout: float
     """
+    req = Request(url)
+    if GITHUB_USER and GITHUB_PASSWORD:
+        authheader = 'Basic %s' % base64.b64encode('%s:%s' % (GITHUB_USER, GITHUB_PASSWORD))
+        req.add_header('Authorization', authheader)
+
     try:
-        fh = urlopen(url, timeout=timeout)
+        fh = urlopen(req, timeout=timeout)
     except HTTPError as e:
         if e.code == 503 and retry:
             time.sleep(retry_period)