commit d9b4425f68b8a239e6085f2700bfc2f95cdb2f46
author Nobuaki Sukegawa <nsuke@apache.org> Tue Mar 01 02:09:11 2016 +0900
committer Nobuaki Sukegawa <nsuke@apache.org> Sat Mar 05 22:53:48 2016 +0900
tree 7906b99c52dbefc2bf2e083a420b04c11c5e5a5e
parent 1ccd81bfbc7dc09dc7a8a5e64f313935b799c833

follow-up: THRIFT-3599 Validate client IP address against cert's SubjectAltName
Client: Python
Patch: Nobuaki Sukegawa

Fix required version of Python or dependency

This closes #914

lib/py/src/transport/TSSLSocket.py

diff --git a/lib/py/src/transport/TSSLSocket.py b/lib/py/src/transport/TSSLSocket.py
index e57a0d4..12bc356 100644
--- a/lib/py/src/transport/TSSLSocket.py
+++ b/lib/py/src/transport/TSSLSocket.py
@@ -385,8 +385,8 @@
                 self._validate_callback(client.peercert, addr[0])
                 client.is_valid = True
             except Exception:
-                logger.warn('Failed to validate client certificate address',
-                            exc_info=True)
+                logger.warn('Failed to validate client certificate address: %s',
+                            addr[0], exc_info=True)
                 client.close()
                 plain_client.close()
                 return None

lib/py/src/transport/sslcompat.py

diff --git a/lib/py/src/transport/sslcompat.py b/lib/py/src/transport/sslcompat.py
index 2d778d2..19cfaca 100644
--- a/lib/py/src/transport/sslcompat.py
+++ b/lib/py/src/transport/sslcompat.py
@@ -17,6 +17,8 @@
 # under the License.
 #
 
+import sys
+
 from thrift.transport.TTransport import TTransportException
 
 
@@ -69,9 +71,10 @@
     from backports.ssl_match_hostname import match_hostname
     _match_hostname = match_hostname
 except ImportError:
+    if sys.hexversion < 0x030500F0:
+        _match_has_ipaddress = False
     try:
         from ssl import match_hostname
         _match_hostname = match_hostname
     except ImportError:
         _match_hostname = legacy_validate_callback
-        _match_has_ipaddress = False