moving header

commands/cli.py

@@ -1,15 +1,10 @@
 import logger
+from appheader import print_header
 from smtpconnection import SMTPConnection
 
-app_description = """  email-spoofer-py v0.0.2 (CLI wizard)  
-  Python 3.x based email spoofer
-  https://github.com/mikechabot/email-spoofer-py"""
-
 
 def run(args):
-    logger.bright('\n{0}'.format('='*50))
-    logger.header(app_description)
-    logger.bright('{0}\n'.format('='*50))
+    print_header()
 
     # Connect to SMTP over TLS
     connection = SMTPConnection(args.host, str(args.port))
@@ -35,9 +30,5 @@ def run(args):
         message_body
     )
 
-    logger.bright('\n{0}\n'.format('='*70))
-    logger.header(message.as_string())
-    logger.bright('\n{0}\n'.format('='*70))
-
     connection.send_mail(message)
 

commands/wizard.py

@@ -1,16 +1,11 @@
 import logger
 import userinput as ui
+from appheader import print_header
 from smtpconnection import SMTPConnection
 
-app_description = """  email-spoofer-py v0.0.2 (CLI wizard)  
-  Python 3.x based email spoofer
-  https://github.com/mikechabot/email-spoofer-py"""
-
 
 def run():
-    logger.bright('\n{0}'.format('='*50))
-    logger.header(app_description)
-    logger.bright('{0}\n'.format('='*50))
+    print_header()
 
     # Connect to SMTP over TLS
     connection = SMTPConnection(ui.get_host(), ui.get_port())
@@ -32,9 +27,5 @@ def run():
         ui.get_message_body()
     )
 
-    logger.bright('\n{0}\n'.format('='*70))
-    logger.header(message.as_string())
-    logger.bright('\n{0}\n'.format('='*70))
-
     if ui.do_send_mail():
         connection.send_mail(message)

models/smtpconnection.py

@@ -57,7 +57,6 @@ def __connect(self):
         try:
             logger.info('Connecting to SMTP socket (' + self.socket + ')...')
             self._server = smtplib.SMTP(self.host, self.port)
-            logger.success('Connected to SMTP server')
         except (gaierror, OSError):
             logger.error('Unable to establish connection to SMTP socket.')
             exit(1)
@@ -71,7 +70,6 @@ def __start_tls(self):
             try:
                 logger.info('Starting TLS session...')
                 self.server.starttls()
-                logger.success('Started TLS session')
             except RuntimeError:
                 logger.error('SSL/TLS support is not available to your Python interpreter.')
                 exit(1)
@@ -122,7 +120,7 @@ def send_mail(self, message):
         try:
             logger.info('Sending spoofed message...')
             self.server.sendmail(self.sender, self.recipients, message.as_string())
-            logger.success('Sent message')
+            logger.success('Message sent!')
         except smtplib.SMTPException:
             logger.error('Unable to send message. Check sender, recipients and message body')
             exit(1)

utils/__init__.py

@@ -1,2 +1,3 @@
 import logger
 import userinput
+import appheader

utils/appheader.py

@@ -0,0 +1,12 @@
+from logger import bright, header
+
+description = """  email-spoofer-py v0.0.3 (CLI wizard)  
+  Python 3.x based email spoofer
+  https://github.com/mikechabot/email-spoofer-py"""
+
+def print_header():
+    bright('\n{0}'.format('='*50))
+    header(description)
+    bright('{0}\n'.format('='*50))
+
+

utils/userinput.py

@@ -3,9 +3,9 @@
 from logger import info, success, error
 
 
-def __prompt(text):
+def __prompt(text, color):
     try:
-        print(Fore.WHITE, end='')
+        print(color, end='')
         return input(text).strip()
     except KeyboardInterrupt:
         error('\nInterrupt received. Exiting...')
@@ -17,12 +17,12 @@ def __prompt(text):
 def __get_required_input(text):
     var = None
     while not var:
-        var = __prompt(text)
+        var = __prompt(text, Fore.WHITE)
     return var
 
 
 def __get_optional_input(text, default_value):
-    var = __prompt(text)
+    var = __prompt(text, Fore.WHITE)
     if var:
         return var
     else:
@@ -61,23 +61,23 @@ def get_password():
 
 
 def get_sender_address():
-    return __get_required_input('Sender address (e.g. spoofed@domain.com): ')
+    return __get_required_input('Sender address: ')
 
 
 def get_sender_name():
-    return __get_required_input('Sender name (e.g. John Smith): ')
+    return __get_required_input('Sender name: ')
 
 
 def get_subject():
     return __get_required_input('Subject line: ')
 
 
 def get_recipient_addresses():
-    to_address = __get_required_input('Recipient address (e.g. victim@domain.com): ')
+    to_address = __get_required_input('Recipient address: ')
     to_addresses = [to_address]
     if is_multi_address():
         while to_address:
-            to_address = __get_optional_input('Recipient address (blank to continue): ', None)
+            to_address = __get_optional_input('Recipient address: ', None)
             if to_address:
                 to_addresses.append(to_address)
     return to_addresses
@@ -112,7 +112,7 @@ def get_html():
     html = ''
     while True:
         try:
-            line = input('>| ')
+            line = __prompt('>| ', Fore.LIGHTBLACK_EX)
             html += line + '\n'
         except EOFError:
             success('Captured HTML body')