Merge branch 'community'

Author: rgerman

.gitignore

@@ -34,9 +34,14 @@ nosetests.xml
 .mr.developer.cfg
 .project
 .pydevproject
+pushReports.py
+*.swp
 
 # Tests nodejs
 node_modules
 
 # Couch
 .couchadmin
+
+# Ignore faraday server pid
+server/.faraday-server.pid

AUTHORS

@@ -24,3 +24,4 @@ Project contributors
     * Thierry Beauquier
     * Brice Samulenok
     * Ulisses Albuquerque
+    * Alejandro Parodi

RELEASE.md

@@ -10,6 +10,24 @@ Please run ./faraday.py --update
 New features in the latest update
 =====================================
 
+August 12, 2016:
+---
+* Added Faraday Server
+* Improved performance in web UI
+* Added some basic APIs to Faraday Server
+* Added licenses management section in web UI
+* Totally removed QT3, GTK is now the only GUI
+* Deprecated FileSystem databses: now Faraday works exclusively with Faraday Server and CouchDB
+* Added a button to go to the Faraday Web directly from GTK
+* Fixed bug when deleting objects from Faraday Web
+* Fixed bug where icons where not copied to correct folder on initialization
+* Fixed bug where current workspace wouldn't correspond to selected workspace on the sidebar on GTK
+* Fixed bug in 'Refresh Workspace' button on GTK
+* Fixed bug where Host Sidebar and Statusbar information wasn't correctly updated on GTK
+* Fixed bug in service editing
+* Fixed sqlmap plugin
+* Fixed metapsloit plugin
+
 Jul 1, 2016:
 ---
 * GTK is the default interface now.

VERSION

@@ -1 +1 @@
-1.0.22
+2.0.0

bin/fplugin

@@ -5,39 +5,40 @@
 Faraday Penetration Test IDE
 Copyright (C) 2013  Infobyte LLC (http://www.infobytesec.com/)
 See the file 'doc/LICENSE' for the license information
-
 '''
-import re
+
 import os
-import pprint
-import sys
 import argparse
-import shlex
 
 if __name__ == '__main__':
-    parser = argparse.ArgumentParser()
-    
-    # executes received code
-    parser.add_argument('-e')
-    # where to store fplugin's output
-    parser.add_argument('-o')
+    description = (
+        'Using our plugin you can do different actions in the command line'
+        ' and interact with Faraday. Faraday comes with some presets for bulk'
+        ' actions such as object removal, get object information, etc.')
+
+    parser = argparse.ArgumentParser(description=description)
+
+    parser.add_argument(
+        '-e',
+        '--execute',
+        help='Execute code received in this parameter.'
+        ' Example:\n./fplugin -e "for h in api.__model_controller.getAllHosts(): print h.name"')
+
+    parser.add_argument(
+        '-o',
+        '--output',
+        help='Store output of fplugin in a file.')
+
     # file with code to execute
-    parser.add_argument('-f')
-    
-    #get all hosts
-    #./fplugin -e 'for h in api.__model_controller.getAllHosts(): print h.name'
-    #create a new host
-    #./fplugin -e 'for h in api.createAndAddHost("8.8.8.8","Linux")'
-    #get all creds
-    #get all hostname
-    #get all ip port http/https
+    parser.add_argument(
+        '-f',
+        '--file',
+        help='File with code to execute.'
+        ' Example:\n./fplugin -f getAllIps.py ')
 
     args, unknown = parser.parse_known_args()
-    
-    if args.o:
-        if os.path.isfile(args.o):
-            with open(args.o) as f:
+    if args.output:
+        if os.path.isfile(args.output):
+            with open(args.output) as f:
                 data = f.read()
                 print data
-        
-    

config/default.xml

@@ -2,7 +2,7 @@
 <faraday>
 
     <appname>Faraday - Penetration Test IDE</appname>
-    <version>1.0.22</version>
+    <version>2.0.0</version>
     <debug_status>0</debug_status>
     <font>-Misc-Fixed-medium-r-normal-*-12-100-100-100-c-70-iso8859-1</font>
     <home_path>~/</home_path>

config/globals.py

@@ -11,25 +11,20 @@
 CONST_FARADAY_HOME_PATH = '~/.faraday'
 CONST_FARADAY_PLUGINS_PATH = 'plugins'
 CONST_FARADAY_PLUGINS_REPO_PATH = 'plugins/repo'
-CONST_FARADAY_QTRC_PATH = 'deps/qtrc'
 CONST_FARADAY_IMAGES = 'images/'
 CONST_FARADAY_LOGS_PATH = 'logs/'
 CONST_FARADAY_FOLDER_LIST = [ "config", "data", "images",
                         "persistence", "plugins",
                         "report", "temp", "zsh", "logs" ]
 
 
-CONST_USER_QT_PATH = '~/.qt/'
-CONST_USER_QTRC_PATH = '~/.qt/qtrc'
-CONST_USER_QTRC_BACKUP = '~/.qt/.qtrc_original.bak'
-CONST_FARADAY_QTRC_BACKUP = '~/.qt/.qtrc_faraday.bak'
 CONST_FARADAY_ZSHRC = "zsh/.zshrc"
 CONST_FARADAY_ZSH_FARADAY = "zsh/faraday.zsh"
 CONST_FARADAY_ZSH_OUTPUT_PATH = "zsh/output"
 CONST_FARADAY_BASE_CFG = "config/default.xml"
 CONST_FARADAY_USER_CFG = "config/config.xml"
-CONST_FARADAY_LIB_HELPERS = "shell/core/_helpers.so"
-CONST_BLACKDBS = ('cwe','reports')
+CONST_LICENSES_DB = "faraday_licenses"
+CONST_BLACKDBS = ('cwe','reports', CONST_LICENSES_DB)
 
 CONST_USER_HOME = "~"
 CONST_USER_ZSHRC = "~/.zshrc"

controllers/change.py

@@ -60,16 +60,16 @@ def _notify_model_object_change(self, change, obj):
         elif (change.getChangeType() != CHANGETYPE.UNKNOWN):
             model.guiapi.notification_center.editHost(host)
 
-    def manageConnectionLost(self):
-        """All it does is send a notification to the notification center"""
-        model.guiapi.notification_center.CouchDBConnectionProblem()
+
+    def revertToNoWorkspace(self):
+        model.guiapi.notification_center.WorkspaceProblem()
 
     def watch(self, mapper, dbConnector):
         self.mapper_manager = mapper
         self.dbConnector = dbConnector
         self.changesWatcher = ChangeWatcher(dbConnector.waitForDBChange)
         dbConnector.setChangesCallback(self.loadChange)
-        dbConnector.setCouchExceptionCallback(self.manageConnectionLost)
+        dbConnector.setNoWorkspacesCallback(self.revertToNoWorkspace)
         self.changesWatcher.start()
 
     def unwatch(self):