summaryrefslogtreecommitdiffstats
path: root/ipa-python/aci.py
diff options
context:
space:
mode:
authorKevin McCarthy <kmccarth@redhat.com>2007-10-12 15:11:55 -0700
committerKevin McCarthy <kmccarth@redhat.com>2007-10-12 15:11:55 -0700
commit63f7cdf7f7e1c39b791dad6951fa39d9a6d58c9d (patch)
tree72f1bd539e6fcbbce99a31f4b6695c149e828c2a /ipa-python/aci.py
parentaf0a1d989b1eb483ae3e76fa5a3008fda3fafb5e (diff)
downloadfreeipa-63f7cdf7f7e1c39b791dad6951fa39d9a6d58c9d.tar.gz
freeipa-63f7cdf7f7e1c39b791dad6951fa39d9a6d58c9d.tar.xz
freeipa-63f7cdf7f7e1c39b791dad6951fa39d9a6d58c9d.zip
Adds delegation listing and creation to the GUI.
Diffstat (limited to 'ipa-python/aci.py')
-rw-r--r--ipa-python/aci.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/ipa-python/aci.py b/ipa-python/aci.py
index d834f8997..137d9ee1d 100644
--- a/ipa-python/aci.py
+++ b/ipa-python/aci.py
@@ -16,6 +16,7 @@
#
import re
+import urllib
class ACI:
"""
@@ -25,10 +26,10 @@ class ACI:
"""
def __init__(self,acistr=None):
+ self.name = ''
self.source_group = ''
self.dest_group = ''
self.attrs = []
- self.name = ''
if acistr is not None:
self.parse_acistr(acistr)
@@ -40,15 +41,15 @@ class ACI:
# dn's aren't typed in, but searched for, and the search results
# will return escaped dns
- acistr = ('(targetattr = "%s")' +
+ acistr = ('(targetattr="%s")' +
'(targetfilter="(memberOf=%s)")' +
'(version 3.0;' +
'acl "%s";' +
'allow (write) ' +
- 'groupdn="%s";)') % (attrs_str,
+ 'groupdn="ldap:///%s";)') % (attrs_str,
self.dest_group,
self.name,
- self.source_group)
+ urllib.quote(self.source_group, "/=, "))
return acistr
def _match(self, prefix, inputstr):
@@ -89,7 +90,7 @@ class ACI:
def parse_acistr(self, acistr):
"""Parses the acistr. If the string isn't recognized, a SyntaxError
is raised."""
- acistr = self._match('(targetattr = ', acistr)
+ acistr = self._match('(targetattr=', acistr)
(attrstr, acistr) = self._match_str(acistr)
self.attrs = attrstr.split(' || ')
@@ -107,7 +108,8 @@ class ACI:
acistr = self._match(';allow (write) groupdn=', acistr)
(src_dn_str, acistr) = self._match_str(acistr)
- self.source_group = src_dn_str
+ src_dn_str = self._match('ldap:///', src_dn_str)
+ self.source_group = urllib.unquote(src_dn_str)
acistr = self._match(';)', acistr)
if len(acistr) > 0: