Rename has_credential to _has_credential

Also removed places where we guarded calling check_revoked_cert with
has_credential('crl'); the method already handles that internally.

Author: Sean Cribbs

docs/advanced.rst

@@ -116,6 +116,7 @@ Security helpers
 .. autoclass:: fileobject
 
 .. automethod:: riak.security.SecurityCreds.check_revoked_cert
+.. automethod:: riak.security.SecurityCreds._has_credential
 
 ^^^^^^^^^^^^^^
 HTTP Transport

docs/security.rst

@@ -222,5 +222,3 @@ SecurityCreds object
    .. autoattribute:: pkey
    .. autoattribute:: ciphers
    .. autoattribute:: ssl_version
-
-.. automethod:: SecurityCreds.has_credential

riak/security.py

@@ -185,7 +185,7 @@ def _cached_cert(self, key, loader):
             setattr(self, key, cert_list)
         return getattr(self, key)
 
-    def has_credential(self, key):
+    def _has_credential(self, key):
         """
         ``True`` if a credential or filename value has been supplied for the
         given property.
@@ -207,7 +207,7 @@ def check_revoked_cert(self, ssl_socket):
         :rtype: bool
         :raises SecurityError: when the certificate has been revoked
         """
-        if not self.has_credential('crl'):
+        if not self._has_credential('crl'):
             return True
 
         servcert = ssl_socket.get_peer_certificate()

riak/transports/http/__init__.py

@@ -102,8 +102,7 @@ def connect(self):
             break
 
         self.sock = RiakWrappedSocket(cxn, sock)
-        if self.credentials.has_credential('crl'):
-            self.credentials.check_revoked_cert(self.sock)
+        self.credentials.check_revoked_cert(self.sock)
 
 
 class RiakHttpPool(Pool):

riak/transports/pbc/connection.py

@@ -126,8 +126,7 @@ def _ssl_handshake(self):
                 # ssl handshake successful
                 self._socket = ssl_socket
 
-                if self._client._credentials.has_credential('crl'):
-                    self._client._credentials.check_revoked_cert(ssl_socket)
+                self._client._credentials.check_revoked_cert(ssl_socket)
 
                 return True
             except Exception as e:

riak/transports/security.py

@@ -45,11 +45,11 @@ def configure_context(ssl_ctx, credentials):
     :type credentials: :class:`~riak.security.SecurityCreds`
     """
 
-    if credentials.has_credential('pkey'):
+    if credentials._has_credential('pkey'):
         ssl_ctx.use_privatekey(credentials.pkey)
-    if credentials.has_credential('cert'):
+    if credentials._has_credential('cert'):
         ssl_ctx.use_certificate(credentials.cert)
-    if credentials.has_credential('cacert'):
+    if credentials._has_credential('cacert'):
         store = ssl_ctx.get_cert_store()
         cacerts = credentials.cacert
         if not isinstance(cacerts, list):