[OpenSRF-GIT] OpenSRF branch master updated. cc1f6ee9349584f7ec7b6f16861805a43f7161d6

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".

The branch, master has been updated
       via  cc1f6ee9349584f7ec7b6f16861805a43f7161d6 (commit)
      from  42f14c919d82abbf5927775b933ff8c5d4070d2e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cc1f6ee9349584f7ec7b6f16861805a43f7161d6
Author: Dan Scott <dscott at laurentian.ca>
Date:   Thu Jun 18 11:52:00 2015 -0400

    LP#1409055 Support specific protocols for OpenSRF gateway requests
    
    If the user passes in a gateway hostname that contains a specific HTTP or HTTPS
    protocol, let's just use that.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Bill Erickson <berickxx at gmail.com>

diff --git a/src/python/osrf/gateway.py b/src/python/osrf/gateway.py
index eda1139..8796ce2 100644
--- a/src/python/osrf/gateway.py
+++ b/src/python/osrf/gateway.py
@@ -50,6 +50,18 @@ class GatewayRequest:
     setDefaultHost = staticmethod(setDefaultHost)
 
     def buildURL(self):
+        """
+        Builds the URL for the OpenSRF gateway based on the host and path
+
+        Previous versions of the code assumed that the host would be a bare
+        hostname or IP address, and prepended the http:// protocol. However,
+        to enable more secure communications, now we check for the existence
+        of the HTTP or HTTPS prefix and use that if it has been supplied.
+        """
+
+        if defaultHost.lower().startswith(('http://', 'https://')):
+            return '%s/%s' % (defaultHost, self.path)
+
         return 'http://%s/%s' % (defaultHost, self.path)
 
 class JSONGatewayRequest(GatewayRequest):

-----------------------------------------------------------------------

Summary of changes:
 src/python/osrf/gateway.py |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
OpenSRF