From 243e090bcb31892120d1012c8f5a1500a8ac63f8 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Wed, 12 Feb 2020 16:15:18 +0100
Subject: [PATCH] Add default ports for IMAP and SMTP

---
 server.go | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/server.go b/server.go
index 5fdcc8b..bf67fce 100644
--- a/server.go
+++ b/server.go
@@ -114,16 +114,20 @@ func (s *Server) parseIMAPUpstream() error {
 		}
 	}
 
-	s.imap.host = u.Host
 	switch u.Scheme {
-	case "imap":
-		// This space is intentionally left blank
 	case "imaps":
 		s.imap.tls = true
 	case "imap+insecure":
 		s.imap.insecure = true
-	default:
-		panic("unreachable")
+	}
+
+	s.imap.host = u.Host
+	if !strings.ContainsRune(s.imap.host, ':') {
+		if u.Scheme == "imaps" {
+			s.imap.host += ":993"
+		} else {
+			s.imap.host += ":143"
+		}
 	}
 
 	c, err := s.dialIMAP()
@@ -152,16 +156,20 @@ func (s *Server) parseSMTPUpstream() error {
 		}
 	}
 
-	s.smtp.host = u.Host
 	switch u.Scheme {
-	case "smtp":
-		// This space is intentionally left blank
 	case "smtps":
 		s.smtp.tls = true
 	case "smtp+insecure":
 		s.smtp.insecure = true
-	default:
-		panic("unreachable")
+	}
+
+	s.smtp.host = u.Host
+	if !strings.ContainsRune(s.smtp.host, ':') {
+		if u.Scheme == "smtps" {
+			s.smtp.host += ":465"
+		} else {
+			s.smtp.host += ":587"
+		}
 	}
 
 	c, err := s.dialSMTP()