force import of AuthorizeHelpers

[plcapi.git] / PLC / Methods / UpdateInterfaceTag.py

diff --git a/PLC/Methods/UpdateInterfaceTag.py b/PLC/Methods/UpdateInterfaceTag.py
index 1d52ea3..bcd6fc0 100644 (file)
--- a/PLC/Methods/UpdateInterfaceTag.py
+++ b/PLC/Methods/UpdateInterfaceTag.py
@@ -12,6 +12,9 @@ from PLC.Interfaces import Interface, Interfaces
 from PLC.TagTypes import TagType, TagTypes
 from PLC.InterfaceTags import InterfaceTag, InterfaceTags
 
+# need to import so the core classes get decorated with caller_may_write_tag
+from PLC.AuthorizeHelpers import AuthorizeHelpers
+
 class UpdateInterfaceTag(Method):
     """
     Updates the value of an existing interface setting
@@ -41,18 +44,14 @@ class UpdateInterfaceTag(Method):
 
         tag_type_id = interface_tag['tag_type_id']
         tag_type = TagTypes (self.api,[tag_type_id])[0]
-        interface = Interfaces (self.api, interface_tag['interface_id'])
 
-        # check authorizations
-        if 'admin' in self.caller['roles']:
-            pass
-        elif not AuthorizeHelpers.caller_may_access_tag_type (self.api, self.caller, tag_type):
-            raise PLCPermissionDenied, "%s, forbidden tag %s"%(self.name,tag_type['tagname'])
-        elif AuthorizeHelpers.interface_belongs_to_person (self.api, interface, self.caller):
-            pass
-        else:
-            raise PLCPermissionDenied, "%s: you must belong in the same site as subject interface"%self.name
+        interfaces = Interfaces (self.api, interface_tag['interface_id'])
+        if not interfaces:
+            raise PLCInvalidArgument, "No such interface %d"%interface_tag['interface_id']
+        interface=interfaces[0]
 
+        # check authorizations
+        interface.caller_may_write_tag(self.api, self.caller, tag_type)
 
         interface_tag['value'] = value
         interface_tag.sync()