Use scheme to determine TLS use from CLI

Author: Lukasa

hyper/cli.py

@@ -123,6 +123,7 @@ def __init__(self):
             self.port = 443
             self.query = None
             self.scheme = 'https'
+            self.secure = False
 
     info = UrlInfo()
     _result = urlsplit(args._url)
@@ -134,6 +135,9 @@ def __init__(self):
     if info.scheme == 'http' and not _result.port:
         info.port = 80
 
+    # Set the secure arg is the scheme is HTTPS, otherwise do unsecured.
+    info.secure = info.scheme == 'https'
+
     if info.netloc:
         hostname, _ = split_host_and_port(info.netloc)
         info.host = hostname  # ensure stripping port number
@@ -214,7 +218,7 @@ def get_content_type_and_charset(response):
 
 
 def request(args):
-    conn = HTTPConnection(args.url.host, args.url.port)
+    conn = HTTPConnection(args.url.host, args.url.port, secure=args.url.secure)
     conn.request(args.method, args.url.path, args.body, args.headers)
     response = conn.get_response()
     log.debug('Response Headers:\n%s', pformat(response.headers))

test/test_cli.py

@@ -46,10 +46,11 @@ def getheaders(self):
 
 
 class DummyConnection(object):
-    def __init__(self, host, port):
+    def __init__(self, host, port, secure=False):
         self.host = host
         self.port = port
         self.response = DummyResponse({'content-type': 'application/json'})
+        self.secure = secure
 
     def request(self, method, path, body, headers):
         return method, path, body, headers
@@ -177,27 +178,33 @@ def test_set_request_data(args, expected):
 @pytest.mark.parametrize(('args', 'expected'), [
     (DummyNamespace({'_url': ''}),
      {'query': None, 'host': 'localhost', 'fragment': None,
-      'port': 443, 'netloc': None, 'scheme': 'https', 'path': '/'}),
+      'port': 443, 'netloc': None, 'scheme': 'https', 'path': '/',
+      'secure': True}),
     (DummyNamespace({'_url': 'example.com'}),
-     {'host': 'example.com', 'port': 443, 'path': '/'}),
+     {'host': 'example.com', 'port': 443, 'path': '/', 'secure': True}),
     (DummyNamespace({'_url': 'example.com/httpbin/get'}),
-     {'host': 'example.com', 'port': 443, 'path': '/httpbin/get'}),
+     {'host': 'example.com', 'port': 443, 'path': '/httpbin/get',
+     'secure': True}),
     (DummyNamespace({'_url': 'example.com:80'}),
-     {'host': 'example.com', 'port': 80, 'path': '/'}),
+     {'host': 'example.com', 'port': 80, 'path': '/', 'secure': True}),
     (DummyNamespace({'_url': 'http://example.com'}),
-     {'host': 'example.com', 'port': 80, 'path': '/', 'scheme': 'http'}),
+     {'host': 'example.com', 'port': 80, 'path': '/', 'scheme': 'http',
+     'secure': False}),
     (DummyNamespace({'_url': 'http://example.com/'}),
-     {'host': 'example.com', 'port': 80, 'path': '/', 'scheme': 'http'}),
+     {'host': 'example.com', 'port': 80, 'path': '/', 'scheme': 'http',
+     'secure': False}),
     (DummyNamespace({'_url': 'http://example.com:8080'}),
-     {'host': 'example.com', 'port': 8080, 'path': '/', 'scheme': 'http'}),
+     {'host': 'example.com', 'port': 8080, 'path': '/', 'scheme': 'http',
+     'secure': False}),
     (DummyNamespace({'_url': 'https://example.com'}),
-     {'host': 'example.com', 'port': 443, 'path': '/', 'scheme': 'https'}),
+     {'host': 'example.com', 'port': 443, 'path': '/', 'scheme': 'https',
+     'secure': True}),
     (DummyNamespace({'_url': 'https://example.com/httpbin/get'}),
      {'host': 'example.com', 'port': 443, 'path': '/httpbin/get',
-      'scheme': 'https'}),
+      'scheme': 'https', 'secure': True}),
     (DummyNamespace({'_url': 'https://example.com:8443/httpbin/get'}),
      {'host': 'example.com', 'port': 8443, 'path': '/httpbin/get',
-      'scheme': 'https'}),
+      'scheme': 'https', 'secure': True}),
 ], ids=[
     'set no url (it means default settings)',
     'set only hostname',