openstack/keystone
Code Issues Proposed changes

Merge "Remove log translations in keystone"

Browse Source
This commit is contained in:
Jenkins 2017-03-27 17:35:03 +00:00 committed by Gerrit Code Review
commit af4e98c770
41 changed files with 334 additions and 565 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
keystone/assignment/core.py
View File

@ -25,7 +25,7 @@ from keystone.common import driver_hints
from keystone.common import manager from keystone.common import manager
import keystone.conf import keystone.conf
from keystone import exception from keystone import exception
from keystone.i18n import _, _LI, _LE from keystone.i18n import _
from keystone import notifications from keystone import notifications
@ -145,16 +145,16 @@ class Manager(manager.Manager):
try: try:
self.role_api.get_role(CONF.member_role_id) self.role_api.get_role(CONF.member_role_id)
except exception.RoleNotFound: except exception.RoleNotFound:
LOG.info(_LI("Creating the default role %s " LOG.info("Creating the default role %s "
"because it does not exist."), "because it does not exist.",
CONF.member_role_id) CONF.member_role_id)
role = {'id': CONF.member_role_id, role = {'id': CONF.member_role_id,
'name': CONF.member_role_name} 'name': CONF.member_role_name}
try: try:
self.role_api.create_role(CONF.member_role_id, role) self.role_api.create_role(CONF.member_role_id, role)
except exception.Conflict: except exception.Conflict:
LOG.info(_LI("Creating the default role %s failed because it " LOG.info("Creating the default role %s failed because it "
"was already created"), "was already created",
CONF.member_role_id) CONF.member_role_id)
def add_user_to_project(self, tenant_id, user_id): def add_user_to_project(self, tenant_id, user_id):
@ -644,14 +644,14 @@ class Manager(manager.Manager):
_make_implied_ref_copy( _make_implied_ref_copy(
next_ref, implied_role['implied_role_id'])) next_ref, implied_role['implied_role_id']))
if implied_ref in checked_role_refs: if implied_ref in checked_role_refs:
msg = _LE('Circular reference found ' msg = ('Circular reference found '
'role inference rules - %(prior_role_id)s.') 'role inference rules - %(prior_role_id)s.')
LOG.error(msg, {'prior_role_id': next_ref['role_id']}) LOG.error(msg, {'prior_role_id': next_ref['role_id']})
else: else:
ref_results.append(implied_ref) ref_results.append(implied_ref)
role_refs_to_check.append(implied_ref) role_refs_to_check.append(implied_ref)
except exception.NotImplemented: except exception.NotImplemented:
LOG.error(_LE('Role driver does not support implied roles.')) LOG.error('Role driver does not support implied roles.')
return ref_results return ref_results

32
keystone/auth/controllers.py
View File

@ -27,7 +27,7 @@ from keystone.common import wsgi
import keystone.conf import keystone.conf
from keystone import exception from keystone import exception
from keystone.federation import constants from keystone.federation import constants
from keystone.i18n import _, _LW, _LE from keystone.i18n import _
from keystone.resource import controllers as resource_controllers from keystone.resource import controllers as resource_controllers
@ -194,26 +194,26 @@ class Auth(controller.V3Controller):
user_ref['id'], default_project_id): user_ref['id'], default_project_id):
auth_info.set_scope(project_id=default_project_id) auth_info.set_scope(project_id=default_project_id)
else: else:
msg = _LW("User %(user_id)s doesn't have access to" msg = ("User %(user_id)s doesn't have access to"
" default project %(project_id)s. The token" " default project %(project_id)s. The token"
" will be unscoped rather than scoped to the" " will be unscoped rather than scoped to the"
" project.") " project.")
LOG.warning(msg, LOG.warning(msg,
{'user_id': user_ref['id'], {'user_id': user_ref['id'],
'project_id': default_project_id}) 'project_id': default_project_id})
else: else:
msg = _LW("User %(user_id)s's default project %(project_id)s" msg = ("User %(user_id)s's default project %(project_id)s"
" is disabled. The token will be unscoped rather" " is disabled. The token will be unscoped rather"
" than scoped to the project.") " than scoped to the project.")
LOG.warning(msg, LOG.warning(msg,
{'user_id': user_ref['id'], {'user_id': user_ref['id'],
'project_id': default_project_id}) 'project_id': default_project_id})
except (exception.ProjectNotFound, exception.DomainNotFound): except (exception.ProjectNotFound, exception.DomainNotFound):
# default project or default project domain doesn't exist, # default project or default project domain doesn't exist,
# will issue unscoped token instead # will issue unscoped token instead
msg = _LW("User %(user_id)s's default project %(project_id)s not" msg = ("User %(user_id)s's default project %(project_id)s not"
" found. The token will be unscoped rather than" " found. The token will be unscoped rather than"
" scoped to the project.") " scoped to the project.")
LOG.warning(msg, {'user_id': user_ref['id'], LOG.warning(msg, {'user_id': user_ref['id'],
'project_id': default_project_id}) 'project_id': default_project_id})
@ -227,11 +227,11 @@ class Auth(controller.V3Controller):
if not isinstance(auth_context, core.AuthContext): if not isinstance(auth_context, core.AuthContext):
LOG.error( LOG.error(
_LE('`auth_context` passed to the Auth controller ' '`auth_context` passed to the Auth controller '
'`authenticate` method is not of type ' '`authenticate` method is not of type '
'`keystone.auth.controllers.AuthContext`. For security ' '`keystone.auth.controllers.AuthContext`. For security '
'purposes this is required. This is likely a programming ' 'purposes this is required. This is likely a programming '
'error. Received object of type `%s`'), type(auth_context)) 'error. Received object of type `%s`', type(auth_context))
raise exception.Unauthorized( raise exception.Unauthorized(
_('Cannot Authenticate due to internal error.')) _('Cannot Authenticate due to internal error.'))
# The 'external' method allows any 'REMOTE_USER' based authentication # The 'external' method allows any 'REMOTE_USER' based authentication

20
keystone/auth/core.py
View File

@ -22,7 +22,7 @@ from keystone.common import dependency
from keystone.common import utils from keystone.common import utils
import keystone.conf import keystone.conf
from keystone import exception from keystone import exception
from keystone.i18n import _, _LI, _LE from keystone.i18n import _
from keystone.identity.backends import resource_options as ro from keystone.identity.backends import resource_options as ro
@ -102,9 +102,9 @@ class AuthContext(dict):
# special treatment for 'expires_at', we are going to take # special treatment for 'expires_at', we are going to take
# the earliest expiration instead. # the earliest expiration instead.
if existing_val != val: if existing_val != val:
LOG.info(_LI('"expires_at" has conflicting values ' LOG.info('"expires_at" has conflicting values '
'%(existing)s and %(new)s. Will use the ' '%(existing)s and %(new)s. Will use the '
'earliest value.'), 'earliest value.',
{'existing': existing_val, 'new': val}) {'existing': existing_val, 'new': val})
if existing_val is None or val is None: if existing_val is None or val is None:
val = existing_val or val val = existing_val or val
@ -434,8 +434,8 @@ class UserMFARulesValidator(object):
# processing. # processing.
rule_set = [] rule_set = []
if not isinstance(rules, list): if not isinstance(rules, list):
LOG.error(_LE('Corrupt rule data structure for user %(user_id)s, ' LOG.error('Corrupt rule data structure for user %(user_id)s, '
'no rules loaded.'), 'no rules loaded.',
{'user_id': user_id}) {'user_id': user_id})
# Corrupt Data means no rules. Auth success > MFA rules in this # Corrupt Data means no rules. Auth success > MFA rules in this
# case. # case.
@ -448,8 +448,8 @@ class UserMFARulesValidator(object):
if not isinstance(r_list, list): if not isinstance(r_list, list):
# Rule was not a list, it is invalid, drop the rule from # Rule was not a list, it is invalid, drop the rule from
# being considered. # being considered.
LOG.info(_LI('Ignoring Rule %(rule)r; rule must be a list of ' LOG.info('Ignoring Rule %(rule)r; rule must be a list of '
'strings.'), 'strings.',
{'type': type(r_list)}) {'type': type(r_list)})
continue continue
@ -460,8 +460,8 @@ class UserMFARulesValidator(object):
if not isinstance(item, six.string_types): if not isinstance(item, six.string_types):
# Rules may only contain strings for method names # Rules may only contain strings for method names
# Reject a rule with non-string values # Reject a rule with non-string values
LOG.info(_LI('Ignoring Rule %(rule)r; rule contains ' LOG.info('Ignoring Rule %(rule)r; rule contains '
'non-string values.'), 'non-string values.',
{'rule': r_list}) {'rule': r_list})
# Rule is known to be bad, drop it from consideration. # Rule is known to be bad, drop it from consideration.
_ok_rule = False _ok_rule = False

16
keystone/auth/plugins/mapped.py
View File

@ -23,7 +23,7 @@ from keystone.common import dependency
from keystone import exception from keystone import exception
from keystone.federation import constants as federation_constants from keystone.federation import constants as federation_constants
from keystone.federation import utils from keystone.federation import utils
from keystone.i18n import _, _LE, _LI from keystone.i18n import _
from keystone.models import token_model from keystone.models import token_model
from keystone import notifications from keystone import notifications
@ -123,9 +123,9 @@ def handle_unscoped_token(request, auth_payload, resource_api, federation_api,
# be useful. # be useful.
if shadow_role['name'] not in existing_roles: if shadow_role['name'] not in existing_roles:
LOG.error( LOG.error(
_LE('Role %s was specified in the mapping but does ' 'Role %s was specified in the mapping but does '
'not exist. All roles specified in a mapping must ' 'not exist. All roles specified in a mapping must '
'exist before assignment.'), 'exist before assignment.',
shadow_role['name'] shadow_role['name']
) )
# NOTE(lbragstad): The RoleNotFound exception usually # NOTE(lbragstad): The RoleNotFound exception usually
@ -136,8 +136,8 @@ def handle_unscoped_token(request, auth_payload, resource_api, federation_api,
if (role['domain_id'] is not None and if (role['domain_id'] is not None and
role['domain_id'] != idp_domain_id): role['domain_id'] != idp_domain_id):
LOG.error( LOG.error(
_LE('Role %(role)s is a domain-specific role and ' 'Role %(role)s is a domain-specific role and '
'cannot be assigned within %(domain)s.'), 'cannot be assigned within %(domain)s.',
{'role': shadow_role['name'], 'domain': idp_domain_id} {'role': shadow_role['name'], 'domain': idp_domain_id}
) )
raise exception.DomainSpecificRoleNotWithinIdPDomain( raise exception.DomainSpecificRoleNotWithinIdPDomain(
@ -157,8 +157,8 @@ def handle_unscoped_token(request, auth_payload, resource_api, federation_api,
) )
except exception.ProjectNotFound: except exception.ProjectNotFound:
LOG.info( LOG.info(
_LI('Project %(project_name)s does not exist. It will be ' 'Project %(project_name)s does not exist. It will be '
'automatically provisioning for user %(user_id)s.'), 'automatically provisioning for user %(user_id)s.',
{'project_name': shadow_project['name'], {'project_name': shadow_project['name'],
'user_id': user['id']} 'user_id': user['id']}
) )

3
keystone/catalog/backends/templated.py
View File

@ -21,7 +21,6 @@ from keystone.catalog.backends import base
from keystone.common import utils from keystone.common import utils
import keystone.conf import keystone.conf
from keystone import exception from keystone import exception
from keystone.i18n import _LC
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
@ -103,7 +102,7 @@ class Catalog(base.CatalogDriverBase):
with open(template_file) as f: with open(template_file) as f:
self.templates = parse_templates(f) self.templates = parse_templates(f)
except IOError: except IOError:
LOG.critical(_LC('Unable to open template file %s'), template_file) LOG.critical('Unable to open template file %s', template_file)
raise raise
# region crud # region crud

119
keystone/cmd/cli.py
View File

@ -39,7 +39,7 @@ from keystone.credential.providers import fernet as credential_fernet
from keystone import exception from keystone import exception
from keystone.federation import idp from keystone.federation import idp
from keystone.federation import utils as mapping_engine from keystone.federation import utils as mapping_engine
from keystone.i18n import _, _LE, _LI, _LW from keystone.i18n import _
from keystone.server import backends from keystone.server import backends
from keystone import token from keystone import token
@ -190,10 +190,10 @@ class BootStrap(BaseApp):
self.resource_manager.create_domain( self.resource_manager.create_domain(
domain_id=default_domain['id'], domain_id=default_domain['id'],
domain=default_domain) domain=default_domain)
LOG.info(_LI('Created domain %s'), default_domain['id']) LOG.info('Created domain %s', default_domain['id'])
except exception.Conflict: except exception.Conflict:
# NOTE(morganfainberg): Domain already exists, continue on. # NOTE(morganfainberg): Domain already exists, continue on.
LOG.info(_LI('Domain %s already exists, skipping creation.'), LOG.info('Domain %s already exists, skipping creation.',
default_domain['id']) default_domain['id'])
try: try:
@ -206,9 +206,9 @@ class BootStrap(BaseApp):
'the cloud.', 'the cloud.',
'name': self.project_name} 'name': self.project_name}
) )
LOG.info(_LI('Created project %s'), self.project_name) LOG.info('Created project %s', self.project_name)
except exception.Conflict: except exception.Conflict:
LOG.info(_LI('Project %s already exists, skipping creation.'), LOG.info('Project %s already exists, skipping creation.',
self.project_name) self.project_name)
project = self.resource_manager.get_project_by_name( project = self.resource_manager.get_project_by_name(
self.project_name, default_domain['id']) self.project_name, default_domain['id'])
@ -218,7 +218,7 @@ class BootStrap(BaseApp):
try: try:
user = self.identity_manager.get_user_by_name(self.username, user = self.identity_manager.get_user_by_name(self.username,
default_domain['id']) default_domain['id'])
LOG.info(_LI('User %s already exists, skipping creation.'), LOG.info('User %s already exists, skipping creation.',
self.username) self.username)
# If the user is not enabled, re-enable them. This also helps # If the user is not enabled, re-enable them. This also helps
@ -246,12 +246,12 @@ class BootStrap(BaseApp):
# as a recovery tool, without having to create a new user. # as a recovery tool, without having to create a new user.
if update: if update:
user = self.identity_manager.update_user(user['id'], update) user = self.identity_manager.update_user(user['id'], update)
LOG.info(_LI('Reset password for user %s.'), self.username) LOG.info('Reset password for user %s.', self.username)
if not enabled and user['enabled']: if not enabled and user['enabled']:
# Although we always try to enable the user, this log # Although we always try to enable the user, this log
# message only makes sense if we know that the user was # message only makes sense if we know that the user was
# previously disabled. # previously disabled.
LOG.info(_LI('Enabled user %s.'), self.username) LOG.info('Enabled user %s.', self.username)
except exception.UserNotFound: except exception.UserNotFound:
user = self.identity_manager.create_user( user = self.identity_manager.create_user(
user_ref={'name': self.username, user_ref={'name': self.username,
@ -260,7 +260,7 @@ class BootStrap(BaseApp):
'password': self.password 'password': self.password
} }
) )
LOG.info(_LI('Created user %s'), self.username) LOG.info('Created user %s', self.username)
# NOTE(morganfainberg): Do not create the role if it already exists. # NOTE(morganfainberg): Do not create the role if it already exists.
try: try:
@ -269,9 +269,9 @@ class BootStrap(BaseApp):
role={'name': self.role_name, role={'name': self.role_name,
'id': self.role_id}, 'id': self.role_id},
) )
LOG.info(_LI('Created role %s'), self.role_name) LOG.info('Created role %s', self.role_name)
except exception.Conflict: except exception.Conflict:
LOG.info(_LI('Role %s exists, skipping creation.'), self.role_name) LOG.info('Role %s exists, skipping creation.', self.role_name)
# NOTE(davechen): There is no backend method to get the role # NOTE(davechen): There is no backend method to get the role
# by name, so build the hints to list the roles and filter by # by name, so build the hints to list the roles and filter by
# name instead. # name instead.
@ -288,14 +288,14 @@ class BootStrap(BaseApp):
tenant_id=self.project_id, tenant_id=self.project_id,
role_id=self.role_id role_id=self.role_id
) )
LOG.info(_LI('Granted %(role)s on %(project)s to user' LOG.info('Granted %(role)s on %(project)s to user'
' %(username)s.'), ' %(username)s.',
{'role': self.role_name, {'role': self.role_name,
'project': self.project_name, 'project': self.project_name,
'username': self.username}) 'username': self.username})
except exception.Conflict: except exception.Conflict:
LOG.info(_LI('User %(username)s already has %(role)s on ' LOG.info('User %(username)s already has %(role)s on '
'%(project)s.'), '%(project)s.',
{'username': self.username, {'username': self.username,
'role': self.role_name, 'role': self.role_name,
'project': self.project_name}) 'project': self.project_name})
@ -305,9 +305,9 @@ class BootStrap(BaseApp):
self.catalog_manager.create_region( self.catalog_manager.create_region(
region_ref={'id': self.region_id} region_ref={'id': self.region_id}
) )
LOG.info(_LI('Created region %s'), self.region_id) LOG.info('Created region %s', self.region_id)
except exception.Conflict: except exception.Conflict:
LOG.info(_LI('Region %s exists, skipping creation.'), LOG.info('Region %s exists, skipping creation.',
self.region_id) self.region_id)
if self.public_url or self.admin_url or self.internal_url: if self.public_url or self.admin_url or self.internal_url:
@ -364,12 +364,12 @@ class BootStrap(BaseApp):
endpoint_id=endpoint_ref['id'], endpoint_id=endpoint_ref['id'],
endpoint_ref=endpoint_ref) endpoint_ref=endpoint_ref)
LOG.info(_LI('Created %(interface)s endpoint %(url)s'), LOG.info('Created %(interface)s endpoint %(url)s',
{'interface': interface, 'url': url}) {'interface': interface, 'url': url})
else: else:
# NOTE(jamielennox): electing not to update existing # NOTE(jamielennox): electing not to update existing
# endpoints here. There may be call to do so in future. # endpoints here. There may be call to do so in future.
LOG.info(_LI('Skipping %s endpoint as already created'), LOG.info('Skipping %s endpoint as already created',
interface) interface)
self.endpoints[interface] = endpoint_ref['id'] self.endpoints[interface] = endpoint_ref['id']
@ -464,10 +464,10 @@ class DbSync(BaseApp):
repo='data_migration_repo') repo='data_migration_repo')
contract_version = upgrades.get_db_version(repo='contract_repo') contract_version = upgrades.get_db_version(repo='contract_repo')
except migration.exception.DbMigrationError: except migration.exception.DbMigrationError:
LOG.info(_LI('Your database is not currently under version ' LOG.info('Your database is not currently under version '
'control or the database is already controlled. Your ' 'control or the database is already controlled. Your '
'first step is to run `keystone-manage db_sync ' 'first step is to run `keystone-manage db_sync '
'--expand`.')) '--expand`.')
return 2 return 2
repo = migrate.versioning.repository.Repository( repo = migrate.versioning.repository.Repository(
@ -476,34 +476,33 @@ class DbSync(BaseApp):
if (contract_version > migrate_version or migrate_version > if (contract_version > migrate_version or migrate_version >
expand_version): expand_version):
LOG.info(_LI('Your database is out of sync. For more information ' LOG.info('Your database is out of sync. For more information '
'refer to https://docs.openstack.org/developer/' 'refer to https://docs.openstack.org/developer/'
'keystone/upgrading.html')) 'keystone/upgrading.html')
status = 1 status = 1
elif migration_script_version > expand_version: elif migration_script_version > expand_version:
LOG.info(_LI('Your database is not up to date. Your first step is ' LOG.info('Your database is not up to date. Your first step is '
'to run `keystone-manage db_sync --expand`.')) 'to run `keystone-manage db_sync --expand`.')
status = 2 status = 2
elif expand_version > migrate_version: elif expand_version > migrate_version:
LOG.info(_LI('Expand version is ahead of migrate. Your next step ' LOG.info('Expand version is ahead of migrate. Your next step '
'is to run `keystone-manage db_sync --migrate`.')) 'is to run `keystone-manage db_sync --migrate`.')
status = 3 status = 3
elif migrate_version > contract_version: elif migrate_version > contract_version:
LOG.info(_LI('Migrate version is ahead of contract. Your next ' LOG.info('Migrate version is ahead of contract. Your next '
'step is to run `keystone-manage db_sync --contract`.' 'step is to run `keystone-manage db_sync --contract`.')
))
status = 4 status = 4
elif (migration_script_version == expand_version == migrate_version == elif (migration_script_version == expand_version == migrate_version ==
contract_version): contract_version):
LOG.info(_LI('All db_sync commands are upgraded to the same ' LOG.info('All db_sync commands are upgraded to the same '
'version and up-to-date.')) 'version and up-to-date.')
LOG.info(_LI('The latest installed migration script version is: ' LOG.info('The latest installed migration script version is: '
'%(script)d.\nCurrent repository versions:\nExpand: ' '%(script)d.\nCurrent repository versions:\nExpand: '
'%(expand)d \nMigrate: %(migrate)d\nContract: ' '%(expand)d \nMigrate: %(migrate)d\nContract: '
'%(contract)d') % {'script': migration_script_version, '%(contract)d' % {'script': migration_script_version,
'expand': expand_version, 'expand': expand_version,
'migrate': migrate_version, 'migrate': migrate_version,
'contract': contract_version}) 'contract': contract_version})
return status return status
@staticmethod @staticmethod
@ -610,11 +609,11 @@ class PKISetup(BaseCertificateSetup):
def main(cls): def main(cls):
versionutils.report_deprecated_feature( versionutils.report_deprecated_feature(
LOG, LOG,
_LW("keystone-manage pki_setup is deprecated as of Mitaka in " "keystone-manage pki_setup is deprecated as of Mitaka in "
"favor of not using PKI tokens and may be removed in 'O' " "favor of not using PKI tokens and may be removed in 'O' "
"release.")) "release.")
LOG.warning(_LW('keystone-manage pki_setup is not recommended for ' LOG.warning('keystone-manage pki_setup is not recommended for '
'production use.')) 'production use.')
keystone_user_id, keystone_group_id = cls.get_user_group() keystone_user_id, keystone_group_id = cls.get_user_group()
conf_pki = openssl.ConfigurePKI(keystone_user_id, keystone_group_id, conf_pki = openssl.ConfigurePKI(keystone_user_id, keystone_group_id,
rebuild=CONF.command.rebuild) rebuild=CONF.command.rebuild)
@ -848,8 +847,8 @@ class TokenFlush(BaseApp):
except exception.NotImplemented: except exception.NotImplemented:
# NOTE(ravelar159): Stop NotImplemented from unsupported token # NOTE(ravelar159): Stop NotImplemented from unsupported token
# driver when using token_flush and print out warning instead # driver when using token_flush and print out warning instead
LOG.warning(_LW('Token driver %s does not support token_flush. ' LOG.warning('Token driver %s does not support token_flush. '
'The token_flush command had no effect.'), 'The token_flush command had no effect.',
CONF.token.driver) CONF.token.driver)
@ -945,7 +944,7 @@ def _domain_config_finder(conf_dir):
:returns: generator yielding (filename, domain_name) tuples :returns: generator yielding (filename, domain_name) tuples
""" """
LOG.info(_LI('Scanning %r for domain config files'), conf_dir) LOG.info('Scanning %r for domain config files', conf_dir)
for r, d, f in os.walk(conf_dir): for r, d, f in os.walk(conf_dir):
for fname in f: for fname in f:
if (fname.startswith(DOMAIN_CONF_FHEAD) and if (fname.startswith(DOMAIN_CONF_FHEAD) and
@ -956,8 +955,8 @@ def _domain_config_finder(conf_dir):
yield (os.path.join(r, fname), domain_name) yield (os.path.join(r, fname), domain_name)
continue continue
LOG.warning(_LW('Ignoring file (%s) while scanning ' LOG.warning('Ignoring file (%s) while scanning '
'domain config directory'), fname) 'domain config directory', fname)
class DomainConfigUploadFiles(object): class DomainConfigUploadFiles(object):
@ -1045,8 +1044,8 @@ class DomainConfigUploadFiles(object):
sections) sections)
return True return True
except Exception as e: except Exception as e:
msg = _LE('Error processing config file for domain: ' msg = ('Error processing config file for domain: '
'%(domain_name)s, file: %(filename)s, error: %(error)s') '%(domain_name)s, file: %(filename)s, error: %(error)s')
LOG.error(msg, LOG.error(msg,
{'domain_name': domain_name, {'domain_name': domain_name,
'filename': file_name, 'filename': file_name,
@ -1082,13 +1081,13 @@ class DomainConfigUploadFiles(object):
for filename, domain_name in self._domain_config_finder(conf_dir): for filename, domain_name in self._domain_config_finder(conf_dir):
if self._upload_config_to_database(filename, domain_name): if self._upload_config_to_database(filename, domain_name):
success_cnt += 1 success_cnt += 1
LOG.info(_LI('Successfully uploaded domain config %r'), LOG.info('Successfully uploaded domain config %r',
filename) filename)
else: else:
failure_cnt += 1 failure_cnt += 1
if success_cnt == 0: if success_cnt == 0:
LOG.warning(_LW('No domain configs uploaded from %r'), conf_dir) LOG.warning('No domain configs uploaded from %r', conf_dir)
if failure_cnt: if failure_cnt:
return False return False
@ -1136,9 +1135,9 @@ class DomainConfigUpload(BaseApp):
def main(): def main():
versionutils.report_deprecated_feature( versionutils.report_deprecated_feature(
LOG, LOG,
_LW("keystone-manage domain_config_upload is deprecated as of " "keystone-manage domain_config_upload is deprecated as of "
"Newton in favor of setting domain config options via the API " "Newton in favor of setting domain config options via the API "
"and may be removed in 'P' release.")) "and may be removed in 'P' release.")
dcu = DomainConfigUploadFiles() dcu = DomainConfigUploadFiles()
status = dcu.run() status = dcu.run()
if status is not None: if status is not None:
@ -1367,6 +1366,6 @@ def main(argv=None, config_files=None):
usage='%(prog)s [' + '|'.join([cmd.name for cmd in CMDS]) + ']', usage='%(prog)s [' + '|'.join([cmd.name for cmd in CMDS]) + ']',
default_config_files=config_files) default_config_files=config_files)
if not CONF.default_config_files: if not CONF.default_config_files:
LOG.warning(_LW('Config file not found, using default configs.')) LOG.warning('Config file not found, using default configs.')
keystone.conf.setup_logging() keystone.conf.setup_logging()
CONF.command.cmd_class.main() CONF.command.cmd_class.main()

4
keystone/common/authorization.py
View File

@ -19,7 +19,7 @@
from oslo_log import log from oslo_log import log
from keystone import exception from keystone import exception
from keystone.i18n import _, _LW from keystone.i18n import _
from keystone.models import token_model from keystone.models import token_model
@ -66,7 +66,7 @@ def token_to_auth_context(token):
try: try:
auth_context['user_id'] = token.user_id auth_context['user_id'] = token.user_id
except KeyError: except KeyError:
LOG.warning(_LW('RBAC: Invalid user data in token')) LOG.warning('RBAC: Invalid user data in token')
raise exception.Unauthorized(_('No user_id in token')) raise exception.Unauthorized(_('No user_id in token'))
auth_context['user_domain_id'] = token.user_domain_id auth_context['user_domain_id'] = token.user_domain_id

20
keystone/common/controller.py
View File

@ -28,7 +28,7 @@ from keystone.common import utils
from keystone.common import wsgi from keystone.common import wsgi
import keystone.conf import keystone.conf
from keystone import exception from keystone import exception
from keystone.i18n import _, _LW from keystone.i18n import _
from keystone.models import token_model from keystone.models import token_model
@ -100,7 +100,7 @@ def protected(callback=None):
request.assert_authenticated() request.assert_authenticated()
if request.context.is_admin: if request.context.is_admin:
LOG.warning(_LW('RBAC: Bypassing authorization')) LOG.warning('RBAC: Bypassing authorization')
elif callback is not None: elif callback is not None:
prep_info = {'f_name': f.__name__, prep_info = {'f_name': f.__name__,
'input_attr': kwargs} 'input_attr': kwargs}
@ -228,7 +228,7 @@ def filterprotected(*filters, **callback):
LOG.debug('RBAC: Authorization granted') LOG.debug('RBAC: Authorization granted')
else: else:
LOG.warning(_LW('RBAC: Bypassing authorization')) LOG.warning('RBAC: Bypassing authorization')
return f(self, request, filters, **kwargs) return f(self, request, filters, **kwargs)
return wrapper return wrapper
return _filterprotected return _filterprotected
@ -723,12 +723,12 @@ class V3Controller(wsgi.Application):
# issue a deprecation warning. # issue a deprecation warning.
versionutils.report_deprecated_feature( versionutils.report_deprecated_feature(
LOG, LOG,
_LW('Not specifying a domain during a create user, group or ' 'Not specifying a domain during a create user, group or '
'project call, and relying on falling back to the ' 'project call, and relying on falling back to the '
'default domain, is deprecated as of Liberty. There is no ' 'default domain, is deprecated as of Liberty. There is no '
'plan to remove this compatibility, however, future API ' 'plan to remove this compatibility, however, future API '
'versions may remove this, so please specify the domain ' 'versions may remove this, so please specify the domain '
'explicitly or use a domain-scoped token.')) 'explicitly or use a domain-scoped token.')
return CONF.identity.default_domain_id return CONF.identity.default_domain_id
def _normalize_domain_id(self, request, ref): def _normalize_domain_id(self, request, ref):
@ -752,7 +752,7 @@ class V3Controller(wsgi.Application):
""" """
if request.context.is_admin: if request.context.is_admin:
LOG.warning(_LW('RBAC: Bypassing authorization')) LOG.warning('RBAC: Bypassing authorization')
else: else:
action = 'identity:%s' % prep_info['f_name'] action = 'identity:%s' % prep_info['f_name']
# TODO(henry-nash) need to log the target attributes as well # TODO(henry-nash) need to log the target attributes as well

51
keystone/common/fernet_utils.py
View File

@ -18,7 +18,6 @@ from cryptography import fernet
from oslo_log import log from oslo_log import log
import keystone.conf import keystone.conf
from keystone.i18n import _LE, _LW, _LI
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
@ -56,9 +55,9 @@ class FernetUtils(object):
if not is_valid: if not is_valid:
LOG.error( LOG.error(
_LE('Either [%(config_group)s] key_repository does not exist ' 'Either [%(config_group)s] key_repository does not exist '
'or Keystone does not have sufficient permission to ' 'or Keystone does not have sufficient permission to '
'access it: %(key_repo)s'), 'access it: %(key_repo)s',
{'key_repo': self.key_repository, {'key_repo': self.key_repository,
'config_group': self.config_group}) 'config_group': self.config_group})
else: else:
@ -66,8 +65,8 @@ class FernetUtils(object):
stat_info = os.stat(self.key_repository) stat_info = os.stat(self.key_repository)
if(stat_info.st_mode & stat.S_IROTH or if(stat_info.st_mode & stat.S_IROTH or
stat_info.st_mode & stat.S_IXOTH): stat_info.st_mode & stat.S_IXOTH):
LOG.warning(_LW( LOG.warning(
'key_repository is world readable: %s'), 'key_repository is world readable: %s',
self.key_repository) self.key_repository)
return is_valid return is_valid
@ -76,17 +75,17 @@ class FernetUtils(object):
keystone_group_id=None): keystone_group_id=None):
"""Attempt to create the key directory if it doesn't exist.""" """Attempt to create the key directory if it doesn't exist."""
if not os.access(self.key_repository, os.F_OK): if not os.access(self.key_repository, os.F_OK):
LOG.info(_LI( LOG.info(
'key_repository does not appear to exist; attempting to ' 'key_repository does not appear to exist; attempting to '
'create it')) 'create it')
try: try:
os.makedirs(self.key_repository, 0o700) os.makedirs(self.key_repository, 0o700)
except OSError: except OSError:
LOG.error(_LE( LOG.error(
'Failed to create key_repository: either it already ' 'Failed to create key_repository: either it already '
'exists or you don\'t have sufficient permissions to ' 'exists or you don\'t have sufficient permissions to '
'create it')) 'create it')
if keystone_user_id and keystone_group_id: if keystone_user_id and keystone_group_id:
os.chown( os.chown(
@ -94,10 +93,10 @@ class FernetUtils(object):
keystone_user_id, keystone_user_id,
keystone_group_id) keystone_group_id)
elif keystone_user_id or keystone_group_id: elif keystone_user_id or keystone_group_id:
LOG.warning(_LW( LOG.warning(
'Unable to change the ownership of key_repository without ' 'Unable to change the ownership of key_repository without '
'a keystone user ID and keystone group ID both being ' 'a keystone user ID and keystone group ID both being '
'provided: %s') % self.key_repository) 'provided: %s' % self.key_repository)
def _create_new_key(self, keystone_user_id, keystone_group_id): def _create_new_key(self, keystone_user_id, keystone_group_id):
"""Securely create a new encryption key. """Securely create a new encryption key.
@ -126,10 +125,10 @@ class FernetUtils(object):
os.setegid(keystone_group_id) os.setegid(keystone_group_id)
os.seteuid(keystone_user_id) os.seteuid(keystone_user_id)
elif keystone_user_id or keystone_group_id: elif keystone_user_id or keystone_group_id:
LOG.warning(_LW( LOG.warning(
'Unable to change the ownership of the new key without a ' 'Unable to change the ownership of the new key without a '
'keystone user ID and keystone group ID both being provided: ' 'keystone user ID and keystone group ID both being provided: '
'%s') % '%s' %
self.key_repository) self.key_repository)
# Determine the file name of the new key # Determine the file name of the new key
key_file = os.path.join(self.key_repository, '0.tmp') key_file = os.path.join(self.key_repository, '0.tmp')
@ -141,7 +140,7 @@ class FernetUtils(object):
f.flush() f.flush()
create_success = True create_success = True
except IOError: except IOError:
LOG.error(_LE('Failed to create new temporary key: %s'), key_file) LOG.error('Failed to create new temporary key: %s', key_file)
raise raise
finally: finally:
# After writing the key, set the umask back to it's original value. # After writing the key, set the umask back to it's original value.
@ -155,7 +154,7 @@ class FernetUtils(object):
if not create_success and os.access(key_file, os.F_OK): if not create_success and os.access(key_file, os.F_OK):
os.remove(key_file) os.remove(key_file)
LOG.info(_LI('Created a new temporary key: %s'), key_file) LOG.info('Created a new temporary key: %s', key_file)
def _become_valid_new_key(self): def _become_valid_new_key(self):
"""Make the tmp new key a valid new key. """Make the tmp new key a valid new key.
@ -167,7 +166,7 @@ class FernetUtils(object):
os.rename(tmp_key_file, valid_key_file) os.rename(tmp_key_file, valid_key_file)
LOG.info(_LI('Become a valid new key: %s'), valid_key_file) LOG.info('Become a valid new key: %s', valid_key_file)
def initialize_key_repository(self, keystone_user_id=None, def initialize_key_repository(self, keystone_user_id=None,
keystone_group_id=None): keystone_group_id=None):
@ -180,7 +179,7 @@ class FernetUtils(object):
# make sure we have work to do before proceeding # make sure we have work to do before proceeding
if os.access(os.path.join(self.key_repository, '0'), if os.access(os.path.join(self.key_repository, '0'),
os.F_OK): os.F_OK):
LOG.info(_LI('Key repository is already initialized; aborting.')) LOG.info('Key repository is already initialized; aborting.')
return return
# bootstrap an existing key # bootstrap an existing key
@ -221,19 +220,19 @@ class FernetUtils(object):
else: else:
key_files[key_id] = path key_files[key_id] = path
LOG.info(_LI('Starting key rotation with %(count)s key files: ' LOG.info('Starting key rotation with %(count)s key files: '
'%(list)s'), { '%(list)s', {
'count': len(key_files), 'count': len(key_files),
'list': list(key_files.values())}) 'list': list(key_files.values())})
# add a tmp new key to the rotation, which will be the *next* primary # add a tmp new key to the rotation, which will be the *next* primary
self._create_tmp_new_key(keystone_user_id, keystone_group_id) self._create_tmp_new_key(keystone_user_id, keystone_group_id)
# determine the number of the new primary key # determine the number of the new primary key
current_primary_key = max(key_files.keys()) current_primary_key = max(key_files.keys())
LOG.info(_LI('Current primary key is: %s'), current_primary_key) LOG.info('Current primary key is: %s', current_primary_key)
new_primary_key = current_primary_key + 1 new_primary_key = current_primary_key + 1
LOG.info(_LI('Next primary key will be: %s'), new_primary_key) LOG.info('Next primary key will be: %s', new_primary_key)
# promote the next primary key to be the primary # promote the next primary key to be the primary
os.rename( os.rename(
@ -244,7 +243,7 @@ class FernetUtils(object):
key_files[new_primary_key] = os.path.join( key_files[new_primary_key] = os.path.join(
self.key_repository, self.key_repository,
str(new_primary_key)) str(new_primary_key))
LOG.info(_LI('Promoted key 0 to be the primary: %s'), new_primary_key) LOG.info('Promoted key 0 to be the primary: %s', new_primary_key)
# rename the tmp key to the real staged key # rename the tmp key to the real staged key
self._become_valid_new_key() self._become_valid_new_key()
@ -259,7 +258,7 @@ class FernetUtils(object):
while len(keys) > (max_active_keys - 1): while len(keys) > (max_active_keys - 1):
index_to_purge = keys.pop() index_to_purge = keys.pop()
key_to_purge = key_files[index_to_purge] key_to_purge = key_files[index_to_purge]
LOG.info(_LI('Excess key to purge: %s'), key_to_purge) LOG.info('Excess key to purge: %s', key_to_purge)
os.remove(key_to_purge) os.remove(key_to_purge)
def load_keys(self, use_null_key=False): def load_keys(self, use_null_key=False):

15
keystone/common/openssl.py
View File

@ -20,7 +20,6 @@ from oslo_log import log
from keystone.common import utils from keystone.common import utils
import keystone.conf import keystone.conf
from keystone.i18n import _LI, _LE, _LW
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
CONF = keystone.conf.CONF CONF = keystone.conf.CONF
@ -71,13 +70,13 @@ class BaseCertificateConfigure(object):
if b'OpenSSL 0.' in openssl_ver: if b'OpenSSL 0.' in openssl_ver:
self.ssl_dictionary['default_md'] = 'sha1' self.ssl_dictionary['default_md'] = 'sha1'
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
LOG.warning(_LW('Failed to invoke ``openssl version``, ' LOG.warning('Failed to invoke ``openssl version``, '
'assuming is v1.0 or newer')) 'assuming is v1.0 or newer')
self.ssl_dictionary.update(kwargs) self.ssl_dictionary.update(kwargs)
def exec_command(self, command): def exec_command(self, command):
to_exec = [part % self.ssl_dictionary for part in command] to_exec = [part % self.ssl_dictionary for part in command]
LOG.info(_LI('Running command - %s'), ' '.join(to_exec)) LOG.info('Running command - %s', ' '.join(to_exec))
try: try:
# NOTE(shaleh): use check_output instead of the simpler # NOTE(shaleh): use check_output instead of the simpler
# `check_call()` in order to log any output from an error. # `check_call()` in order to log any output from an error.
@ -87,8 +86,8 @@ class BaseCertificateConfigure(object):
to_exec, to_exec,
stderr=subprocess.STDOUT) stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
msg = _LE("Command %(to_exec)s exited with %(retcode)s - " msg = ("Command %(to_exec)s exited with %(retcode)s - "
"%(output)s)") "%(output)s)")
LOG.error(msg, LOG.error(msg,
{'to_exec': to_exec, {'to_exec': to_exec,
'retcode': e.returncode, 'retcode': e.returncode,
@ -112,8 +111,8 @@ class BaseCertificateConfigure(object):
try: try:
os.remove(file_path) os.remove(file_path)
except OSError as exc: except OSError as exc:
msg = _LE("Failed to remove file %(file_path)r: " msg = ("Failed to remove file %(file_path)r: "
"%(error)s") "%(error)s")
LOG.error(msg, LOG.error(msg,
{'file_path': file_path, {'file_path': file_path,
'error': exc.strerror}) 'error': exc.strerror})

17
keystone/common/profiler.py
View File

@ -14,7 +14,6 @@ from oslo_log import log
import osprofiler.initializer import osprofiler.initializer
import keystone.conf import keystone.conf
from keystone.i18n import _LI
CONF = keystone.conf.CONF CONF = keystone.conf.CONF
@ -37,11 +36,11 @@ def setup(name, host='0.0.0.0'): # nosec
service=name, service=name,
host=host host=host
) )
LOG.info(_LI("OSProfiler is enabled.\n" LOG.info("OSProfiler is enabled.\n"
"Traces provided from the profiler " "Traces provided from the profiler "
"can only be subscribed to using the same HMAC keys that " "can only be subscribed to using the same HMAC keys that "
"are configured in Keystone's configuration file " "are configured in Keystone's configuration file "
"under the [profiler] section. \n To disable OSprofiler " "under the [profiler] section. \n To disable OSprofiler "
"set in /etc/keystone/keystone.conf:\n" "set in /etc/keystone/keystone.conf:\n"
"[profiler]\n" "[profiler]\n"
"enabled=false")) "enabled=false")

3
keystone/common/sql/migrate_repo/versions/067_kilo.py
View File

@ -17,7 +17,6 @@ import sqlalchemy as sql
from keystone.assignment.backends import sql as assignment_sql from keystone.assignment.backends import sql as assignment_sql
from keystone.common import sql as ks_sql from keystone.common import sql as ks_sql
from keystone.i18n import _LE
from keystone.identity.mapping_backends import mapping as mapping_backend from keystone.identity.mapping_backends import mapping as mapping_backend
@ -245,7 +244,7 @@ def upgrade(migrate_engine):
try: try:
table.create() table.create()
except Exception: except Exception:
LOG.exception(_LE('Exception while creating table: %r'), table) LOG.exception('Exception while creating table: %r', table)
raise raise
# Unique Constraints # Unique Constraints

21
keystone/common/utils.py
View File

@ -37,7 +37,7 @@ from six import moves
from keystone.common import authorization from keystone.common import authorization
import keystone.conf import keystone.conf
from keystone import exception from keystone import exception
from keystone.i18n import _, _LE, _LW from keystone.i18n import _
CONF = keystone.conf.CONF CONF = keystone.conf.CONF
@ -103,7 +103,7 @@ def verify_length_and_trunc_password(password):
if CONF.strict_password_check: if CONF.strict_password_check:
raise exception.PasswordVerificationError(size=max_length) raise exception.PasswordVerificationError(size=max_length)
else: else:
msg = _LW("Truncating user password to %d characters.") msg = "Truncating user password to %d characters."
LOG.warning(msg, max_length) LOG.warning(msg, max_length)
return password[:max_length] return password[:max_length]
else: else:
@ -241,10 +241,10 @@ def setup_remote_pydev_debug():
stderrToServer=True) stderrToServer=True)
return True return True
except Exception: except Exception:
LOG.exception(_LE( LOG.exception(
'Error setting up the debug environment. Verify that the ' 'Error setting up the debug environment. Verify that the '
'option --debug-url has the format <host>:<port> and that a ' 'option --debug-url has the format <host>:<port> and that a '
'debugger processes is listening on that port.')) 'debugger processes is listening on that port.')
raise raise
@ -606,25 +606,24 @@ def format_url(url, substitutions, silent_keyerror_failures=None):
try: try:
result = url.replace('$(', '%(') % substitutions result = url.replace('$(', '%(') % substitutions
except AttributeError: except AttributeError:
msg = _LE("Malformed endpoint - %(url)r is not a string") msg = "Malformed endpoint - %(url)r is not a string"
LOG.error(msg, {"url": url}) LOG.error(msg, {"url": url})
raise exception.MalformedEndpoint(endpoint=url) raise exception.MalformedEndpoint(endpoint=url)
except KeyError as e: except KeyError as e:
if not e.args or e.args[0] not in allow_keyerror: if not e.args or e.args[0] not in allow_keyerror:
msg = _LE("Malformed endpoint %(url)s - unknown key " msg = "Malformed endpoint %(url)s - unknown key %(keyerror)s"
"%(keyerror)s")
LOG.error(msg, {"url": url, "keyerror": e}) LOG.error(msg, {"url": url, "keyerror": e})
raise exception.MalformedEndpoint(endpoint=url) raise exception.MalformedEndpoint(endpoint=url)
else: else:
result = None result = None
except TypeError as e: except TypeError as e:
msg = _LE("Malformed endpoint '%(url)s'. The following type error " msg = ("Malformed endpoint '%(url)s'. The following type error "
"occurred during string substitution: %(typeerror)s") "occurred during string substitution: %(typeerror)s")
LOG.error(msg, {"url": url, "typeerror": e}) LOG.error(msg, {"url": url, "typeerror": e})
raise exception.MalformedEndpoint(endpoint=url) raise exception.MalformedEndpoint(endpoint=url)
except ValueError: except ValueError:
msg = _LE("Malformed endpoint %s - incomplete format " msg = ("Malformed endpoint %s - incomplete format "
"(are you missing a type notifier ?)") "(are you missing a type notifier ?)")
LOG.error(msg, url) LOG.error(msg, url)
raise exception.MalformedEndpoint(endpoint=url) raise exception.MalformedEndpoint(endpoint=url)
return result return result

6
keystone/common/validation/validators.py
View File

@ -19,7 +19,7 @@ from oslo_log import log
import six import six
from keystone import exception from keystone import exception
from keystone.i18n import _, _LE from keystone.i18n import _
CONF = cfg.CONF CONF = cfg.CONF
@ -40,8 +40,8 @@ def validate_password(password):
raise exception.PasswordRequirementsValidationError( raise exception.PasswordRequirementsValidationError(
detail=pattern_desc) detail=pattern_desc)
except re.error: except re.error:
msg = _LE("Unable to validate password due to invalid regular " msg = ("Unable to validate password due to invalid regular "
"expression - password_regex: ") "expression - password_regex: ")
LOG.error(msg, pattern) LOG.error(msg, pattern)
detail = _("Unable to validate password due to invalid " detail = _("Unable to validate password due to invalid "
"configuration") "configuration")

8
keystone/common/wsgi.py
View File

@ -42,7 +42,7 @@ from keystone.common import request as request_mod
from keystone.common import utils from keystone.common import utils
import keystone.conf import keystone.conf
from keystone import exception from keystone import exception
from keystone.i18n import _, _LI, _LW from keystone.i18n import _
from keystone.models import token_model from keystone.models import token_model
@ -105,7 +105,7 @@ def validate_token_bind(context, token_ref):
LOG.info(msg) LOG.info(msg)
raise exception.Unauthorized(msg) raise exception.Unauthorized(msg)
LOG.info(_LI('Kerberos bind authentication successful')) LOG.info('Kerberos bind authentication successful')
elif bind_mode == 'permissive': elif bind_mode == 'permissive':
LOG.debug(("Ignoring unknown bind (due to permissive mode): " LOG.debug(("Ignoring unknown bind (due to permissive mode): "
@ -229,8 +229,8 @@ class Application(BaseApplication):
result = method(req, **params) result = method(req, **params)
except exception.Unauthorized as e: except exception.Unauthorized as e:
LOG.warning( LOG.warning(
_LW("Authorization failed. %(exception)s from " "Authorization failed. %(exception)s from "
"%(remote_addr)s"), "%(remote_addr)s",
{'exception': e, 'remote_addr': req.environ['REMOTE_ADDR']}) {'exception': e, 'remote_addr': req.environ['REMOTE_ADDR']})
return render_exception(e, return render_exception(e,
context=req.context_dict, context=req.context_dict,

6
keystone/credential/providers/fernet/core.py
View File

@ -20,7 +20,7 @@ from keystone.common import fernet_utils
import keystone.conf import keystone.conf
from keystone.credential.providers import core from keystone.credential.providers import core
from keystone import exception from keystone import exception
from keystone.i18n import _, _LW from keystone.i18n import _
CONF = keystone.conf.CONF CONF = keystone.conf.CONF
@ -70,11 +70,11 @@ class Provider(core.Provider):
crypto, keys = get_multi_fernet_keys() crypto, keys = get_multi_fernet_keys()
if keys[0] == fernet_utils.NULL_KEY: if keys[0] == fernet_utils.NULL_KEY:
LOG.warning(_LW( LOG.warning(
'Encrypting credentials with the null key. Please properly ' 'Encrypting credentials with the null key. Please properly '
'encrypt credentials using `keystone-manage credential_setup`,' 'encrypt credentials using `keystone-manage credential_setup`,'
' `keystone-manage credential_migrate`, and `keystone-manage ' ' `keystone-manage credential_migrate`, and `keystone-manage '
'credential_rotate`')) 'credential_rotate`')
try: try:
return ( return (

24
keystone/endpoint_policy/core.py
View File

@ -18,7 +18,7 @@ from keystone.common import dependency
from keystone.common import manager from keystone.common import manager
import keystone.conf import keystone.conf
from keystone import exception from keystone import exception
from keystone.i18n import _, _LE, _LW from keystone.i18n import _
CONF = keystone.conf.CONF CONF = keystone.conf.CONF
@ -88,8 +88,8 @@ class Manager(manager.Manager):
try: try:
return self.catalog_api.get_endpoint(endpoint_id) return self.catalog_api.get_endpoint(endpoint_id)
except exception.EndpointNotFound: except exception.EndpointNotFound:
msg = _LW('Endpoint %(endpoint_id)s referenced in ' msg = ('Endpoint %(endpoint_id)s referenced in '
'association for policy %(policy_id)s not found.') 'association for policy %(policy_id)s not found.')
LOG.warning(msg, {'policy_id': policy_id, LOG.warning(msg, {'policy_id': policy_id,
'endpoint_id': endpoint_id}) 'endpoint_id': endpoint_id})
raise raise
@ -125,8 +125,8 @@ class Manager(manager.Manager):
""" """
if region_id in regions_examined: if region_id in regions_examined:
msg = _LE('Circular reference or a repeated entry found ' msg = ('Circular reference or a repeated entry found '
'in region tree - %(region_id)s.') 'in region tree - %(region_id)s.')
LOG.error(msg, {'region_id': ref.region_id}) LOG.error(msg, {'region_id': ref.region_id})
return return
@ -175,9 +175,9 @@ class Manager(manager.Manager):
endpoints, regions)) endpoints, regions))
continue continue
msg = _LW('Unsupported policy association found - ' msg = ('Unsupported policy association found - '
'Policy %(policy_id)s, Endpoint %(endpoint_id)s, ' 'Policy %(policy_id)s, Endpoint %(endpoint_id)s, '
'Service %(service_id)s, Region %(region_id)s, ') 'Service %(service_id)s, Region %(region_id)s, ')
LOG.warning(msg, {'policy_id': policy_id, LOG.warning(msg, {'policy_id': policy_id,
'endpoint_id': ref['endpoint_id'], 'endpoint_id': ref['endpoint_id'],
'service_id': ref['service_id'], 'service_id': ref['service_id'],
@ -191,8 +191,8 @@ class Manager(manager.Manager):
try: try:
return self.policy_api.get_policy(policy_id) return self.policy_api.get_policy(policy_id)
except exception.PolicyNotFound: except exception.PolicyNotFound:
msg = _LW('Policy %(policy_id)s referenced in association ' msg = ('Policy %(policy_id)s referenced in association '
'for endpoint %(endpoint_id)s not found.') 'for endpoint %(endpoint_id)s not found.')
LOG.warning(msg, {'policy_id': policy_id, LOG.warning(msg, {'policy_id': policy_id,
'endpoint_id': endpoint_id}) 'endpoint_id': endpoint_id})
raise raise
@ -225,8 +225,8 @@ class Manager(manager.Manager):
if region.get('parent_region_id') is not None: if region.get('parent_region_id') is not None:
region_id = region['parent_region_id'] region_id = region['parent_region_id']
if region_id in regions_examined: if region_id in regions_examined:
msg = _LE('Circular reference or a repeated entry ' msg = ('Circular reference or a repeated entry '
'found in region tree - %(region_id)s.') 'found in region tree - %(region_id)s.')
LOG.error(msg, {'region_id': region_id}) LOG.error(msg, {'region_id': region_id})
break break

4
keystone/exception.py
View File

@ -18,7 +18,7 @@ import six
from six.moves import http_client from six.moves import http_client
import keystone.conf import keystone.conf
from keystone.i18n import _, _LW from keystone.i18n import _
CONF = keystone.conf.CONF CONF = keystone.conf.CONF
@ -64,7 +64,7 @@ class Error(Exception):
if _FATAL_EXCEPTION_FORMAT_ERRORS: if _FATAL_EXCEPTION_FORMAT_ERRORS:
raise raise
else: else:
LOG.warning(_LW('missing exception kwargs (programmer error)')) LOG.warning('missing exception kwargs (programmer error)')
message = self.message_format message = self.message_format
super(Error, self).__init__(message) super(Error, self).__init__(message)

8
keystone/federation/idp.py
View File

@ -34,7 +34,7 @@ if not xmldsig:
from keystone.common import utils from keystone.common import utils
import keystone.conf import keystone.conf
from keystone import exception from keystone import exception
from keystone.i18n import _, _LE from keystone.i18n import _
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
@ -405,9 +405,9 @@ def _sign_assertion(assertion):
# explode like a thousand fiery supernovas made entirely of unsigned SAML. # explode like a thousand fiery supernovas made entirely of unsigned SAML.
for option in ('keyfile', 'certfile'): for option in ('keyfile', 'certfile'):
if ',' in getattr(CONF.saml, option, ''): if ',' in getattr(CONF.saml, option, ''):
raise exception.UnexpectedError(_LE( raise exception.UnexpectedError(
'The configuration value in `keystone.conf [saml] %s` cannot ' 'The configuration value in `keystone.conf [saml] %s` cannot '
'contain a comma (`,`). Please fix your configuration.') % 'contain a comma (`,`). Please fix your configuration.' %
option) option)
# xmlsec1 --sign --privkey-pem privkey,cert --id-attr:ID <tag> <file> # xmlsec1 --sign --privkey-pem privkey,cert --id-attr:ID <tag> <file>
@ -443,7 +443,7 @@ def _sign_assertion(assertion):
# parsing. # parsing.
stderr=subprocess.STDOUT) stderr=subprocess.STDOUT)
except Exception as e: except Exception as e:
msg = _LE('Error when signing assertion, reason: %(reason)s%(output)s') msg = ('Error when signing assertion, reason: %(reason)s%(output)s')
LOG.error(msg, LOG.error(msg,
{'reason': e, {'reason': e,
'output': ' ' + e.output if hasattr(e, 'output') else ''}) 'output': ' ' + e.output if hasattr(e, 'output') else ''})

4
keystone/federation/utils.py
View File

@ -23,7 +23,7 @@ import six
import keystone.conf import keystone.conf
from keystone import exception from keystone import exception
from keystone.i18n import _, _LW from keystone.i18n import _
CONF = keystone.conf.CONF CONF = keystone.conf.CONF
@ -616,7 +616,7 @@ class RuleProcessor(object):
if 'user' in identity_value: if 'user' in identity_value:
# if a mapping outputs more than one user name, log it # if a mapping outputs more than one user name, log it
if user: if user:
LOG.warning(_LW('Ignoring user name')) LOG.warning('Ignoring user name')
else: else:
user = identity_value.get('user') user = identity_value.get('user')
if 'group' in identity_value: if 'group' in identity_value:

10
keystone/i18n.py
View File

@ -25,13 +25,3 @@ _translators = oslo_i18n.TranslatorFactory(domain='keystone')
# The primary translation function using the well-known name "_" # The primary translation function using the well-known name "_"
_ = _translators.primary _ = _translators.primary
# Translators for log levels.
#
# The abbreviated names are meant to reflect the usual use of a short
# name like '_'. The "L" is for "log" and the other letter comes from
# the level.
_LI = _translators.log_info
_LW = _translators.log_warning
_LE = _translators.log_error
_LC = _translators.log_critical

27
keystone/identity/backends/ldap/common.py
View File

@ -30,7 +30,7 @@ from six.moves import map, zip
from keystone.common import driver_hints from keystone.common import driver_hints
from keystone import exception from keystone import exception
from keystone.i18n import _, _LW from keystone.i18n import _
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
@ -1037,9 +1037,9 @@ class KeystoneLDAPHandler(LDAPHandler):
# Exit condition no more data on server # Exit condition no more data on server
break break
else: else:
LOG.warning(_LW('LDAP Server does not support paging. ' LOG.warning('LDAP Server does not support paging. '
'Disable paging in keystone.conf to ' 'Disable paging in keystone.conf to '
'avoid this message.')) 'avoid this message.')
self._disable_paging() self._disable_paging()
break break
return res return res
@ -1222,9 +1222,9 @@ class BaseLdap(object):
try: try:
ldap_attr, attr_map = item.split(':') ldap_attr, attr_map = item.split(':')
except ValueError: except ValueError:
LOG.warning(_LW( LOG.warning(
'Invalid additional attribute mapping: "%s". ' 'Invalid additional attribute mapping: "%s". '
'Format must be <ldap_attribute>:<keystone_attribute>'), 'Format must be <ldap_attribute>:<keystone_attribute>',
item) item)
continue continue
mapping[ldap_attr] = attr_map mapping[ldap_attr] = attr_map
@ -1334,11 +1334,10 @@ class BaseLdap(object):
# logic here so it does not potentially break existing # logic here so it does not potentially break existing
# deployments. We need to fix our read-write LDAP logic so # deployments. We need to fix our read-write LDAP logic so
# it does not get the ID from DN. # it does not get the ID from DN.
message = _LW('ID attribute %(id_attr)s for LDAP object %(dn)s ' message = ('ID attribute %(id_attr)s for LDAP object %(dn)s '
'has multiple values and therefore cannot be used ' 'has multiple values and therefore cannot be used '
'as an ID. Will get the ID from DN instead') % ( 'as an ID. Will get the ID from DN instead') % (
{'id_attr': self.id_attr, {'id_attr': self.id_attr, 'dn': res[0]})
'dn': res[0]})
LOG.warning(message) LOG.warning(message)
id_val = self._dn_to_id(res[0]) id_val = self._dn_to_id(res[0])
else: else:
@ -1641,9 +1640,9 @@ class BaseLdap(object):
not_deleted_nodes.append(node_dn) not_deleted_nodes.append(node_dn)
if not_deleted_nodes: if not_deleted_nodes:
msg = _LW('When deleting entries for %(search_base)s, ' msg = ('When deleting entries for %(search_base)s, '
'could not delete nonexistent entries ' 'could not delete nonexistent entries '
'%(entries)s%(dots)s') '%(entries)s%(dots)s')
LOG.warning(msg, LOG.warning(msg,
{'search_base': search_base, {'search_base': search_base,
'entries': not_deleted_nodes[:3], 'entries': not_deleted_nodes[:3],

6
keystone/identity/backends/ldap/core.py
View File

@ -21,7 +21,7 @@ import six
import keystone.conf import keystone.conf
from keystone import exception from keystone import exception
from keystone.i18n import _, _LW from keystone.i18n import _
from keystone.identity.backends import base from keystone.identity.backends import base
from keystone.identity.backends.ldap import common as common_ldap from keystone.identity.backends.ldap import common as common_ldap
from keystone.identity.backends.ldap import models from keystone.identity.backends.ldap import models
@ -229,8 +229,8 @@ class Identity(base.IdentityDriverBase):
try: try:
super(GroupApi, self.group).remove_member(user_dn, group_dn) super(GroupApi, self.group).remove_member(user_dn, group_dn)
except ldap.NO_SUCH_ATTRIBUTE: except ldap.NO_SUCH_ATTRIBUTE:
msg = _LW('User %(user)s was not removed from group %(group)s ' msg = ('User %(user)s was not removed from group %(group)s '
'because the relationship was not found') 'because the relationship was not found')
LOG.warning(msg, {'user': user_id, 'group': group['id']}) LOG.warning(msg, {'user': user_id, 'group': group['id']})
if hasattr(user, 'tenant_id'): if hasattr(user, 'tenant_id'):

7
keystone/identity/controllers.py
View File

@ -21,7 +21,7 @@ from keystone.common import dependency
from keystone.common import validation from keystone.common import validation
import keystone.conf import keystone.conf
from keystone import exception from keystone import exception
from keystone.i18n import _, _LW from keystone.i18n import _
from keystone.identity import schema from keystone.identity import schema
@ -134,8 +134,7 @@ class User(controller.V2Controller):
# old tenant. This could occur if roles aren't found # old tenant. This could occur if roles aren't found
# or if the project is invalid or if there are no roles # or if the project is invalid or if there are no roles
# for the user on that project. # for the user on that project.
msg = _LW('Unable to remove user %(user)s from ' msg = 'Unable to remove user %(user)s from %(tenant)s.'
'%(tenant)s.')
LOG.warning(msg, {'user': user_id, LOG.warning(msg, {'user': user_id,
'tenant': old_user_ref['tenantId']}) 'tenant': old_user_ref['tenantId']})
@ -153,7 +152,7 @@ class User(controller.V2Controller):
# that the project is invalid or roles are some how # that the project is invalid or roles are some how
# incorrect. This shouldn't prevent the return of the # incorrect. This shouldn't prevent the return of the
# new ref. # new ref.
msg = _LW('Unable to add user %(user)s to %(tenant)s.') msg = 'Unable to add user %(user)s to %(tenant)s.'
LOG.warning(msg, {'user': user_id, LOG.warning(msg, {'user': user_id,
'tenant': user_ref['tenantId']}) 'tenant': user_ref['tenantId']})

14
keystone/identity/core.py
View File

@ -33,7 +33,7 @@ from keystone.common import manager
from keystone.common.validation import validators from keystone.common.validation import validators
import keystone.conf import keystone.conf
from keystone import exception from keystone import exception
from keystone.i18n import _, _LW from keystone.i18n import _
from keystone.identity.mapping_backends import mapping from keystone.identity.mapping_backends import mapping
from keystone import notifications from keystone import notifications
from oslo_utils import timeutils from oslo_utils import timeutils
@ -109,7 +109,7 @@ class DomainConfigs(dict):
domain_ref = resource_api.get_domain_by_name(domain_name) domain_ref = resource_api.get_domain_by_name(domain_name)
except exception.DomainNotFound: except exception.DomainNotFound:
LOG.warning( LOG.warning(
_LW('Invalid domain name (%s) found in config file name'), ('Invalid domain name (%s) found in config file name'),
domain_name) domain_name)
return return
@ -146,7 +146,7 @@ class DomainConfigs(dict):
""" """
conf_dir = CONF.identity.domain_config_dir conf_dir = CONF.identity.domain_config_dir
if not os.path.exists(conf_dir): if not os.path.exists(conf_dir):
LOG.warning(_LW('Unable to locate domain config directory: %s'), LOG.warning('Unable to locate domain config directory: %s',
conf_dir) conf_dir)
return return
@ -736,10 +736,10 @@ class Manager(manager.Manager):
if (not driver.is_domain_aware() and driver == self.driver and if (not driver.is_domain_aware() and driver == self.driver and
domain_id != CONF.identity.default_domain_id and domain_id != CONF.identity.default_domain_id and
domain_id is not None): domain_id is not None):
LOG.warning(_LW('Found multiple domains being mapped to a ' LOG.warning('Found multiple domains being mapped to a '
'driver that does not support that (e.g. ' 'driver that does not support that (e.g. '
'LDAP) - Domain ID: %(domain)s, ' 'LDAP) - Domain ID: %(domain)s, '
'Default Driver: %(driver)s'), 'Default Driver: %(driver)s',
{'domain': domain_id, {'domain': domain_id,
'driver': (driver == self.driver)}) 'driver': (driver == self.driver)})
raise exception.DomainNotFound(domain_id=domain_id) raise exception.DomainNotFound(domain_id=domain_id)

26
keystone/middleware/auth.py
View File

@ -22,7 +22,7 @@ import keystone.conf
from keystone import exception from keystone import exception
from keystone.federation import constants as federation_constants from keystone.federation import constants as federation_constants
from keystone.federation import utils from keystone.federation import utils
from keystone.i18n import _, _LI, _LW from keystone.i18n import _
from keystone.middleware import core from keystone.middleware import core
from keystone.models import token_model from keystone.models import token_model
from keystone.token.providers import common from keystone.token.providers import common
@ -118,16 +118,16 @@ class AuthContextMiddleware(auth_token.BaseAuthProtocol):
issuer = request.environ.get(CONF.tokenless_auth.issuer_attribute) issuer = request.environ.get(CONF.tokenless_auth.issuer_attribute)
if not issuer: if not issuer:
msg = _LI('Cannot find client issuer in env by the ' msg = ('Cannot find client issuer in env by the '
'issuer attribute - %s.') 'issuer attribute - %s.')
LOG.info(msg, CONF.tokenless_auth.issuer_attribute) LOG.info(msg, CONF.tokenless_auth.issuer_attribute)
return False return False
if issuer in CONF.tokenless_auth.trusted_issuer: if issuer in CONF.tokenless_auth.trusted_issuer:
return True return True
msg = _LI('The client issuer %(client_issuer)s does not match with ' msg = ('The client issuer %(client_issuer)s does not match with '
'the trusted issuer %(trusted_issuer)s') 'the trusted issuer %(trusted_issuer)s')
LOG.info( LOG.info(
msg, {'client_issuer': issuer, msg, {'client_issuer': issuer,
'trusted_issuer': CONF.tokenless_auth.trusted_issuer}) 'trusted_issuer': CONF.tokenless_auth.trusted_issuer})
@ -145,11 +145,11 @@ class AuthContextMiddleware(auth_token.BaseAuthProtocol):
if CONF.admin_token and (token == CONF.admin_token): if CONF.admin_token and (token == CONF.admin_token):
context_env['is_admin'] = True context_env['is_admin'] = True
LOG.warning( LOG.warning(
_LW("The use of the '[DEFAULT] admin_token' configuration" "The use of the '[DEFAULT] admin_token' configuration"
"option presents a significant security risk and should " "option presents a significant security risk and should "
"not be set. This option is deprecated in favor of using " "not be set. This option is deprecated in favor of using "
"'keystone-manage bootstrap' and will be removed in a " "'keystone-manage bootstrap' and will be removed in a "
"future release.")) "future release.")
request.environ[core.CONTEXT_ENV] = context_env request.environ[core.CONTEXT_ENV] = context_env
if not context_env.get('is_admin', False): if not context_env.get('is_admin', False):
@ -174,9 +174,9 @@ class AuthContextMiddleware(auth_token.BaseAuthProtocol):
request.environ[context.REQUEST_CONTEXT_ENV] = request_context request.environ[context.REQUEST_CONTEXT_ENV] = request_context
if authorization.AUTH_CONTEXT_ENV in request.environ: if authorization.AUTH_CONTEXT_ENV in request.environ:
msg = _LW('Auth context already exists in the request ' msg = ('Auth context already exists in the request '
'environment; it will be used for authorization ' 'environment; it will be used for authorization '
'instead of creating a new one.') 'instead of creating a new one.')
LOG.warning(msg) LOG.warning(msg)
return return

17
keystone/middleware/core.py
View File

@ -19,7 +19,6 @@ from oslo_serialization import jsonutils
from keystone.common import wsgi from keystone.common import wsgi
import keystone.conf import keystone.conf
from keystone import exception from keystone import exception
from keystone.i18n import _LE
CONF = keystone.conf.CONF CONF = keystone.conf.CONF
@ -64,14 +63,14 @@ class AdminTokenAuthMiddleware(wsgi.Middleware):
# NOTE(notmorgan): This is deprecated and emits a significant error # NOTE(notmorgan): This is deprecated and emits a significant error
# message to make sure deployers update their deployments so in the # message to make sure deployers update their deployments so in the
# future release upgrade the deployment does not break. # future release upgrade the deployment does not break.
LOG.error(_LE('The admin_token_auth middleware functionality has been ' LOG.error('The admin_token_auth middleware functionality has been '
'merged into the main auth middleware ' 'merged into the main auth middleware '
'(keystone.middleware.auth.AuthContextMiddleware). ' '(keystone.middleware.auth.AuthContextMiddleware). '
'`admin_token_auth` must be removed from the ' '`admin_token_auth` must be removed from the '
'[pipeline:api_v3], [pipeline:admin_api], and ' '[pipeline:api_v3], [pipeline:admin_api], and '
'[pipeline:public_api] sections of your paste ini ' '[pipeline:public_api] sections of your paste ini '
'file. The [filter:admin_token_auth] block will also ' 'file. The [filter:admin_token_auth] block will also '
'need to be removed from your paste ini file. ')) 'need to be removed from your paste ini file. ')
class JsonBodyMiddleware(wsgi.Middleware): class JsonBodyMiddleware(wsgi.Middleware):

15
keystone/notifications.py
View File

@ -30,11 +30,12 @@ from pycadf import eventfactory
from pycadf import reason from pycadf import reason
from pycadf import resource from pycadf import resource
from keystone import exception
from keystone.i18n import _, _LE
from keystone.common import dependency from keystone.common import dependency
from keystone.common import utils from keystone.common import utils
import keystone.conf import keystone.conf
from keystone import exception
from keystone.i18n import _
_CATALOG_HELPER_OBJ = None _CATALOG_HELPER_OBJ = None
@ -314,7 +315,7 @@ def _get_notifier():
_notifier = oslo_messaging.Notifier(transport, _notifier = oslo_messaging.Notifier(transport,
"identity.%s" % host) "identity.%s" % host)
except Exception: except Exception:
LOG.exception(_LE("Failed to construct notifier")) LOG.exception("Failed to construct notifier")
_notifier = False _notifier = False
return _notifier return _notifier
@ -419,8 +420,8 @@ def _send_notification(operation, resource_type, resource_id, actor_dict=None,
try: try:
notifier.info(context, event_type, payload) notifier.info(context, event_type, payload)
except Exception: except Exception:
LOG.exception(_LE( LOG.exception(
'Failed to send %(res_id)s %(event_type)s notification'), 'Failed to send %(res_id)s %(event_type)s notification',
{'res_id': resource_id, 'event_type': event_type}) {'res_id': resource_id, 'event_type': event_type})
@ -716,8 +717,8 @@ def _send_audit_notification(action, initiator, outcome, target,
except Exception: except Exception:
# diaper defense: any exception that occurs while emitting the # diaper defense: any exception that occurs while emitting the
# notification should not interfere with the API request # notification should not interfere with the API request
LOG.exception(_LE( LOG.exception(
'Failed to send %(action)s %(event_type)s notification'), 'Failed to send %(action)s %(event_type)s notification',
{'action': action, 'event_type': event_type}) {'action': action, 'event_type': event_type})

4
keystone/oauth1/core.py
View File

@ -27,7 +27,7 @@ from keystone.common import extension
from keystone.common import manager from keystone.common import manager
import keystone.conf import keystone.conf
from keystone import exception from keystone import exception
from keystone.i18n import _, _LE from keystone.i18n import _
from keystone import notifications from keystone import notifications
@ -96,7 +96,7 @@ def get_oauth_headers(headers):
parameters.update(dict(params)) parameters.update(dict(params))
return parameters return parameters
else: else:
msg = _LE('Cannot retrieve Authorization headers') msg = 'Cannot retrieve Authorization headers'
LOG.error(msg) LOG.error(msg)
raise exception.OAuthHeadersMissingError() raise exception.OAuthHeadersMissingError()

17
keystone/resource/backends/sql.py
View File

@ -15,7 +15,6 @@ from oslo_log import log
from keystone.common import driver_hints from keystone.common import driver_hints
from keystone.common import sql from keystone.common import sql
from keystone import exception from keystone import exception
from keystone.i18n import _LE, _LW
from keystone.resource.backends import base from keystone.resource.backends import base
@ -133,9 +132,9 @@ class Resource(base.ResourceDriverBase):
children_ids = set() children_ids = set()
for ref in children: for ref in children:
if ref['id'] in examined: if ref['id'] in examined:
msg = _LE('Circular reference or a repeated ' msg = ('Circular reference or a repeated '
'entry found in projects hierarchy - ' 'entry found in projects hierarchy - '
'%(project_id)s.') '%(project_id)s.')
LOG.error(msg, {'project_id': ref['id']}) LOG.error(msg, {'project_id': ref['id']})
return return
children_ids.add(ref['id']) children_ids.add(ref['id'])
@ -152,9 +151,9 @@ class Resource(base.ResourceDriverBase):
examined = set() examined = set()
while project.get('parent_id') is not None: while project.get('parent_id') is not None:
if project['id'] in examined: if project['id'] in examined:
msg = _LE('Circular reference or a repeated ' msg = ('Circular reference or a repeated '
'entry found in projects hierarchy - ' 'entry found in projects hierarchy - '
'%(project_id)s.') '%(project_id)s.')
LOG.error(msg, {'project_id': project['id']}) LOG.error(msg, {'project_id': project['id']})
return return
@ -214,8 +213,8 @@ class Resource(base.ResourceDriverBase):
for project_id in project_ids: for project_id in project_ids:
if (project_id not in project_ids_from_bd or if (project_id not in project_ids_from_bd or
project_id == base.NULL_DOMAIN_ID): project_id == base.NULL_DOMAIN_ID):
LOG.warning(_LW('Project %s does not exist and was not ' LOG.warning('Project %s does not exist and was not '
'deleted.') % project_id) 'deleted.' % project_id)
query.delete(synchronize_session=False) query.delete(synchronize_session=False)

28
keystone/resource/core.py
View File

@ -24,7 +24,7 @@ from keystone.common import manager
from keystone.common import utils from keystone.common import utils
import keystone.conf import keystone.conf
from keystone import exception from keystone import exception
from keystone.i18n import _, _LE, _LW from keystone.i18n import _
from keystone import notifications from keystone import notifications
from keystone.resource.backends import base from keystone.resource.backends import base
from keystone.token import provider as token_provider from keystone.token import provider as token_provider
@ -686,9 +686,9 @@ class Manager(manager.Manager):
result can be returned in response to a domain API call. result can be returned in response to a domain API call.
""" """
if not project_ref['is_domain']: if not project_ref['is_domain']:
LOG.error(_LE('Asked to convert a non-domain project into a ' LOG.error('Asked to convert a non-domain project into a '
'domain - Domain: %(domain_id)s, Project ID: ' 'domain - Domain: %(domain_id)s, Project ID: '
'%(id)s, Project Name: %(project_name)s'), '%(id)s, Project Name: %(project_name)s',
{'domain_id': project_ref['domain_id'], {'domain_id': project_ref['domain_id'],
'id': project_ref['id'], 'id': project_ref['id'],
'project_name': project_ref['name']}) 'project_name': project_ref['name']})
@ -780,8 +780,8 @@ class Manager(manager.Manager):
""" """
def _delete_projects(project, projects, examined): def _delete_projects(project, projects, examined):
if project['id'] in examined: if project['id'] in examined:
msg = _LE('Circular reference or a repeated entry found ' msg = ('Circular reference or a repeated entry found '
'projects hierarchy - %(project_id)s.') 'projects hierarchy - %(project_id)s.')
LOG.error(msg, {'project_id': project['id']}) LOG.error(msg, {'project_id': project['id']})
return return
@ -845,15 +845,15 @@ class Manager(manager.Manager):
} }
self.create_domain(CONF.identity.default_domain_id, self.create_domain(CONF.identity.default_domain_id,
default_domain_attrs) default_domain_attrs)
LOG.warning(_LW( LOG.warning(
'The default domain was created automatically to contain V2 ' 'The default domain was created automatically to contain V2 '
'resources. This is deprecated in the M release and will not ' 'resources. This is deprecated in the M release and will not '
'be supported in the O release. Create the default domain ' 'be supported in the O release. Create the default domain '
'manually or use the keystone-manage bootstrap command.')) 'manually or use the keystone-manage bootstrap command.')
except exception.Conflict: except exception.Conflict:
LOG.debug('The default domain already exists.') LOG.debug('The default domain already exists.')
except Exception: except Exception:
LOG.error(_LE('Failed to create the default domain.')) LOG.error('Failed to create the default domain.')
raise raise
def _require_matching_domain_id(self, new_ref, orig_ref): def _require_matching_domain_id(self, new_ref, orig_ref):
@ -1028,9 +1028,9 @@ class DomainConfigManager(manager.Manager):
# there is only one option in the answer (and that it's the right # there is only one option in the answer (and that it's the right
# one) - if not, something has gone wrong and we raise an error # one) - if not, something has gone wrong and we raise an error
if len(the_list) > 1 or the_list[0]['option'] != req_option: if len(the_list) > 1 or the_list[0]['option'] != req_option:
LOG.error(_LE('Unexpected results in response for domain ' LOG.error('Unexpected results in response for domain '
'config - %(count)s responses, first option is ' 'config - %(count)s responses, first option is '
'%(option)s, expected option %(expected)s'), '%(option)s, expected option %(expected)s',
{'count': len(the_list), 'option': list[0]['option'], {'count': len(the_list), 'option': list[0]['option'],
'expected': req_option}) 'expected': req_option})
raise exception.UnexpectedError( raise exception.UnexpectedError(
@ -1334,14 +1334,14 @@ class DomainConfigManager(manager.Manager):
each_whitelisted['value'] = ( each_whitelisted['value'] = (
each_whitelisted['value'] % sensitive_dict) each_whitelisted['value'] % sensitive_dict)
except KeyError: except KeyError:
warning_msg = _LW( warning_msg = (
'Found what looks like an unmatched config option ' 'Found what looks like an unmatched config option '
'substitution reference - domain: %(domain)s, group: ' 'substitution reference - domain: %(domain)s, group: '
'%(group)s, option: %(option)s, value: %(value)s. Perhaps ' '%(group)s, option: %(option)s, value: %(value)s. Perhaps '
'the config option to which it refers has yet to be ' 'the config option to which it refers has yet to be '
'added?') 'added?')
except (ValueError, TypeError): except (ValueError, TypeError):
warning_msg = _LW( warning_msg = (
'Found what looks like an incorrectly constructed ' 'Found what looks like an incorrectly constructed '
'config option substitution reference - domain: ' 'config option substitution reference - domain: '
'%(domain)s, group: %(group)s, option: %(option)s, ' '%(domain)s, group: %(group)s, option: %(option)s, '

5
keystone/server/common.py
View File

@ -17,7 +17,6 @@ from oslo_log import log
from keystone.common import dependency from keystone.common import dependency
from keystone.common import sql from keystone.common import sql
import keystone.conf import keystone.conf
from keystone.i18n import _LW
from keystone.server import backends from keystone.server import backends
@ -38,9 +37,9 @@ def configure(version=None, config_files=None,
keystone.conf.setup_logging() keystone.conf.setup_logging()
if CONF.insecure_debug: if CONF.insecure_debug:
LOG.warning(_LW( LOG.warning(
'insecure_debug is enabled so responses may include sensitive ' 'insecure_debug is enabled so responses may include sensitive '
'information.')) 'information.')
def setup_backends(load_extra_backends_fn=lambda: {}, def setup_backends(load_extra_backends_fn=lambda: {},

98
keystone/tests/hacking/checks.py
View File

@ -146,19 +146,13 @@ class CheckForAssertingNoneEquality(BaseASTChecker):
super(CheckForAssertingNoneEquality, self).generic_visit(node) super(CheckForAssertingNoneEquality, self).generic_visit(node)
class CheckForLoggingIssues(BaseASTChecker): class CheckForTranslationIssues(BaseASTChecker):
DEBUG_CHECK_DESC = 'K005 Using translated string in debug logging' LOGGING_CHECK_DESC = 'K005 Using translated string in logging'
NONDEBUG_CHECK_DESC = 'K006 Not using translating helper for logging'
EXCESS_HELPER_CHECK_DESC = 'K007 Using hints when _ is necessary'
USING_DEPRECATED_WARN = 'K009 Using the deprecated Logger.warn' USING_DEPRECATED_WARN = 'K009 Using the deprecated Logger.warn'
LOG_MODULES = ('logging', 'oslo_log.log') LOG_MODULES = ('logging', 'oslo_log.log')
I18N_MODULES = ( I18N_MODULES = (
'keystone.i18n._', 'keystone.i18n._',
'keystone.i18n._LI',
'keystone.i18n._LW',
'keystone.i18n._LE',
'keystone.i18n._LC',
) )
TRANS_HELPER_MAP = { TRANS_HELPER_MAP = {
'debug': None, 'debug': None,
@ -170,7 +164,7 @@ class CheckForLoggingIssues(BaseASTChecker):
} }
def __init__(self, tree, filename): def __init__(self, tree, filename):
super(CheckForLoggingIssues, self).__init__(tree, filename) super(CheckForTranslationIssues, self).__init__(tree, filename)
self.logger_names = [] self.logger_names = []
self.logger_module_names = [] self.logger_module_names = []
@ -202,13 +196,13 @@ class CheckForLoggingIssues(BaseASTChecker):
def visit_Import(self, node): def visit_Import(self, node):
for alias in node.names: for alias in node.names:
self._filter_imports(alias.name, alias) self._filter_imports(alias.name, alias)
return super(CheckForLoggingIssues, self).generic_visit(node) return super(CheckForTranslationIssues, self).generic_visit(node)
def visit_ImportFrom(self, node): def visit_ImportFrom(self, node):
for alias in node.names: for alias in node.names:
full_name = '%s.%s' % (node.module, alias.name) full_name = '%s.%s' % (node.module, alias.name)
self._filter_imports(full_name, alias) self._filter_imports(full_name, alias)
return super(CheckForLoggingIssues, self).generic_visit(node) return super(CheckForTranslationIssues, self).generic_visit(node)
def _find_name(self, node): def _find_name(self, node):
"""Return the fully qualified name or a Name or Attribute.""" """Return the fully qualified name or a Name or Attribute."""
@ -249,7 +243,7 @@ class CheckForLoggingIssues(BaseASTChecker):
if (len(node.targets) != 1 if (len(node.targets) != 1
or not isinstance(node.targets[0], attr_node_types)): or not isinstance(node.targets[0], attr_node_types)):
# say no to: "x, y = ..." # say no to: "x, y = ..."
return super(CheckForLoggingIssues, self).generic_visit(node) return super(CheckForTranslationIssues, self).generic_visit(node)
target_name = self._find_name(node.targets[0]) target_name = self._find_name(node.targets[0])
@ -265,19 +259,19 @@ class CheckForLoggingIssues(BaseASTChecker):
if not isinstance(node.value, ast.Call): if not isinstance(node.value, ast.Call):
# node.value must be a call to getLogger # node.value must be a call to getLogger
self.assignments.pop(target_name, None) self.assignments.pop(target_name, None)
return super(CheckForLoggingIssues, self).generic_visit(node) return super(CheckForTranslationIssues, self).generic_visit(node)
# is this a call to an i18n function? # is this a call to an i18n function?
if (isinstance(node.value.func, ast.Name) if (isinstance(node.value.func, ast.Name)
and node.value.func.id in self.i18n_names): and node.value.func.id in self.i18n_names):
self.assignments[target_name] = node.value.func.id self.assignments[target_name] = node.value.func.id
return super(CheckForLoggingIssues, self).generic_visit(node) return super(CheckForTranslationIssues, self).generic_visit(node)
if (not isinstance(node.value.func, ast.Attribute) if (not isinstance(node.value.func, ast.Attribute)
or not isinstance(node.value.func.value, attr_node_types)): or not isinstance(node.value.func.value, attr_node_types)):
# function must be an attribute on an object like # function must be an attribute on an object like
# logging.getLogger # logging.getLogger
return super(CheckForLoggingIssues, self).generic_visit(node) return super(CheckForTranslationIssues, self).generic_visit(node)
object_name = self._find_name(node.value.func.value) object_name = self._find_name(node.value.func.value)
func_name = node.value.func.attr func_name = node.value.func.attr
@ -286,7 +280,7 @@ class CheckForLoggingIssues(BaseASTChecker):
and func_name == 'getLogger'): and func_name == 'getLogger'):
self.logger_names.append(target_name) self.logger_names.append(target_name)
return super(CheckForLoggingIssues, self).generic_visit(node) return super(CheckForTranslationIssues, self).generic_visit(node)
def visit_Call(self, node): def visit_Call(self, node):
"""Look for the 'LOG.*' calls.""" """Look for the 'LOG.*' calls."""
@ -299,7 +293,8 @@ class CheckForLoggingIssues(BaseASTChecker):
obj_name = self._find_name(node.func.value) obj_name = self._find_name(node.func.value)
method_name = node.func.attr method_name = node.func.attr
else: # could be Subscript, Call or many more else: # could be Subscript, Call or many more
return super(CheckForLoggingIssues, self).generic_visit(node) return (super(CheckForTranslationIssues, self)
.generic_visit(node))
# if dealing with a logger the method can't be "warn" # if dealing with a logger the method can't be "warn"
if obj_name in self.logger_names and method_name == 'warn': if obj_name in self.logger_names and method_name == 'warn':
@ -309,81 +304,32 @@ class CheckForLoggingIssues(BaseASTChecker):
# must be a logger instance and one of the support logging methods # must be a logger instance and one of the support logging methods
if (obj_name not in self.logger_names if (obj_name not in self.logger_names
or method_name not in self.TRANS_HELPER_MAP): or method_name not in self.TRANS_HELPER_MAP):
return super(CheckForLoggingIssues, self).generic_visit(node) return (super(CheckForTranslationIssues, self)
.generic_visit(node))
# the call must have arguments # the call must have arguments
if not node.args: if not node.args:
return super(CheckForLoggingIssues, self).generic_visit(node) return (super(CheckForTranslationIssues, self)
.generic_visit(node))
if method_name == 'debug': self._process_log_messages(node)
self._process_debug(node)
elif method_name in self.TRANS_HELPER_MAP:
self._process_non_debug(node, method_name)
return super(CheckForLoggingIssues, self).generic_visit(node) return super(CheckForTranslationIssues, self).generic_visit(node)
def _process_debug(self, node): def _process_log_messages(self, node):
msg = node.args[0] # first arg to a logging method is the msg msg = node.args[0] # first arg to a logging method is the msg
# if first arg is a call to a i18n name # if first arg is a call to a i18n name
if (isinstance(msg, ast.Call) if (isinstance(msg, ast.Call)
and isinstance(msg.func, ast.Name) and isinstance(msg.func, ast.Name)
and msg.func.id in self.i18n_names): and msg.func.id in self.i18n_names):
self.add_error(msg, message=self.DEBUG_CHECK_DESC) self.add_error(msg, message=self.LOGGING_CHECK_DESC)
# if the first arg is a reference to a i18n call # if the first arg is a reference to a i18n call
elif (isinstance(msg, ast.Name) elif (isinstance(msg, ast.Name)
and msg.id in self.assignments and msg.id in self.assignments
and not self._is_raised_later(node, msg.id)): and not self._is_raised_later(node, msg.id)):
self.add_error(msg, message=self.DEBUG_CHECK_DESC) self.add_error(msg, message=self.LOGGING_CHECK_DESC)
def _process_non_debug(self, node, method_name):
msg = node.args[0] # first arg to a logging method is the msg
# if first arg is a call to a i18n name
if isinstance(msg, ast.Call):
try:
func_name = msg.func.id
except AttributeError:
# in the case of logging only an exception, the msg function
# will not have an id associated with it, for instance:
# LOG.warning(six.text_type(e))
return
# the function name is the correct translation helper
# for the logging method
if func_name == self.TRANS_HELPER_MAP[method_name]:
return
# the function name is an alias for the correct translation
# helper for the loggine method
if (self.i18n_names[func_name] ==
self.TRANS_HELPER_MAP[method_name]):
return
self.add_error(msg, message=self.NONDEBUG_CHECK_DESC)
# if the first arg is not a reference to the correct i18n hint
elif isinstance(msg, ast.Name):
# FIXME(dstanek): to make sure more robust we should be checking
# all names passed into a logging method. we can't right now
# because:
# 1. We have code like this that we'll fix when dealing with the %:
# msg = _('....') % {}
# LOG.warning(msg)
# 2. We also do LOG.exception(e) in several places. I'm not sure
# exactly what we should be doing about that.
if msg.id not in self.assignments:
return
helper_method_name = self.TRANS_HELPER_MAP[method_name]
if (self.assignments[msg.id] != helper_method_name
and not self._is_raised_later(node, msg.id)):
self.add_error(msg, message=self.NONDEBUG_CHECK_DESC)
elif (self.assignments[msg.id] == helper_method_name
and self._is_raised_later(node, msg.id)):
self.add_error(msg, message=self.EXCESS_HELPER_CHECK_DESC)
def _is_raised_later(self, node, name): def _is_raised_later(self, node, name):
@ -454,5 +400,5 @@ def factory(register):
register(CheckForMutableDefaultArgs) register(CheckForMutableDefaultArgs)
register(block_comments_begin_with_a_space) register(block_comments_begin_with_a_space)
register(CheckForAssertingNoneEquality) register(CheckForAssertingNoneEquality)
register(CheckForLoggingIssues) register(CheckForTranslationIssues)
register(dict_constructor_with_sequence_copy) register(dict_constructor_with_sequence_copy)

165
keystone/tests/unit/ksfixtures/hacking.py
View File

@ -137,18 +137,20 @@ class HackingCode(fixtures.Fixture):
]} ]}
class HackingLogging(fixtures.Fixture): class HackingTranslations(fixtures.Fixture):
"""Fixtures for checking translation rules.
1. Exception messages should be translated
2. Logging messages should not be translated
3. If a message is used for both an exception and logging it
should be translated
"""
shared_imports = """ shared_imports = """
import logging import logging
import logging as stlib_logging import logging as stlib_logging
from keystone.i18n import _ from keystone.i18n import _
from keystone.i18n import _ as oslo_i18n from keystone.i18n import _ as oslo_i18n
from keystone.i18n import _LC
from keystone.i18n import _LE
from keystone.i18n import _LE as error_hint
from keystone.i18n import _LI
from keystone.i18n import _LW
from oslo_log import log from oslo_log import log
from oslo_log import log as oslo_logging from oslo_log import log as oslo_logging
""" """
@ -162,11 +164,10 @@ class HackingLogging(fixtures.Fixture):
class C: class C:
def __init__(self): def __init__(self):
LOG.warning(oslo_i18n('text', {})) LOG.warning(oslo_i18n('text', {}))
LOG.warning(_LW('text', {}))
""", """,
'expected_errors': [ 'expected_errors': [
(3, 9, 'K006'), (3, 9, 'K005'),
(6, 20, 'K006'), (6, 20, 'K005'),
], ],
}, },
{ {
@ -179,12 +180,9 @@ class HackingLogging(fixtures.Fixture):
self.L.warning( self.L.warning(
_('text'), {} _('text'), {}
) )
self.L.warning(
_LW('text'), {}
)
""", """,
'expected_errors': [ 'expected_errors': [
(7, 12, 'K006'), (7, 12, 'K005'),
], ],
}, },
{ {
@ -192,10 +190,9 @@ class HackingLogging(fixtures.Fixture):
# oslo logging and specifying a logger # oslo logging and specifying a logger
L = log.getLogger(__name__) L = log.getLogger(__name__)
L.error(oslo_i18n('text')) L.error(oslo_i18n('text'))
L.error(error_hint('text'))
""", """,
'expected_errors': [ 'expected_errors': [
(3, 8, 'K006'), (3, 8, 'K005'),
], ],
}, },
{ {
@ -205,10 +202,9 @@ class HackingLogging(fixtures.Fixture):
def __init__(self): def __init__(self):
self.LOG = oslo_logging.getLogger() self.LOG = oslo_logging.getLogger()
self.LOG.critical(_('text')) self.LOG.critical(_('text'))
self.LOG.critical(_LC('text'))
""", """,
'expected_errors': [ 'expected_errors': [
(5, 26, 'K006'), (5, 26, 'K005'),
], ],
}, },
{ {
@ -217,26 +213,9 @@ class HackingLogging(fixtures.Fixture):
# translation on a separate line # translation on a separate line
msg = _('text') msg = _('text')
LOG.exception(msg) LOG.exception(msg)
msg = _LE('text')
LOG.exception(msg)
""", """,
'expected_errors': [ 'expected_errors': [
(4, 14, 'K006'), (4, 14, 'K005'),
],
},
{
'code': """
LOG = logging.getLogger()
# ensure the correct helper is being used
LOG.warning(_LI('this should cause an error'))
# debug should not allow any helpers either
LOG.debug(_LI('this should cause an error'))
""",
'expected_errors': [
(4, 12, 'K006'),
(7, 10, 'K005'),
], ],
}, },
{ {
@ -269,7 +248,7 @@ class HackingLogging(fixtures.Fixture):
raise Exception('some other message') raise Exception('some other message')
""", """,
'expected_errors': [ 'expected_errors': [
(4, 16, 'K006'), (4, 16, 'K005'),
], ],
}, },
{ {
@ -295,18 +274,7 @@ class HackingLogging(fixtures.Fixture):
LOG.warning(msg) LOG.warning(msg)
""", """,
'expected_errors': [ 'expected_errors': [
(6, 12, 'K006'), (6, 12, 'K005'),
],
},
{
'code': """
LOG = log.getLogger(__name__)
msg = _LW('text')
LOG.warning(msg)
raise Exception(msg)
""",
'expected_errors': [
(3, 12, 'K007'),
], ],
}, },
{ {
@ -322,22 +290,13 @@ class HackingLogging(fixtures.Fixture):
{ {
'code': """ 'code': """
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
msg = _LW('hello %s') % 'world' msg = _('hello %s') % 'world'
LOG.warning(msg) LOG.warning(msg)
raise Exception(msg)
""", """,
'expected_errors': [ 'expected_errors': [
(3, 12, 'K007'), (3, 12, 'K005'),
], ],
}, },
{
'code': """
LOG = log.getLogger(__name__)
msg = _LW('hello %s') % 'world'
LOG.warning(msg)
""",
'expected_errors': [],
},
{ {
'code': """ 'code': """
# this should not be an error # this should not be an error
@ -363,92 +322,4 @@ class HackingLogging(fixtures.Fixture):
""", """,
'expected_errors': [], 'expected_errors': [],
}, },
{
'code': """
# this should error since we are using _LW instead of _
LOG = log.getLogger(__name__)
try:
pass
except AssertionError as e:
msg = _LW('some message')
LOG.warning(msg)
raise exception.Unauthorized(message=msg)
""",
'expected_errors': [
(7, 16, 'K007'),
],
},
] ]
assert_not_using_deprecated_warn = {
'code': """
# Logger.warn has been deprecated in Python3 in favor of
# Logger.warning
LOG = log.getLogger(__name__)
LOG.warn(_LW('text'))
""",
'expected_errors': [
(4, 9, 'K009'),
],
}
assert_no_translations_for_debug_logging = {
'code': """
# stdlib logging
L0 = logging.getLogger()
L0.debug(_('text'))
class C:
def __init__(self):
L0.debug(oslo_i18n('text', {}))
# stdlib logging w/ alias and specifying a logger
class C:
def __init__(self):
self.L1 = logging.getLogger(__name__)
def m(self):
self.L1.debug(
_('text'), {}
)
# oslo logging and specifying a logger
L2 = logging.getLogger(__name__)
L2.debug(oslo_i18n('text'))
# oslo logging w/ alias
class C:
def __init__(self):
self.L3 = oslo_logging.getLogger()
self.L3.debug(_('text'))
# translation on a separate line
msg = _('text')
L2.debug(msg)
# this should not fail
if True:
msg = _('message %s') % X
L2.error(msg)
raise TypeError(msg)
if True:
msg = 'message'
L2.debug(msg)
# this should not fail
if True:
if True:
msg = _('message')
else:
msg = _('message')
L2.debug(msg)
raise Exception(msg)
""",
'expected_errors': [
(3, 9, 'K005'),
(6, 17, 'K005'),
(14, 12, 'K005'),
(19, 9, 'K005'),
(25, 22, 'K005'),
(29, 9, 'K005'),
]
}

9
keystone/tests/unit/test_exception.py
View File

@ -23,7 +23,6 @@ import six
from keystone.common import wsgi from keystone.common import wsgi
import keystone.conf import keystone.conf
from keystone import exception from keystone import exception
from keystone.i18n import _LE
from keystone.tests import unit from keystone.tests import unit
@ -293,17 +292,17 @@ class TestSecurityErrorTranslation(unit.BaseTestCase):
setattr, exception, '_FATAL_EXCEPTION_FORMAT_ERRORS', True) setattr, exception, '_FATAL_EXCEPTION_FORMAT_ERRORS', True)
class CustomSecurityError(exception.SecurityError): class CustomSecurityError(exception.SecurityError):
message_format = _LE('We had a failure in the %(place)r') message_format = 'We had a failure in the %(place)r'
class CustomError(exception.Error): class CustomError(exception.Error):
message_format = _LE('We had a failure in the %(place)r') message_format = 'We had a failure in the %(place)r'
def test_nested_translation_of_SecurityErrors(self): def test_nested_translation_of_SecurityErrors(self):
e = self.CustomSecurityError(place='code') e = self.CustomSecurityError(place='code')
_LE('Admiral found this in the log: %s') % e ('Admiral found this in the log: %s') % e
self.assertNotIn('programmer error', self.warning_log.output) self.assertNotIn('programmer error', self.warning_log.output)
def test_that_regular_Errors_can_be_deep_copied(self): def test_that_regular_Errors_can_be_deep_copied(self):
e = self.CustomError(place='code') e = self.CustomError(place='code')
_LE('Admiral found this in the log: %s') % e ('Admiral found this in the log: %s') % e
self.assertNotIn('programmer error', self.warning_log.output) self.assertNotIn('programmer error', self.warning_log.output)

28
keystone/tests/unit/test_hacking_checks.py
View File

@ -91,16 +91,15 @@ class TestAssertingNoneEquality(BaseStyleCheck):
self.assert_has_errors(code, expected_errors=errors) self.assert_has_errors(code, expected_errors=errors)
class BaseLoggingCheck(BaseStyleCheck): class TestTranslationChecks(BaseStyleCheck):
def get_checker(self): def get_checker(self):
return checks.CheckForLoggingIssues return checks.CheckForTranslationIssues
def get_fixture(self): def get_fixture(self):
return hacking_fixtures.HackingLogging() return hacking_fixtures.HackingTranslations()
def assert_has_errors(self, code, expected_errors=None): def assert_has_errors(self, code, expected_errors=None):
# pull out the parts of the error that we'll match against # pull out the parts of the error that we'll match against
actual_errors = (e[:3] for e in self.run_check(code)) actual_errors = (e[:3] for e in self.run_check(code))
# adjust line numbers to make the fixture data more readable. # adjust line numbers to make the fixture data more readable.
@ -109,27 +108,6 @@ class BaseLoggingCheck(BaseStyleCheck):
for e in actual_errors] for e in actual_errors]
self.assertEqual(expected_errors or [], actual_errors) self.assertEqual(expected_errors or [], actual_errors)
class TestCheckForDebugLoggingIssues(BaseLoggingCheck):
def test_for_translations(self):
fixture = self.code_ex.assert_no_translations_for_debug_logging
code = self.code_ex.shared_imports + fixture['code']
errors = fixture['expected_errors']
self.assert_has_errors(code, expected_errors=errors)
class TestLoggingWithWarn(BaseLoggingCheck):
def test(self):
data = self.code_ex.assert_not_using_deprecated_warn
code = self.code_ex.shared_imports + data['code']
errors = data['expected_errors']
self.assert_has_errors(code, expected_errors=errors)
class TestCheckForNonDebugLoggingIssues(BaseLoggingCheck):
def test_for_translations(self): def test_for_translations(self):
for example in self.code_ex.examples: for example in self.code_ex.examples:
code = self.code_ex.shared_imports + example['code'] code = self.code_ex.shared_imports + example['code']

3
keystone/token/persistence/backends/sql.py
View File

@ -22,7 +22,6 @@ from oslo_utils import timeutils
from keystone.common import sql from keystone.common import sql
import keystone.conf import keystone.conf
from keystone import exception from keystone import exception
from keystone.i18n import _LI
from keystone import token from keystone import token
from keystone.token.providers import common from keystone.token.providers import common
@ -290,4 +289,4 @@ class Token(token.persistence.TokenDriverBase):
LOG.debug('Removed %d total expired tokens', total_removed) LOG.debug('Removed %d total expired tokens', total_removed)
session.flush() session.flush()
LOG.info(_LI('Total expired tokens removed: %d'), total_removed) LOG.info('Total expired tokens removed: %d', total_removed)

7
keystone/token/persistence/core.py
View File

@ -25,7 +25,6 @@ from keystone.common import dependency
from keystone.common import manager from keystone.common import manager
import keystone.conf import keystone.conf
from keystone import exception from keystone import exception
from keystone.i18n import _LW
CONF = keystone.conf.CONF CONF = keystone.conf.CONF
@ -192,9 +191,9 @@ class Manager(object):
raise AttributeError() raise AttributeError()
f = getattr(self.token_provider_api._persistence, item) f = getattr(self.token_provider_api._persistence, item)
LOG.warning(_LW('`token_api.%s` is deprecated as of Juno in favor of ' LOG.warning('`token_api.%s` is deprecated as of Juno in favor of '
'utilizing methods on `token_provider_api` and may be ' 'utilizing methods on `token_provider_api` and may be '
'removed in Kilo.'), item) 'removed in Kilo.', item)
setattr(self, item, f) setattr(self, item, f)
return f return f

6
keystone/token/provider.py
View File

@ -26,7 +26,7 @@ from keystone.common import dependency
from keystone.common import manager from keystone.common import manager
import keystone.conf import keystone.conf
from keystone import exception from keystone import exception
from keystone.i18n import _, _LE from keystone.i18n import _
from keystone.models import token_model from keystone.models import token_model
from keystone import notifications from keystone import notifications
from keystone.token import persistence from keystone.token import persistence
@ -201,8 +201,8 @@ class Manager(manager.Manager):
expiry += datetime.timedelta(seconds=window_seconds) expiry += datetime.timedelta(seconds=window_seconds)
except Exception: except Exception:
LOG.exception(_LE('Unexpected error or malformed token ' LOG.exception('Unexpected error or malformed token '
'determining token expiry: %s'), token) 'determining token expiry: %s', token)
raise exception.TokenNotFound(_('Failed to validate token')) raise exception.TokenNotFound(_('Failed to validate token'))
if current_time < expiry: if current_time < expiry:

6
keystone/token/providers/fernet/token_formatters.py
View File

@ -27,7 +27,7 @@ from keystone.common import fernet_utils as utils
from keystone.common import utils as ks_utils from keystone.common import utils as ks_utils
import keystone.conf import keystone.conf
from keystone import exception from keystone import exception
from keystone.i18n import _, _LI from keystone.i18n import _
CONF = keystone.conf.CONF CONF = keystone.conf.CONF
@ -163,8 +163,8 @@ class TokenFormatter(object):
# anywhere, we can't say it isn't being stored somewhere else with # anywhere, we can't say it isn't being stored somewhere else with
# those kind of backend constraints. # those kind of backend constraints.
if len(token) > 255: if len(token) > 255:
LOG.info(_LI('Fernet token created with length of %d ' LOG.info('Fernet token created with length of %d '
'characters, which exceeds 255 characters'), 'characters, which exceeds 255 characters',
len(token)) len(token))
return token return token

4
keystone/version/service.py
View File

@ -27,7 +27,6 @@ import keystone.conf
from keystone.credential import routers as credential_routers from keystone.credential import routers as credential_routers
from keystone.endpoint_policy import routers as endpoint_policy_routers from keystone.endpoint_policy import routers as endpoint_policy_routers
from keystone.federation import routers as federation_routers from keystone.federation import routers as federation_routers
from keystone.i18n import _LW
from keystone.identity import routers as identity_routers from keystone.identity import routers as identity_routers
from keystone.oauth1 import routers as oauth1_routers from keystone.oauth1 import routers as oauth1_routers
from keystone.policy import routers as policy_routers from keystone.policy import routers as policy_routers
@ -74,8 +73,7 @@ def warn_local_conf(f):
@functools.wraps(f) @functools.wraps(f)
def wrapper(*args, **local_conf): def wrapper(*args, **local_conf):
if local_conf: if local_conf:
LOG.warning(_LW('\'local conf\' from PasteDeploy INI is being ' LOG.warning("'local conf' from PasteDeploy INI is being ignored.")
'ignored.'))
return f(*args, **local_conf) return f(*args, **local_conf)
return wrapper return wrapper