Merge pull request #2 from dehnert/master

[invirt/packages/python-afs.git] / afs / pts.py

diff --git a/afs/pts.py b/afs/pts.py
index 47346f7..95c6d4a 100644 (file)
--- a/afs/pts.py
+++ b/afs/pts.py
@@ -1,7 +1,12 @@
 import collections
 from afs import _pts
 
 import collections
 from afs import _pts
 

-class PTRelationSet(collections.MutableSet):
+try:
+    SetMixin = collections.MutableSet
+except AttributeError:
+    SetMixin = object
+
+class PTRelationSet(SetMixin):

     """Collection class for the groups/members of a PTEntry.
 
     This class, which acts like a set, is actually a view of the
     """Collection class for the groups/members of a PTEntry.
 
     This class, which acts like a set, is actually a view of the

@@ -45,7 +50,8 @@ class PTRelationSet(collections.MutableSet):
         Args:
             elt: The element to add.
         """
         Args:
             elt: The element to add.
         """

-        self._set.add(self._ent._pts.getEntry(elt))
+        if hasattr(self, '_set'):
+            self._set.add(self._ent._pts.getEntry(elt))

 
     def _discard(self, elt):
         """Remove a PTEntry to this instance's internal representation.
 
     def _discard(self, elt):
         """Remove a PTEntry to this instance's internal representation.

@@ -57,7 +63,8 @@ class PTRelationSet(collections.MutableSet):
         Args:
             elt: The element to discard.
         """
         Args:
             elt: The element to discard.
         """

-        self._set.discard(self._ent._pts.getEntry(elt))
+        if hasattr(self, '_set'):
+            self._set.discard(self._ent._pts.getEntry(elt))

 
     def __len__(self):
         """Count the members/groups in this set.
 
     def __len__(self):
         """Count the members/groups in this set.

@@ -165,6 +172,16 @@ class PTRelationSet(collections.MutableSet):
 
         self._discard(elt)
 
 
         self._discard(elt)
 

+    def remove(self, elt):
+        """Remove an entity from a group; it must already be a member.
+
+        If the entity is not a member, raise a KeyError.
+        """
+        if elt not in self:
+            raise KeyError(elt)
+
+        self.discard(elt)
+

 
 class PTEntry(object):
     """An entry in the AFS protection database.
 
 class PTEntry(object):
     """An entry in the AFS protection database.

@@ -198,7 +215,7 @@ class PTEntry(object):
 
       groups: For users, this contains a collection class representing
         the set of groups the user is a member of.
 
       groups: For users, this contains a collection class representing
         the set of groups the user is a member of.

-      users: For groups, this contains a collection class representing
+      members: For groups, this contains a collection class representing

         the members of this group.
     """
     _attrs = ('id', 'name', 'count', 'flags', 'ngroups', 'nusers')
         the members of this group.
     """
     _attrs = ('id', 'name', 'count', 'flags', 'ngroups', 'nusers')

@@ -248,6 +265,12 @@ class PTEntry(object):
         self._name = val
     name = property(_get_name, _set_name)
 
         self._name = val
     name = property(_get_name, _set_name)
 

+    def _get_krbname(self):
+        return self._pts._AfsToKrb5(self.name)
+    def _set_krbname(self, val):
+        self.name = self._pts._Krb5ToAfs(val)
+    krbname = property(_get_krbname, _set_krbname)
+

     def _get_count(self):
         self._loadEntry()
         return self._count
     def _get_count(self):
         self._loadEntry()
         return self._count

@@ -298,6 +321,13 @@ class PTEntry(object):
             for field in self._entry_attrs:
                 setattr(self, '_%s' % field, self._pts.getEntry(getattr(info, field)))
 
             for field in self._entry_attrs:
                 setattr(self, '_%s' % field, self._pts.getEntry(getattr(info, field)))
 

+
+PTS_UNAUTH = 0
+PTS_AUTH = 1
+PTS_FORCEAUTH = 2
+PTS_ENCRYPT = 3
+
+

 class PTS(_pts.PTS):
     """A connection to an AFS protection database.
 
 class PTS(_pts.PTS):
     """A connection to an AFS protection database.
 

@@ -315,12 +345,14 @@ class PTS(_pts.PTS):
     Args:
       cell: The cell to connect to. If None (the default), PTS
         connects to the workstations home cell.
     Args:
       cell: The cell to connect to. If None (the default), PTS
         connects to the workstations home cell.

-      sec: The security level to connect with, an integer from 0 to 3:
-        - 0: unauthenticated connection
-        - 1: try authenticated, then fall back to unauthenticated
-        - 2: fail if an authenticated connection can't be established
-        - 3: same as 2, plus encrypt all traffic to the protection
-          server
+      sec: The security level to connect with:
+        - PTS_UNAUTH: unauthenticated connection
+        - PTS_AUTH: try authenticated, then fall back to
+          unauthenticated
+        - PTS_FORCEAUTH: fail if an authenticated connection can't be
+          established
+        - PTS_ENCRYPT: same as PTS_FORCEAUTH, plus encrypt all traffic
+          to the protection server

 
     Attributes:
       realm: The Kerberos realm against which this cell authenticates
 
     Attributes:
       realm: The Kerberos realm against which this cell authenticates

@@ -354,6 +386,14 @@ class PTS(_pts.PTS):
         else:
             return PTEntry(self, id=ident)
 
         else:
             return PTEntry(self, id=ident)
 

+    def getEntryFromKrbname(self, ident):
+        """Retrieve a PTEntry matching a given Kerberos v5 principal.
+
+        getEntryFromKrb accepts a krb5 principal, converts it to the
+        equivalent AFS principal, and returns a PTEntry for that
+        principal."""
+        return self.getEntry(self._Krb5ToAfs(ident))
+

     def expire(self):
         """Flush the cache of PTEntry objects.
 
     def expire(self):
         """Flush the cache of PTEntry objects.