reviewing the tags permission system

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

diff --git a/PLC/Methods/AddIlink.py b/PLC/Methods/AddIlink.py
index d132561..c9d18b1 100644 (file)
--- a/PLC/Methods/AddIlink.py
+++ b/PLC/Methods/AddIlink.py
@@ -1,10 +1,6 @@
-# $Id$
-# $URL$
 #
 # Thierry Parmentelat - INRIA
 #
-# $Revision: 9423 $
-#
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
@@ -13,14 +9,15 @@ from PLC.Auth import Auth
 from PLC.TagTypes import TagType, TagTypes
 from PLC.Ilinks import Ilink, Ilinks
 from PLC.Interfaces import Interface, Interfaces
-
 from PLC.Sites import Sites
 
+from PLC.AuthorizeHelpers import AuthorizeHelpers
+
 class AddIlink(Method):
     """
     Create a link between two interfaces
     The link has a tag type, that needs be created beforehand
-    and an optional value. 
+    and an optional value.
 
     Returns the new ilink_id (> 0) if successful, faults
     otherwise.
@@ -54,7 +51,7 @@ class AddIlink(Method):
             raise PLCInvalidArgument, "AddIlink: No such tag type %r"%tag_type_id_or_name
         tag_type = tag_types[0]
 
-       # checks for existence - with the same type
+        # checks for existence - with the same type
         conflicts = Ilinks(self.api,
                            {'tag_type_id':tag_type['tag_type_id'],
                             'src_interface_id':src_if_id,
@@ -65,21 +62,18 @@ class AddIlink(Method):
             raise PLCInvalidArgument, "Ilink (%s,%d,%d) already exists and has value %r"\
                 %(tag_type['name'],src_if_id,dst_if_id,ilink['value'])
 
-       if 'admin' not in self.caller['roles']:
-#      # check permission : it not admin, is the user affiliated with the right site(s) ????
-#          # locate node
-#          node = Nodes (self.api,[node['node_id']])[0]
-#          # locate site
-#          site = Sites (self.api, [node['site_id']])[0]
-#          # check caller is affiliated with this site
-#          if self.caller['person_id'] not in site['person_ids']:
-#              raise PLCPermissionDenied, "Not a member of the hosting site %s"%site['abbreviated_site']
-           
-           required_min_role = tag_type ['min_role_id']
-           if required_min_role is not None and \
-                   min(self.caller['role_ids']) > required_min_role:
-               raise PLCPermissionDenied, "Not allowed to modify the specified ilink, requires role %d",required_min_role
-
+        # check authorizations
+        if 'admin' in self.caller['roles']:
+            pass
+        elif not AuthorizeHelpers.person_access_tag_type (self.api, self.caller, tag_type):
+            raise PLCPermissionDenied, "%s, no permission to use this tag type"%self.name
+        elif AuthorizeHelpers.interface_belongs_to_person (self.api, src_if, self.caller):
+            pass
+        elif src_if_id != dst_if_id and AuthorizeHelpers.interface_belongs_to_person (self.api, dst_if, self.caller):
+            pass
+        else:
+            raise PLCPermissionDenied, "%s: you must one either the src or dst interface"%self.name
+            
         ilink = Ilink(self.api)
         ilink['tag_type_id'] = tag_type['tag_type_id']
         ilink['src_interface_id'] = src_if_id
@@ -89,6 +83,6 @@ class AddIlink(Method):
         ilink.sync()
 
         self.object_type = 'Interface'
-       self.object_ids = [src_if_id,dst_if_id]
+        self.object_ids = [src_if_id,dst_if_id]
 
         return ilink['ilink_id']