Compare commits

..

No commits in common. "0273cee2ba34c23584c05275bc202232178dd393" and "d5e2df49db91aefa9a0dd14a621c8436f9d6de60" have entirely different histories.

2 changed files with 5 additions and 5 deletions

View file

@ -61,8 +61,8 @@ func init() {
rootCmd.PersistentFlags().Duration("mfaDelay", time.Second*10, "Delay between MFA Attempts, only used in noninteractive modes") rootCmd.PersistentFlags().Duration("mfaDelay", time.Second*10, "Delay between MFA Attempts, only used in noninteractive modes")
rootCmd.PersistentFlags().Bool("tlsSkipVerify", false, "Allow servers with self-signed certificates") rootCmd.PersistentFlags().Bool("tlsSkipVerify", false, "Allow servers with self-signed certificates")
rootCmd.PersistentFlags().String("tlsClientPrivateKeyFile", "", "Client private key for mtls") rootCmd.PersistentFlags().String("tlsClientPrivateKey", "", "Client private key for mtls")
rootCmd.PersistentFlags().String("tlsClientCertFile", "", "Client certificate for mtls") rootCmd.PersistentFlags().String("tlsClientCert", "", "Client certificate for mtls")
viper.BindPFlag("debug", rootCmd.PersistentFlags().Lookup("debug")) viper.BindPFlag("debug", rootCmd.PersistentFlags().Lookup("debug"))
viper.BindPFlag("timeout", rootCmd.PersistentFlags().Lookup("timeout")) viper.BindPFlag("timeout", rootCmd.PersistentFlags().Lookup("timeout"))

View file

@ -17,12 +17,12 @@ func GetClientCertificate() (tls.Certificate, error) {
return tls.Certificate{}, nil return tls.Certificate{}, nil
} }
if certExists && !keyExists { if certExists && !keyExists {
return tls.Certificate{}, fmt.Errorf("Client TLS private key is empty, but client TLS cert was set.") return tls.Certificate{}, fmt.Errorf("Client TLS private key is empty, but client TLS cert was sent.")
} }
if !certExists && keyExists { if !certExists && keyExists {
return tls.Certificate{}, fmt.Errorf("Client TLS cert is empty, but client TLS private key was set.") return tls.Certificate{}, fmt.Errorf("Client TLS cert is empty, but client TLS private key was sent.")
} }
return tls.LoadX509KeyPair(cert, key) return tls.LoadX509KeyPair("client.cert", "client-key.pem")
} }
func GetHttpClient() (*http.Client, error) { func GetHttpClient() (*http.Client, error) {