Guard against expiring tokens due to wrong database (#13693)

evcc-io · May 4, 2024 · f4f7a90 · f4f7a90
1 parent eeb42c4
commit f4f7a90
Show file tree

Hide file tree

Showing 17 changed files with 54 additions and 19 deletions.
diff --git a/cmd/charger.go b/cmd/charger.go
@@ -31,7 +31,7 @@ func init() {
 
 func runCharger(cmd *cobra.Command, args []string) {
 	// load config
-	if err := loadConfigFile(&conf); err != nil {
+	if err := loadConfigFile(&conf, !cmd.Flag(flagIgnoreDatabase).Changed); err != nil {
 		log.FATAL.Fatal(err)
 	}
 

diff --git a/cmd/charger_ramp.go b/cmd/charger_ramp.go
@@ -66,7 +66,7 @@ func ramp(c api.Charger, digits int, delay time.Duration) {
 
 func runChargerRamp(cmd *cobra.Command, args []string) {
 	// load config
-	if err := loadConfigFile(&conf); err != nil {
+	if err := loadConfigFile(&conf, !cmd.Flag(flagIgnoreDatabase).Changed); err != nil {
 		log.FATAL.Fatal(err)
 	}
 

diff --git a/cmd/check_config.go b/cmd/check_config.go
@@ -19,7 +19,7 @@ func init() {
 }
 
 func runConfigCheck(cmd *cobra.Command, args []string) {
-	err := loadConfigFile(&conf)
+	err := loadConfigFile(&conf, !cmd.Flag(flagIgnoreDatabase).Changed)
 
 	if err != nil {
 		log.FATAL.Println("config invalid:", err)

diff --git a/cmd/device.go b/cmd/device.go
@@ -24,7 +24,7 @@ func init() {
 
 func runDevice(cmd *cobra.Command, args []string) {
 	// load config
-	if err := loadConfigFile(&conf); err != nil {
+	if err := loadConfigFile(&conf, !cmd.Flag(flagIgnoreDatabase).Changed); err != nil {
 		log.FATAL.Fatal(err)
 	}
 

diff --git a/cmd/discuss.go b/cmd/discuss.go
@@ -35,7 +35,7 @@ func errorString(err error) string {
 }
 
 func runDiscuss(cmd *cobra.Command, args []string) {
-	cfgErr := loadConfigFile(&conf)
+	cfgErr := loadConfigFile(&conf, !cmd.Flag(flagIgnoreDatabase).Changed)
 
 	file, pathErr := filepath.Abs(cfgFile)
 	if pathErr != nil {

diff --git a/cmd/dump.go b/cmd/dump.go
@@ -45,7 +45,7 @@ func handle[T any](name string, h config.Handler[T]) config.Device[T] {
 
 func runDump(cmd *cobra.Command, args []string) {
 	// load config
-	err := loadConfigFile(&conf)
+	err := loadConfigFile(&conf, !cmd.Flag(flagIgnoreDatabase).Changed)
 
 	// setup environment
 	if err == nil {

diff --git a/cmd/flags.go b/cmd/flags.go
@@ -9,6 +9,9 @@ const (
 	flagHeaders            = "log-headers"
 	flagHeadersDescription = "Log headers"
 
+	flagIgnoreDatabase            = "ignore-db"
+	flagIgnoreDatabaseDescription = "Run command ignoring service database"
+
 	flagBatteryMode                = "battery-mode"
 	flagBatteryModeDescription     = "Set battery mode (normal, hold, charge)"
 	flagBatteryModeWait            = "battery-mode-wait"

diff --git a/cmd/meter.go b/cmd/meter.go
@@ -25,7 +25,7 @@ func init() {
 
 func runMeter(cmd *cobra.Command, args []string) {
 	// load config
-	if err := loadConfigFile(&conf); err != nil {
+	if err := loadConfigFile(&conf, !cmd.Flag(flagIgnoreDatabase).Changed); err != nil {
 		log.FATAL.Fatal(err)
 	}
 

diff --git a/cmd/password_reset.go b/cmd/password_reset.go
@@ -19,7 +19,7 @@ func init() {
 
 func runPasswordReset(cmd *cobra.Command, args []string) {
 	// load config
-	if err := loadConfigFile(&conf); err != nil {
+	if err := loadConfigFile(&conf, !cmd.Flag(flagIgnoreDatabase).Changed); err != nil {
 		log.FATAL.Fatal(err)
 	}
 

diff --git a/cmd/password_set.go b/cmd/password_set.go
@@ -19,7 +19,7 @@ func init() {
 
 func runPasswordSet(cmd *cobra.Command, args []string) {
 	// load config
-	if err := loadConfigFile(&conf); err != nil {
+	if err := loadConfigFile(&conf, !cmd.Flag(flagIgnoreDatabase).Changed); err != nil {
 		log.FATAL.Fatal(err)
 	}
 

diff --git a/cmd/root.go b/cmd/root.go
@@ -29,7 +29,10 @@ import (
 	"github.com/spf13/viper"
 )
 
-const rebootDelay = 5 * time.Minute // delayed reboot on error
+const (
+	rebootDelay = 5 * time.Minute // delayed reboot on error
+	serviceDB   = "/var/lib/evcc/evcc.db"
+)
 
 var (
 	log     = util.NewLogger("main")
@@ -53,10 +56,9 @@ func init() {
 
 	// global options
 	rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "", "Config file (default \"~/evcc.yaml\" or \"/etc/evcc.yaml\")")
-
 	rootCmd.PersistentFlags().BoolP("help", "h", false, "Help")
-
 	rootCmd.PersistentFlags().Bool(flagHeaders, false, flagHeadersDescription)
+	rootCmd.PersistentFlags().Bool(flagIgnoreDatabase, false, flagIgnoreDatabaseDescription)
 
 	// config file options
 	rootCmd.PersistentFlags().StringP("log", "l", "info", "Log level (fatal, error, warn, info, debug, trace)")
@@ -107,7 +109,7 @@ func Execute() {
 func runRoot(cmd *cobra.Command, args []string) {
 	// load config and re-configure logging after reading config file
 	var err error
-	if cfgErr := loadConfigFile(&conf); errors.As(cfgErr, &viper.ConfigFileNotFoundError{}) {
+	if cfgErr := loadConfigFile(&conf, !cmd.Flag(flagIgnoreDatabase).Changed); errors.As(cfgErr, &viper.ConfigFileNotFoundError{}) {
 		log.INFO.Println("missing config file - switching into demo mode")
 		if err := demoConfig(&conf); err != nil {
 			log.FATAL.Fatal(err)

diff --git a/cmd/settings-get.go b/cmd/settings-get.go
@@ -24,7 +24,7 @@ func init() {
 
 func runSettingsGet(cmd *cobra.Command, args []string) {
 	// load config
-	if err := loadConfigFile(&conf); err != nil {
+	if err := loadConfigFile(&conf, !cmd.Flag(flagIgnoreDatabase).Changed); err != nil {
 		log.FATAL.Fatal(err)
 	}
 

diff --git a/cmd/settings-set.go b/cmd/settings-set.go
@@ -23,7 +23,7 @@ func init() {
 
 func runSettingsSet(cmd *cobra.Command, args []string) {
 	// load config
-	if err := loadConfigFile(&conf); err != nil {
+	if err := loadConfigFile(&conf, !cmd.Flag(flagIgnoreDatabase).Changed); err != nil {
 		log.FATAL.Fatal(err)
 	}
 

diff --git a/cmd/setup.go b/cmd/setup.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"net"
 	"net/http"
+	"os"
 	"regexp"
 	"slices"
 	"strconv"
@@ -162,7 +163,23 @@ func nameValid(name string) error {
 	return nil
 }
 
-func loadConfigFile(conf *globalConfig) error {
+func tokenDanger(conf []config.Named) bool {
+	problematic := []string{"tesla", "psa", "opel", "citroen", "ds", "peugeot"}
+
+	for _, cc := range conf {
+		if slices.Contains(problematic, cc.Type) {
+			return true
+		}
+		template, ok := cc.Other["template"].(string)
+		if ok && cc.Type == "template" && slices.Contains(problematic, template) {
+			return true
+		}
+	}
+
+	return false
+}
+
+func loadConfigFile(conf *globalConfig, checkDB bool) error {
 	err := viper.ReadInConfig()
 
 	if cfgFile = viper.ConfigFileUsed(); cfgFile == "" {
@@ -177,6 +194,19 @@ func loadConfigFile(conf *globalConfig) error {
 		}
 	}
 
+	// check service database
+	if _, err := os.Stat(serviceDB); err == nil && checkDB && conf.Database.Dsn != serviceDB && tokenDanger(conf.Vehicles) {
+		log.FATAL.Fatal(`
+
+Found systemd service database at "` + serviceDB + `", evcc has been invoked with database "` + conf.Database.Dsn + `".
+Running evcc with vehicles configured in evcc.yaml may lead to expiring the yaml configuration's vehicle tokens.
+This is due to the fact, that the token refresh will be saved to the local instead of the service's database.
+If you have vehicles with touchy tokens like PSA or Tesla, make sure to remove vehicle configuration from the yaml file.
+
+If you know what you're doing, you can run evcc ignoring the service database with the --ignore-db flag.
+`)
+	}
+
 	// parse log levels after reading config
 	if err == nil {
 		parseLogLevels()

diff --git a/cmd/tariff.go b/cmd/tariff.go
@@ -24,7 +24,7 @@ func init() {
 
 func runTariff(cmd *cobra.Command, args []string) {
 	// load config
-	if err := loadConfigFile(&conf); err != nil {
+	if err := loadConfigFile(&conf, !cmd.Flag(flagIgnoreDatabase).Changed); err != nil {
 		fatal(err)
 	}
 

diff --git a/cmd/token.go b/cmd/token.go
@@ -24,7 +24,7 @@ func init() {
 
 func runToken(cmd *cobra.Command, args []string) {
 	// load config
-	if err := loadConfigFile(&conf); err != nil {
+	if err := loadConfigFile(&conf, !cmd.Flag(flagIgnoreDatabase).Changed); err != nil {
 		log.FATAL.Fatal(err)
 	}
 

diff --git a/cmd/vehicle.go b/cmd/vehicle.go
@@ -28,7 +28,7 @@ func init() {
 
 func runVehicle(cmd *cobra.Command, args []string) {
 	// load config
-	if err := loadConfigFile(&conf); err != nil {
+	if err := loadConfigFile(&conf, !cmd.Flag(flagIgnoreDatabase).Changed); err != nil {
 		fatal(err)
 	}