Skip to content
Snippets Groups Projects
Verified Commit 2da6bfab authored by Malte Bauch's avatar Malte Bauch
Browse files

small fixes for tls

parent 2708076c
No related branches found
No related tags found
No related merge requests found
Pipeline #223423 failed
This commit is part of merge request !206. Comments created here will be created in the context of that merge request.
...@@ -70,9 +70,13 @@ func main() { ...@@ -70,9 +70,13 @@ func main() {
} }
server.TLSConfig = tlsConfig server.TLSConfig = tlsConfig
logrus.Fatal(server.ListenAndServeTLS("", ""))
} else {
logrus.Fatal(server.ListenAndServe())
} }
logrus.Fatal(server.ListenAndServe())
} }
func getLogFile(w http.ResponseWriter, r *http.Request) { func getLogFile(w http.ResponseWriter, r *http.Request) {
......
...@@ -15,7 +15,8 @@ import ( ...@@ -15,7 +15,8 @@ import (
) )
type AKMSReceiverServer struct { type AKMSReceiverServer struct {
server *http.Server server *http.Server
tlsConfig config.TLSConfig
} }
func NewAKMSReceiver(port string, eventBus *event.EventBus, receiver *receiver.Receiver, generateAndSend func(string, uuid.UUID, string, int) error, tlsConfig config.TLSConfig) (*AKMSReceiverServer, error) { func NewAKMSReceiver(port string, eventBus *event.EventBus, receiver *receiver.Receiver, generateAndSend func(string, uuid.UUID, string, int) error, tlsConfig config.TLSConfig) (*AKMSReceiverServer, error) {
...@@ -37,14 +38,21 @@ func NewAKMSReceiver(port string, eventBus *event.EventBus, receiver *receiver.R ...@@ -37,14 +38,21 @@ func NewAKMSReceiver(port string, eventBus *event.EventBus, receiver *receiver.R
} }
AKMSReceiver := &AKMSReceiverServer{ AKMSReceiver := &AKMSReceiverServer{
server: server, server: server,
tlsConfig: tlsConfig,
} }
return AKMSReceiver, nil return AKMSReceiver, nil
} }
func (akmsReceiver *AKMSReceiverServer) Serve() { func (akmsReceiver *AKMSReceiverServer) Serve() {
go akmsReceiver.server.ListenAndServe() //nolint:errcheck
if akmsReceiver.tlsConfig.Active {
go akmsReceiver.server.ListenAndServeTLS("", "") //nolint:errcheck
} else {
go akmsReceiver.server.ListenAndServe() //nolint:errcheck
}
} }
type KeyProperties struct { type KeyProperties struct {
......
...@@ -13,4 +13,7 @@ keyUsage = keyEncipherment, dataEncipherment ...@@ -13,4 +13,7 @@ keyUsage = keyEncipherment, dataEncipherment
extendedKeyUsage = serverAuth, clientAuth extendedKeyUsage = serverAuth, clientAuth
subjectAltName = @alt_names subjectAltName = @alt_names
[alt_names] [alt_names]
IP.1 = 127.0.0.1
DNS.1 = kms01 DNS.1 = kms01
DNS.2 = akms-simulator_1
DNS.3 = akms-simulator_2
...@@ -13,4 +13,7 @@ keyUsage = keyEncipherment, dataEncipherment ...@@ -13,4 +13,7 @@ keyUsage = keyEncipherment, dataEncipherment
extendedKeyUsage = serverAuth, clientAuth extendedKeyUsage = serverAuth, clientAuth
subjectAltName = @alt_names subjectAltName = @alt_names
[alt_names] [alt_names]
IP.1 = 127.0.0.1
DNS.1 = kms02 DNS.1 = kms02
DNS.2 = akms-simulator_1
DNS.3 = akms-simulator_2
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment