Merge pull request #41 from mkontani/configurable-host

add tlshost option
theparanoids · Jun 24, 2020 · 659eb6a · 659eb6a
2 parents 4842fed + f52c5f3
commit 659eb6a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/config/config.go b/config/config.go
@@ -18,6 +18,7 @@ const (
 	defaultTLSServerCertPath = "/opt/crypki/server.crt"
 	defaultTLSCACertPath     = "/opt/crypki/ca.crt"
 	defaultTLSServerKeyPath  = "/opt/crypki/server.key"
+	defaultTLSHost           = ""
 	defaultTLSPort           = "4443"
 	defaultPoolSize          = 2
 	defaultKeyType           = crypki.RSA
@@ -87,6 +88,7 @@ type Config struct {
 	TLSServerCertPath string
 	TLSServerKeyPath  string
 	TLSCACertPath     string
+	TLSHost           string
 	TLSPort           string
 	SignersPerPool    int
 	Keys              []KeyConfig
@@ -179,6 +181,9 @@ func (c *Config) loadDefaults() {
 	if c.SignersPerPool == 0 {
 		c.SignersPerPool = defaultPoolSize
 	}
+	if strings.TrimSpace(c.TLSHost) == "" {
+		c.TLSHost = defaultTLSHost
+	}
 	if strings.TrimSpace(c.TLSPort) == "" {
 		c.TLSPort = defaultTLSPort
 	}

diff --git a/config/config_test.go b/config/config_test.go
@@ -16,6 +16,7 @@ func TestParse(t *testing.T) {
 		TLSClientAuthMode: 4,
 		TLSServerCertPath: "/opt/crypki/server.crt",
 		TLSServerKeyPath:  "/opt/crypki/server.key",
+		TLSHost:           "",
 		TLSPort:           "4443",
 		SignersPerPool:    2,
 		Keys: []KeyConfig{

diff --git a/server/server.go b/server/server.go
@@ -182,7 +182,7 @@ func Main(keyP crypki.KeyIDProcessor) {
 
 	proto.RegisterSigningServer(grpcServer, ss)
 
-	server := initHTTPServer(ctx, tlsConfig, grpcServer, gwmux, net.JoinHostPort("", cfg.TLSPort))
+	server := initHTTPServer(ctx, tlsConfig, grpcServer, gwmux, net.JoinHostPort(cfg.TLSHost, cfg.TLSPort))
 
 	listener, err := net.Listen("tcp", server.Addr)
 	if err != nil {