X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/python-afs.git/blobdiff_plain/72ed2e0334e58d6d8db5cd91c6fe5ba47d27a21b..562c4cd06e8c80fe088658a91dd63a3cb9e1fa8b:/afs/_pts.pyx diff --git a/afs/_pts.pyx b/afs/_pts.pyx index dfe1244..511e9ee 100644 --- a/afs/_pts.pyx +++ b/afs/_pts.pyx @@ -71,8 +71,6 @@ cdef import from "afs/pterror.h": PRNOENT PRTOOMANY - void initialize_PT_error_table() - cdef class PTEntry: cdef public afs_int32 flags cdef public afs_int32 id @@ -89,7 +87,7 @@ cdef class PTEntry: else: return '' % self.id -cdef int _ptentry_from_checkentry(PTEntry p_entry, prcheckentry c_entry) except -1: +cdef int _ptentry_from_c(PTEntry p_entry, prcheckentry * c_entry) except -1: if p_entry is None: raise TypeError return -1 @@ -104,37 +102,7 @@ cdef int _ptentry_from_checkentry(PTEntry p_entry, prcheckentry c_entry) except p_entry.name = c_entry.name return 0 -cdef int _ptentry_to_checkentry(prcheckentry * c_entry, PTEntry p_entry) except -1: - if p_entry is None: - raise TypeError - return -1 - - c_entry.flags = p_entry.flags - c_entry.id = p_entry.id - c_entry.owner = p_entry.owner - c_entry.creator = p_entry.creator - c_entry.ngroups = p_entry.ngroups - c_entry.nusers = p_entry.nusers - c_entry.count = p_entry.count - strncpy(c_entry.name, p_entry.name, sizeof(c_entry.name)) - return 0 - -cdef int _ptentry_from_listentry(PTEntry p_entry, prlistentries c_entry) except -1: - if p_entry is None: - raise TypeError - return -1 - - p_entry.flags = c_entry.flags - p_entry.id = c_entry.id - p_entry.owner = c_entry.owner - p_entry.creator = c_entry.creator - p_entry.ngroups = c_entry.ngroups - p_entry.nusers = c_entry.nusers - p_entry.count = c_entry.count - p_entry.name = c_entry.name - return 0 - -cdef int _ptentry_to_listentry(prlistentries * c_entry, PTEntry p_entry) except -1: +cdef int _ptentry_to_c(prcheckentry * c_entry, PTEntry p_entry) except -1: if p_entry is None: raise TypeError return -1 @@ -242,6 +210,17 @@ cdef class PTS: ubik_ClientDestroy(self.client) rx_Finalize() + def NameOrId(self, ident): + """ + Given an identifier, convert it to a PTS ID by looking up the + name if it's a string, or otherwise just converting it to an + integer. + """ + if isinstance(ident, (str, unicode)): + return self.NameToId(ident) + else: + return int(ident) + def NameToId(self, name): """ Converts a user or group to an AFS ID. @@ -321,7 +300,7 @@ cdef class PTS: cdef afs_int32 code, cid name = name[:PR_MAXNAMELEN].lower() - oid = self.NameToId(owner) + oid = self.NameOrId(owner) if id is not None: cid = id @@ -333,45 +312,49 @@ cdef class PTS: raise Exception("Failed to create group: %s" % afs_error_message(code)) return cid - def Delete(self, id): + def Delete(self, ident): """ - Delete the protection database entry with the provided ID. + Delete the protection database entry with the provided + identifier. """ cdef afs_int32 code + cdef afs_int32 id = self.NameOrId(ident) code = ubik_PR_Delete(self.client, 0, id) if code != 0: raise Exception("Failed to delete user: %s" % afs_error_message(code)) - def AddToGroup(self, uid, gid): + def AddToGroup(self, user, group): """ - Add the user with the given ID to the group with the given ID. + Add the given user to the given group. """ cdef afs_int32 code + cdef afs_int32 uid = self.NameOrId(user), gid = self.NameOrId(group) code = ubik_PR_AddToGroup(self.client, 0, uid, gid) if code != 0: raise Exception("Failed to add user to group: %s" % afs_error_message(code)) - def RemoveFromGroup(self, uid, gid): + def RemoveFromGroup(self, user, group): """ - Remove the user with the given ID from the group with the given ID. + Remove the given user from the given group. """ cdef afs_int32 code + cdef afs_int32 uid = self.NameOrId(user), gid = self.NameOrId(group) code = ubik_PR_RemoveFromGroup(self.client, 0, uid, gid) if code != 0: raise Exception("Failed to remove user from group: %s" % afs_error_message(code)) - def ListMembers(self, id): + def ListMembers(self, ident): """ Get the membership of an entity. - If id is a group ID, this returns the users that are in that + If id is a group, this returns the users that are in that group. - If id is a user ID, this returns the list of groups that user - is on. + If id is a user, this returns the list of groups that user is + on. This returns a list of PTS IDs. """ @@ -380,6 +363,8 @@ cdef class PTS: cdef int i cdef object members = [] + cdef afs_int32 id = self.NameOrId(ident) + alist.prlist_len = 0 alist.prlist_val = NULL @@ -397,7 +382,7 @@ cdef class PTS: return members - def ListOwned(self, oid): + def ListOwned(self, owner): """ Get all groups owned by an entity. """ @@ -406,6 +391,8 @@ cdef class PTS: cdef int i cdef object owned = [] + cdef afs_int32 oid = self.NameOrId(owner) + alist.prlist_len = 0 alist.prlist_val = NULL @@ -423,23 +410,25 @@ cdef class PTS: return owned - def ListEntry(self, id): + def ListEntry(self, ident): """ Load a PTEntry instance with information about the provided - ID. + entity. """ cdef afs_int32 code cdef prcheckentry centry cdef object entry = PTEntry() + cdef afs_int32 id = self.NameOrId(ident) + code = ubik_PR_ListEntry(self.client, 0, id, ¢ry) if code != 0: raise Exception("Error getting entity info: %s" % afs_error_message(code)) - _ptentry_from_checkentry(entry, centry) + _ptentry_from_c(entry, ¢ry) return entry - def ChangeEntry(self, id, newname=None, newid=None, newoid=None): + def ChangeEntry(self, ident, newname=None, newid=None, newoid=None): """ Change the name, ID, and/or owner of a PTS entity. @@ -450,6 +439,8 @@ cdef class PTS: cdef afs_int32 c_newid = 0, c_newoid = 0 cdef char * c_newname + cdef afs_int32 id = self.NameOrId(ident) + if newname is None: newname = self.IdToName(id) c_newname = newname @@ -462,13 +453,15 @@ cdef class PTS: if code != 0: raise Exception("Error changing entity info: %s" % afs_error_message(code)) - def IsAMemberOf(self, uid, gid): + def IsAMemberOf(self, user, group): """ - Return True if the given uid is a member of the given gid. + Return True if the given user is a member of the given group. """ cdef afs_int32 code cdef afs_int32 flag + cdef afs_int32 uid = self.NameOrId(user), gid = self.NameOrId(group) + code = ubik_PR_IsAMemberOf(self.client, 0, uid, gid, &flag) if code != 0: raise Exception("Error testing membership: %s" % afs_error_message(code)) @@ -539,7 +532,7 @@ cdef class PTS: if centries.prentries_val is not NULL: for i in range(centries.prentries_len): e = PTEntry() - _ptentry_from_listentry(e, centries.prentries_val[i]) + _ptentry_from_c(e, ¢ries.prentries_val[i]) entries.append(e) free(centries.prentries_val) if code != 0: @@ -549,7 +542,7 @@ cdef class PTS: return entries - def SetFields(self, id, access=None, groups=None, users=None): + def SetFields(self, ident, access=None, groups=None, users=None): """ Update the fields for an entry. @@ -561,6 +554,8 @@ cdef class PTS: cdef afs_int32 code cdef afs_int32 mask = 0, flags = 0, nusers = 0, ngroups = 0 + cdef afs_int32 id = self.NameOrId(ident) + if access is not None: flags = access mask |= PR_SF_ALLBITS