From fb3826cee5a4c23cc1135523e267fc3801e8533a Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 16 May 2019 16:40:29 -0400
Subject: Revert "Abort if accounts.conf is world readable"

This reverts commit a755608ef9d5893b68dc4c774bbda06503481552.
---
 aerc.go          |  8 +++-----
 config/config.go | 26 +-------------------------
 2 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/aerc.go b/aerc.go
index 3566895..f3607bb 100644
--- a/aerc.go
+++ b/aerc.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"io"
 	"io/ioutil"
 	"log"
@@ -10,12 +9,12 @@ import (
 
 	"github.com/mattn/go-isatty"
 
+	"git.sr.ht/~sircmpwn/aerc2/config"
 	"git.sr.ht/~sircmpwn/aerc2/commands"
 	"git.sr.ht/~sircmpwn/aerc2/commands/account"
 	"git.sr.ht/~sircmpwn/aerc2/commands/compose"
 	"git.sr.ht/~sircmpwn/aerc2/commands/msgview"
 	"git.sr.ht/~sircmpwn/aerc2/commands/terminal"
-	"git.sr.ht/~sircmpwn/aerc2/config"
 	libui "git.sr.ht/~sircmpwn/aerc2/lib/ui"
 	"git.sr.ht/~sircmpwn/aerc2/widgets"
 )
@@ -62,8 +61,7 @@ func main() {
 
 	conf, err := config.LoadConfig(nil)
 	if err != nil {
-		fmt.Printf("Failed to load config: %v\n", err)
-		os.Exit(1)
+		panic(err)
 	}
 
 	var (
@@ -75,7 +73,7 @@ func main() {
 		for i, set := range cmds {
 			err := set.ExecuteCommand(aerc, cmd)
 			if _, ok := err.(commands.NoSuchCommand); ok {
-				if i == len(cmds)-1 {
+				if i == len(cmds) - 1 {
 					return err
 				} else {
 					continue
diff --git a/config/config.go b/config/config.go
index 33623d5..736acbf 100644
--- a/config/config.go
+++ b/config/config.go
@@ -3,7 +3,6 @@ package config
 import (
 	"errors"
 	"fmt"
-	"os"
 	"path"
 	"regexp"
 	"strings"
@@ -143,11 +142,7 @@ func LoadConfig(root *string) (*AercConfig, error) {
 		_root := path.Join(xdg.ConfigHome(), "aerc")
 		root = &_root
 	}
-	filename := path.Join(*root, "aerc.conf")
-	if err := checkConfigPerms(filename); err != nil {
-		return nil, err
-	}
-	file, err := ini.Load(filename)
+	file, err := ini.Load(path.Join(*root, "aerc.conf"))
 	if err != nil {
 		return nil, err
 	}
@@ -294,22 +289,3 @@ func LoadConfig(root *string) (*AercConfig, error) {
 	config.Bindings.Global.Globals = false
 	return config, nil
 }
-
-// checkConfigPerms checks for too open permissions
-// printing the fix on stdout and returning an error
-func checkConfigPerms(filename string) error {
-	info, err := os.Stat(filename)
-	if err != nil {
-		return err
-	}
-	perms := info.Mode().Perm()
-	goPerms := perms >> 3
-	// group or others have read access
-	if goPerms&0x44 != 0 {
-		fmt.Printf("The file %v has too open permissions.\n", filename)
-		fmt.Println("This is a security issue (it contains passwords).")
-		fmt.Printf("To fix it, run `chmod 600 %v`\n", filename)
-		return errors.New("account.conf permissions too lax")
-	}
-	return nil
-}
-- 
cgit v1.2.3