ipc: disable IPC completely when disable-ipc=true

Truly disable IPC when disable-ipc is set to true in aerc.conf. Don't
run commands over IPC and don't start an IPC server.

Being able to disable IPC in the config is useful because it allows
making aerc open mailto links in a new instance without modifying the
aerc.desktop file. There are of course potential security benefits as
well.

Changelog-changed: The `disable-ipc` option in `aerc.conf` completely
 disables IPC.
Signed-off-by: Jason Cox <me@jasoncarloscox.com>
Acked-by: Robin Jarry <robin@jarry.cc>

1 files changed, 11 insertions, 9 deletions

diff --git a/main.go b/main.go
index 9558382b..b7437fbd 100644
--- a/main.go
+++ b/main.go
@@ -162,7 +162,16 @@ func main() {
 		die("%s", err)
 	}
 
-	if len(opts.Command) > 0 && !opts.NoIPC {
+	err = config.LoadConfigFromFile(
+		nil, opts.Accounts, opts.ConfAerc, opts.ConfBinds, opts.ConfAccounts,
+	)
+	if err != nil {
+		die("%s", err)
+	}
+
+	noIPC := opts.NoIPC || config.General.DisableIPC
+
+	if len(opts.Command) > 0 && !noIPC {
 		response, err := ipc.ConnectAndExec(opts.Command)
 		if err == nil {
 			if response.Error != "" {
@@ -173,13 +182,6 @@ func main() {
 		// continue with setting up a new aerc instance and retry after init
 	}
 
-	err = config.LoadConfigFromFile(
-		nil, opts.Accounts, opts.ConfAerc, opts.ConfBinds, opts.ConfAccounts,
-	)
-	if err != nil {
-		die("%s", err)
-	}
-
 	log.Infof("Starting up version %s", log.BuildInfo)
 
 	deferLoop := make(chan struct{})
@@ -205,7 +207,7 @@ func main() {
 
 	startup, startupDone := context.WithCancel(context.Background())
 
-	if !opts.NoIPC {
+	if !noIPC {
 		as, err := ipc.StartServer(app.IPCHandler(), startup)
 		if err != nil {
 			log.Warnf("Failed to start Unix server: %v", err)