Merge lp:~max-rabkin/ibid/perms-705860 into lp:~ibid-core/ibid/old-trunk-1.6

[Max Rabkin]

Enforce permissions on non-@match handlers

[marcog (marco-gallotta)]

> + if (not getattr(method, 'auth_required', False)

How about if getattr(method, 'auth_required', True)?

review: Needs Fixing

[marcog (marco-gallotta)]

Arg, ignore that. It's wrong sorry.

review: Approve

[marcog (marco-gallotta)]

review: Approve

[Stefano Rivera (stefanor)]

review: Approve

=== modified file 'ibid/plugins/__init__.py'
--- ibid/plugins/__init__.py	2010-11-07 15:11:39 +0000
+++ ibid/plugins/__init__.py	2011-01-21 13:51:16 +0000
@@ -132,19 +132,22 @@
 
         found = False
         for method in self._get_event_handlers():
+            args = None
             if not hasattr(method, 'pattern'):
                 found = True
-                method(event)
+                args = ()
             elif hasattr(event, 'message'):
                 found = True
                 match = method.pattern.search(
                         event.message[method.message_version])
                 if match is not None:
-                    if (not getattr(method, 'auth_required', False)
-                            or auth_responses(event, self.permission)):
-                        method(event, *match.groups())
-                    elif not getattr(method, 'auth_fallthrough', True):
-                        event.processed = True
+                    args = match.groups()
+            if args is not None:
+                if (not getattr(method, 'auth_required', False)
+                        or auth_responses(event, self.permission)):
+                    method(event, *args)
+                elif not getattr(method, 'auth_fallthrough', True):
+                    event.processed = True
 
         if not found:
             raise RuntimeError(u'No handlers found in %s' % self)