diff options
| -rw-r--r-- | cmd/alps/main.go | 1 | ||||
| -rw-r--r-- | imap.go | 3 | ||||
| -rw-r--r-- | server.go | 11 | ||||
| -rw-r--r-- | smtp.go | 3 | ||||
| -rw-r--r-- | themes/alps/assets/style.css | 2 | ||||
| -rw-r--r-- | themes/alps/util.html | 12 |
6 files changed, 19 insertions, 13 deletions
diff --git a/cmd/alps/main.go b/cmd/alps/main.go index 5a00957..b38ac59 100644 --- a/cmd/alps/main.go +++ b/cmd/alps/main.go @@ -34,6 +34,7 @@ func main() { flag.StringVar(&options.Theme, "theme", "", "default theme") flag.StringVar(&addr, "addr", ":1323", "listening address") flag.BoolVar(&options.Debug, "debug", false, "enable debug logs") + flag.BoolVar(&options.SkipTlsVerification, "skiptlsverification", false, "skip TLS hostname verification") flag.StringVar(&loginKey, "login-key", "", "Fernet key for login persistence") flag.Usage = func() { @@ -1,6 +1,7 @@ package alps import ( + "crypto/tls" "fmt" "github.com/emersion/go-imap" @@ -16,7 +17,7 @@ func (s *Server) dialIMAP() (*imapclient.Client, error) { var c *imapclient.Client var err error if s.imap.tls { - c, err = imapclient.DialTLS(s.imap.host, nil) + c, err = imapclient.DialTLS(s.imap.host, &tls.Config{InsecureSkipVerify: s.Options.SkipTlsVerification}) if err != nil { return nil, fmt.Errorf("failed to connect to IMAPS server: %v", err) } @@ -365,11 +365,12 @@ func handleUnauthenticated(next echo.HandlerFunc, ctx *Context) error { } type Options struct { - Upstreams []string - Theme string - ThemesPath string - Debug bool - LoginKey *fernet.Key + Upstreams []string + Theme string + ThemesPath string + Debug bool + SkipTlsVerification bool + LoginKey *fernet.Key } // New creates a new server. @@ -1,6 +1,7 @@ package alps import ( + "crypto/tls" "fmt" "github.com/emersion/go-smtp" @@ -14,7 +15,7 @@ func (s *Server) dialSMTP() (*smtp.Client, error) { var c *smtp.Client var err error if s.smtp.tls { - c, err = smtp.DialTLS(s.smtp.host, nil) + c, err = smtp.DialTLS(s.smtp.host, &tls.Config{InsecureSkipVerify: s.Options.SkipTlsVerification}) if err != nil { return nil, fmt.Errorf("failed to connect to SMTPS server: %v", err) } diff --git a/themes/alps/assets/style.css b/themes/alps/assets/style.css index d652f66..50453c9 100644 --- a/themes/alps/assets/style.css +++ b/themes/alps/assets/style.css @@ -667,9 +667,11 @@ main table tfoot { float: left; } +/* .action-group select { height: 10rem; } +*/ .actions-message, .actions-contacts { diff --git a/themes/alps/util.html b/themes/alps/util.html index 9cdfd86..b0022ec 100644 --- a/themes/alps/util.html +++ b/themes/alps/util.html @@ -32,12 +32,12 @@ ">Compose mail</a> </li> {{ with .CategorizedMailboxes }} - {{ with .Common.Inbox }}{{ template "mbox-link" . }}{{ end }} - {{ with .Common.Drafts }}{{ template "mbox-link" . }}{{ end }} - {{ with .Common.Sent }}{{ template "mbox-link" . }}{{ end }} - {{ with .Common.Junk }}{{ template "mbox-link" . }}{{ end }} - {{ with .Common.Trash }}{{ template "mbox-link" . }}{{ end }} - {{ with .Common.Archive }}{{ template "mbox-link" . }}{{ end }} + {{ if .Common.Inbox.Info }}{{ with .Common.Inbox }}{{ template "mbox-link" . }}{{ end }}{{ end }} + {{ if .Common.Drafts.Info }}{{ with .Common.Drafts }}{{ template "mbox-link" . }}{{ end }}{{ end }} + {{ if .Common.Sent.Info }}{{ with .Common.Sent }}{{ template "mbox-link" . }}{{ end }}{{ end }} + {{ if .Common.Junk.Info }}{{ with .Common.Junk }}{{ template "mbox-link" . }}{{ end }}{{ end }} + {{ if .Common.Trash.Info }}{{ with .Common.Trash }}{{ template "mbox-link" . }}{{ end }}{{ end }} + {{ if .Common.Archive.Info }}{{ with .Common.Archive }}{{ template "mbox-link" . }}{{ end }}{{ end }} {{ if .Additional }} <hr /> {{ range .Additional }} |