diff options
Diffstat (limited to 'keystonemiddleware/auth_token/_identity.py')
-rw-r--r-- | keystonemiddleware/auth_token/_identity.py | 52 |
1 files changed, 2 insertions, 50 deletions
diff --git a/keystonemiddleware/auth_token/_identity.py b/keystonemiddleware/auth_token/_identity.py index aeeb8d9..4c10521 100644 --- a/keystonemiddleware/auth_token/_identity.py +++ b/keystonemiddleware/auth_token/_identity.py @@ -10,12 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. -import functools - from keystoneauth1 import discover from keystoneauth1 import exceptions as ksa_exceptions from keystoneauth1 import plugin -from keystoneclient import exceptions as ksc_exceptions from keystoneclient.v2_0 import client as v2_client from keystoneclient.v3 import client as v3_client from six.moves import urllib @@ -25,18 +22,6 @@ from keystonemiddleware.auth_token import _exceptions as ksm_exceptions from keystonemiddleware.i18n import _ -def _convert_fetch_cert_exception(fetch_cert): - @functools.wraps(fetch_cert) - def wrapper(self): - try: - text = fetch_cert(self) - except ksa_exceptions.HttpError as e: - raise ksc_exceptions.CertificateConfigError(e.details) - return text - - return wrapper - - class _RequestStrategy(object): AUTH_VERSION = None @@ -49,20 +34,6 @@ class _RequestStrategy(object): def verify_token(self, user_token, allow_expired=False): pass - @_convert_fetch_cert_exception - def fetch_signing_cert(self): - return self._fetch_signing_cert() - - def _fetch_signing_cert(self): - pass - - @_convert_fetch_cert_exception - def fetch_ca_cert(self): - return self._fetch_ca_cert() - - def _fetch_ca_cert(self): - pass - class _V2RequestStrategy(_RequestStrategy): @@ -82,12 +53,6 @@ class _V2RequestStrategy(_RequestStrategy): return {'access': auth_ref} - def _fetch_signing_cert(self): - return self._client.certificates.get_signing_certificate() - - def _fetch_ca_cert(self): - return self._client.certificates.get_ca_certificate() - class _V3RequestStrategy(_RequestStrategy): @@ -112,12 +77,6 @@ class _V3RequestStrategy(_RequestStrategy): return {'token': auth_ref} - def _fetch_signing_cert(self): - return self._client.simple_cert.get_certificates() - - def _fetch_ca_cert(self): - return self._client.simple_cert.get_ca_certificates() - _REQUEST_STRATEGIES = [_V3RequestStrategy, _V2RequestStrategy] @@ -126,9 +85,8 @@ class IdentityServer(object): """Base class for operations on the Identity API server. The auth_token middleware needs to communicate with the Identity API server - to validate UUID tokens, signing certificates, - etc. This class encapsulates the data and methods to perform these - operations. + to validate tokens. This class encapsulates the data and methods to perform + the operations. """ @@ -241,11 +199,5 @@ class IdentityServer(object): else: return auth_ref - def fetch_signing_cert(self): - return self._request_strategy.fetch_signing_cert() - - def fetch_ca_cert(self): - return self._request_strategy.fetch_ca_cert() - def invalidate(self): return self._adapter.invalidate() |