makeTLSConfig() and better error message

hashicorp · Oct 20, 2021 · 05aeaaf · 05aeaaf
1 parent 7b094b7
commit 05aeaaf
Showing 1 changed file with 29 additions and 18 deletions.
diff --git a/subcommand/injector/command.go b/subcommand/injector/command.go
@@ -211,28 +211,16 @@ func (c *Command) Run(args []string) int {
 	}
 
 	var handler http.Handler = mux
-	minTLSVersion, ok := tlsutil.TLSLookup[c.flagTLSMinVersion]
-	if !ok {
-		c.UI.Error(fmt.Sprintf("Failed to parse minimum TLS version %q", c.flagTLSMinVersion))
-		return 1
-	}
-	ciphers, err := tlsutil.ParseCiphers(c.flagTLSCipherSuites)
+	tlsConfig, err := c.makeTLSConfig()
 	if err != nil {
-		c.UI.Error(fmt.Sprintf("Failed to parse TLS cipher suites list %q: %s", c.flagTLSCipherSuites, err))
+		c.UI.Error(fmt.Sprintf("Failed to configure TLS: %s", err))
 		return 1
 	}
 	server := &http.Server{
-		Addr:    c.flagListen,
-		Handler: handler,
-		TLSConfig: &tls.Config{
-			GetCertificate:           c.getCertificate,
-			MinVersion:               minTLSVersion,
-			PreferServerCipherSuites: c.flagTLSPreferServerCipherSuites,
-		},
-		ErrorLog: logger.StandardLogger(&hclog.StandardLoggerOptions{ForceLevel: hclog.Error}),
-	}
-	if len(ciphers) > 0 {
-		server.TLSConfig.CipherSuites = ciphers
+		Addr:      c.flagListen,
+		Handler:   handler,
+		TLSConfig: tlsConfig,
+		ErrorLog:  logger.StandardLogger(&hclog.StandardLoggerOptions{ForceLevel: hclog.Error}),
 	}
 
 	trap := make(chan os.Signal, 1)
@@ -287,6 +275,29 @@ func (c *Command) handleReady(rw http.ResponseWriter, req *http.Request) {
 	rw.WriteHeader(204)
 }
 
+func (c *Command) makeTLSConfig() (*tls.Config, error) {
+	minTLSVersion, ok := tlsutil.TLSLookup[c.flagTLSMinVersion]
+	if !ok {
+		return nil, fmt.Errorf("invalid or unsupported TLS version %q", c.flagTLSMinVersion)
+	}
+
+	ciphers, err := tlsutil.ParseCiphers(c.flagTLSCipherSuites)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse TLS cipher suites list %q: %s", c.flagTLSCipherSuites, err)
+	}
+
+	tlsConfig := &tls.Config{
+		GetCertificate:           c.getCertificate,
+		MinVersion:               minTLSVersion,
+		PreferServerCipherSuites: c.flagTLSPreferServerCipherSuites,
+	}
+	if len(ciphers) > 0 {
+		tlsConfig.CipherSuites = ciphers
+	}
+
+	return tlsConfig, nil
+}
+
 func (c *Command) getCertificate(*tls.ClientHelloInfo) (*tls.Certificate, error) {
 	certRaw := c.cert.Load()
 	if certRaw == nil {