Merge pull request #50 from tierpod/security_config

Security config
tierpod · Apr 13, 2024 · e47ca16 · e47ca16
2 parents 41d9a4e + 258378e
commit e47ca16
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 23 deletions.
diff --git a/cmd/dmarc-report-converter/config.go b/cmd/dmarc-report-converter/config.go
@@ -77,6 +77,14 @@ func loadConfig(path string) (*config, error) {
 		return nil, fmt.Errorf("input.dir is not configured")
 	}
 
+	if c.Input.IMAP.Security == "" {
+		c.Input.IMAP.Security = "tls"
+	}
+
+	if c.Input.IMAP.Security != "tls" && c.Input.IMAP.Security != "starttls" && c.Input.IMAP.Security != "plaintext" {
+		return nil, fmt.Errorf("'input.imap.security' must be one of: tls, starttls, plaintext")
+	}
+
 	// Determine which template is used based upon Output.Format.
 	t := txtTmpl
 	switch c.Output.Format {

diff --git a/cmd/dmarc-report-converter/imap.go b/cmd/dmarc-report-converter/imap.go
@@ -18,31 +18,31 @@ func fetchIMAPAttachments(cfg *config) error {
 
 	// connect to server
 	var c *client.Client
-        var err error
-        if cfg.Input.IMAP.Security == "plaintext" {
+	var err error
+	if cfg.Input.IMAP.Security == "plaintext" {
 		log.Printf("[WARN] Without encryption your credentials may be stolen. Be careful!")
-                c, err = client.Dial(cfg.Input.IMAP.Server)
-        } else if cfg.Input.IMAP.Security == "starttls" {
-                // go-imap v2 will replace all the following lines with
-                // c, err = client.DialStartTLS(cfg.Input.IMAP.Server, nil)
+		c, err = client.Dial(cfg.Input.IMAP.Server)
+	} else if cfg.Input.IMAP.Security == "starttls" {
+		// go-imap v2 will replace all the following lines with
+		// c, err = client.DialStartTLS(cfg.Input.IMAP.Server, nil)
 		// and there will be no need to import "errors"
-                c, err = client.Dial(cfg.Input.IMAP.Server)
-                if err == nil {
-                        sstRet, sstErr := c.SupportStartTLS();
-                        if sstErr != nil {
-                                err = sstErr
-                        } else if !sstRet {
-                                err = errors.New("server doesn't support starttls")
-                        } else {
-                                err = c.StartTLS(nil);
-                        }
-                }
-                if err != nil {
-                        c.Logout()
-                }
-        } else {
-                c, err = client.DialTLS(cfg.Input.IMAP.Server, nil)
-        }
+		c, err = client.Dial(cfg.Input.IMAP.Server)
+		if err == nil {
+			sstRet, sstErr := c.SupportStartTLS()
+			if sstErr != nil {
+				err = sstErr
+			} else if !sstRet {
+				err = errors.New("server doesn't support starttls")
+			} else {
+				err = c.StartTLS(nil)
+			}
+		}
+		if err != nil {
+			c.Logout()
+		}
+	} else {
+		c, err = client.DialTLS(cfg.Input.IMAP.Server, nil)
+	}
 	if err != nil {
 		return err
 	}