address review comments

Signed-off-by: Matthew Peveler <[email protected]>

Author: MasterOdin

README.md

@@ -58,7 +58,12 @@ In order of precedence:
 If you are experiencing issues with *tldr*, consider deleting the cache files before trying other measures.
 
 ### SSL Inspection
-* `TLDR_IGNORE_SSL=1` will disable SSL certificate inspection
+
+For networks that sit behind a proxy, it may be necessary to disable SSL verification for the client to function. Setting the following:
+
+* `TLDR_ALLOW_INSECURE=1` 
+
+will disable SSL certificate inspection. This __should be avoided__ unless absolutely necessary.
 
 ### Colors
 
@@ -86,4 +91,4 @@ can either use the `--source` flag when using tldr or by specifying the followin
   * defaults to `https://raw.githubusercontent.com/tldr-pages/tldr/master/pages`
   * it can also point to local directory using `file:///path/to/directory`
 * `TLDR_DOWNLOAD_CACHE_LOCATION` to control where to pull a zip of all pages from
-  * defaults to `https://tldr-pages.github.io/assets/tldr.zip`
+  * defaults to `https://tldr-pages.github.io/assets/tldr.zip`

tldr.py

@@ -26,14 +26,11 @@
 )
 USE_CACHE = int(os.environ.get('TLDR_CACHE_ENABLED', '1')) > 0
 MAX_CACHE_AGE = int(os.environ.get('TLDR_CACHE_MAX_AGE', 24))
-IGNORE_SSL    = int(os.environ.get('TLDR_IGNORE_SSL','0'))
-
-ignore_ctx = ssl.create_default_context()
-ignore_ctx .check_hostname = False
-ignore_ctx .verify_mode = ssl.CERT_NONE
-
-
-
+URLOPEN_CONTEXT = None
+if int(os.environ.get('TLDR_ALLOW_INSECURE', '0')) == 1:
+    URLOPEN_CONTEXT = ssl.create_default_context()
+    URLOPEN_CONTEXT.check_hostname = False
+    URLOPEN_CONTEXT.verify_mode = ssl.CERT_NONE
 
 OS_DIRECTORIES = {
     "linux": "linux",
@@ -97,7 +94,7 @@ def get_page_for_platform(command, platform, remote=None):
     else:
         page_url = get_page_url(platform, command, remote)
         try:
-            data = urlopen(Request(page_url, headers=REQUEST_HEADERS), context=ignore_ctx).read()
+            data = urlopen(Request(page_url, headers=REQUEST_HEADERS), context=URLOPEN_CONTEXT).read()
             data_downloaded = True
         except Exception:
             data = load_page_from_cache(command, platform)
@@ -110,7 +107,7 @@ def get_page_for_platform(command, platform, remote=None):
 
 def update_page_for_platform(command, platform, remote=None):
     page_url = get_page_url(platform, command, remote)
-    data = urlopen(Request(page_url, headers=REQUEST_HEADERS), context=ignore_ctx).read()
+    data = urlopen(Request(page_url, headers=REQUEST_HEADERS), context=URLOPEN_CONTEXT).read()
     store_page_to_cache(data, command, platform)
 
 
@@ -231,7 +228,7 @@ def update_cache():
         req = urlopen(Request(
             DOWNLOAD_CACHE_LOCATION,
             headers=REQUEST_HEADERS
-        ))
+        ), context=URLOPEN_CONTEXT)
         zipfile = ZipFile(BytesIO(req.read()))
         pattern = re.compile(r'pages/(.+)/(.+)\.md')
         cached = 0
@@ -281,8 +278,6 @@ def main():
 
     colorama.init(strip=options.color)
 
-    other_options = [str('-'.join(other_options))]
-
     if options.update_cache:
         update_cache()
         return