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

Applied Rob's errors patch

Browse Source
This commit is contained in:
Rob Crittenden
2009-01-28 21:47:21 -07:00
parent 48a278047d
commit 5717c9d668
21 changed files with 206 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ipalib/plugins/f_automount.py
View File

@@ -24,7 +24,7 @@ RFC 2707bis http://www.padl.com/~lukeh/rfc2307bis.txt
"""
from ldap import explode_dn
from ipalib import crud, errors
from ipalib import crud, errors2
from ipalib import api, Str, Flag, Object, Command
map_attributes = ['automountMapName', 'description', ]
@@ -199,7 +199,7 @@ class automount_delkey(crud.Del):
keydn = k.get('dn')
break
if not keydn:
raise errors.NotFound
raise errors2.NotFound(msg='Entry not found')
return ldap.delete(keydn)
def output_for_cli(self, textui, result, *args, **options):
"""
@@ -277,7 +277,7 @@ class automount_modkey(crud.Mod):
keydn = k.get('dn')
break
if not keydn:
raise errors.NotFound
raise errors2.NotFound(msg='Entry not found')
return ldap.update(keydn, **kw)
def output_for_cli(self, textui, result, *args, **options):
@@ -425,7 +425,7 @@ class automount_showkey(crud.Get):
keydn = k.get('dn')
break
if not keydn:
raise errors.NotFound
raise errors2.NotFound(msg='Entry not found')
# FIXME: should kw contain the list of attributes to display?
if kw.get('all', False):
return ldap.retrieve(keydn)
@@ -466,7 +466,7 @@ class automount_getkeys(Command):
dn = ldap.find_entry_dn("automountmapname", mapname, "automountmap", api.env.container_automount)
try:
keys = ldap.get_one_entry(dn, 'objectclass=*', ['automountkey'])
except errors.NotFound:
except errors2.NotFound:
keys = []
return keys

1
ipalib/plugins/f_delegation.py
View File

@@ -25,7 +25,6 @@ from ipalib import frontend
from ipalib import crud
from ipalib.frontend import Param
from ipalib import api
from ipalib import errors
class delegation(frontend.Object):
"""

10
ipalib/plugins/f_group.py
View File

@@ -21,7 +21,7 @@
Frontend plugins for group (Identity).
"""
from ipalib import api, crud, errors
from ipalib import api, crud, errors, errors2
from ipalib import Object, Command # Plugin base classes
from ipalib import Str, Int # Parameter types
@@ -283,7 +283,7 @@ class group_add_member(Command):
try:
member_dn = ldap.find_entry_dn("cn", m)
to_add.append(member_dn)
except errors.NotFound:
except errors2.NotFound:
add_failed.append(m)
continue
@@ -293,7 +293,7 @@ class group_add_member(Command):
try:
member_dn = ldap.find_entry_dn("uid", m)
to_add.append(member_dn)
except errors.NotFound:
except errors2.NotFound:
add_failed.append(m)
continue
@@ -350,7 +350,7 @@ class group_remove_member(Command):
try:
member_dn = ldap.find_entry_dn("cn", m)
to_remove.append(member_dn)
except errors.NotFound:
except errors2.NotFound:
remove_failed.append(m)
continue
@@ -359,7 +359,7 @@ class group_remove_member(Command):
try:
member_dn = ldap.find_entry_dn("uid", m,)
to_remove.append(member_dn)
except errors.NotFound:
except errors2.NotFound:
remove_failed.append(m)
continue

6
ipalib/plugins/f_host.py
View File

