RPC: Added support for HTTPS access URLs

When the server uses SSL, forge an https://... URL, to fix #69
tcalmant · Aug 27, 2016 · 5182dc7 · 5182dc7
1 parent d3d529c
commit 5182dc7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/pelix/remote/json_rpc.py b/pelix/remote/json_rpc.py
@@ -160,7 +160,8 @@ def get_access(self):
         Retrieves the URL to access this component
         """
         port = self._http.get_access()[1]
-        return "http://{{server}}:{0}{1}".format(port, self._path)
+        return "http{2}://{{server}}:{0}{1}".format(
+            port, self._path, "s" if self._http.is_https() else "")
 
     def make_endpoint_properties(self, svc_ref, name, fw_uid):
         """

diff --git a/pelix/remote/transport/jabsorb_rpc.py b/pelix/remote/transport/jabsorb_rpc.py
@@ -210,7 +210,8 @@ def get_accesses(self):
 
         # Return two accesses: with a {server} variable and with the
         # bound address
-        model = "http://{{server}}:{0}{1}".format(port, self._path)
+        model = "http{2}://{{server}}:{0}{1}".format(
+            port, self._path, "s" if self._http.is_https() else "")
         return ','.join((model, model.format(server=host)))
 
     @Validate

diff --git a/pelix/remote/xml_rpc.py b/pelix/remote/xml_rpc.py
@@ -159,7 +159,8 @@ def get_access(self):
         Retrieves the URL to access this component
         """
         port = self._http.get_access()[1]
-        return "http://{{server}}:{0}{1}".format(port, self._path)
+        return "http{2}://{{server}}:{0}{1}".format(
+            port, self._path, "s" if self._http.is_https() else "")
 
     def make_endpoint_properties(self, svc_ref, name, fw_uid):
         """