From f040d33cb5f54ec41d55c43d73c210e301e4c132 Mon Sep 17 00:00:00 2001
From: ManuelBerrueta <manuelberrueta@gmail.com>
Date: Wed, 20 Oct 2021 15:46:23 -0700
Subject: [PATCH] TLS Support

---
 scripts/smtp_authcheck.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/scripts/smtp_authcheck.py b/scripts/smtp_authcheck.py
index 068a2d9..f6114d7 100644
--- a/scripts/smtp_authcheck.py
+++ b/scripts/smtp_authcheck.py
@@ -16,19 +16,26 @@ def banner():
 
 
 def usage():
-    print("Usage: python smtp_authcheck.py --server <mail server> --port <SMTP port> --username <username> --password <password>")
+    print("Usage: python smtp_authcheck.py --server <mail server> --port <SMTP port> --username <username> --password <password> [--start-tls]")
 
 
 def smtp_auth(server, port, username, password):
+    print("[+] Attempting to connect to server")
     s = smtplib.SMTP(server, port)
-    s.starttls()
-
-    try:
+    #s.starttls()
+    if args.starttls:
+        print("[+] Attempting to use STARTTLS")
+        s.starttls()
+
+    print("[+] Attempting to say ehlo")
+    s.ehlo()
+    
+    try:       
         s.login(username, password)
         return "Authentication successful"
-
-    except smtplib.SMTPAuthenticationError:
-        return "Wrong username or password"
+    
+    except:
+        sys.exit("Wrong username or password")
 
     finally:
         s.close()
@@ -40,7 +47,7 @@ def smtp_auth(server, port, username, password):
     parser.add_argument("--port", action="store", dest='port', help="server port", type=int)
     parser.add_argument("--username", action="store", dest='username', help="username")
     parser.add_argument("--password", action="store", dest='password', help="password")
-
+    parser.add_argument('--start-tls', action='store_true', dest='starttls', help='run using STARTTLS')
     args = parser.parse_args()
     banner()
     main(args)