Removed parameters in createAndAddHost in plugins and Faraday Core.

helpers/plugins/canvas/faraday_report/faraday_report.py

@@ -118,12 +118,9 @@ def getAndCreateNewHost(self, node):
 
         #Create Host
         host_id = self.faraday_api.createAndAddHost(
-        node['resolved_from'],
-        op_sy,
-        'Unknown',
-        'Unknown',
-        node['ip']
-        )
+            node['resolved_from'],
+            op_sy)
+
         host = Host(node['ip'], host_id)
         self.host_list.append(host)
         return host
@@ -313,13 +310,7 @@ def parsingAndSendClientd(self):
             info_host = self.data['clients'][ip]['agents'][agent]
 
             #Create Host
-            host_id = self.faraday_api.createAndAddHost(
-            ip,
-            os,
-            'Unknown',
-            'Unknown',
-            'Unknown'
-            )
+            host_id = self.faraday_api.createAndAddHost(ip, os)
 
             #'IE Flash' is a keyword only for Internet Explorer??'
             try:

model/api.py

@@ -137,9 +137,9 @@ def _setUpAPIServer(hostname=None, port=None):
 # plugin created the object
 
 
-def createAndAddHost(name, os = "Unknown"):
+def createAndAddHost(name, os="Unknown"):
     host = newHost(name, os)
-    if addHost(host, category, update, old_hostname):
+    if addHost(host):
         return host.getID()
     return None
 
@@ -239,9 +239,9 @@ def createAndAddCredToService(host_id, service_id, username, password):
 
 #TODO: add class check to object passed to be sure we are adding the right thing to the model
 
-def addHost(host, category=None, update = False, old_hostname = None):
+def addHost(host):
     if host is not None:
-        __model_controller.addHostASYNC(host, category, update, old_hostname)
+        __model_controller.addHostASYNC(host)
         return True
     return False
 

model/controller.py

@@ -422,16 +422,16 @@ def addUpdate(self, old_object, new_object):
     def find(self, obj_id):
         return self.mappers_manager.find(obj_id)
 
-    def addHostASYNC(self, host, category=None, update=False, old_hostname=None):
+    def addHostASYNC(self, host):
         """
         ASYNC API
         Adds an action to the ModelController actions queue indicating a
         new host must be added to the model
         """
         self.__addPendingAction(modelactions.ADDHOST,
-                                host, category, update, old_hostname)
+                                host)
 
-    def addHostSYNC(self, host, category=None, update=False, old_hostname=None):
+    def addHostSYNC(self, host):
         """
         SYNC API
         Adds a host directly to the model

model/guiapi.py

@@ -60,7 +60,7 @@ def deregisterWidget(widget):
 
 def createAndAddHost(name, os="Unknown"):
     host = model.api.newHost(name, os)
-    if addHost(host, category, update, old_hostname):
+    if addHost(host):
         return host.getID()
     return None
 
@@ -205,9 +205,9 @@ def createAndAddCredToService(host_id, service_id, username, password):
     return None
 
 
-def addHost(host, category=None, update = False, old_hostname = None):
+def addHost(host):
     if host is not None:
-        __model_controller.addHostSYNC(host, category, update, old_hostname)
+        __model_controller.addHostSYNC(host)
         return True
     return False
 

plugins/repo/sentinel/plugin.py

@@ -54,15 +54,15 @@ def parseOutputString(self, output, debug=False):
         if self.getSetting("Api_key") == "":
             self.log("Please set Sentinel API in plugin configuration", "ERROR")
             return True
-            
+
         allVulns = self.getAllVulns()
         for element in allVulns['collection']:
 
             vulnClass = element.get('class', "Vuln_Without_Title")
             severity = element.get('severity', "INFO")
             host = element.get('url', 'Unknown Hostname')
 
-            hostId = self.faraday_api.createAndAddHost(host, "", "", False, "")
+            hostId = self.faraday_api.createAndAddHost(host, "")
 
             interfaceId = self.faraday_api.createAndAddInterface(
                 hostId,
@@ -78,9 +78,9 @@ def parseOutputString(self, output, debug=False):
             vulnData = self.getAttackVector(element.get('href', 'unknown'))
 
             for vuln in vulnData['collection']:
-                
+
                 vuln_information  = self.getVulnInformation(element.get('href', 'unknown')) 
-                
+
                 desc = vuln_information.get("description", "").get("description_prepend", "")
                 solution = vuln_information.get("solution", "").get("solution_prepend", "")
                 siteId = vuln_information.get("site", "Unknown")