Merge branch 'pts-orm'

diff --git a/afs/_acl.pyx b/afs/_acl.pyx
index ef65388..3f34685 100644 (file)
--- a/afs/_acl.pyx
+++ b/afs/_acl.pyx
@@ -43,3 +43,6 @@ def getCallerAccess(char *dir, int follow=1):
     cdef vcxstat2 stat
     pioctl_read(dir, VIOC_GETVCXSTATUS2, <void*>&stat, sizeof(vcxstat2), follow)
     return stat.callerAccess
+
+def setAcl(char* dir, char* acl, int follow=1):
+    pioctl_write(dir, VIOCSETAL, acl, follow)

diff --git a/afs/acl.py b/afs/acl.py
index 713d5b8..a5293bd 100644 (file)
--- a/afs/acl.py
+++ b/afs/acl.py
@@ -5,18 +5,20 @@ from _acl import getCallerAccess
 
 _canonical = {
     "read": "rl",
-    "write": "rwlidwk",
-    "all": "rwlidwka",
+    "write": "rlidwk",
+    "all": "rlidwka",
     "mail": "lik",
     "none": "",
 }
 
+_reverseCanonical = dict((y, x) for (x, y) in _canonical.iteritems())
+
 _charBitAssoc = [
     ('r', READ),
-    ('w', WRITE),
-    ('i', INSERT),
     ('l', LOOKUP),
+    ('i', INSERT),
     ('d', DELETE),
+    ('w', WRITE),
     ('k', LOCK),
     ('a', ADMINISTER),
     ('A', USR0),
@@ -32,6 +34,13 @@ _charBitAssoc = [
 _char2bit = dict(_charBitAssoc)
 
 
+def rightsToEnglish(s):
+    """Turns a rlwidwka string into a canonical name if possible"""
+    if s in _reverseCanonical:
+        return _reverseCanonical[s]
+    else:
+        return ''
+
 def readRights(s):
     """Canonicalizes string rights to bitmask"""
     if s in _canonical: s = _canonical[s]
@@ -70,6 +79,16 @@ def _parseAcl(inp):
             neg[name] = int(acl)
     return (pos, neg)
 
+def _unparseAcl(pos, neg):
+    npos = len(pos)
+    nneg = len(neg)
+    acl = "%d\n%d\n" % (npos, nneg)
+    for p in pos.items():
+        acl += "%s\t%d\n" % p
+    for n in neg.items():
+        acl += "%s\t%d\n" % n
+    return acl
+
 class ACL(object):
     def __init__(self, pos, neg):
         """
@@ -85,4 +104,27 @@ class ACL(object):
         """Retrieve the ACL for an AFS directory"""
         pos, neg = _parseAcl(_acl.getAcl(dir, follow))
         return ACL(pos, neg)
-
+    def apply(self, dir, follow=True):
+        """Apply the ACL to a directory"""
+        self._clean()
+        _acl.setAcl(dir, _unparseAcl(self.pos, self.neg), follow)
+    def _clean(self):
+        """Clean an ACL by removing any entries whose bitmask is 0"""
+        for n,a in self.pos.items():
+            if a == 0:
+                del self.pos[n]
+        for n,a in self.neg.items():
+            if a == 0:
+                del self.neg[n]
+    def set(self, user, bitmask, negative=False):
+        """Set the bitmask for a given user"""
+        if bitmask < 0 or bitmask > max(_char2bit.values()):
+            raise ValueError, "Invalid bitmask"
+        if negative:
+            self.neg[user] = bitmask
+        else:
+            self.pos[user] = bitmask
+    def remove(self, user, negative=False):
+        """Convenience function to removeSet the bitmask for a given user"""
+        self.set(user, 0, negative)
+        

diff --git a/afs/afs.pxd b/afs/afs.pxd
index 02518e2..2b02338 100644 (file)
--- a/afs/afs.pxd
+++ b/afs/afs.pxd
@@ -9,6 +9,7 @@ cdef extern from "string.h":
     char * strncpy(char *s1, char *s2, size_t n)
     void * memset(void *b, int c, size_t n)
     void * memcpy(void *s1, void *s2, size_t n)
+    size_t strlen(char *s)
 
 cdef extern from "stdlib.h":
      void * malloc(size_t size)
@@ -157,9 +158,10 @@ cdef extern from "afs/vice.h":
 cdef import from "afs/venus.h":
     enum:
         # PIOCTLS to Venus that we use
-        VIOCGETAL, VIOC_GETVCXSTATUS2
+        VIOCGETAL, VIOC_GETVCXSTATUS2, VIOCSETAL
 
 # pioctl doesn't actually have a header, so we have to define it here
 cdef extern int pioctl(char *, afs_int32, ViceIoctl *, afs_int32)
 cdef int pioctl_read(char *, afs_int32, void *, unsigned short, afs_int32) except -1
+cdef int pioctl_write(char *, afs_int32, char *, afs_int32) except -1
 

diff --git a/afs/afs.pyx b/afs/afs.pyx
index 29a2442..4fe9e1c 100644 (file)
--- a/afs/afs.pyx
+++ b/afs/afs.pyx
@@ -26,6 +26,20 @@ cdef extern int pioctl_read(char *dir, afs_int32 op, void *buffer, unsigned shor
     pyafs_error(code)
     return code
 
+cdef extern int pioctl_write(char *dir, afs_int32 op, char *buffer, afs_int32 follow) except -1:
+    cdef ViceIoctl blob
+    cdef afs_int32 code
+    blob.cin = buffer
+    blob.in_size = 1 + strlen(buffer)
+    blob.out_size = 0
+    code = pioctl(dir, op, &blob, follow)
+    # This might work with the rest of OpenAFS, but I'm not convinced
+    # the rest of it is consistent
+    if code == -1:
+        raise OSError(errno, strerror(errno))
+    pyafs_error(code)
+    return code
+
 # Error handling
 
 class AFSException(Exception):