mirror of
https://git.sr.ht/~rjarry/aerc
synced 2025-02-22 23:23:57 +01:00
163ea3ec7d
Support terminal-based pinentry programs. Suspend vaxis before running the command that can trigger a pinentry call. Provide the proper tty in the GPG_TTY environment variable (and set a TERM variable if not provided; this is necessary for pinentry-curses). Finally, resume vaxis. To enable terminal-based pinentry support, you have to set [general] use-terminal-pinentry = true in your aerc.conf. Any GUI-based pinentry programs will work the same as before if this option is not set to true. To test pinentry-tty, add the following to your ~/.gnupg/gpg-agent.conf: pinentry-program /usr/bin/pinentry-tty and kill all running gpg-agents: $ killall gpg-agent Fixes: https://todo.sr.ht/~rjarry/aerc/202 Changelog-fixed: Terminal-based pinentry programs (e.g. `pinentry-curses`) now work properly. Signed-off-by: Koni Marti <koni.marti@gmail.com> Acked-by: Robin Jarry <robin@jarry.cc>
79 lines
2.3 KiB
Go
79 lines
2.3 KiB
Go
package config
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
|
|
"git.sr.ht/~rjarry/aerc/lib/log"
|
|
"git.sr.ht/~rjarry/aerc/lib/xdg"
|
|
"github.com/go-ini/ini"
|
|
"github.com/mattn/go-isatty"
|
|
)
|
|
|
|
type GeneralConfig struct {
|
|
DefaultSavePath string `ini:"default-save-path"`
|
|
PgpProvider string `ini:"pgp-provider" default:"auto" parse:"ParsePgpProvider"`
|
|
UnsafeAccountsConf bool `ini:"unsafe-accounts-conf"`
|
|
LogFile string `ini:"log-file"`
|
|
LogLevel log.LogLevel `ini:"log-level" default:"info" parse:"ParseLogLevel"`
|
|
DisableIPC bool `ini:"disable-ipc"`
|
|
DisableIPCMailto bool `ini:"disable-ipc-mailto"`
|
|
DisableIPCMbox bool `ini:"disable-ipc-mbox"`
|
|
EnableOSC8 bool `ini:"enable-osc8" default:"false"`
|
|
Term string `ini:"term" default:"xterm-256color"`
|
|
DefaultMenuCmd string `ini:"default-menu-cmd"`
|
|
QuakeMode bool `ini:"enable-quake-mode" default:"false"`
|
|
UsePinentry bool `ini:"use-terminal-pinentry" default:"false"`
|
|
}
|
|
|
|
var General = new(GeneralConfig)
|
|
|
|
func parseGeneral(file *ini.File) error {
|
|
var logFile *os.File
|
|
|
|
if err := MapToStruct(file.Section("general"), General, true); err != nil {
|
|
return err
|
|
}
|
|
|
|
useStdout := false
|
|
if !isatty.IsTerminal(os.Stdout.Fd()) {
|
|
logFile = os.Stdout
|
|
useStdout = true
|
|
// redirected to file, force TRACE level
|
|
General.LogLevel = log.TRACE
|
|
} else if General.LogFile != "" {
|
|
var err error
|
|
path := xdg.ExpandHome(General.LogFile)
|
|
err = os.MkdirAll(filepath.Dir(path), 0o700)
|
|
if err != nil {
|
|
return fmt.Errorf("log-file: %w", err)
|
|
}
|
|
logFile, err = os.OpenFile(path,
|
|
os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0o600)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
err := log.Init(logFile, useStdout, General.LogLevel)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
log.Debugf("aerc.conf: [general] %#v", General)
|
|
|
|
return nil
|
|
}
|
|
|
|
func (gen *GeneralConfig) ParseLogLevel(sec *ini.Section, key *ini.Key) (log.LogLevel, error) {
|
|
return log.ParseLevel(key.String())
|
|
}
|
|
|
|
func (gen *GeneralConfig) ParsePgpProvider(sec *ini.Section, key *ini.Key) (string, error) {
|
|
switch key.String() {
|
|
case "gpg", "internal", "auto":
|
|
return key.String(), nil
|
|
}
|
|
return "", fmt.Errorf("must be either auto, gpg or internal")
|
|
}
|