| 0 | 0 |
--- a/faraday.py
|
| 1 | 1 |
+++ b/faraday.py
|
| 2 | |
@@ -129,10 +129,6 @@ def getParserArgs():
|
|
2 |
@@ -131,10 +131,6 @@ def getParserArgs():
|
| 3 | 3 |
default=False,
|
| 4 | 4 |
help="Ignore python dependencies resolution.")
|
| 5 | 5 |
|
|
| 10 | 10 |
parser.add_argument('--cert', action="store", dest="cert_path",
|
| 11 | 11 |
default=None,
|
| 12 | 12 |
help="Path to the valid CouchDB certificate")
|
| 13 | |
@@ -202,45 +198,6 @@ def query_user_bool(question, default=Tr
|
|
13 |
@@ -204,45 +200,6 @@ def query_user_bool(question, default=Tr
|
| 14 | 14 |
"(or 'y' or 'n').\n")
|
| 15 | 15 |
|
| 16 | 16 |
|
|
| 26 | 26 |
- try:
|
| 27 | 27 |
- import pip
|
| 28 | 28 |
- modules = []
|
| 29 | |
- f = open(CONST_REQUIREMENTS_FILE)
|
|
29 |
- f = open(FARADAY_REQUIREMENTS_FILE)
|
| 30 | 30 |
- for line in f:
|
| 31 | 31 |
- if not line.find('#'):
|
| 32 | 32 |
- break
|
|
| 56 | 56 |
def startProfiler(app, output, depth):
|
| 57 | 57 |
"""Profiler handler.
|
| 58 | 58 |
|
| 59 | |
@@ -520,40 +477,6 @@ _/ ____\_____ ____________ __| _/__
|
|
59 |
@@ -522,40 +479,6 @@ _/ ____\_____ ____________ __| _/__
|
| 60 | 60 |
logger.info("Starting Faraday IDE.")
|
| 61 | 61 |
|
| 62 | 62 |
|
|
| 77 | 77 |
- uri = getInstanceConfiguration().getUpdatesUri()
|
| 78 | 78 |
- resp = u"OK"
|
| 79 | 79 |
- try:
|
| 80 | |
- f = open(CONST_VERSION_FILE)
|
|
80 |
- f = open(FARADAY_VERSION_FILE)
|
| 81 | 81 |
-
|
| 82 | 82 |
- getInstanceConfiguration().setVersion(f.read().strip())
|
| 83 | 83 |
- getInstanceConfiguration().setAppname("Faraday - Penetration Test IDE Community")
|
|
| 97 | 97 |
def checkCouchUrl():
|
| 98 | 98 |
import requests
|
| 99 | 99 |
try:
|
| 100 | |
@@ -569,29 +492,6 @@ def checkCouchUrl():
|
|
100 |
@@ -571,30 +494,6 @@ def checkCouchUrl():
|
| 101 | 101 |
# Non fatal error
|
| 102 | 102 |
pass
|
| 103 | 103 |
|
| 104 | 104 |
-def checkVersion():
|
| 105 | 105 |
- try:
|
| 106 | |
- f = open(CONST_VERSION_FILE)
|
|
106 |
- f = open(FARADAY_VERSION_FILE)
|
| 107 | 107 |
- f_version = f.read().strip()
|
| 108 | 108 |
- if not args.update:
|
| 109 | 109 |
- if getInstanceConfiguration().getVersion() != None and getInstanceConfiguration().getVersion() != f_version:
|
|
| 116 | 116 |
-
|
| 117 | 117 |
- doc = {"ver": getInstanceConfiguration().getVersion()}
|
| 118 | 118 |
-
|
| 119 | |
- if os.path.isfile(CONST_CONFIG):
|
| 120 | |
- os.remove(CONST_CONFIG)
|
| 121 | |
- with open(CONST_CONFIG, "w") as doc_file:
|
|
119 |
- if os.path.isfile(FARADAY_CONFIG):
|
|
120 |
- os.remove(FARADAY_CONFIG)
|
|
121 |
- with open(FARADAY_CONFIG, "w") as doc_file:
|
| 122 | 122 |
- json.dump(doc, doc_file)
|
| 123 | 123 |
- except Exception as e:
|
| 124 | 124 |
- getLogger("launcher").error("It seems that something's wrong with your version\nPlease contact customer support")
|
| 125 | 125 |
- sys.exit(-1)
|
| 126 | 126 |
-
|
| 127 | |
|
|
127 |
-
|
| 128 | 128 |
def init():
|
| 129 | 129 |
"""Initializes what is needed before starting.
|
| 130 | |
@@ -618,20 +518,12 @@ def main():
|
| 131 | |
"""
|
|
130 |
|
|
131 |
@@ -622,20 +521,12 @@ def main():
|
|
132 |
os.chdir(FARADAY_BASE)
|
| 132 | 133 |
|
| 133 | 134 |
init()
|
| 134 | 135 |
- if checkDependencies():
|