Implemented two command line options. Replaced cutycapt by wkhtmltoim…

…age.
Claudinei-init · Feb 16, 2019 · fc9f5e0 · fc9f5e0
1 parent 6eb64ba
commit fc9f5e0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/app/auxiliary.py b/app/auxiliary.py
@@ -15,7 +15,7 @@
 from PyQt4 import QtGui, QtCore
 from PyQt4.QtCore import *												# for QProcess
 #import errno															# temporary for isHttpd
-import subprocess														# for screenshots with cutycapt
+import subprocess														# for screenshots
 import string															# for input validation
 
 # bubble sort algorithm that sorts an array (in place) based on the values in another array

diff --git a/app/settings.py b/app/settings.py
@@ -70,7 +70,7 @@ def createDefaultSettings(self):
 		self.actions.beginGroup('ToolSettings')
 		self.actions.setValue('nmap-path','/usr/bin/nmap')
 		self.actions.setValue('hydra-path','/usr/bin/hydra')
-		self.actions.setValue('cutycapt-path','/usr/bin/cutycapt')
+#		self.actions.setValue('cutycapt-path','/usr/bin/cutycapt')
 		self.actions.setValue('texteditor-path','/usr/bin/leafpad')
 		self.actions.endGroup()
 
@@ -360,7 +360,7 @@ def __init__(self, appSettings=None):
 
 		self.tools_path_nmap = "/usr/bin/nmap"
 		self.tools_path_hydra = "/usr/bin/hydra"
-		self.tools_path_cutycapt = "/usr/bin/cutycapt"
+#		self.tools_path_cutycapt = "/usr/bin/cutycapt"
 		self.tools_path_texteditor = "/usr/bin/leafpad"
 
 		self.hostActions = []
@@ -410,7 +410,7 @@ def __init__(self, appSettings=None):
 
 				self.tools_path_nmap = self.toolSettings['nmap-path']
 				self.tools_path_hydra = self.toolSettings['hydra-path']
-				self.tools_path_cutycapt = self.toolSettings['cutycapt-path']
+#				self.tools_path_cutycapt = self.toolSettings['cutycapt-path']
 				self.tools_path_texteditor = self.toolSettings['texteditor-path']
 
 			except KeyError:

diff --git a/ui/settingsdialogs.py b/ui/settingsdialogs.py
@@ -215,7 +215,7 @@ def populateToolsTab(self):
 		# POPULATE TOOL PATHS TAB
 		self.nmapPathInput.setText(self.settings.tools_path_nmap)
 		self.hydraPathInput.setText(self.settings.tools_path_hydra)
-		self.cutycaptPathInput.setText(self.settings.tools_path_cutycapt)
+#		self.cutycaptPathInput.setText(self.settings.tools_path_cutycapt)
 		self.textEditorPathInput.setText(self.settings.tools_path_texteditor)
 
 		# POPULATE STAGED NMAP TAB
@@ -537,7 +537,7 @@ def validateBruteTab(self):											# LEO: do NOT change the order of the AND
 	def toolPathsValidate(self):				
 		validationPassed = self.validateFile(self.nmapPathInput)
 		validationPassed = self.validateFile(self.hydraPathInput) and validationPassed
-		validationPassed = self.validateFile(self.cutycaptPathInput) and validationPassed
+#		validationPassed = self.validateFile(self.cutycaptPathInput) and validationPassed
 		validationPassed = self.validateFile(self.textEditorPathInput) and validationPassed
 		return validationPassed
 
@@ -1070,14 +1070,14 @@ def setupToolPathsTab(self):
 		self.hydraPathHorLayout.addWidget(self.hydraPathInput)
 		self.hydraPathHorLayout.addStretch()
 
-		self.cutycaptPathlabel = QtGui.QLabel()
-		self.cutycaptPathlabel.setText('Cutycapt')
-		self.cutycaptPathlabel.setFixedWidth(100)
-		self.cutycaptPathInput = QtGui.QLineEdit()
-		self.cutycaptPathHorLayout = QtGui.QHBoxLayout()
-		self.cutycaptPathHorLayout.addWidget(self.cutycaptPathlabel)
-		self.cutycaptPathHorLayout.addWidget(self.cutycaptPathInput)
-		self.cutycaptPathHorLayout.addStretch()
+#		self.cutycaptPathlabel = QtGui.QLabel()
+#		self.cutycaptPathlabel.setText('Cutycapt')
+#		self.cutycaptPathlabel.setFixedWidth(100)
+#		self.cutycaptPathInput = QtGui.QLineEdit()
+#		self.cutycaptPathHorLayout = QtGui.QHBoxLayout()
+#		self.cutycaptPathHorLayout.addWidget(self.cutycaptPathlabel)
+#		self.cutycaptPathHorLayout.addWidget(self.cutycaptPathInput)
+#		self.cutycaptPathHorLayout.addStretch()
 
 		self.textEditorPathlabel = QtGui.QLabel()
 		self.textEditorPathlabel.setText('Text editor')
@@ -1091,7 +1091,7 @@ def setupToolPathsTab(self):
 		self.toolsPathVerLayout = QtGui.QVBoxLayout()		
 		self.toolsPathVerLayout.addLayout(self.nmapPathHorLayout)
 		self.toolsPathVerLayout.addLayout(self.hydraPathHorLayout)
-		self.toolsPathVerLayout.addLayout(self.cutycaptPathHorLayout)
+#		self.toolsPathVerLayout.addLayout(self.cutycaptPathHorLayout)
 		self.toolsPathVerLayout.addLayout(self.textEditorPathHorLayout)
 		self.toolsPathVerLayout.addStretch()