diff options
author | Endi S. Dewata <edewata@redhat.com> | 2011-09-09 18:58:52 -0500 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2011-09-13 17:32:33 +0000 |
commit | 0882c25c665da4cf0a14ab4b8eae10bcf86e9c5d (patch) | |
tree | c6d29e86deec6b45360015e6ebca286278fe2f78 | |
parent | df049ff13dadceb8eeecc960622c8796cf287bec (diff) | |
download | freeipa-0882c25c665da4cf0a14ab4b8eae10bcf86e9c5d.tar.gz freeipa-0882c25c665da4cf0a14ab4b8eae10bcf86e9c5d.tar.xz freeipa-0882c25c665da4cf0a14ab4b8eae10bcf86e9c5d.zip |
Fixed labels for run-as users and groups.
The labels for the run-as users and groups tables in sudo rule details
page have been modified to improve the clarity.
Ticket #1752
-rw-r--r-- | install/ui/association.js | 2 | ||||
-rw-r--r-- | install/ui/hbac.js | 8 | ||||
-rw-r--r-- | install/ui/sudo.js | 17 | ||||
-rw-r--r-- | install/ui/test/data/ipa_init.json | 858 | ||||
-rw-r--r-- | ipalib/plugins/hbacrule.py | 6 | ||||
-rw-r--r-- | ipalib/plugins/sudorule.py | 17 |
6 files changed, 859 insertions, 49 deletions
diff --git a/install/ui/association.js b/install/ui/association.js index a9cce8e84..a9a2b50a0 100644 --- a/install/ui/association.js +++ b/install/ui/association.js @@ -324,7 +324,7 @@ IPA.association_table_widget = function (spec) { if (!that.columns.length) { that.create_column({ name: that.name, - label: IPA.metadata.objects[that.other_entity].label, + label: that.label, entity_name: that.other_entity, primary_key: true, link: true diff --git a/install/ui/hbac.js b/install/ui/hbac.js index 0f2da3a9e..e2873a787 100644 --- a/install/ui/hbac.js +++ b/install/ui/hbac.js @@ -187,6 +187,7 @@ IPA.hbacrule_details_facet = function(spec) { section.add_field(IPA.association_table_widget({ id: that.entity.name+'-memberuser_user', name: 'memberuser_user', + entity: that.entity, add_method: 'add_user', remove_method: 'remove_user', add_title: IPA.messages.association.add.member, @@ -195,6 +196,7 @@ IPA.hbacrule_details_facet = function(spec) { section.add_field(IPA.association_table_widget({ id: that.entity.name+'-memberuser_group', name: 'memberuser_group', + entity: that.entity, add_method: 'add_user', remove_method: 'remove_user', add_title: IPA.messages.association.add.member, @@ -226,6 +228,7 @@ IPA.hbacrule_details_facet = function(spec) { section.add_field(IPA.association_table_widget({ id: that.entity.name+'-memberhost_host', name: 'memberhost_host', + entity: that.entity, add_method: 'add_host', remove_method: 'remove_host', add_title: IPA.messages.association.add.member, @@ -234,6 +237,7 @@ IPA.hbacrule_details_facet = function(spec) { section.add_field(IPA.association_table_widget({ id: that.entity.name+'-memberhost_hostgroup', name: 'memberhost_hostgroup', + entity: that.entity, add_method: 'add_host', remove_method: 'remove_host', add_title: IPA.messages.association.add.member, @@ -266,6 +270,7 @@ IPA.hbacrule_details_facet = function(spec) { section.add_field(IPA.association_table_widget({ id: that.entity.name+'-memberservice_hbacsvc', name: 'memberservice_hbacsvc', + entity: that.entity, add_method: 'add_service', remove_method: 'remove_service', add_title: IPA.messages.association.add.member, @@ -274,6 +279,7 @@ IPA.hbacrule_details_facet = function(spec) { section.add_field(IPA.association_table_widget({ id: that.entity.name+'-memberservice_hbacsvcgroup', name: 'memberservice_hbacsvcgroup', + entity: that.entity, add_method: 'add_service', remove_method: 'remove_service', add_title: IPA.messages.association.add.member, @@ -305,6 +311,7 @@ IPA.hbacrule_details_facet = function(spec) { section.add_field(IPA.association_table_widget({ id: that.entity.name+'-sourcehost_host', name: 'sourcehost_host', + entity: that.entity, add_method: 'add_sourcehost', remove_method: 'remove_sourcehost', add_title: IPA.messages.association.add.sourcehost, @@ -313,6 +320,7 @@ IPA.hbacrule_details_facet = function(spec) { section.add_field(IPA.association_table_widget({ id: that.entity.name+'-sourcehost_hostgroup', name: 'sourcehost_hostgroup', + entity: that.entity, add_method: 'add_sourcehost', remove_method: 'remove_sourcehost', add_title: IPA.messages.association.add.sourcehost, diff --git a/install/ui/sudo.js b/install/ui/sudo.js index 4806c17b3..6b17e89ad 100644 --- a/install/ui/sudo.js +++ b/install/ui/sudo.js @@ -450,12 +450,12 @@ IPA.sudorule_details_facet = function(spec) { that.add_section(options_section()); that.add_section(user_section()); that.add_section(host_section()); - that.add_section( IPA.sudo.rule_details_command_section({ - name: 'command', - entity: that.entity, - label: IPA.messages.objects.sudorule.command + that.add_section(IPA.sudo.rule_details_command_section({ + name: 'command', + entity: that.entity, + label: IPA.messages.objects.sudorule.command })); - that.add_section( IPA.sudo.rule_details_runas_section({ + that.add_section(IPA.sudo.rule_details_runas_section({ name: 'runas', entity: that.entity, label: IPA.messages.objects.sudorule.runas @@ -704,6 +704,7 @@ IPA.sudo.rule_details_command_section = function(spec) { that.add_field(IPA.association_table_widget({ id: that.entity.name+'-memberallowcmd_sudocmd', name: 'memberallowcmd_sudocmd', + entity: that.entity, add_method: 'add_allow_command', remove_method: 'remove_allow_command', add_title: IPA.messages.association.add.memberallowcmd, @@ -712,6 +713,7 @@ IPA.sudo.rule_details_command_section = function(spec) { that.add_field(IPA.association_table_widget({ id: that.entity.name+'-memberallowcmd_sudocmdgroup', name: 'memberallowcmd_sudocmdgroup', + entity: that.entity, add_method: 'add_allow_command', remove_method: 'remove_allow_command', add_title: IPA.messages.association.add.memberallowcmd, @@ -721,6 +723,7 @@ IPA.sudo.rule_details_command_section = function(spec) { that.add_field(IPA.association_table_widget({ id: that.entity.name+'-memberdenycmd_sudocmd', name: 'memberdenycmd_sudocmd', + entity: that.entity, add_method: 'add_deny_command', remove_method: 'remove_deny_command', add_title: IPA.messages.association.add.memberdenycmd, @@ -729,6 +732,7 @@ IPA.sudo.rule_details_command_section = function(spec) { that.add_field(IPA.association_table_widget({ id: that.entity.name+'-memberdenycmd_sudocmdgroup', name: 'memberdenycmd_sudocmdgroup', + entity: that.entity, add_method: 'add_deny_command', remove_method: 'remove_deny_command', add_title: IPA.messages.association.add.memberdenycmd, @@ -870,6 +874,7 @@ IPA.sudo.rule_details_runas_section = function(spec) { that.add_field(IPA.sudorule_association_table_widget({ id: that.entity.name+'-runasruser_user', name: 'ipasudorunas_user', + entity: that.entity, add_method: 'add_runasuser', remove_method: 'remove_runasuser', add_title: IPA.messages.association.add.ipasudorunas, @@ -878,6 +883,7 @@ IPA.sudo.rule_details_runas_section = function(spec) { that.add_field(IPA.sudorule_association_table_widget({ id: that.entity.name+'-runasuser_group', name: 'ipasudorunas_group', + entity: that.entity, add_method: 'add_runasuser', remove_method: 'remove_runasuser', add_title: IPA.messages.association.add.ipasudorunas, @@ -902,6 +908,7 @@ IPA.sudo.rule_details_runas_section = function(spec) { that.add_field(IPA.sudorule_association_table_widget({ id: that.entity.name+'-runasgroup_group', name: 'ipasudorunasgroup_group', + entity: that.entity, add_method: 'add_runasgroup', remove_method: 'remove_runasgroup', add_title: IPA.messages.association.add.ipasudorunasgroup, diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json index e15c26188..96339a849 100644 --- a/install/ui/test/data/ipa_init.json +++ b/install/ui/test/data/ipa_init.json @@ -25,6 +25,657 @@ "aci_show": { "__base64__": "" }, + "automember_add": { + "takes_args": [ + { + "alwaysask": false, + "attribute": false, + "autofill": false, + "class": "Str", + "cli_name": "automember_rule", + "cli_short_name": null, + "default": null, + "doc": "Automember Rule", + "exclude": null, + "flags": [], + "hint": null, + "include": null, + "label": "Automember Rule", + "length": null, + "maxlength": null, + "minlength": null, + "multivalue": false, + "name": "cn", + "noextrawhitespace": true, + "pattern": null, + "pattern_errmsg": null, + "primary_key": false, + "query": false, + "required": true, + "type": "unicode" + } + ], + "takes_options": [ + { + "alwaysask": false, + "attribute": false, + "autofill": false, + "class": "StrEnum", + "cli_name": "type", + "cli_short_name": null, + "default": null, + "doc": "Grouping to which the rule applies", + "exclude": null, + "flags": [], + "hint": null, + "include": null, + "label": "Grouping Type", + "multivalue": false, + "name": "type", + "primary_key": false, + "query": false, + "required": true, + "type": "unicode", + "values": [ + "group", + "hostgroup" + ] + } + ] + }, + "automember_add_condition": { + "takes_args": [ + { + "alwaysask": false, + "attribute": false, + "autofill": false, + "class": "Str", + "cli_name": "automember_rule", + "cli_short_name": null, + "default": null, + "doc": "Automember Rule", + "exclude": null, + "flags": [], + "hint": null, + "include": null, + "label": "Automember Rule", + "length": null, + "maxlength": null, + "minlength": null, + "multivalue": false, + "name": "cn", + "noextrawhitespace": true, + "pattern": null, + "pattern_errmsg": null, + "primary_key": false, + "query": false, + "required": true, + "type": "unicode" + } + ], + "takes_options": [ + { + "alwaysask": true, + "attribute": false, + "autofill": false, + "class": "List", + "cli_name": "inclusive_regex", + "cli_short_name": null, + "default": null, + "doc": "Inclusive Regex", + "exclude": null, + "flags": [], + "hint": null, + "include": null, + "label": "Inclusive Regex", + "multivalue": true, + "name": "automemberinclusiveregex", + "primary_key": false, + "query": false, + "required": false, + "separator": ",", + "skipspace": true, + "type": "tuple" + }, + { + "alwaysask": true, + "attribute": false, + "autofill": false, + "class": "List", + "cli_name": "exclusive_regex", + "cli_short_name": null, + "default": null, + "doc": "Exclusive Regex", + "exclude": null, + "flags": [], + "hint": null, + "include": null, + "label": "Exclusive Regex", + "multivalue": true, + "name": "automemberexclusiveregex", + "primary_key": false, + "query": false, + "required": false, + "separator": ",", + "skipspace": true, + "type": "tuple" + }, + { + "alwaysask": false, + "attribute": false, + "autofill": false, + "class": "Str", + "cli_name": "key", + "cli_short_name": null, + "default": null, + "doc": "Attribute to filter via regex. For example fqdn for a host, or manager for a user", + "exclude": null, + "flags": [ + "no_update", + "no_create", + "no_search" + ], + "hint": null, + "include": null, + "label": "Attribute Key", + "length": null, + "maxlength": null, + "minlength": null, + "multivalue": false, + "name": "key", + "noextrawhitespace": true, + "pattern": null, + "pattern_errmsg": null, + "primary_key": false, + "query": false, + "required": true, + "type": "unicode" + }, + { + "alwaysask": false, + "attribute": false, + "autofill": false, + "class": "StrEnum", + "cli_name": "type", + "cli_short_name": null, + "default": null, + "doc": "Grouping to which the rule applies", + "exclude": null, + "flags": [], + "hint": null, + "include": null, + "label": "Grouping Type", + "multivalue": false, + "name": "type", + "primary_key": false, + "query": false, + "required": true, + "type": "unicode", + "values": [ + "group", + "hostgroup" + ] + } + ] + }, + "automember_default_group_remove": { + "takes_args": [], + "takes_options": [ + { + "alwaysask": false, + "attribute": false, + "autofill": false, + "class": "StrEnum", + "cli_name": "type", + "cli_short_name": null, + "default": null, + "doc": "Grouping to which the rule applies", + "exclude": null, + "flags": [], + "hint": null, + "include": null, + "label": "Grouping Type", + "multivalue": false, + "name": "type", + "primary_key": false, + "query": false, + "required": true, + "type": "unicode", + "values": [ + "group", + "hostgroup" + ] + } + ] + }, + "automember_default_group_set": { + "takes_args": [], + "takes_options": [ + { + "alwaysask": false, + "attribute": false, + "autofill": false, + "class": "Str", + "cli_name": "default_group", + "cli_short_name": null, + "default": null, + "doc": "Default group for entires to land", + "exclude": null, + "flags": [ + "no_update", + "no_create" + ], + "hint": null, + "include": null, + "label": "Default Group", + "length": null, + "maxlength": null, + "minlength": null, + "multivalue": false, + "name": "automemberdefaultgroup", + "noextrawhitespace": true, + "pattern": null, + "pattern_errmsg": null, + "primary_key": false, + "query": false, + "required": true, + "type": "unicode" + }, + { + "alwaysask": false, + "attribute": false, + "autofill": false, + "class": "StrEnum", + "cli_name": "type", + "cli_short_name": null, + "default": null, + "doc": "Grouping to which the rule applies", + "exclude": null, + "flags": [], + "hint": null, + "include": null, + "label": "Grouping Type", + "multivalue": false, + "name": "type", + "primary_key": false, + "query": false, + "required": true, + "type": "unicode", + "values": [ + "group", + "hostgroup" + ] + } + ] + }, + "automember_default_group_show": { + "takes_args": [], + "takes_options": [ + { + "alwaysask": false, + "attribute": false, + "autofill": false, + "class": "StrEnum", + "cli_name": "type", + "cli_short_name": null, + "default": null, + "doc": "Grouping to which the rule applies", + "exclude": null, + "flags": [], + "hint": null, + "include": null, + "label": "Grouping Type", + "multivalue": false, + "name": "type", + "primary_key": false, + "query": false, + "required": true, + "type": "unicode", + "values": [ + "group", + "hostgroup" + ] + } + ] + }, + "automember_del": { + "takes_args": [ + { + "alwaysask": false, + "attribute": false, + "autofill": false, + "class": "Str", + "cli_name": "automember_rule", + "cli_short_name": null, + "default": null, + "doc": "Automember Rule", + "exclude": null, + "flags": [], + "hint": null, + "include": null, + "label": "Automember Rule", + "length": null, + "maxlength": null, + "minlength": null, + "multivalue": false, + "name": "cn", + "noextrawhitespace": true, + "pattern": null, + "pattern_errmsg": null, + "primary_key": false, + "query": false, + "required": true, + "type": "unicode" + } + ], + "takes_options": [ + { + "alwaysask": false, + "attribute": false, + "autofill": false, + "class": "StrEnum", + "cli_name": "type", + "cli_short_name": null, + "default": null, + "doc": "Grouping to which the rule applies", + "exclude": null, + "flags": [], + "hint": null, + "include": null, + "label": "Grouping Type", + "multivalue": false, + "name": "type", + "primary_key": false, + "query": false, + "required": true, + "type": "unicode", + "values": [ + "group", + "hostgroup" + ] + } + ] + }, + "automember_find": { + "takes_options": [ + { + "alwaysask": false, + "attribute": false, + "autofill": false, + "class": "StrEnum", + "cli_name": "type", + "cli_short_name": null, + "default": null, + "doc": "Grouping to which the rule applies", + "exclude": null, + "flags": [], + "hint": null, + "include": null, + "label": "Grouping Type", + "multivalue": false, + "name": "type", + "primary_key": false, + "query": false, + "required": true, + "type": "unicode", + "values": [ + "group", + "hostgroup" + ] + } + ] + }, + "automember_mod": { + "takes_args": [ + { + "alwaysask": false, + "attribute": false, + "autofill": false, + "class": "Str", + "cli_name": "automember_rule", + "cli_short_name": null, + "default": null, + "doc": "Automember Rule", + "exclude": null, + "flags": [], + "hint": null, + "include": null, + "label": "Automember Rule", + "length": null, + "maxlength": null, + "minlength": null, + "multivalue": false, + "name": "cn", + "noextrawhitespace": true, + "pattern": null, + "pattern_errmsg": null, + "primary_key": false, + "query": false, + "required": true, + "type": "unicode" + } + ], + "takes_options": [ + { + "alwaysask": false, + "attribute": false, + "autofill": false, + "class": "StrEnum", + "cli_name": "type", + "cli_short_name": null, + "default": null, + "doc": "Grouping to which the rule applies", + "exclude": null, + "flags": [], + "hint": null, + "include": null, + "label": "Grouping Type", + "multivalue": false, + "name": "type", + "primary_key": false, + "query": false, + "required": true, + "type": "unicode", + "values": [ + "group", + "hostgroup" + ] + } + ] + }, + "automember_remove_condition": { + "takes_args": [ + { + "alwaysask": false, + "attribute": false, + "autofill": false, + "class": "Str", + "cli_name": "automember_rule", + "cli_short_name": null, + "default": null, + "doc": "Automember Rule", + "exclude": null, + "flags": [], + "hint": null, + "include": null, + "label": "Automember Rule", + "length": null, + "maxlength": null, + "minlength": null, + "multivalue": false, + "name": "cn", + "noextrawhitespace": true, + "pattern": null, + "pattern_errmsg": null, + "primary_key": false, + "query": false, + "required": true, + "type": "unicode" + } + ], + "takes_options": [ + { + "alwaysask": true, + "attribute": false, + "autofill": false, + "class": "List", + "cli_name": "inclusive_regex", + "cli_short_name": null, + "default": null, + "doc": "Inclusive Regex", + "exclude": null, + "flags": [], + "hint": null, + "include": null, + "label": "Inclusive Regex", + "multivalue": true, + "name": "automemberinclusiveregex", + "primary_key": false, + "query": false, + "required": false, + "separator": ",", + "skipspace": true, + "type": "tuple" + }, + { + "alwaysask": true, + "attribute": false, + "autofill": false, + "class": "List", + "cli_name": "exclusive_regex", + "cli_short_name": null, + "default": null, + "doc": "Exclusive Regex", + "exclude": null, + "flags": [], + "hint": null, + "include": null, + "label": "Exclusive Regex", + "multivalue": true, + "name": "automemberexclusiveregex", + "primary_key": false, + "query": false, + "required": false, + "separator": ",", + "skipspace": true, + "type": "tuple" + }, + { + "alwaysask": false, + "attribute": false, + "autofill": false, + "class": "Str", + "cli_name": "key", + "cli_short_name": null, + "default": null, + "doc": "Attribute to filter via regex. For example fqdn for a host, or manager for a user", + "exclude": null, + "flags": [ + "no_update", + "no_create", + "no_search" + ], + "hint": null, + "include": null, + "label": "Attribute Key", + "length": null, + "maxlength": null, + "minlength": null, + "multivalue": false, + "name": "key", + "noextrawhitespace": true, + "pattern": null, + "pattern_errmsg": null, + "primary_key": false, + "query": false, + "required": true, + "type": "unicode" + }, + { + "alwaysask": false, + "attribute": false, + "autofill": false, + "class": "StrEnum", + "cli_name": "type", + "cli_short_name": null, + "default": null, + "doc": "Grouping to which the rule applies", + "exclude": null, + "flags": [], + "hint": null, + "include": null, + "label": "Grouping Type", + "multivalue": false, + "name": "type", + "primary_key": false, + "query": false, + "required": true, + "type": "unicode", + "values": [ + "group", + "hostgroup" + ] + } + ] + }, + "automember_show": { + "takes_args": [ + { + "alwaysask": false, + "attribute": false, + "autofill": false, + "class": "Str", + "cli_name": "automember_rule", + "cli_short_name": null, + "default": null, + "doc": "Automember Rule", + "exclude": null, + "flags": [], + "hint": null, + "include": null, + "label": "Automember Rule", + "length": null, + "maxlength": null, + "minlength": null, + "multivalue": false, + "name": "cn", + "noextrawhitespace": true, + "pattern": null, + "pattern_errmsg": null, + "primary_key": false, + "query": false, + "required": true, + "type": "unicode" + } + ], + "takes_options": [ + { + "alwaysask": false, + "attribute": false, + "autofill": false, + "class": "StrEnum", + "cli_name": "type", + "cli_short_name": null, + "default": null, + "doc": "Grouping to which the rule applies", + "exclude": null, + "flags": [], + "hint": null, + "include": null, + "label": "Grouping Type", + "multivalue": false, + "name": "type", + "primary_key": false, + "query": false, + "required": true, + "type": "unicode", + "values": [ + "group", + "hostgroup" + ] + } + ] + }, "automountkey_add": { "takes_args": [], "takes_options": [ @@ -8048,6 +8699,138 @@ "aci": { "__base64__": "" }, + "automember": { + "aciattrs": [ + "automemberexclusiveregex", + "automemberinclusiveregex", + "automembertargetgroup", + "cn", + "description", + "objectclass" + ], + "attribute_members": {}, + "bindable": false, + "container_dn": "cn=automember,cn=etc", + "default_attributes": [ + "automemberinclusiveregex", + "automemberexclusiveregex", + "cn", + "automembertargetgroup", + "description", + "automemberdefaultgroup" + ], + "hidden_attributes": [ + "objectclass", + "aci" + ], + "label": "Auto Membership Rule", + "label_singular": "Entry", + "methods": [ + "add", + "add_condition", + "default_group_remove", + "default_group_set", + "default_group_show", + "del", + "find", + "mod", + "remove_condition", + "show" + ], + "name": "automember", + "object_class": [ + "top", + "automemberregexrule" + ], + "object_class_config": null, + "object_name": "auto_member_rule", + "object_name_plural": "auto_member_rules", + "parent_object": "", + "rdn_attribute": "", + "relationships": { + "member": [ + "Member", + "", + "no_" + ], + "memberindirect": [ + "Indirect Member", + null, + "no_indirect_" + ], + "memberof": [ + "Member Of", + "in_", + "not_in_" + ], + "memberofindirect": [ + "Indirect Member Of", + null, + "not_in_indirect_" + ] + }, + "takes_params": [ + { + "alwaysask": false, + "attribute": false, + "autofill": false, + "class": "Str", + "cli_name": "desc", + "cli_short_name": null, + "default": null, + "doc": "A description of this auto member rule", + "exclude": null, + "flags": [], + "hint": null, + "include": null, + "label": "Description", + "length": null, + "maxlength": null, + "minlength": null, + "multivalue": false, + "name": "description", + "noextrawhitespace": true, + "pattern": null, + "pattern_errmsg": null, + "primary_key": false, + "query": false, + "required": false, + "type": "unicode" + }, + { + "alwaysask": false, + "attribute": false, + "autofill": false, + "class": "Str", + "cli_name": "default_group", + "cli_short_name": null, + "default": null, + "doc": "Default group for entires to land", + "exclude": null, + "flags": [ + "no_update", + "no_create", + "no_search" + ], + "hint": null, + "include": null, + "label": "Default Group", + "length": null, + "maxlength": null, + "minlength": null, + "multivalue": false, + "name": "automemberdefaultgroup", + "noextrawhitespace": true, + "pattern": null, + "pattern_errmsg": null, + "primary_key": false, + "query": false, + "required": false, + "type": "unicode" + } + ], + "uuid_attribute": "" + }, "automountkey": { "aciattrs": [ "automountinformation", @@ -9058,7 +9841,6 @@ "ipadefaultprimarygroup", "ipaenabledflag", "ipaentitlementid", - "ipaexternalmember", "ipagroupobjectclasses", "ipagroupsearchfields", "ipahomesrootdir", @@ -11002,7 +11784,8 @@ "sourcehost", "memberhost", "memberservice", - "memberhostgroup" + "memberhostgroup", + "externalhost" ], "hidden_attributes": [ "objectclass", @@ -11317,7 +12100,7 @@ "cli_name": "memberuser_group", "cli_short_name": null, "default": null, - "doc": "Groups", + "doc": "User Groups", "exclude": null, "flags": [ "no_update", @@ -11326,7 +12109,7 @@ ], "hint": null, "include": null, - "label": "Groups", + "label": "User Groups", "length": null, "maxlength": null, "minlength": null, @@ -11410,7 +12193,7 @@ "cli_name": "sourcehost_host", "cli_short_name": null, "default": null, - "doc": "Source hosts", + "doc": "Source Hosts", "exclude": null, "flags": [ "no_update", @@ -11419,7 +12202,7 @@ ], "hint": null, "include": null, - "label": "Source hosts", + "label": "Source Hosts", "length": null, "maxlength": null, "minlength": null, @@ -11441,7 +12224,7 @@ "cli_name": "sourcehost_hostgroup", "cli_short_name": null, "default": null, - "doc": "Source host groups", + "doc": "Source Host Groups", "exclude": null, "flags": [ "no_update", @@ -11450,7 +12233,7 @@ ], "hint": null, "include": null, - "label": "Source host groups", + "label": "Source Host Groups", "length": null, "maxlength": null, "minlength": null, @@ -12237,6 +13020,7 @@ ], "memberof": [ "hostgroup", + "netgroup", "hbacrule", "sudorule" ], @@ -14586,7 +15370,7 @@ "cli_name": "memberuser_group", "cli_short_name": null, "default": null, - "doc": "Groups", + "doc": "User Groups", "exclude": null, "flags": [ "no_update", @@ -14595,7 +15379,7 @@ ], "hint": null, "include": null, - "label": "Groups", + "label": "User Groups", "length": null, "maxlength": null, "minlength": null, @@ -14741,7 +15525,7 @@ "cli_name": "memberallowcmd_sudocmdgroup", "cli_short_name": null, "default": null, - "doc": "Sudo Command Groups", + "doc": "Sudo Allow Command Groups", "exclude": null, "flags": [ "no_update", @@ -14750,7 +15534,7 @@ ], "hint": null, "include": null, - "label": "Sudo Command Groups", + "label": "Sudo Allow Command Groups", "length": null, "maxlength": null, "minlength": null, @@ -14772,7 +15556,7 @@ "cli_name": "memberdenycmd_sudocmdgroup", "cli_short_name": null, "default": null, - "doc": "Sudo Command Groups", + "doc": "Sudo Deny Command Groups", "exclude": null, "flags": [ "no_update", @@ -14781,7 +15565,7 @@ ], "hint": null, "include": null, - "label": "Sudo Command Groups", + "label": "Sudo Deny Command Groups", "length": null, "maxlength": null, "minlength": null, @@ -14803,7 +15587,7 @@ "cli_name": "ipasudorunas_user", "cli_short_name": null, "default": null, - "doc": "Run as a user or any user within a specified group", + "doc": "Run as a user", "exclude": null, "flags": [ "no_update", @@ -14812,7 +15596,7 @@ ], "hint": null, "include": null, - "label": "RunAs User", + "label": "RunAs Users", "length": null, "maxlength": null, "minlength": null, @@ -14834,7 +15618,7 @@ "cli_name": "ipasudorunas_group", "cli_short_name": null, "default": null, - "doc": "Run with the gid of a specified POSIX group ", + "doc": "Run as any user within a specified group", "exclude": null, "flags": [ "no_update", @@ -14843,7 +15627,7 @@ ], "hint": null, "include": null, - "label": "RunAs Group", + "label": "Groups of RunAs Users", "length": null, "maxlength": null, "minlength": null, @@ -14977,7 +15761,7 @@ "cli_name": "ipasudorunasgroup_group", "cli_short_name": null, "default": null, - "doc": "RunAsGroup Group", + "doc": "Run with the gid of a specified POSIX group", "exclude": null, "flags": [ "no_update", @@ -14986,7 +15770,7 @@ ], "hint": null, "include": null, - "label": "RunAsGroup Group", + "label": "RunAs Groups", "length": null, "maxlength": null, "minlength": null, @@ -16293,7 +17077,7 @@ "Administrator" ], "gidnumber": [ - "1890800000" + "719000000" ], "has_keytab": true, "has_password": true, @@ -16301,18 +17085,24 @@ "/home/admin" ], "ipauniqueid": [ - "dcc874a0-d2d1-11e0-83f8-525400e135d8" + "03400b10-ddc8-11e0-9103-525400e135d8" ], "krbextradata": [ { - "__base64__": "AAJ/hFxOcm9vdC9hZG1pbkBJRE0uTEFCLkJPUy5SRURIQVQuQ09NAA==" + "__base64__": "AAJF6G5Ocm9vdC9hZG1pbkBJRE0uTEFCLkJPUy5SRURIQVQuQ09NAA==" + }, + { + "__base64__": "AAgBAA==" } ], "krblastpwdchange": [ - "20110830063439Z" + "20110913052109Z" + ], + "krblastsuccessfulauth": [ + "20110913053553Z" ], "krbpasswordexpiration": [ - "20111128063439Z" + "20111212052109Z" ], "krbprincipalname": [ "admin@IDM.LAB.BOS.REDHAT.COM" @@ -16340,7 +17130,7 @@ "admin" ], "uidnumber": [ - "1890800000" + "719000000" ] } ], @@ -16348,21 +17138,25 @@ "truncated": false }, { - "count": 68, + "count": 72, "error": null, "result": { "basedn": "dc=idm,dc=lab,dc=bos,dc=redhat,dc=com", "bin": "/var/www", - "ca_agent_port": 9443, - "ca_ee_port": 9444, + "ca_agent_install_port": 9443, + "ca_agent_port": 443, + "ca_ee_install_port": 9444, + "ca_ee_port": 443, "ca_host": "edewata-f15.idm.lab.bos.redhat.com", - "ca_port": 9180, + "ca_install_port": 9180, + "ca_port": 80, "conf": "/etc/ipa/server.conf", "conf_default": "/etc/ipa/default.conf", "confdir": "/etc/ipa", "config_loaded": true, "container_accounts": "cn=accounts", "container_applications": "cn=applications,cn=configs,cn=policies", + "container_automember": "cn=automember,cn=etc", "container_automount": "cn=automount", "container_configs": "cn=configs,cn=policies", "container_dns": "cn=dns", @@ -16420,8 +17214,8 @@ "webui_prod": true, "xmlrpc_uri": "https://edewata-f15.idm.lab.bos.redhat.com/ipa/xml" }, - "summary": "68 variables", - "total": 68 + "summary": "72 variables", + "total": 72 }, { "error": null, diff --git a/ipalib/plugins/hbacrule.py b/ipalib/plugins/hbacrule.py index b7c0bcac0..22a6a0dc6 100644 --- a/ipalib/plugins/hbacrule.py +++ b/ipalib/plugins/hbacrule.py @@ -189,7 +189,7 @@ class hbacrule(LDAPObject): flags=['no_create', 'no_update', 'no_search'], ), Str('memberuser_group?', - label=_('Groups'), + label=_('User Groups'), flags=['no_create', 'no_update', 'no_search'], ), Str('memberhost_host?', @@ -201,11 +201,11 @@ class hbacrule(LDAPObject): flags=['no_create', 'no_update', 'no_search'], ), Str('sourcehost_host?', - label=_('Source hosts'), + label=_('Source Hosts'), flags=['no_create', 'no_update', 'no_search'], ), Str('sourcehost_hostgroup?', - label=_('Source host groups'), + label=_('Source Host Groups'), flags=['no_create', 'no_update', 'no_search'], ), Str('memberservice_hbacsvc?', diff --git a/ipalib/plugins/sudorule.py b/ipalib/plugins/sudorule.py index ddb0bd5ba..93ca03f01 100644 --- a/ipalib/plugins/sudorule.py +++ b/ipalib/plugins/sudorule.py @@ -141,7 +141,7 @@ class sudorule(LDAPObject): flags=['no_create', 'no_update', 'no_search'], ), Str('memberuser_group?', - label=_('Groups'), + label=_('User Groups'), flags=['no_create', 'no_update', 'no_search'], ), Str('memberhost_host?', @@ -161,21 +161,21 @@ class sudorule(LDAPObject): flags=['no_create', 'no_update', 'no_search'], ), Str('memberallowcmd_sudocmdgroup?', - label=_('Sudo Command Groups'), + label=_('Sudo Allow Command Groups'), flags=['no_create', 'no_update', 'no_search'], ), Str('memberdenycmd_sudocmdgroup?', - label=_('Sudo Command Groups'), + label=_('Sudo Deny Command Groups'), flags=['no_create', 'no_update', 'no_search'], ), Str('ipasudorunas_user?', - label=_('RunAs User'), - doc=_('Run as a user or any user within a specified group'), + label=_('RunAs Users'), + doc=_('Run as a user'), flags=['no_create', 'no_update', 'no_search'], ), Str('ipasudorunas_group?', - label=_('RunAs Group'), - doc=_('Run with the gid of a specified POSIX group '), + label=_('Groups of RunAs Users'), + doc=_('Run as any user within a specified group'), flags=['no_create', 'no_update', 'no_search'], ), Str('externaluser?', validate_externaluser, @@ -198,7 +198,8 @@ class sudorule(LDAPObject): flags=['no_create', 'no_update', 'no_search'], ), Str('ipasudorunasgroup_group?', - label=_('RunAsGroup Group'), + label=_('RunAs Groups'), + doc=_('Run with the gid of a specified POSIX group'), flags=['no_create', 'no_update', 'no_search'], ), ) |