13bb2f74b0
The attempt at a move to user-name is an exercise in churn, and is filling everyone's logs with admonitions to change the name of their variables - which does not work if they do. Swap this, effectively reverting the attempt at a move. user-name will continue to work on the off chance anyone started consuming that path, which is unlikely because none of the consuming programs expose that as an actual option. Closes-Bug: 1498247 Change-Id: I62d991fda1df63c9cbabfde2f6836bc031f5147c
93 lines
3.5 KiB
Python
93 lines
3.5 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import logging
|
|
|
|
from oslo_config import cfg
|
|
|
|
from keystoneclient import _discover
|
|
from keystoneclient.auth.identity.generic import base
|
|
from keystoneclient.auth.identity import v2
|
|
from keystoneclient.auth.identity import v3
|
|
from keystoneclient import utils
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
def get_options():
|
|
return [
|
|
cfg.StrOpt('user-id', help='User id'),
|
|
cfg.StrOpt('username', dest='username', help='Username',
|
|
deprecated_name='user-name'),
|
|
cfg.StrOpt('user-domain-id', help="User's domain id"),
|
|
cfg.StrOpt('user-domain-name', help="User's domain name"),
|
|
cfg.StrOpt('password', help="User's password"),
|
|
]
|
|
|
|
|
|
class Password(base.BaseGenericPlugin):
|
|
"""A common user/password authentication plugin.
|
|
|
|
:param string username: Username for authentication.
|
|
:param string user_id: User ID for authentication.
|
|
:param string password: Password for authentication.
|
|
:param string user_domain_id: User's domain ID for authentication.
|
|
:param string user_domain_name: User's domain name for authentication.
|
|
|
|
"""
|
|
|
|
@utils.positional()
|
|
def __init__(self, auth_url, username=None, user_id=None, password=None,
|
|
user_domain_id=None, user_domain_name=None, **kwargs):
|
|
super(Password, self).__init__(auth_url=auth_url, **kwargs)
|
|
|
|
self._username = username
|
|
self._user_id = user_id
|
|
self._password = password
|
|
self._user_domain_id = user_domain_id
|
|
self._user_domain_name = user_domain_name
|
|
|
|
def create_plugin(self, session, version, url, raw_status=None):
|
|
if _discover.version_match((2,), version):
|
|
if self._user_domain_id or self._user_domain_name:
|
|
# If you specify any domain parameters it won't work so quit.
|
|
return None
|
|
|
|
return v2.Password(auth_url=url,
|
|
user_id=self._user_id,
|
|
username=self._username,
|
|
password=self._password,
|
|
**self._v2_params)
|
|
|
|
elif _discover.version_match((3,), version):
|
|
return v3.Password(auth_url=url,
|
|
user_id=self._user_id,
|
|
username=self._username,
|
|
user_domain_id=self._user_domain_id,
|
|
user_domain_name=self._user_domain_name,
|
|
password=self._password,
|
|
**self._v3_params)
|
|
|
|
@classmethod
|
|
def get_options(cls):
|
|
options = super(Password, cls).get_options()
|
|
options.extend(get_options())
|
|
return options
|
|
|
|
@classmethod
|
|
def load_from_argparse_arguments(cls, namespace, **kwargs):
|
|
if not (kwargs.get('password') or namespace.os_password):
|
|
kwargs['password'] = utils.prompt_user_password()
|
|
|
|
return super(Password, cls).load_from_argparse_arguments(namespace,
|
|
**kwargs)
|