ensure CONSUL_HTTP_ADDR starts with a scheme, either http or https if CONSUL_HTTP_SSL is set

asteven · asteven · commit 84d73ca8d4dd · 2020-09-11T21:10:09.000+02:00
Signed-off-by: Steven Armstrong &lt;steven.armstrong@id.ethz.ch&gt;
diff --git a/consul/base.py b/consul/base.py
@@ -352,9 +352,26 @@ def from_env(cls, consistency='default', dc=None):
         kwargs = {
             'consistency': consistency,
             'dc': dc,
-            'addr': oe.get('CONSUL_HTTP_ADDR', None),
             'token': oe.get('CONSUL_HTTP_TOKEN', None),
         }
+
+        addr = oe.get('CONSUL_HTTP_ADDR', None)
+        if addr:
+            if not addr.startswith('http'):
+                # Ensure addr starts with a scheme.
+                ssl = oe.get('CONSUL_HTTP_SSL', False)
+                if ssl == 'false':
+                    ssl = False
+                elif ssl == 'true':
+                    ssl = True
+
+                if ssl:
+                    scheme = 'https'
+                else:
+                    scheme = 'http'
+                addr = '%s://%s' % (scheme, addr)
+            kwargs['addr'] = addr
+
         verify = oe.get('CONSUL_CACERT',
                         oe.get('CONSUL_HTTP_SSL_VERIFY', None))
         if verify:
