openstack/trove
Code Issues Proposed changes

Merge "Logging audit for trove/db module"

Browse Source
This commit is contained in:
Jenkins 2014-07-07 06:56:34 +00:00 committed by Gerrit Code Review
commit 5c0b202ae3
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
trove/db/models.py
View File

@ -95,15 +95,19 @@ class DatabaseModelBase(models.ModelBase):
model = cls.get_by(**conditions) model = cls.get_by(**conditions)
if model is None: if model is None:
raise exception.ModelNotFoundError(_("%s Not Found") % raise exception.ModelNotFoundError(_("%(s_name)s Not Found") %
cls.__name__) {"s_name": cls.__name__})
if ((context and not context.is_admin and hasattr(model, 'tenant_id') if ((context and not context.is_admin and hasattr(model, 'tenant_id')
and model.tenant_id != context.tenant)): and model.tenant_id != context.tenant)):
LOG.error("Tenant %s tried to access %s, owned by %s." msg = _("Tenant %(s_tenant)s tried to access "
% (context.tenant, cls.__name__, model.tenant_id)) "%(s_name)s, owned by %(s_owner)s.")
raise exception.ModelNotFoundError(_("%s Not Found") % LOG.error(msg % (
cls.__name__) {"s_tenant": context.tenant, "s_name": cls.__name__,
"s_owner": model.tenant_id}))
raise exception.ModelNotFoundError(
_("Tenant %(s_tenant)s cannot access %(s_name)s") % (
{"s_tenant": context.tenant, "s_name": cls.__name__}))
return model return model