IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge.

Browse Source
This commit is contained in:
Karl MacMillan
-
parent d2a19b2009 2b38769b50
commit f25e7c46ef
9 changed files with 89 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ipa-server/ipa-gui/ipagui/subcontrollers/group.py
View File

@@ -84,7 +84,7 @@ class GroupController(IPAController):
# on any error, we redirect to the _edit_ group page.
# this code does data setup, similar to groupedit()
#
group = client.get_group_by_cn(kw['cn'], group_fields)
group = client.get_entry_by_cn(kw['cn'], group_fields)
group_dict = group.toDict()
member_dicts = []
@@ -169,7 +169,7 @@ class GroupController(IPAController):
client = self.get_ipaclient()
try:
group = client.get_group_by_cn(cn, group_fields)
group = client.get_entry_by_cn(cn, group_fields)
group_dict = group.toDict()
@@ -186,9 +186,8 @@ class GroupController(IPAController):
member_dns = [member_dns]
# TODO: convert this into an efficient (single) function call
# Note: this isn't quite right, since it can be users and groups.
members = map(
lambda dn: client.get_user_by_dn(dn, ['dn', 'givenname', 'sn',
lambda dn: client.get_entry_by_dn(dn, ['dn', 'givenname', 'sn',
'uid', 'cn']),
member_dns)
members.sort(self.sort_group_member)
@@ -346,7 +345,7 @@ class GroupController(IPAController):
client = self.get_ipaclient()
try:
group = client.get_group_by_cn(cn, group_fields)
group = client.get_entry_by_cn(cn, group_fields)
group_dict = group.toDict()
#
@@ -359,9 +358,8 @@ class GroupController(IPAController):
member_dns = [member_dns]
# TODO: convert this into an efficient (single) function call
# Note: this isn't quite right, since it can be users and groups.
members = map(
lambda dn: client.get_user_by_dn(dn, ['dn', 'givenname', 'sn',
lambda dn: client.get_entry_by_dn(dn, ['dn', 'givenname', 'sn',
'uid', 'cn']),
member_dns)
members.sort(self.sort_group_member)

2
ipa-server/ipa-gui/ipagui/subcontrollers/user.py
View File

@@ -411,7 +411,7 @@ class UserController(IPAController):
user_manager = None
try:
if user.manager:
user_manager = client.get_user_by_dn(user.manager,
user_manager = client.get_entry_by_dn(user.manager,
['givenname', 'sn', 'uid'])
except ipaerror.exception_for(ipaerror.LDAP_NOT_FOUND):
pass

2
ipa-server/ipa-gui/ipagui/templates/usereditform.kid
View File

@@ -65,7 +65,7 @@ from ipagui.helpers import ipahelper
function renderMemberInfo(newdiv, info) {
if (info.type == "group") {
newdiv.appendChild(document.createTextNode(
info.name.escapeHTML() + " "));
info.name + " "));
}
}
</script>

2
ipa-server/ipa-gui/ipagui/templates/usernewform.kid
View File

@@ -36,7 +36,7 @@ from ipagui.helpers import ipahelper
function renderMemberInfo(newdiv, info) {
if (info.type == "group") {
newdiv.appendChild(document.createTextNode(
info.name.escapeHTML() + " "));
info.name + " "));
}
}
</script>

56
ipa-server/xmlrpc-server/funcs.py
View File

@@ -323,7 +323,26 @@ class IPAServer:
partial_match_filter += ")"
return (exact_match_filter, partial_match_filter)
# General searches
def get_entry_by_dn (self, dn, sattrs=None, opts=None):
"""Get a specific entry. Return as a dict of values.
Multi-valued fields are represented as lists.
"""
filter = "(objectClass=*)"
return self.__get_entry(dn, filter, sattrs, opts)
def get_entry_by_cn (self, cn, sattrs=None, opts=None):
"""Get a specific entry by cn. Return as a dict of values.
Multi-valued fields are represented as lists.
"""
cn = self.__safe_filter(cn)
filter = "(cn=" + cn + ")"
return self.__get_entry(self.basedn, filter, sattrs, opts)
# User support
def __is_user_unique(self, uid, opts):
@@ -345,14 +364,6 @@ class IPAServer:
uid = self.__safe_filter(uid)
filter = "(uid=" + uid + ")"
return self.__get_entry(self.basedn, filter, sattrs, opts)
def get_user_by_dn (self, dn, sattrs=None, opts=None):
"""Get a specific user's entry. Return as a dict of values.
Multi-valued fields are represented as lists.
"""
filter = "(objectClass=*)"
return self.__get_entry(dn, filter, sattrs, opts)
def get_user_by_principal(self, principal, sattrs=None, opts=None):
"""Get a user entry searching by Kerberos Principal Name.
@@ -649,23 +660,6 @@ class IPAServer:
except ipaerror.exception_for(ipaerror.LDAP_NOT_FOUND):
return 1
def get_group_by_cn (self, cn, sattrs=None, opts=None):
"""Get a specific group's entry. Return as a dict of values.
Multi-valued fields are represented as lists.
"""
cn = self.__safe_filter(cn)
filter = "(cn=" + cn + ")"
return self.__get_entry(self.basedn, filter, sattrs, opts)
def get_group_by_dn (self, dn, sattrs=None, opts=None):
"""Get a specific group's entry. Return as a dict of values.
Multi-valued fields are represented as lists.
"""
filter = "(objectClass=*)"
return self.__get_entry(dn, filter, sattrs, opts)
def get_groups_by_member (self, member_dn, sattrs=None, opts=None):
"""Get a specific group's entry. Return as a dict of values.
Multi-valued fields are represented as lists.
@@ -787,7 +781,7 @@ class IPAServer:
"""Add a member to an existing group.
"""
old_group = self.get_group_by_dn(group_dn, None, opts)
old_group = self.get_entry_by_dn(group_dn, None, opts)
if old_group is None:
raise ipaerror.gen_exception(ipaerror.LDAP_NOT_FOUND)
new_group = copy.deepcopy(old_group)
@@ -834,7 +828,7 @@ class IPAServer:
"""Remove a member_dn from an existing group.
"""
old_group = self.get_group_by_dn(group_dn, None, opts)
old_group = self.get_entry_by_dn(group_dn, None, opts)
if old_group is None:
raise ipaerror.gen_exception(ipaerror.LDAP_NOT_FOUND)
new_group = copy.deepcopy(old_group)
@@ -1002,7 +996,7 @@ class IPAServer:
The memberOf plugin handles removing the group from any other
groups.
"""
group = self.get_group_by_dn(group_dn, ['dn', 'cn'], opts)
group = self.get_entry_by_dn(group_dn, ['dn', 'cn'], opts)
if len(group) != 1:
raise ipaerror.gen_exception(ipaerror.LDAP_NOT_FOUND)
@@ -1020,12 +1014,12 @@ class IPAServer:
tgroup is the DN of the target group to be added to
"""
old_group = self.get_group_by_dn(tgroup, None, opts)
old_group = self.get_entry_by_dn(tgroup, None, opts)
if old_group is None:
raise ipaerror.gen_exception(ipaerror.LDAP_NOT_FOUND)
new_group = copy.deepcopy(old_group)
group_dn = self.get_group_by_dn(group, ['dn', 'cn', 'objectclass'], opts)
group_dn = self.get_entry_by_dn(group, ['dn', 'cn', 'objectclass'], opts)
if group_dn is None:
raise ipaerror.gen_exception(ipaerror.LDAP_NOT_FOUND)

5
ipa-server/xmlrpc-server/ipaxmlrpc.py
View File

@@ -317,8 +317,9 @@ def handler(req, profiling=False):
try:
f = funcs.IPAServer()
h = ModXMLRPCRequestHandler()
h.register_function(f.get_entry_by_dn)
h.register_function(f.get_entry_by_cn)
h.register_function(f.get_user_by_uid)
h.register_function(f.get_user_by_dn)
h.register_function(f.get_user_by_principal)
h.register_function(f.get_users_by_manager)
h.register_function(f.add_user)
@@ -329,8 +330,6 @@ def handler(req, profiling=False):
h.register_function(f.delete_user)
h.register_function(f.mark_user_deleted)
h.register_function(f.modifyPassword)
h.register_function(f.get_group_by_cn)
h.register_function(f.get_group_by_dn)
h.register_function(f.get_groups_by_member)
h.register_function(f.add_group)
h.register_function(f.find_groups)