add MFA support, update deps

Author: speatzle

cmd/root.go

@@ -41,12 +41,22 @@ func init() {
 	rootCmd.PersistentFlags().String("serverAddress", "", "Passbolt Server Address (https://passbolt.example.com)")
 	rootCmd.PersistentFlags().String("userPrivateKey", "", "Passbolt User Private Key")
 	rootCmd.PersistentFlags().String("userPassword", "", "Passbolt User Password")
+	rootCmd.PersistentFlags().String("mfaMode", "interactive-totp", "How to Handle MFA, the following Modes exist: none, interactive-totp and noninteractive-totp")
+	rootCmd.PersistentFlags().String("totpToken", "", "Token to generate TOTP's, only used in nointeractive-totp mode")
+	rootCmd.PersistentFlags().Duration("totpOffset", time.Duration(0), "TOTP Generation offset only used in noninteractive-totp mode")
+	rootCmd.PersistentFlags().Uint("mfaRetrys", 3, "How often to retry TOTP Auth, only used in nointeractive modes")
+	rootCmd.PersistentFlags().Duration("mfaDelay", time.Second*10, "Delay between MFA Attempts, only used in noninteractive modes")
 
 	viper.BindPFlag("debug", rootCmd.PersistentFlags().Lookup("debug"))
 	viper.BindPFlag("timeout", rootCmd.PersistentFlags().Lookup("timeout"))
 	viper.BindPFlag("serverAddress", rootCmd.PersistentFlags().Lookup("serverAddress"))
 	viper.BindPFlag("userPrivateKey", rootCmd.PersistentFlags().Lookup("userPrivateKey"))
 	viper.BindPFlag("userPassword", rootCmd.PersistentFlags().Lookup("userPassword"))
+	viper.BindPFlag("mfaMode", rootCmd.PersistentFlags().Lookup("mfaMode"))
+	viper.BindPFlag("totpToken", rootCmd.PersistentFlags().Lookup("totpToken"))
+	viper.BindPFlag("totpOffset", rootCmd.PersistentFlags().Lookup("totpOffset"))
+	viper.BindPFlag("mfaRetrys", rootCmd.PersistentFlags().Lookup("mfaRetrys"))
+	viper.BindPFlag("mfaDelay", rootCmd.PersistentFlags().Lookup("mfaDelay"))
 }
 
 // initConfig reads in config file and ENV variables if set.

go.mod

@@ -3,14 +3,13 @@ module github.com/speatzle/go-passbolt-cli
 go 1.16
 
 require (
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
-	github.com/pelletier/go-toml v1.9.4 // indirect
-	github.com/pterm/pterm v0.12.30
-	github.com/speatzle/go-passbolt v0.4.0
-	github.com/spf13/cast v1.4.1 // indirect
+	github.com/ProtonMail/gopenpgp/v2 v2.2.3 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
+	github.com/pterm/pterm v0.12.31
+	github.com/speatzle/go-passbolt v0.5.0
 	github.com/spf13/cobra v1.2.1
-	github.com/spf13/viper v1.8.1
-	golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34 // indirect
-	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
-	gopkg.in/ini.v1 v1.63.0 // indirect
+	github.com/spf13/viper v1.9.0
+	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
+	golang.org/x/sys v0.0.0-20210921065528-437939a70204 // indirect
+	golang.org/x/term v0.0.0-20210916214954-140adaaadfaf
 )