Fix big leak in type-checking add/update args for taggable classes

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

diff --git a/PLC/Methods/UpdateNode.py b/PLC/Methods/UpdateNode.py
index d6c9e45..ecfa6cf 100644 (file)
--- a/PLC/Methods/UpdateNode.py
+++ b/PLC/Methods/UpdateNode.py
@@ -2,14 +2,17 @@
 from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
-from PLC.Nodes import Node, Nodes
+from PLC.Table import Row
 from PLC.Auth import Auth
 
-related_fields = Node.related_fields.keys()
-can_update = lambda (field, value): field in \
-             ['hostname', 'boot_state', 'model', 'version',
-              'key', 'session', 'boot_nonce', 'site_id'] + \
-            related_fields
+from PLC.Nodes import Node, Nodes
+from PLC.TagTypes import TagTypes
+from PLC.NodeTags import NodeTags
+from PLC.Methods.AddNodeTag import AddNodeTag
+from PLC.Methods.UpdateNodeTag import UpdateNodeTag
+
+can_update = ['hostname', 'boot_state', 'model', 'version','key', 'session', 'boot_nonce', 'site_id'] + \
+              Node.related_fields.keys()
 
 class UpdateNode(Method):
     """
@@ -24,7 +27,7 @@ class UpdateNode(Method):
 
     roles = ['admin', 'pi', 'tech']
 
-    node_fields = dict(filter(can_update, Node.fields.items() + Node.related_fields.items()))
+    node_fields = Row.accepted_fields(can_update,[Node.fields,Node.related_fields,Node.tags])
 
     accepts = [
         Auth(),
@@ -37,22 +40,28 @@ class UpdateNode(Method):
 
     def call(self, auth, node_id_or_hostname, node_fields):
         
-       node_fields = dict(filter(can_update, node_fields.items()))
+        node_fields = Row.check_fields (node_fields, self.accepted_fields)
+
+        # split provided fields 
+        [native,related,tags,rejected] = Row.split_fields(node_fields,[Node.fields,Node.related_fields,Node.tags])
+
+        if rejected:
+            raise PLCInvalidArgument, "Cannot update Node column(s) %r"%rejected
 
        # Remove admin only fields
        if 'admin' not in self.caller['roles']:
             for key in 'key', 'session', 'boot_nonce', 'site_id':
-                if node_fields.has_key(key):
-                    del node_fields[key]
+                if native.has_key(key):
+                    del native[key]
 
         # Get account information
         nodes = Nodes(self.api, [node_id_or_hostname])
         if not nodes:
-            raise PLCInvalidArgument, "No such node"
+            raise PLCInvalidArgument, "No such node %r"%node_id_or_hostname
         node = nodes[0]
 
         if node['peer_id'] is not None:
-            raise PLCInvalidArgument, "Not a local node"
+            raise PLCInvalidArgument, "Not a local node %r"%node_id_or_hostname
 
         # Authenticated function
         assert self.caller is not None
@@ -64,20 +73,31 @@ class UpdateNode(Method):
                 raise PLCPermissionDenied, "Not allowed to delete nodes from specified site"
 
         # Make requested associations
-        for field in related_fields:
-            if field in node_fields:
-                node.associate(auth, field, node_fields[field])
-                node_fields.pop(field)
-
-       node.update(node_fields)
-       node.update_last_updated(False)
-        node.sync()
+        for (k,v) in related.iteritems():
+            node.associate(auth, k,v)
+
+       node.update(native)
+       node.update_last_updated(commit=False)
+        node.sync(commit=True)
        
+        for (tagname,value) in tags.iteritems():
+            # the tagtype instance is assumed to exist, just check that
+            if not TagTypes(self.api,{'tagname':tagname}):
+                raise PLCInvalidArgument,"No such TagType %s"%tagname
+            node_tags=NodeTags(self.api,{'tagname':tagname,'node_id':node['node_id']})
+            if not node_tags:
+                AddNodeTag(self.api).__call__(auth,node['node_id'],tagname,value)
+            else:
+                UpdateNodeTag(self.api).__call__(auth,node_tags[0]['node_tag_id'],value)
+
        # Logging variables
        self.event_objects = {'Node': [node['node_id']]}
-       self.message = 'Node %d updated: %s.' % \
-               (node['node_id'], ", ".join(node_fields.keys()))
+        if 'hostname' in node:
+            self.message = 'Node %s updated'%node['hostname']
+        else:
+            self.message = 'Node %d updated'%node['node_id']
+        self.message += " [%s]." % (", ".join(node_fields.keys()),)
        if 'boot_state' in node_fields.keys():
-               self.message += ' boot_state updated to %s' %  node_fields['boot_state']
+               self.message += ' boot_state updated to %s' % node_fields['boot_state']
 
         return 1