From 92fd2dbfb672d7b2b1cdfd5dd5cf89f7716b3e12 Mon Sep 17 00:00:00 2001
From: asteroide <thomas.duval@orange.com>
Date: Tue, 1 Sep 2015 16:03:26 +0200
Subject: Update Keystone code from official Github repository with branch
 Master on 09/01/2015.

Change-Id: I0ff6099e6e2580f87f502002a998bbfe12673498
---
 keystone-moon/keystone/auth/plugins/external.py | 85 -------------------------
 1 file changed, 85 deletions(-)

(limited to 'keystone-moon/keystone/auth/plugins/external.py')

diff --git a/keystone-moon/keystone/auth/plugins/external.py b/keystone-moon/keystone/auth/plugins/external.py
index 2322649f..cabe6282 100644
--- a/keystone-moon/keystone/auth/plugins/external.py
+++ b/keystone-moon/keystone/auth/plugins/external.py
@@ -23,7 +23,6 @@ from keystone import auth
 from keystone.common import dependency
 from keystone import exception
 from keystone.i18n import _
-from keystone.openstack.common import versionutils
 
 
 CONF = cfg.CONF
@@ -31,9 +30,6 @@ CONF = cfg.CONF
 
 @six.add_metaclass(abc.ABCMeta)
 class Base(auth.AuthMethodHandler):
-
-    method = 'external'
-
     def authenticate(self, context, auth_info, auth_context):
         """Use REMOTE_USER to look up the user in the identity backend.
 
@@ -96,91 +92,10 @@ class Domain(Base):
         return user_ref
 
 
-@dependency.requires('assignment_api', 'identity_api')
 class KerberosDomain(Domain):
     """Allows `kerberos` as a method."""
-    method = 'kerberos'
-
     def _authenticate(self, remote_user, context):
         auth_type = context['environment'].get('AUTH_TYPE')
         if auth_type != 'Negotiate':
             raise exception.Unauthorized(_("auth_type is not Negotiate"))
         return super(KerberosDomain, self)._authenticate(remote_user, context)
-
-
-class ExternalDefault(DefaultDomain):
-    """Deprecated. Please use keystone.auth.external.DefaultDomain instead."""
-
-    @versionutils.deprecated(
-        as_of=versionutils.deprecated.ICEHOUSE,
-        in_favor_of='keystone.auth.external.DefaultDomain',
-        remove_in=+1)
-    def __init__(self):
-        super(ExternalDefault, self).__init__()
-
-
-class ExternalDomain(Domain):
-    """Deprecated. Please use keystone.auth.external.Domain instead."""
-
-    @versionutils.deprecated(
-        as_of=versionutils.deprecated.ICEHOUSE,
-        in_favor_of='keystone.auth.external.Domain',
-        remove_in=+1)
-    def __init__(self):
-        super(ExternalDomain, self).__init__()
-
-
-@dependency.requires('identity_api')
-class LegacyDefaultDomain(Base):
-    """Deprecated. Please use keystone.auth.external.DefaultDomain instead.
-
-    This plugin exists to provide compatibility for the unintended behavior
-    described here: https://bugs.launchpad.net/keystone/+bug/1253484
-
-    """
-
-    @versionutils.deprecated(
-        as_of=versionutils.deprecated.ICEHOUSE,
-        in_favor_of='keystone.auth.external.DefaultDomain',
-        remove_in=+1)
-    def __init__(self):
-        super(LegacyDefaultDomain, self).__init__()
-
-    def _authenticate(self, remote_user, context):
-        """Use remote_user to look up the user in the identity backend."""
-        # NOTE(dolph): this unintentionally discards half the REMOTE_USER value
-        names = remote_user.split('@')
-        username = names.pop(0)
-        domain_id = CONF.identity.default_domain_id
-        user_ref = self.identity_api.get_user_by_name(username, domain_id)
-        return user_ref
-
-
-@dependency.requires('identity_api', 'resource_api')
-class LegacyDomain(Base):
-    """Deprecated. Please use keystone.auth.external.Domain instead."""
-
-    @versionutils.deprecated(
-        as_of=versionutils.deprecated.ICEHOUSE,
-        in_favor_of='keystone.auth.external.Domain',
-        remove_in=+1)
-    def __init__(self):
-        super(LegacyDomain, self).__init__()
-
-    def _authenticate(self, remote_user, context):
-        """Use remote_user to look up the user in the identity backend.
-
-        If remote_user contains an `@` assume that the substring before the
-        rightmost `@` is the username, and the substring after the @ is the
-        domain name.
-        """
-        names = remote_user.rsplit('@', 1)
-        username = names.pop(0)
-        if names:
-            domain_name = names[0]
-            domain_ref = self.resource_api.get_domain_by_name(domain_name)
-            domain_id = domain_ref['id']
-        else:
-            domain_id = CONF.identity.default_domain_id
-        user_ref = self.identity_api.get_user_by_name(username, domain_id)
-        return user_ref
-- 
cgit 1.2.3-korg