@@ -21,7 +21,7 @@
Frontend plugins for host/machine Identity.
"""
from ipalib import api, crud, errors, util
from ipalib import api, crud, errors2, util
from ipalib import Object # Plugin base class
from ipalib import Str, Flag # Parameter types
@@ -38,7 +38,7 @@ def get_host(hostname):
hostname = hostname[:-1]
try:
dn = ldap.find_entry_dn("cn", hostname, "ipaHost")
except errors.NotFound:
except errors2.NotFound:
dn = ldap.find_entry_dn("serverhostname", hostname, "ipaHost")
return dn
@@ -120,7 +120,7 @@ class host_add(crud.Add):
current = util.get_current_principal()
if not current:
raise errors.NotFound('Unable to determine current user')
raise errors2.NotFound('Unable to determine current user')
kw['enrolledby'] = ldap.find_entry_dn("krbPrincipalName", current, "posixAccount")
# Get our configuration

10
ipalib/plugins/f_hostgroup.py
View File

@@ -21,7 +21,7 @@
Frontend plugins for groups of hosts
"""
from ipalib import api, crud, errors
from ipalib import api, crud, errors2
from ipalib import Object, Command # Plugin base classes
from ipalib import Str # Parameter types
@@ -249,7 +249,7 @@ class hostgroup_add_member(Command):
try:
member_dn = ldap.find_entry_dn("cn", m, hostgroup_filter)
to_add.append(member_dn)
except errors.NotFound:
except errors2.NotFound:
add_failed.append(m)
continue
@@ -259,7 +259,7 @@ class hostgroup_add_member(Command):
try:
member_dn = ldap.find_entry_dn("cn", m, "ipaHost")
to_add.append(member_dn)
except errors.NotFound:
except errors2.NotFound:
add_failed.append(m)
continue
@@ -317,7 +317,7 @@ class hostgroup_remove_member(Command):
try:
member_dn = ldap.find_entry_dn("cn", m, hostgroup_filter)
to_remove.append(member_dn)
except errors.NotFound:
except errors2.NotFound:
remove_failed.append(m)
continue
@@ -327,7 +327,7 @@ class hostgroup_remove_member(Command):
try:
member_dn = ldap.find_entry_dn("cn", m, "ipaHost")
to_remove.append(member_dn)
except errors.NotFound:
except errors2.NotFound:
remove_failed.append(m)
continue

4
ipalib/plugins/f_netgroup.py
View File

@@ -21,7 +21,7 @@
Frontend plugin for netgroups.
"""
from ipalib import api, crud, errors
from ipalib import api, crud, errors2
from ipalib import Object, Command # Plugin base classes
from ipalib import Str # Parameter types
from ipalib import uuid
@@ -53,7 +53,7 @@ def find_members(ldap, failed, members, attribute, filter=None):
try:
member_dn = ldap.find_entry_dn(attribute, m, filter)
found.append(member_dn)
except errors.NotFound:
except errors2.NotFound:
failed.append(m)
continue

10
ipalib/plugins/f_service.py
View File

@@ -22,7 +22,7 @@
Frontend plugins for service (Identity).
"""
from ipalib import api, crud, errors
from ipalib import api, crud, errors2
from ipalib import Object # Plugin base classes
from ipalib import Str, Flag # Parameter types
@@ -72,11 +72,11 @@ class service_add(crud.Add):
# may not include the realm.
sp = principal.split('/')
if len(sp) != 2:
raise errors.MalformedServicePrincipal
raise errors2.MalformedServicePrincipal
service = sp[0]
if service.lower() == "host":
raise errors.HostService
raise errors2.HostService
sr = sp[1].split('@')
if len(sr) == 1:
@@ -86,7 +86,7 @@ class service_add(crud.Add):
hostname = sr[0].lower()
realm = sr[1]
else:
raise MalformedServicePrincipal
raise errors2.MalformedServicePrincipal
"""
FIXME once DNS client is done
@@ -102,7 +102,7 @@ class service_add(crud.Add):
# At some point we'll support multiple realms
if (realm != self.api.env.realm):
raise errors.RealmMismatch
raise errors2.RealmMismatch
# Put the principal back together again
princ_name = service + "/" + hostname + "@" + realm

9
ipalib/plugins/f_user.py
View File

@@ -21,7 +21,7 @@
Frontend plugins for user (Identity).
"""
from ipalib import api, crud, errors
from ipalib import api, crud, errors2
from ipalib import Object, Command # Plugin base classes
from ipalib import Str, Password, Flag, Int # Parameter types
@@ -99,6 +99,9 @@ class user(Object):
cli_name='uid',
doc='The uid to use for this user. If not included one is automatically set.',
),
Str('street?',
doc='The street address',
),
)
api.register(user)
@@ -151,9 +154,9 @@ class user_add(crud.Add):
default_group = ldap.retrieve(group_dn, ['dn','gidNumber'])
if default_group:
kw['gidnumber'] = default_group.get('gidnumber')
except errors.NotFound:
except errors2.NotFound:
# Fake an LDAP error so we can return something useful to the kw
raise errors.NotFound, "The default group for new kws, '%s', cannot be found." % config.get('ipadefaultprimarygroup')
raise errors2.NotFound, "The default group for new kws, '%s', cannot be found." % config.get('ipadefaultprimarygroup')
except Exception, e:
# catch everything else
raise e