Handle multiple time formats for SSL cert expiry time. by: Conrad, Giles

Author: gpjt

pythonanywhere/api.py

@@ -1,9 +1,9 @@
 import getpass
 import os
-from datetime import datetime
 from pathlib import Path
 from textwrap import dedent
 
+from dateutil.parser import parse
 import requests
 
 from pythonanywhere.exceptions import SanityException
@@ -162,7 +162,7 @@ def get_ssl_info(self):
             )
 
         result = response.json()
-        result["not_after"] = datetime.strptime(result["not_after"], "%Y%m%dT%H%M%SZ")
+        result["not_after"] = parse(result["not_after"])
         return result
 
     def delete_log(self, log_type, index=0):

requirements.txt

@@ -9,6 +9,7 @@ psutil==5.4.0
 py==1.7.0
 pytest==3.2.3
 pytest-cov==2.6.0
+python-dateutil==2.7.5
 requests==2.18.4
 responses==0.8.1
 six==1.11.0

setup.py

@@ -32,6 +32,7 @@
     install_requires=[
         'docopt',
         'requests',
+        'python-dateutil',
     ],
     extras_require={},
     python_requires='>=3.5',

tests/test_api.py

@@ -4,6 +4,7 @@
 from unittest.mock import patch
 from urllib.parse import urlencode
 
+from dateutil.tz import tzutc
 import pytest
 import responses
 from pythonanywhere.api import PYTHON_VERSIONS, AuthenticationError, Webapp, call_api, get_api_endpoint
@@ -277,7 +278,9 @@ def test_raises_if_post_does_not_20x(self, api_responses, api_token):
 
 
 class TestGetWebappSSLInfo:
-    def test_returns_json_from_server_having_parsed_expiry(self, api_responses, api_token):
+    def test_returns_json_from_server_having_parsed_expiry_with_z_for_utc_and_no_separators(
+        self, api_responses, api_token
+    ):
         expected_url = get_api_endpoint().format(username=getpass.getuser(), flavor="webapps") + "mydomain.com/ssl/"
         api_responses.add(
             responses.GET,
@@ -294,7 +297,37 @@ def test_returns_json_from_server_having_parsed_expiry(self, api_responses, api_
         )
 
         assert Webapp("mydomain.com").get_ssl_info() == {
-            "not_after": datetime(2018, 8, 24, 17, 16, 23),
+            "not_after": datetime(2018, 8, 24, 17, 16, 23, tzinfo=tzutc()),
+            "issuer_name": "PythonAnywhere test CA",
+            "subject_name": "www.mycoolsite.com",
+            "subject_alternate_names": ["www.mycoolsite.com", "mycoolsite.com"],
+        }
+
+        get = api_responses.calls[0]
+        assert get.request.method == "GET"
+        assert get.request.url == expected_url
+        assert get.request.headers["Authorization"] == "Token {api_token}".format(api_token=api_token)
+
+    def test_returns_json_from_server_having_parsed_expiry_with_timezone_offset_and_separators(
+        self, api_responses, api_token
+    ):
+        expected_url = get_api_endpoint().format(username=getpass.getuser(), flavor="webapps") + "mydomain.com/ssl/"
+        api_responses.add(
+            responses.GET,
+            expected_url,
+            status=200,
+            body=json.dumps(
+                {
+                    "not_after": "2018-08-24T17:16:23+00:00",
+                    "issuer_name": "PythonAnywhere test CA",
+                    "subject_name": "www.mycoolsite.com",
+                    "subject_alternate_names": ["www.mycoolsite.com", "mycoolsite.com"],
+                }
+            ),
+        )
+
+        assert Webapp("mydomain.com").get_ssl_info() == {
+            "not_after": datetime(2018, 8, 24, 17, 16, 23, tzinfo=tzutc()),
             "issuer_name": "PythonAnywhere test CA",
             "subject_name": "www.mycoolsite.com",
             "subject_alternate_names": ["www.mycoolsite.com", "mycoolsite.com"],