Merge lp:~max-rabkin/ibid/perm-check-725240 into lp:~ibid-core/ibid/old-trunk-1.6

[Max Rabkin]

Check granted/revoked permission against list of all permissions (and make retrieving permissions list take linear time)

[lp:~max-rabkin/ibid/perm-check-725240]

1017. By Max Rabkin on 2011-02-27

Check name, not permission

[Stefano Rivera (stefanor)]

review: Approve

[Jonathan Hitchcock (vhata)]

review: Approve

=== modified file 'ibid/plugins/identity.py'
--- ibid/plugins/identity.py	2010-04-26 10:19:16 +0000
+++ ibid/plugins/identity.py	2011-02-27 16:07:18 +0000
@@ -582,6 +582,10 @@
 
         else:
             if not permission:
+                if name.lower() not in self.all_perms():
+                    event.addresponse(u"I don't know about a permission "
+                                      u"called '%s'", name)
+                    return
                 permission = Permission(name)
                 account.permissions.append(permission)
 
@@ -629,18 +633,19 @@
         permissions = sorted(u'%s%s' % (permission_values[perm.value], perm.name) for perm in account.permissions)
         event.addresponse(u'Permissions: %s', human_join(permissions) or u'none')
 
+    def all_perms(self):
+        permissions = set()
+        for processor in ibid.processors:
+            if hasattr(processor, 'permission'):
+                permissions.add(processor.permission)
+            if hasattr(processor, 'permissions'):
+                for permission in processor.permissions:
+                    permissions.add(permission)
+        return permissions
+
     @match(r'^list\s+permissions$')
     def list_permissions(self, event):
-        permissions = []
-        for processor in ibid.processors:
-            if hasattr(processor, 'permission') and getattr(processor, 'permission') not in permissions:
-                permissions.append(getattr(processor, 'permission'))
-            if hasattr(processor, 'permissions'):
-                for permission in getattr(processor, 'permissions'):
-                    if permission not in permissions:
-                        permissions.append(permission)
-
-        event.addresponse(u'Permissions: %s', human_join(sorted(permissions)) or u'none')
+        event.addresponse(u'Permissions: %s', human_join(sorted(self.all_perms())) or u'none')
 
 class Auth(Processor):
     usage = u'auth <credential>'