This patch reverts the use of pygettext for i18n string extraction. It
was originally introduced because the help documentation for commands
are in the class docstring and module docstring.
Docstrings are a Python construct whereby any string which immediately
follows a class declaration, function/method declaration or appears
first in a module is taken to be the documentation for that
object. Python automatically assigns that string to the __doc__
variable associated with the object. Explicitly assigning to the
__doc__ variable is equivalent and permitted.
We mark strings in the source for i18n translation by embedding them
in _() or ngettext(). Specialized extraction tools (e.g. xgettext)
scan the source code looking for strings with those markers and
extracts the string for inclusion in a translation catalog.
It was mistakingly assumed one could not mark for translation Python
docstrings. Since some docstrings are vital for our command help
system some method had to be devised to extract docstrings for the
translation catalog. pygettext has the ability to locate and extract
docstrings and it was introduced to acquire the documentation for our
commands located in module and class docstrings.
However pygettext was too large a hammer for this task, it lacked any
fined grained ability to extract only the docstrings we were
interested in. In practice it extracted EVERY docstring in each file
it was presented with. This caused a large number strings to be
extracted for translation which had no reason to be translated, the
string might have been internal code documentation never meant to be
seen by users. Often the superfluous docstrings were long, complex and
likely difficult to translate. This placed an unnecessary burden on
our volunteer translators.
Instead what is needed is some method to extract only those strings
intended for translation. We already have such a mechanism and it is
already widely used, namely wrapping strings intended for translation
in calls to _() or _negettext(), i.e. marking a string for i18n
translation. Thus the solution to the docstring translation problem is
to mark the docstrings exactly as we have been doing, it only requires
that instead of a bare Python docstring we instead assign the marked
string to the __doc__ variable. Using the hypothetical class foo as
an example.
class foo(Command):
'''
The foo command takes out the garbage.
'''
Would become:
class foo(Command):
__doc__ = _('The foo command takes out the garbage.')
But which docstrings need to be marked for translation? The makeapi
tool knows how to iterate over every command in our public API. It was
extended to validate every command's documentation and report if any
documentation is missing or not marked for translation. That
information was then used to identify each docstring in the code which
needed to be transformed.
In summary what this patch does is:
* Remove the use of pygettext (modification to install/po/Makefile.in)
* Replace every docstring with an explicit assignment to __doc__ where
the rhs of the assignment is an i18n marking function.
* Single line docstrings appearing in multi-line string literals
(e.g. ''' or """) were replaced with single line string literals
because the multi-line literals were introducing unnecessary
whitespace and newlines in the string extracted for translation. For
example:
'''
The foo command takes out the garbage.
'''
Would appear in the translation catalog as:
"\n
The foo command takes out the garbage.\n
"
The superfluous whitespace and newlines are confusing to translators
and requires us to strip leading and trailing whitespace from the
translation at run time.
* Import statements were moved from below the docstring to above
it. This was necessary because the i18n markers are imported
functions and must be available before the the doc is
parsed. Technically only the import of the i18n markers had to
appear before the doc but stylistically it's better to keep all the
imports together.
* It was observed during the docstring editing process that the
command documentation was inconsistent with respect to the use of
periods to terminate a sentence. Some doc had a trailing period,
others didn't. Consistency was enforced by adding a period to end of
every docstring if one was missing.
436 lines
15 KiB
Python
436 lines
15 KiB
Python
# Authors:
|
|
# Rob Crittenden <rcritten@redhat.com>
|
|
#
|
|
# Copyright (C) 2010 Red Hat
|
|
# see file 'COPYING' for use and warranty information
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
import copy
|
|
from ipalib.plugins.baseldap import *
|
|
from ipalib import api, _, ngettext
|
|
from ipalib import Flag, Str, StrEnum
|
|
from ipalib.request import context
|
|
from ipalib import errors
|
|
|
|
__doc__ = _("""
|
|
Permissions
|
|
|
|
A permission enables fine-grained delegation of rights. A permission is
|
|
a human-readable form of a 389-ds Access Control Rule, or instruction (ACI).
|
|
A permission grants the right to perform a specific task such as adding a
|
|
user, modifying a group, etc.
|
|
|
|
A permission may not contain other permissions.
|
|
|
|
* A permission grants access to read, write, add or delete.
|
|
* A privilege combines similar permissions (for example all the permissions
|
|
needed to add a user).
|
|
* A role grants a set of privileges to users, groups, hosts or hostgroups.
|
|
|
|
A permission is made up of a number of different parts:
|
|
|
|
1. The name of the permission.
|
|
2. The target of the permission.
|
|
3. The rights granted by the permission.
|
|
|
|
Rights define what operations are allowed, and may be one or more
|
|
of the following:
|
|
1. write - write one or more attributes
|
|
2. read - read one or more attributes
|
|
3. add - add a new entry to the tree
|
|
4. delete - delete an existing entry
|
|
5. all - all permissions are granted
|
|
|
|
Read permission is granted for most attributes by default so the read
|
|
permission is not expected to be used very often.
|
|
|
|
Note the distinction between attributes and entries. The permissions are
|
|
independent, so being able to add a user does not mean that the user will
|
|
be editable.
|
|
|
|
There are a number of allowed targets:
|
|
1. type: a type of object (user, group, etc).
|
|
2. memberof: a member of a group or hostgroup
|
|
3. filter: an LDAP filter
|
|
4. subtree: an LDAP filter specifying part of the LDAP DIT. This is a
|
|
super-set of the "type" target.
|
|
5. targetgroup: grant access to modify a specific group (such as granting
|
|
the rights to manage group membership)
|
|
|
|
EXAMPLES:
|
|
|
|
Add a permission that grants the creation of users:
|
|
ipa permission-add --type=user --permissions=add "Add Users"
|
|
|
|
Add a permission that grants the ability to manage group membership:
|
|
ipa permission-add --attrs=member --permissions=write --type=group "Manage Group Members"
|
|
""")
|
|
|
|
ACI_PREFIX=u"permission"
|
|
|
|
output_params = (
|
|
Str('ipapermissiontype',
|
|
label=_('Permission Type'),
|
|
),
|
|
)
|
|
|
|
class permission(LDAPObject):
|
|
"""
|
|
Permission object.
|
|
"""
|
|
container_dn = api.env.container_permission
|
|
object_name = _('permission')
|
|
object_name_plural = _('permissions')
|
|
object_class = ['groupofnames', 'ipapermission']
|
|
default_attributes = ['cn', 'member', 'memberof',
|
|
'memberindirect', 'ipapermissiontype',
|
|
]
|
|
aci_attributes = ['group', 'permissions', 'attrs', 'type',
|
|
'filter', 'subtree', 'targetgroup',
|
|
]
|
|
attribute_members = {
|
|
'member': ['privilege'],
|
|
}
|
|
rdnattr='cn'
|
|
|
|
label = _('Permissions')
|
|
label_singular = _('Permission')
|
|
|
|
takes_params = (
|
|
Str('cn',
|
|
cli_name='name',
|
|
label=_('Permission name'),
|
|
primary_key=True,
|
|
normalizer=lambda value: value.lower(),
|
|
),
|
|
List('permissions',
|
|
cli_name='permissions',
|
|
label=_('Permissions'),
|
|
doc=_('Comma-separated list of permissions to grant ' \
|
|
'(read, write, add, delete, all)'),
|
|
),
|
|
List('attrs?',
|
|
cli_name='attrs',
|
|
label=_('Attributes'),
|
|
doc=_('Comma-separated list of attributes'),
|
|
normalizer=lambda value: value.lower(),
|
|
flags=('ask_create', 'ask_update'),
|
|
),
|
|
StrEnum('type?',
|
|
cli_name='type',
|
|
label=_('Type'),
|
|
doc=_('Type of IPA object (user, group, host, hostgroup, service, netgroup, dns)'),
|
|
values=(u'user', u'group', u'host', u'service', u'hostgroup', u'netgroup', u'dnsrecord',),
|
|
flags=('ask_create', 'ask_update'),
|
|
),
|
|
Str('memberof?',
|
|
cli_name='memberof',
|
|
label=_('Member of group'), # FIXME: Does this label make sense?
|
|
doc=_('Target members of a group'),
|
|
flags=('ask_create', 'ask_update'),
|
|
),
|
|
Str('filter?',
|
|
cli_name='filter',
|
|
label=_('Filter'),
|
|
doc=_('Legal LDAP filter (e.g. ou=Engineering)'),
|
|
flags=('ask_create', 'ask_update'),
|
|
),
|
|
Str('subtree?',
|
|
cli_name='subtree',
|
|
label=_('Subtree'),
|
|
doc=_('Subtree to apply permissions to'),
|
|
flags=('ask_create', 'ask_update'),
|
|
),
|
|
Str('targetgroup?',
|
|
cli_name='targetgroup',
|
|
label=_('Target group'),
|
|
doc=_('User group to apply permissions to'),
|
|
flags=('ask_create', 'ask_update'),
|
|
),
|
|
)
|
|
|
|
# Don't allow SYSTEM permissions to be modified or removed
|
|
def check_system(self, ldap, dn, *keys):
|
|
try:
|
|
(dn, entry_attrs) = ldap.get_entry(dn, ['ipapermissiontype'])
|
|
except errors.NotFound:
|
|
self.handle_not_found(*keys)
|
|
if 'ipapermissiontype' in entry_attrs:
|
|
if 'SYSTEM' in entry_attrs['ipapermissiontype']:
|
|
return False
|
|
return True
|
|
|
|
api.register(permission)
|
|
|
|
|
|
class permission_add(LDAPCreate):
|
|
__doc__ = _('Add a new permission.')
|
|
|
|
msg_summary = _('Added permission "%(value)s"')
|
|
|
|
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
|
|
# Test the ACI before going any further
|
|
opts = copy.copy(options)
|
|
opts['test'] = True
|
|
opts['permission'] = keys[-1]
|
|
opts['aciprefix'] = ACI_PREFIX
|
|
try:
|
|
self.api.Command.aci_add(keys[-1], **opts)
|
|
except Exception, e:
|
|
raise e
|
|
|
|
# Clear the aci attributes out of the permission entry
|
|
for o in options:
|
|
try:
|
|
if o not in ['objectclass']:
|
|
del entry_attrs[o]
|
|
except:
|
|
pass
|
|
return dn
|
|
|
|
def post_callback(self, ldap, dn, entry_attrs, *keys, **options):
|
|
# Now actually add the aci.
|
|
opts = copy.copy(options)
|
|
opts['test'] = False
|
|
opts['permission'] = keys[-1]
|
|
opts['aciprefix'] = ACI_PREFIX
|
|
try:
|
|
result = self.api.Command.aci_add(keys[-1], **opts)['result']
|
|
for attr in self.obj.aci_attributes:
|
|
if attr in result:
|
|
entry_attrs[attr] = result[attr]
|
|
except errors.InvalidSyntax, e:
|
|
# A syntax error slipped past our attempt at validation, clean up
|
|
self.api.Command.permission_del(keys[-1])
|
|
raise e
|
|
except Exception, e:
|
|
# Something bad happened, clean up as much as we can and return
|
|
# that error
|
|
try:
|
|
self.api.Command.permission_del(keys[-1])
|
|
except Exception, ignore:
|
|
pass
|
|
try:
|
|
self.api.Command.aci_del(keys[-1], aciprefix=ACI_PREFIX)
|
|
except Exception, ignore:
|
|
pass
|
|
raise e
|
|
return dn
|
|
|
|
api.register(permission_add)
|
|
|
|
|
|
class permission_del(LDAPDelete):
|
|
__doc__ = _('Delete a permission.')
|
|
|
|
msg_summary = _('Deleted permission "%(value)s"')
|
|
|
|
def pre_callback(self, ldap, dn, *keys, **options):
|
|
if not self.obj.check_system(ldap, dn, *keys):
|
|
raise errors.ACIError(info='A SYSTEM permission may not be removed')
|
|
# remove permission even when the underlying ACI is missing
|
|
try:
|
|
self.api.Command.aci_del(keys[-1], aciprefix=ACI_PREFIX)
|
|
except errors.NotFound:
|
|
pass
|
|
return dn
|
|
|
|
api.register(permission_del)
|
|
|
|
|
|
class permission_mod(LDAPUpdate):
|
|
__doc__ = _('Modify a permission.')
|
|
|
|
msg_summary = _('Modified permission "%(value)s"')
|
|
has_output_params = LDAPUpdate.has_output_params + output_params
|
|
|
|
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
|
|
if not self.obj.check_system(ldap, dn, *keys):
|
|
raise errors.ACIError(info='A SYSTEM permission may not be modified')
|
|
|
|
# check if permission is in LDAP
|
|
try:
|
|
(dn, attrs) = ldap.get_entry(
|
|
dn, attrs_list, normalize=self.obj.normalize_dn
|
|
)
|
|
except errors.NotFound:
|
|
self.obj.handle_not_found(*keys)
|
|
|
|
# when renaming permission, check if the target permission does not
|
|
# exists already. Then, make changes to underlying ACI
|
|
if 'rename' in options:
|
|
try:
|
|
new_dn = dn.replace(keys[-1], options['rename'], 1)
|
|
(new_dn, attrs) = ldap.get_entry(
|
|
new_dn, attrs_list, normalize=self.obj.normalize_dn
|
|
)
|
|
raise errors.DuplicateEntry()
|
|
except errors.NotFound:
|
|
pass # permission may be renamed, continue
|
|
|
|
opts = copy.copy(options)
|
|
for o in ['all', 'raw', 'rights', 'rename']:
|
|
if o in opts:
|
|
del opts[o]
|
|
setattr(context, 'aciupdate', False)
|
|
# If there are no options left we don't need to do anything to the
|
|
# underlying ACI.
|
|
if len(opts) > 0:
|
|
opts['test'] = False
|
|
opts['permission'] = keys[-1]
|
|
opts['aciprefix'] = ACI_PREFIX
|
|
try:
|
|
self.api.Command.aci_mod(keys[-1], **opts)
|
|
setattr(context, 'aciupdate', True)
|
|
except Exception, e:
|
|
raise e
|
|
|
|
# Clear the aci attributes out of the permission entry
|
|
for o in self.obj.aci_attributes:
|
|
try:
|
|
del entry_attrs[o]
|
|
except:
|
|
pass
|
|
|
|
return dn
|
|
|
|
def exc_callback(self, keys, options, exc, call_func, *call_args, **call_kwargs):
|
|
if isinstance(exc, errors.EmptyModlist):
|
|
aciupdate = getattr(context, 'aciupdate')
|
|
opts = copy.copy(options)
|
|
# Clear the aci attributes out of the permission entry
|
|
for o in self.obj.aci_attributes + ['all', 'raw', 'rights']:
|
|
try:
|
|
del opts[o]
|
|
except:
|
|
pass
|
|
|
|
if len(opts) > 0 and not aciupdate:
|
|
raise exc
|
|
else:
|
|
raise exc
|
|
|
|
def post_callback(self, ldap, dn, entry_attrs, *keys, **options):
|
|
# rename the underlying ACI after the change to permission
|
|
cn = keys[-1]
|
|
|
|
if 'rename' in options:
|
|
self.api.Command.aci_mod(cn,aciprefix=ACI_PREFIX,
|
|
permission=options['rename'])
|
|
|
|
self.api.Command.aci_rename(cn, aciprefix=ACI_PREFIX,
|
|
newname=options['rename'], newprefix=ACI_PREFIX)
|
|
|
|
cn = options['rename'] # rename finished
|
|
|
|
result = self.api.Command.permission_show(cn, **options)['result']
|
|
for r in result:
|
|
if not r.startswith('member'):
|
|
entry_attrs[r] = result[r]
|
|
return dn
|
|
|
|
api.register(permission_mod)
|
|
|
|
|
|
class permission_find(LDAPSearch):
|
|
__doc__ = _('Search for permissions.')
|
|
|
|
msg_summary = ngettext(
|
|
'%(count)d permission matched', '%(count)d permissions matched', 0
|
|
)
|
|
has_output_params = LDAPSearch.has_output_params + output_params
|
|
|
|
def post_callback(self, ldap, entries, truncated, *args, **options):
|
|
for entry in entries:
|
|
(dn, attrs) = entry
|
|
try:
|
|
aci = self.api.Command.aci_show(attrs['cn'][0], aciprefix=ACI_PREFIX)['result']
|
|
|
|
# copy information from respective ACI to permission entry
|
|
for attr in self.obj.aci_attributes:
|
|
if attr in aci:
|
|
attrs[attr] = aci[attr]
|
|
except errors.NotFound:
|
|
self.debug('ACI not found for %s' % attrs['cn'][0])
|
|
|
|
# Now find all the ACIs that match. Once we find them, add any that
|
|
# aren't already in the list along with their permission info.
|
|
options['aciprefix'] = ACI_PREFIX
|
|
|
|
aciresults = self.api.Command.aci_find(*args, **options)
|
|
truncated = truncated or aciresults['truncated']
|
|
results = aciresults['result']
|
|
|
|
for aci in results:
|
|
found = False
|
|
if 'permission' in aci:
|
|
for entry in entries:
|
|
(dn, attrs) = entry
|
|
if aci['permission'] == attrs['cn'][0]:
|
|
found = True
|
|
break
|
|
if not found:
|
|
permission = self.api.Command.permission_show(aci['permission'])
|
|
attrs = permission['result']
|
|
for attr in self.obj.aci_attributes:
|
|
if attr in aci:
|
|
attrs[attr] = aci[attr]
|
|
dn = attrs['dn']
|
|
del attrs['dn']
|
|
if (dn, attrs) not in entries:
|
|
entries.append((dn, attrs))
|
|
|
|
api.register(permission_find)
|
|
|
|
|
|
class permission_show(LDAPRetrieve):
|
|
__doc__ = _('Display information about a permission.')
|
|
|
|
has_output_params = LDAPRetrieve.has_output_params + output_params
|
|
def post_callback(self, ldap, dn, entry_attrs, *keys, **options):
|
|
try:
|
|
aci = self.api.Command.aci_show(keys[-1], aciprefix=ACI_PREFIX)['result']
|
|
for attr in self.obj.aci_attributes:
|
|
if attr in aci:
|
|
entry_attrs[attr] = aci[attr]
|
|
except errors.NotFound:
|
|
self.debug('ACI not found for %s' % entry_attrs['cn'][0])
|
|
if options.get('rights', False) and options.get('all', False):
|
|
# The ACI attributes are just broken-out components of aci so
|
|
# the rights should all match it.
|
|
for attr in self.obj.aci_attributes:
|
|
entry_attrs['attributelevelrights'][attr] = entry_attrs['attributelevelrights']['aci']
|
|
return dn
|
|
|
|
api.register(permission_show)
|
|
|
|
|
|
class permission_add_member(LDAPAddMember):
|
|
"""
|
|
Add members to a permission.
|
|
"""
|
|
NO_CLI = True
|
|
|
|
api.register(permission_add_member)
|
|
|
|
|
|
class permission_remove_member(LDAPRemoveMember):
|
|
"""
|
|
Remove members from a permission.
|
|
"""
|
|
NO_CLI = True
|
|
|
|
api.register(permission_remove_member)
|