Refactor zsh configs and api config handling

Author: mattaereal

apis/rest/api.py

@@ -42,29 +42,20 @@ def stopServer():
         _http_server.stop()
 
 
-def startAPIs(plugin_manager, model_controller, mapper_manager, hostname=None, port=None):
+def startAPIs(plugin_manager, model_controller, mapper_manager, hostname, port):
     global _rest_controllers
     global _http_server
     _rest_controllers = [PluginControllerAPI(plugin_manager, mapper_manager), ModelControllerAPI(model_controller)]
 
-    #TODO: some way to get defaults.. from config?
-    if str(hostname) == "None":
-        hostname = "localhost"
-    if str(port) == "None":
-        port = 9977
-
-    if CONF.getApiRestfulConInfo() is None:
-        CONF.setApiRestfulConInfo(hostname, port)
-
     app = Flask('APISController')
 
     _http_server = HTTPServer(WSGIContainer(app))
-    _http_server.listen(port,address=hostname) 
+    _http_server.listen(port, address=hostname)
 
     routes = [r for c in _rest_controllers for r in c.getRoutes()]
 
-    for route in routes: 
-        app.add_url_rule(route.path, view_func=route.view_func, methods=route.methods) 
+    for route in routes:
+        app.add_url_rule(route.path, view_func=route.view_func, methods=route.methods)
 
     logging.getLogger("tornado.access").addHandler(logger.getLogger(app))
     logging.getLogger("tornado.access").propagate = False
@@ -169,16 +160,16 @@ def deleteVuln(self):
         hostid = json_data['hostid']
 
         host = self.controller.getHost(hostid)
-        if not host: 
-            return self.badRequest("no plugin available for cmd") 
+        if not host:
+            return self.badRequest("no plugin available for cmd")
 
         visitor = VulnsLookupVisitor(vulnid)
         host.accept(visitor)
 
         if not visitor.vulns:
             return self.noContent('No vuls matched criteria')
 
-        # forward to controller 
+        # forward to controller
         for vuln, parents in zip(visitor.vulns, visitor.parents):
             last_parent = parents[0]
             self.controller.delVulnSYNC(last_parent, vuln.getID())
@@ -198,8 +189,8 @@ def postEditVulns(self):
         hostid = json_data['hostid']
 
         host = self.controller.getHost(hostid)
-        if not host: 
-            return self.badRequest("no plugin available for cmd") 
+        if not host:
+            return self.badRequest("no plugin available for cmd")
 
         visitor = VulnsLookupVisitor(vulnid)
         host.accept(visitor)
@@ -213,9 +204,9 @@ def postEditVulns(self):
         resolution = json_data.get('resolution', None)
         refs = json_data.get('refs', None)
 
-        # forward to controller 
-        for vuln in visitor.vulns: 
-            self.controller.editVulnSYNC(vuln, name, desc, severity, resolution, refs) 
+        # forward to controller
+        for vuln in visitor.vulns:
+            self.controller.editVulnSYNC(vuln, name, desc, severity, resolution, refs)
 
         return self.ok("output successfully sent to plugin")
 

config/configuration.py

@@ -280,8 +280,6 @@ def getApiParams(self):
     def getTktTemplate(self):
         return self._tkt_template
 
-
-
     def setLastWorkspace(self, workspaceName):
         self._last_workspace = workspaceName
 
@@ -411,16 +409,21 @@ def saveConfig(self, xml_file="~/.faraday/config/user.xml"):
 
         ROOT = Element("faraday")
 
+        tree = self._getTree()
+
         API_CON_INFO_HOST = Element(CONST_API_CON_INFO_HOST)
-        API_CON_INFO_HOST.text = self.getApiConInfoHost()
+        API_CON_INFO_HOST.text = self._getValue(tree, CONST_API_CON_INFO_HOST)
+        # API_CON_INFO_HOST.text = self.getApiConInfoHost()
         ROOT.append(API_CON_INFO_HOST)
 
         API_CON_INFO_PORT = Element(CONST_API_CON_INFO_PORT)
-        API_CON_INFO_PORT.text = str(self.getApiConInfoPort())
+        API_CON_INFO_PORT.text = self._getValue(tree, CONST_API_CON_INFO_PORT)
+        # API_CON_INFO_PORT.text = str(self.getApiConInfoPort())
         ROOT.append(API_CON_INFO_PORT)
 
         API_RESTFUL_CON_INFO_PORT = Element(CONST_API_RESTFUL_CON_INFO_PORT)
-        API_RESTFUL_CON_INFO_PORT.text = str(self.getApiRestfulConInfoPort())
+        API_RESTFUL_CON_INFO_PORT.text = self._getValue(tree, CONST_API_RESTFUL_CON_INFO_PORT)
+        # API_RESTFUL_CON_INFO_PORT.text = str(self.getApiRestfulConInfoPort())
         ROOT.append(API_RESTFUL_CON_INFO_PORT)
 
         APPNAME = Element(CONST_APPNAME)

faraday-terminal.zsh

@@ -7,7 +7,25 @@
 ###
 
 #ZDOTDIR="~/.faraday/zsh/" /bin/zsh
