Add HTTPS support

Thanks to Pasi Eronen for figuring out the hard part!

Closes peritus#9 and closes peritus#7.

Author: peritus

src/HttpLibrary/__init__.py

@@ -34,14 +34,15 @@ class HTTP:
     ROBOT_LIBRARY_VERSION = "0.3.2"
 
     class Context(object):
-        def __init__(self, http, host=None):
+        def __init__(self, http, host=None, scheme='http'):
             # daddy
             self._http = http
             self._host = host
+            self._scheme = scheme
 
             # the livetest app
             if host:
-                self.app = livetest.TestApp(host)
+                self.app = livetest.TestApp(host, scheme=scheme)
             else:
                 self.app = None
 
@@ -135,7 +136,7 @@ def _path_from_url_or_path(self, url_or_path):
 
         elif url_or_path.startswith("http"):
             parsed_url = urlparse(url_or_path)
-            self.set_http_host(parsed_url.netloc)
+            self.create_http_context(parsed_url.netloc, parsed_url.scheme)
             return parsed_url.path
 
         raise Exception('"%s" needs to be in form of "/path" or "http://host/path"'
@@ -149,17 +150,22 @@ def set_http_host(self, host):
         """
         self.create_http_context(host)
 
-    def create_http_context(self, host=None):
+    def create_http_context(self, host=None, scheme='http'):
         """
         Sets the HTTP host to use for future requests. You must call this
         before issuing any HTTP requests.
 
         `host` is the name of the host, optionally with port (e.g. 'google.com' or 'localhost:5984')
+        `scheme` the protocol scheme to use. Valid values are 'http', 'https'
         """
+
+        assert scheme in ('http', 'https'), "`scheme` parameter must be 'http' or 'https'"
+
         if host == None:
             host = self.context.app.host
         logger.info("Host for next HTTP request set to '%s'" % host)
-        self._contexts.append(HTTP.Context(self, host))
+        logger.info("Scheme for next HTTP request set to '%s'" % scheme)
+        self._contexts.append(HTTP.Context(self, host, scheme))
 
     def restore_http_context(self):
         """
@@ -180,7 +186,7 @@ def http_request(self, verb, url):
         path = self._path_from_url_or_path(url)
 
         self.context.pre_process_request()
-        logger.debug("Performing %s request on http://%s%s" % (verb, self.app.host, url,))
+        logger.debug("Performing %s request on %s://%s%s" % (verb, self.context._scheme, self.app.host, path,))
         self.context.post_process_request(
             self.context.app.request(path, {}, self.context.request_headers,
             method=verb.upper(),)
@@ -194,7 +200,7 @@ def HEAD(self, url):
         """
         path = self._path_from_url_or_path(url)
         self.context.pre_process_request()
-        logger.debug("Performing HEAD request on http://%s%s" % (self.app.host, url,))
+        logger.debug("Performing HEAD request on %s://%s%s" % (self.context._scheme, self.app.host, path,))
         self.context.post_process_request(
           self.app.head(path, self.context.request_headers)
         )
@@ -207,7 +213,7 @@ def GET(self, url):
         """
         path = self._path_from_url_or_path(url)
         self.context.pre_process_request()
-        logger.debug("Performing GET request on http://%s%s" % (self.app.host, url))
+        logger.debug("Performing GET request on %s://%s%s" % (self.context._scheme, self.app.host, path))
         self.context.post_process_request(
           self.app.get(path, {}, self.context.request_headers)
         )
@@ -222,7 +228,7 @@ def POST(self, url):
         kwargs = {}
         if 'Content-Type' in self.context.request_headers:
             kwargs['content_type'] = self.context.request_headers['Content-Type']
-        logger.debug("Performing POST request on http://%s%s" % (self.app.host, url))
+        logger.debug("Performing POST request on %s://%s%s" % (self.context._scheme, self.app.host, url))
         self.context.pre_process_request()
         self.context.post_process_request(
           self.app.post(path, self.context.request_body or {}, self.context.request_headers, **kwargs)
@@ -239,7 +245,7 @@ def PUT(self, url):
         if 'Content-Type' in self.context.request_headers:
             kwargs['content_type'] = self.context.request_headers['Content-Type']
         self.context.pre_process_request()
-        logger.debug("Performing PUT request on http://%s%s" % (self.app.host, url))
+        logger.debug("Performing PUT request on %s://%s%s" % (self.context._scheme, self.app.host, url))
         self.context.post_process_request(
           self.app.put(path, self.context.request_body or {}, self.context.request_headers, **kwargs)
         )
@@ -252,7 +258,7 @@ def DELETE(self, url):
         """
         path = self._path_from_url_or_path(url)
         self.context.pre_process_request()
-        logger.debug("Performing DELETE request on %s" % url)
+        logger.debug("Performing DELETE request on %s://%s%s" % (self.context._scheme, self.app.host, url))
         self.context.post_process_request(
           self.app.delete(path, {}, self.context.request_headers)
         )

src/HttpLibrary/livetest.py

@@ -60,7 +60,9 @@ def __init__(self, host, scheme='http', relative_to=None):
         self.relative_to = relative_to
         self.conn = {}
         self._load_conn(scheme)
-        self.extra_environ = {}
+        self.extra_environ = {
+          'wsgi.url_scheme': scheme,
+        }
         self.reset()
 
     def _do_httplib_request(self, req):

tests/http/__init__.txt

@@ -3,18 +3,18 @@
 Library         HttpLibrary.HTTP
 Library         OperatingSystem
 
-Resource        ../variables.txt
+Resource        variables.txt
 
 Suite Setup     Start Mockserver
 Suite Teardown  Stop Mockserver
 
 *** Keywords ***
 
 Start Mockserver
-    Start Process  tests/http/mockserver.py
-    Sleep  0.2
+    Start Process   tests/http/mockserver.py ${PORT}
+    Sleep           1
 
 Stop Mockserver
-    Create HTTP Context    ${HOST}
-    POST           /kill
+    POST            http://${HOST}/kill
+    Sleep           1
 

tests/http/mockserver.py

@@ -1,7 +1,9 @@
 #!/usr/bin/env python
 
 import BaseHTTPServer
-from sys import exit
+import sys
+import os
+import ssl
 
 class WebRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
 
@@ -96,13 +98,28 @@ def do_POST(self, *args, **kwargs):
             global server
             self.send_response(201, "Killing myself")
             server.socket.close()
-            exit(0)
+            sys.exit(0)
         else:
             self.send_error(500)
 
     do_PUT = do_POST
 
-print 'Starting server on http://localhost:36503/'
+PORT = int(sys.argv[1])
+server = BaseHTTPServer.HTTPServer(('localhost', PORT), WebRequestHandler)
+scheme = 'http'
+
+if '--ssl' in sys.argv:
+    scheme = 'https'
+
+    cert = os.path.abspath(os.path.join(os.path.dirname(__file__), 'rfhttplibmockserver.pem'))
+
+    server.socket = ssl.wrap_socket(
+      server.socket,
+      certfile=cert,
+      keyfile=cert,
+      server_side=True,
+    )
+
+print 'Starting server on %s://localhost:%d/' % (scheme, PORT)
 
-server = BaseHTTPServer.HTTPServer(('localhost', 36503), WebRequestHandler)
 server.serve_forever()

tests/http/rfhttplibmockserver.pem

@@ -0,0 +1,33 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDiTHYDS4NP84Dn6EeU0s7xqnRtO+JTyW/xV485B5KaEFfeheLD
+v6MAr1T0fg4aLo3R0PzLx0IMLsFuWIdm5+J5IaMcW8rbvWsLM8Ayh9TT7FR0aNiQ
+kGs6A0oDmYUa5FSC2j61Q2mVfoUokQcaWpmEEZMq2uBR3/P1jsEMU16erQIDAQAB
+AoGAWPdgafk0/aiopAOQqLScASxXK16govoNlV8sAmq0uvbz5JrURMrBZZKInro0
+Bx0ISlWUHPUQRUPYbe5GBTHiuak3vneTytTW7pvWw7E/fZrc+5UF/AHPAgIBdaK/
+Gwtafn63c2V/T0GFcI9ZUtMCmvCaBL0OWeIuQVjBSNEB7S0CQQDz9OB2CbUVLIiW
+MHMRIZsBfdLF/N6QtHuDwUL+51NxYSsNumcyI5j4xAsCBplWwOFNs91x/7LEHh6h
+wNpSTlLbAkEA7Xhsh+MMZm5ElmnyPH5Ql1nDAtBl14C77LSz4kbrx7+lzdQy6bsu
++p08ZFkZ6ABcOkoZwwaHHjfzsLaIzUKXFwJAKRSnZ7kiwToKlh/6gHwEOjAR+j0m
+zX9W/UziF0KlDoaqVVl6XzsXW2zH3cN2tuEsD4WmWLgSRmw8BEkReqKt2QJAE882
+5oMHNsg+CnoeDfPPj0CapvJxfG+tvYo5c0fNRWV0VF4+PQczXQ6eyhQwuAzHpMkn
+qwAxZ1DtkDE56j2C0wJBANJ9sX6bB0q5zBrnJdn9t7ymnjvMoFijyWwjJ7B14CYS
++kM1yw959G7/TVwC2PZ1PDes8lRTFgVx8644JZaLyxA=
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIC7zCCAligAwIBAgIJAMt0Xej2hG00MA0GCSqGSIb3DQEBBQUAMFkxCzAJBgNV
+BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQxEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMjEwMTQwODM0
+MDVaFw0yMjEwMTIwODM0MDVaMFkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21l
+LVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEjAQBgNV
+BAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4kx2A0uD
+T/OA5+hHlNLO8ap0bTviU8lv8VePOQeSmhBX3oXiw7+jAK9U9H4OGi6N0dD8y8dC
+DC7BbliHZufieSGjHFvK271rCzPAMofU0+xUdGjYkJBrOgNKA5mFGuRUgto+tUNp
+lX6FKJEHGlqZhBGTKtrgUd/z9Y7BDFNenq0CAwEAAaOBvjCBuzAdBgNVHQ4EFgQU
+WG/vc+TsT7+l/IWVfRFK6m7jw3MwgYsGA1UdIwSBgzCBgIAUWG/vc+TsT7+l/IWV
+fRFK6m7jw3OhXaRbMFkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRl
+MSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEjAQBgNVBAMTCWxv
+Y2FsaG9zdIIJAMt0Xej2hG00MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+gYEAS6Hon/dpLAFJDjOFZQQGQ7YC28XbS0p1q1Gz/utlnZ3xP9AXdyyLfltKo/rk
+OGTvCEbY1mWYI6XgldZZvS1Zo2m/oI8Gp5yYaLeaIQMgGXJ3GX6HDIKmZHUgPCVB
+Bihfc7mq9I+bCu8u6fHf67bunayIpK9ZijdEHFqJiZX39vo=
+-----END CERTIFICATE-----

tests/http/scoping/keyword_new_context.txt

@@ -1,6 +1,6 @@
 *** Settings ***
 
-Resource        ../../variables.txt
+Resource        ../variables.txt
 Library         HttpLibrary.HTTP
 
 *** Keywords ***

tests/http/scoping/simplescope.txt

@@ -1,6 +1,6 @@
 *** Settings ***
 
-Resource        ../../variables.txt
+Resource        ../variables.txt
 Library         HttpLibrary.HTTP
 Suite Setup     Create HTTP Context    ${HOST}
 

tests/http/scoping/suite_setup.txt

@@ -1,6 +1,6 @@
 *** Settings ***
 
-Resource        ../../variables.txt
+Resource        ../variables.txt
 Library         HttpLibrary.HTTP
 Suite Setup     Create HTTP Context   ${HOST}
 

tests/http/simple.txt

@@ -1,6 +1,6 @@
 *** Settings ***
 
-Resource        ../variables.txt
+Resource        variables.txt
 Library         HttpLibrary.HTTP
 Test Setup      Create HTTP Context     ${HOST}
 

tests/http/variables.txt

@@ -0,0 +1,4 @@
+*** Variables ***
+
+${PORT}     36503
+${HOST}     localhost:${PORT}

tests/https/__init__.txt

@@ -0,0 +1,20 @@
+*** Settings ***
+
+Library         HttpLibrary.HTTP
+Library         OperatingSystem
+
+Resource        variables.txt
+
+Suite Setup     Start Secure Mockserver
+Suite Teardown  Stop Secure Mockserver
+
+*** Keywords ***
+
+Start Secure Mockserver
+    Start Process          tests/http/mockserver.py ${PORT} --ssl
+    Sleep  1
+
+Stop Secure Mockserver
+    POST                   https://${HOST}/kill
+    Sleep  1
+

tests/https/simple.txt

@@ -0,0 +1,21 @@
+*** Settings ***
+
+Resource        variables.txt
+Library         HttpLibrary.HTTP
+Test Setup      Create HTTP Context  ${HOST}    https
+
+*** Test Cases ***
+
+Simple GET on self-signed Mockserver
+    GET      /200
+
+Full-URL GET with full url on self-signed mock server
+    GET      https://${HOST}/200
+
+Full-URL GET to https://encrypted.google.com/
+    GET      https://encrypted.google.com/
+
+Simple GET to https://encrypted.google.com/
+    Create HTTP Context  encrypted.google.com   https
+    GET      /
+

tests/https/variables.txt

@@ -0,0 +1,4 @@
+*** Variables ***
+
+${PORT}     36504
+${HOST}     localhost:${PORT}

tests/variables.txt

@@ -1,4 +0,0 @@
-*** Variables ***
-
-${HOST}         localhost:36503
-