Improve parsing

To make the logic more resilient towards potential errors or future
output changes, not only consider the string index but also validate
it against a set of expected positions.

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>

pyacl/acl.py

@@ -43,22 +43,32 @@ def parse_permission(strpermission):
   if len(strpermission) != MAX_PERMBITS:
     return ValueError('Invalid permission')
 
-  permap = {
+  permap_i = {
     0: 'read',
     1: 'write',
     2: 'execute',
   }
 
+  permap_s = {
+    'r': 'read',
+    'w': 'write',
+    'e': 'execute',
+  }
+
   outmap = DEFAULT_PERMISSIONS.copy()
 
-  for i, perm in permap.items():
+  for i, spval in enumerate(strpermission):
-    permval = strpermission[i]
+    permval = permap_i[i]
-    if permval in ['r', 'w', 'x']:
+    if spval == '-':
-      outmap[perm] = True
+      outmap[permval] = False
-    elif permval == '-':
-      outmap[perm] = False
     else:
-      return ValueError('Invalid permission flag')
+      spermval = permap_s.get(spval)
+      if spermval and spermval in outmap:
+        if spermval != permval:
+          raise ValueError('Unexpected permission mismatch')
+        outmap[spermval] = True
+      else:
+        return ValueError('Invalid permission flag')
 
   return outmap