+FARADAY_ZSH_RPORT="9977"
+FARADAY_ZSH_HOST="127.0.0.1"
+if [ $# -eq 2 ]; then
+    FARADAY_ZSH_HOST=$1
+    FARADAY_ZSH_RPORT=$2
+else
+    if [ $# -gt 2 ] || [ $# -eq 1 ]; then
+        echo "[*] Usage $0 host port"
+        echo "[*] Usage $0 127.0.0.1 9977"
+        exit
+    else
+        echo "[!] Using default configuration" $FARADAY_ZSH_HOST:$FARADAY_ZSH_RPORT
+    fi
+fi
+
+export FARADAY_ZSH_RPORT
+export FARADAY_ZSH_HOST
 FARADAYZDOTDIR="$HOME/.faraday/zsh/"
 OLDZDOTDIR=$ZDOTDIR
 ZDOTDIR=$FARADAYZDOTDIR /bin/zsh
-#source ~/.faraday/zsh/.zshrc 
+
+#source ~/.faraday/zsh/.zshrc

faraday.py

@@ -87,14 +87,14 @@ def getParserArgs():
 
     parser_connection.add_argument('-n', '--hostname', action="store",
         dest="host",
-        default="localhost",
+        default=None,
         help="The hostname where both server APIs will listen (XMLRPC and RESTful). \
         Default = localhost")
 
-    parser_connection.add_argument('-px', '--port-xmlrpc', action="store", dest="port_xmlrpc", default=9876, type=int,
+    parser_connection.add_argument('-px', '--port-xmlrpc', action="store", dest="port_xmlrpc", default=None, type=int,
         help="Sets the port where the api XMLRPCServer will listen. Default = 9876")
     parser_connection.add_argument('-pr', '--port-rest', action="store", dest="port_rest",
-        default=9977, type=int,
+        default=None, type=int,
         help="Sets the port where the api RESTful server will listen. Default = 9977")
 
     parser.add_argument('-d', '--debug', action="store_true", dest="debug",
@@ -267,12 +267,28 @@ def setConf():
 
     CONF = getInstanceConfiguration()
     CONF.setDebugStatus(args.debug)
-    # if args.host != FARADAY_DEFAULT_HOST:
-    CONF.setApiConInfoHost(args.host)
-    # if args.port_xmlrpc != FARADAY_DEFAULT_PORT_XMLRPC:
-    CONF.setApiConInfoPort(args.port_xmlrpc)
-    # if args.port_rest != FARADAY_DEFAULT_PORT_REST:
-    CONF.setApiRestfulConInfoPort(args.port_rest)
+
+    host = CONF.getApiConInfoHost()
+    port_xmlrpc = CONF.getApiConInfoPort()
+    port_rest = CONF.getApiRestfulConInfoPort()
+
+    print "[CONF]", host, port_rest, port_xmlrpc
+
+    host = host if host else FARADAY_DEFAULT_HOST
+    port_xmlrpc = port_xmlrpc if port_xmlrpc else FARADAY_DEFAULT_PORT_XMLRPC
+    port_rest = port_rest if port_rest else FARADAY_DEFAULT_PORT_REST
+
+    print "[DEFAULTS]", host, port_rest, port_xmlrpc
+
+    host = args.host if args.host else host
+    port_xmlrpc = args.port_xmlrpc if args.port_xmlrpc else port_xmlrpc
+    port_rest = args.port_rest if args.port_rest else port_rest
+
+    print "[ARGS]", host, port_rest, port_xmlrpc
+
+    CONF.setApiConInfoHost(host)
+    CONF.setApiConInfoPort(port_xmlrpc)
+    CONF.setApiRestfulConInfoPort(port_rest)
 
     CONF.setAuth(args.disable_login)
 
@@ -600,6 +616,7 @@ def init():
     global logger
 
     args = getParserArgs()
+    setUpLogger(args.debug)
     logger = getLogger("launcher")
 
 
@@ -620,7 +637,6 @@ def main():
         setConf()
         checkCouchUrl()
         checkVersion()
-        setUpLogger()
         update()
         checkUpdates()
         startFaraday()

zsh/faraday.zsh

@@ -5,21 +5,20 @@
 #
 #'''
 
-
 WORKSPACE=`cat $HOME/.faraday/config/user.xml |  grep '<last_workspace' | cut -d '>' -f 2 | cut -d '<' -f 1`
-STATUS=`curl -s 127.0.0.1:9977/status/check |  sed "s/[^0-9]//g" | grep -v '^[[:space:]]*$'`
+STATUS=`curl -s $FARADAY_ZSH_HOST:$FARADAY_ZSH_RPORT/status/check |  sed "s/[^0-9]//g" | grep -v '^[[:space:]]*$'`
 PS1="%{${fg_bold[red]}%}[faraday]($WORKSPACE)%{${reset_color}%} $PS1"
 
 echo ">>> WELCOME TO FARADAY"
 echo "[+] Current Workspace: $WORKSPACE"
 if [[ -z $STATUS ]]; then
 		echo "[-] API: Warning API unreachable"
-	
-	elif [[ $STATUS == "200" ]]; then	 
+
+	elif [[ $STATUS == "200" ]]; then
 		echo "[+] API: OK"
-	else	
-		echo "[!] API: $STATUS"	
-	
+	else
+		echo "[!] API: $STATUS"
+
 fi
 
 setopt multios

zsh/plugin_controller_client.py

@@ -20,9 +20,8 @@
 if not os.path.exists(output_folder):
     os.mkdir(output_folder)
 
-#TODO: Load this from faraday config
-host = "127.0.0.1"
-port = 9977
+host = os.environ["FARADAY_ZSH_HOST"]
+port = int(os.environ["FARADAY_ZSH_RPORT"])
 
 url_input = "http://%s:%d/cmd/input" % (host, port)
 url_output = "http://%s:%d/cmd/output" % (host, port)