Skip to content

Make TLSConfig constructor public #1661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hooten wants to merge 1 commit into from
Closed

Make TLSConfig constructor public #1661

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions https/tls_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ type TLSStruct struct {
ClientCAs string `yaml:"clientCAs"`
}

func getTLSConfig(configPath string) (*tls.Config, error) {
// GetTLSConfig unmarshals TLS configuration at the given configPath and returns a *tls.Config.
func GetTLSConfig(configPath string) (*tls.Config, error) {
content, err := ioutil.ReadFile(configPath)
if err != nil {
return nil, err
Expand Down Expand Up @@ -110,14 +111,14 @@ func Listen(server *http.Server, tlsConfigPath string) error {
return server.ListenAndServe()
}
var err error
server.TLSConfig, err = getTLSConfig(tlsConfigPath)
server.TLSConfig, err = GetTLSConfig(tlsConfigPath)
if err != nil {
return err
}
// Set the GetConfigForClient method of the HTTPS server so that the config
// and certs are reloaded on new connections.
server.TLSConfig.GetConfigForClient = func(*tls.ClientHelloInfo) (*tls.Config, error) {
return getTLSConfig(tlsConfigPath)
return GetTLSConfig(tlsConfigPath)
}
return server.ListenAndServeTLS("", "")
}