Update to v0.4

lib/output.py

@@ -1,22 +1,49 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#-------------------------------------------------------------------------------
+# Typo3 Enumerator - Automatic Typo3 Enumeration Tool
+# Copyright (c) 2015 Jan Rude
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/](http://www.gnu.org/licenses/)
+#-------------------------------------------------------------------------------
 
-"""
-Copyright (c) 2014 Jan Rude
-"""
-
-from Queue import Queue
 from colorama import Fore
-from threading import Thread, Lock
-from lib import settings
 
-# Output thread
-def thread():
-	while settings.out_queue is not settings.out_queue.empty():
-		try:
-			extension = settings.out_queue.get()
-			if not "not installed" in extension:
-				settings.EXTENSIONS_FOUND += 1
-			print(extension)
-			settings.out_queue.task_done()
-		except Exception, e:
-			print "Oops! Got:", e
+class Output:
+	"""
+	This class handles the output
+	"""
+	def __init__(self):
+		pass
+
+	def typo3_installation(domain):
+		print('')
+		print('[+] Typo3 default login:'.ljust(30) + Fore.GREEN + domain.get_name() + '/typo3/index.php' + Fore.RESET)
+		print('[+] Typo3 version:'.ljust(30) + Fore.GREEN + domain.get_typo3_version() + Fore.RESET)
+		print(' | known vulnerabilities:'.ljust(30) + Fore.GREEN + 'http://www.cvedetails.com/version-search.php?vendor=&product=Typo3&version=' + domain.get_typo3_version() + Fore.RESET)
+		print('')
+
+	def interesting_headers(name, value):
+		string = '[!] ' + name + ':'
+		print(string.ljust(30) + value)
+
+	def extension_output(extens):
+		if not extens:
+			print(Fore.RED + ' | No extension found' + Fore.RESET)
+		else:
+			for extension in extens:
+				print(Fore.BLUE + '\n[+] Name: ' + extension.split('/')[3] + '\n' + "-"* 25  + Fore.RESET)
+				print(' | Location:'.ljust(16) + extension)
+				if not (extens[extension] == False):
+					print(' | ' + extens[extension].split('.')[0] + ':'.ljust(4) + (extension + '/'+ extens[extension]))