Keep the same scheme (protocol) as was used in Jenkins constructor in all requests

Some Jenkins instances are configured to allow reading the data over HTTP scheme, while for manipulating with
data (e.g. create or delete job) HTTPS scheme is required. Allow user to specify preferred URL scheme (by
specifying Jenkins URL) and use this scheme also manipulations with jobs.

This was introduced in 4f29f6742410736016b568002d8569f19d786841 (version 0.1.13) but lost again in
79934f0b5ca44a1d4ecbaf534eb1add8e343193f.

diff --git a/jenkinsapi/jenkins.py b/jenkinsapi/jenkins.py
index 8c2b2aa13fa8c4934d38f58f66d7e6deca8dd1b2..40e2e35a68a4f4ba881e3ba1df664c4c17d0768c 100644 (file)
--- a/jenkinsapi/jenkins.py
+++ b/jenkinsapi/jenkins.py
@@ -31,7 +31,7 @@ class Jenkins(JenkinsBase):
         """
         self.username = username
         self.password = password
-        self.requester = requester or Requester(username, password)
+        self.requester = requester or Requester(username, password, baseurl=baseurl)
         JenkinsBase.__init__(self, baseurl)
 
     def _clone(self):

diff --git a/jenkinsapi/utils/requester.py b/jenkinsapi/utils/requester.py
index 8f2131e17b8bf652accc9bc7620c461c1e381414..d77ea5c92bd4d6418c83b37fb72cc2b2adfa24ee 100644 (file)
--- a/jenkinsapi/utils/requester.py
+++ b/jenkinsapi/utils/requester.py
@@ -1,4 +1,5 @@
 import requests
+import urlparse
 from jenkinsapi.exceptions import JenkinsAPIException
 # import logging
 
@@ -26,10 +27,11 @@ class Requester(object):
 
     VALID_STATUS_CODES = [200,]
 
-    def __init__(self, username=None, password=None, ssl_verify=True):
+    def __init__(self, username=None, password=None, ssl_verify=True, baseurl=None):
         if username:
             assert password, 'Cannot set a username without a password!'
 
+        self.base_scheme = urlparse.urlsplit(baseurl).scheme if baseurl else None
         self.username = username
         self.password = password
         self.ssl_verify = ssl_verify
@@ -57,13 +59,24 @@ class Requester(object):
             requestKwargs['data'] = data
         return requestKwargs
 
+    def _update_url_scheme(self, url):
+        """
+        Updates scheme of given url to the one used in Jenkins baseurl.
+        """
+        if self.base_scheme and not url.startswith("%s://" % self.base_scheme):
+            url_split = urlparse.urlsplit(url)
+            url = urlparse.urlunsplit([self.base_scheme, url_split.netloc, url_split.path, url_split.query,
+                                       url_split.fragment])
+        return url
+
     def get_url(self, url, params=None, headers=None):
         requestKwargs = self.get_request_dict(url, params, None, headers)
+        url = self._update_url_scheme(url)
         return requests.get(url, **requestKwargs)
 
-
     def post_url(self, url, params=None, data=None, headers=None):
         requestKwargs = self.get_request_dict(url, params, data, headers)
+        url = self._update_url_scheme(url)
         return requests.post(url, **requestKwargs)
 
     def post_xml_and_confirm_status(self, url, params=None, data=None, valid=None):