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.
330 lines
12 KiB
Python
330 lines
12 KiB
Python
# Authors:
|
|
# Alexander Bokovoy <abokovoy@redhat.com>
|
|
#
|
|
# Copyright (C) 2011 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/>.
|
|
|
|
from ipalib import api, errors, output
|
|
from ipalib import Command, List, Str, Flag
|
|
from types import NoneType
|
|
from ipalib.cli import to_cli
|
|
from ipalib import _, ngettext
|
|
import pyhbac
|
|
|
|
__doc__ = _("""
|
|
Simulate use of Host-based access controls
|
|
|
|
HBAC rules control who can access what services on what hosts and from where.
|
|
You can use HBAC to control which users or groups on a source host can
|
|
access a service, or group of services, on a target host.
|
|
|
|
Since applying HBAC rules implies use of a production environment,
|
|
this plugin aims to provide simulation of HBAC rules evaluation without
|
|
having access to the production environment.
|
|
|
|
Test user coming from source host to a service on a named host against
|
|
existing enabled rules.
|
|
|
|
ipa hbactest --user= --srchost= --host= --service=
|
|
[--rules=rules-list] [--nodetail] [--enabled] [--disabled]
|
|
|
|
--user, --srchost, --host, and --service are mandatory, others are optional.
|
|
|
|
If --rules is specified simulate enabling of the specified rules and test
|
|
the login of the user using only these rules.
|
|
|
|
If --enabled is specified, all enabled HBAC rules will be added to simulation
|
|
|
|
If --disabled is specified, all disabled HBAC rules will be added to simulation
|
|
|
|
If --nodetail is specified, do not return information about rules matched/not matched.
|
|
|
|
If both --rules and --enabled are specified, apply simulation to --rules _and_
|
|
all IPA enabled rules.
|
|
|
|
If no --rules specified, simulation is run against all IPA enabled rules.
|
|
|
|
EXAMPLES:
|
|
|
|
1. Use all enabled HBAC rules in IPA database to simulate:
|
|
$ ipa hbactest --user=a1a --srchost=foo --host=bar --service=ssh
|
|
--------------------
|
|
Access granted: True
|
|
--------------------
|
|
notmatched: my-second-rule
|
|
notmatched: my-third-rule
|
|
notmatched: myrule
|
|
matched: allow_all
|
|
|
|
2. Disable detailed summary of how rules were applied:
|
|
$ ipa hbactest --user=a1a --srchost=foo --host=bar --service=ssh --nodetail
|
|
--------------------
|
|
Access granted: True
|
|
--------------------
|
|
|
|
3. Test explicitly specified HBAC rules:
|
|
$ ipa hbactest --user=a1a --srchost=foo --host=bar --service=ssh \
|
|
--rules=my-second-rule,myrule
|
|
---------------------
|
|
Access granted: False
|
|
---------------------
|
|
notmatched: my-second-rule
|
|
notmatched: myrule
|
|
|
|
4. Use all enabled HBAC rules in IPA database + explicitly specified rules:
|
|
$ ipa hbactest --user=a1a --srchost=foo --host=bar --service=ssh \
|
|
--rules=my-second-rule,myrule --enabled
|
|
--------------------
|
|
Access granted: True
|
|
--------------------
|
|
notmatched: my-second-rule
|
|
notmatched: my-third-rule
|
|
notmatched: myrule
|
|
matched: allow_all
|
|
|
|
5. Test all disabled HBAC rules in IPA database:
|
|
$ ipa hbactest --user=a1a --srchost=foo --host=bar --service=ssh --disabled
|
|
---------------------
|
|
Access granted: False
|
|
---------------------
|
|
notmatched: new-rule
|
|
|
|
6. Test all disabled HBAC rules in IPA database + explicitly specified rules:
|
|
$ ipa hbactest --user=a1a --srchost=foo --host=bar --service=ssh \
|
|
--rules=my-second-rule,myrule --disabled
|
|
---------------------
|
|
Access granted: False
|
|
---------------------
|
|
notmatched: my-second-rule
|
|
notmatched: my-third-rule
|
|
notmatched: myrule
|
|
|
|
7. Test all (enabled and disabled) HBAC rules in IPA database:
|
|
$ ipa hbactest --user=a1a --srchost=foo --host=bar --service=ssh \
|
|
--enabled --disabled
|
|
--------------------
|
|
Access granted: True
|
|
--------------------
|
|
notmatched: my-second-rule
|
|
notmatched: my-third-rule
|
|
notmatched: myrule
|
|
notmatched: new-rule
|
|
matched: allow_all
|
|
|
|
""")
|
|
|
|
def convert_to_ipa_rule(rule):
|
|
# convert a dict with a rule to an pyhbac rule
|
|
ipa_rule = pyhbac.HbacRule(rule['cn'][0])
|
|
ipa_rule.enabled = rule['ipaenabledflag'][0]
|
|
# Following code attempts to process rule systematically
|
|
structure = (('user', 'memberuser', 'user', 'group', ipa_rule.users),
|
|
('host', 'memberhost', 'host', 'hostgroup', ipa_rule.targethosts),
|
|
('sourcehost', 'sourcehost', 'host', 'hostgroup', ipa_rule.srchosts),
|
|
('service', 'memberservice', 'hbacsvc', 'hbacsvcgroup', ipa_rule.services),
|
|
)
|
|
for element in structure:
|
|
category = '%scategory' % (element[0])
|
|
if category in rule and rule[category][0] == u'all':
|
|
# rule applies to all elements
|
|
element[4].category = set([pyhbac.HBAC_CATEGORY_ALL])
|
|
else:
|
|
# rule is about specific entities
|
|
# Check if there are explicitly listed entities
|
|
attr_name = '%s_%s' % (element[1], element[2])
|
|
if attr_name in rule:
|
|
element[4].names = rule[attr_name]
|
|
# Now add groups of entities if they are there
|
|
attr_name = '%s_%s' % (element[1], element[3])
|
|
if attr_name in rule:
|
|
element[4].groups = rule[attr_name]
|
|
return ipa_rule
|
|
|
|
|
|
class hbactest(Command):
|
|
__doc__ = _('Simulate use of Host-based access controls')
|
|
|
|
has_output = (
|
|
output.summary,
|
|
output.Output('matched', (list, tuple, NoneType), _('Matched rules')),
|
|
output.Output('notmatched', (list, tuple, NoneType), _('Not matched rules')),
|
|
output.Output('error', (list, tuple, NoneType), _('Non-existent or invalid rules')),
|
|
output.Output('value', bool, _('Result of simulation'), ['no_display']),
|
|
)
|
|
|
|
takes_options = (
|
|
Str('user',
|
|
cli_name='user',
|
|
label=_('User name'),
|
|
primary_key=True,
|
|
),
|
|
Str('sourcehost',
|
|
cli_name='srchost',
|
|
label=_('Source host'),
|
|
),
|
|
Str('targethost',
|
|
cli_name='host',
|
|
label=_('Target host'),
|
|
),
|
|
Str('service',
|
|
cli_name='service',
|
|
label=_('Service'),
|
|
),
|
|
List('rules?',
|
|
cli_name='rules',
|
|
label=_('Rules to test. If not specified, --enabled is assumed'),
|
|
),
|
|
Flag('nodetail?',
|
|
cli_name='nodetail',
|
|
label=_('Hide details which rules are matched, not matched, or invalid'),
|
|
),
|
|
Flag('enabled?',
|
|
cli_name='enabled',
|
|
label=_('Include all enabled IPA rules into test [default]'),
|
|
),
|
|
Flag('disabled?',
|
|
cli_name='disabled',
|
|
label=_('Include all disabled IPA rules into test'),
|
|
),
|
|
)
|
|
|
|
def execute(self, *args, **options):
|
|
# First receive all needed information:
|
|
# 1. HBAC rules (whether enabled or disabled)
|
|
# 2. Required options are (user, source host, target host, service)
|
|
# 3. Options: rules to test (--rules, --enabled, --disabled), request for detail output
|
|
rules = []
|
|
hbacset = self.api.Command.hbacrule_find()['result']
|
|
|
|
# Use all enabled IPA rules by default
|
|
all_enabled = True
|
|
all_disabled = False
|
|
|
|
# We need a local copy of test rules in order find incorrect ones
|
|
testrules = {}
|
|
if 'rules' in options:
|
|
testrules = list(options['rules'])
|
|
# When explicit rules are provided, disable assumptions
|
|
all_enabled = False
|
|
all_disabled = False
|
|
|
|
# Check if --disabled is specified, include all disabled IPA rules
|
|
if options['disabled']:
|
|
all_disabled = True
|
|
all_enabled = False
|
|
|
|
# Finally, if enabled is specified implicitly, override above decisions
|
|
if options['enabled']:
|
|
all_enabled = True
|
|
|
|
# We have some rules, import them
|
|
# --enabled will import all enabled rules (default)
|
|
# --disabled will import all disabled rules
|
|
# --rules will implicitly add the rules from a rule list
|
|
for rule in hbacset:
|
|
ipa_rule = convert_to_ipa_rule(rule)
|
|
if ipa_rule.name in testrules:
|
|
ipa_rule.enabled = True
|
|
rules.append(ipa_rule)
|
|
testrules.remove(ipa_rule.name)
|
|
elif all_enabled and ipa_rule.enabled:
|
|
# Option --enabled forces to include all enabled IPA rules into test
|
|
rules.append(ipa_rule)
|
|
elif all_disabled and not ipa_rule.enabled:
|
|
# Option --disabled forces to include all disabled IPA rules into test
|
|
ipa_rule.enabled = True
|
|
rules.append(ipa_rule)
|
|
|
|
# Check if there are unresolved rules left
|
|
if len(testrules) > 0:
|
|
# Error, unresolved rules are left in --rules
|
|
return {'summary' : unicode(_(u'Unresolved rules in --rules')),
|
|
'error': testrules, 'matched': None, 'notmatched': None,
|
|
'value' : False}
|
|
|
|
# Rules are converted to pyhbac format, we can test them
|
|
request = pyhbac.HbacRequest()
|
|
request.user.name = options['user']
|
|
request.service.name = options['service']
|
|
request.srchost.name = options['sourcehost']
|
|
request.targethost.name = options['targethost']
|
|
|
|
matched_rules = []
|
|
notmatched_rules = []
|
|
error_rules = []
|
|
|
|
result = {'matched':None, 'notmatched':None, 'error':None}
|
|
if not options['nodetail']:
|
|
# Validate runs rules one-by-one and reports failed ones
|
|
for ipa_rule in rules:
|
|
try:
|
|
res = request.evaluate([ipa_rule])
|
|
if res == pyhbac.HBAC_EVAL_ALLOW:
|
|
matched_rules.append(ipa_rule.name)
|
|
if res == pyhbac.HBAC_EVAL_DENY:
|
|
notmatched_rules.append(ipa_rule.name)
|
|
except pyhbac.HbacError as (code, rule_name):
|
|
if code == pyhbac.HBAC_EVAL_ERROR:
|
|
error_rules.append(rule_name)
|
|
self.log.info('Native IPA HBAC rule "%s" parsing error: %s' % \
|
|
(rule_name, pyhbac.hbac_result_string(code)))
|
|
except (TypeError, IOError) as (info):
|
|
self.log.error('Native IPA HBAC module error: %s' % (info))
|
|
|
|
access_granted = len(matched_rules) > 0
|
|
else:
|
|
res = request.evaluate(rules)
|
|
access_granted = (res == pyhbac.HBAC_EVAL_ALLOW)
|
|
|
|
result['summary'] = _('Access granted: %s') % (access_granted)
|
|
|
|
|
|
if len(matched_rules) > 0:
|
|
result['matched'] = matched_rules
|
|
if len(notmatched_rules) > 0:
|
|
result['notmatched'] = notmatched_rules
|
|
if len(error_rules) > 0:
|
|
result['error'] = error_rules
|
|
|
|
result['value'] = access_granted
|
|
return result
|
|
|
|
def output_for_cli(self, textui, output, *args, **options):
|
|
"""
|
|
Command.output_for_cli() uses --all option to decide whether to print detailed output.
|
|
We use --detail to allow that, thus we need to redefine output_for_cli().
|
|
"""
|
|
# Note that we don't actually use --detail below to see if details need
|
|
# to be printed as our execute() method will return None for corresponding
|
|
# entries and None entries will be skipped.
|
|
for o in self.output:
|
|
outp = self.output[o]
|
|
if 'no_display' in outp.flags:
|
|
continue
|
|
result = output[o]
|
|
if isinstance(result, (list, tuple)):
|
|
textui.print_attribute(outp.name, result, '%s: %s', 1, True)
|
|
elif isinstance(result, (unicode, bool)):
|
|
if o == 'summary':
|
|
textui.print_summary(result)
|
|
else:
|
|
textui.print_indented(result)
|
|
|
|
# Propagate integer value for result. It will give proper command line result for scripts
|
|
return int(not bool(output['value']))
|
|
|
|
api.register(hbactest)
|