Skip to content
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.

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

Add TLS options for http server #114

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ bin/
main
conf/freno.local.conf.json
.vendor/
server.crt
server.key
9 changes: 9 additions & 0 deletions conf/freno.conf.ssl.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"ListenPort": 8088,
"RaftBind": "127.0.0.1:10008",
"RaftDataDir": "/tmp",
"RaftNodes": [],
"UseSSL": true,
"SSLPrivateKeyFile": "server.key",
"SSLCertFile": "server.crt"
}
53 changes: 51 additions & 2 deletions go/cmd/freno/main.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package main

import (
"crypto/tls"
"flag"
"fmt"
gohttp "net/http"
Expand All @@ -9,6 +10,7 @@ import (
"github.com/github/freno/go/config"
"github.com/github/freno/go/group"
"github.com/github/freno/go/http"

"github.com/github/freno/go/throttle"
"github.com/outbrain/golib/log"
)
Expand Down Expand Up @@ -122,8 +124,55 @@ func httpServe() error {
api := http.NewAPIImpl(throttlerCheck, consensusServiceProvider.GetConsensusService())
router := http.ConfigureRoutes(api)
port := config.Settings().ListenPort
log.Infof("Starting server in port %d", port)
return gohttp.ListenAndServe(fmt.Sprintf(":%d", port), router)

if config.Settings().UseSSL {
log.Infof("Starting HTTPS server on port %d", port)

keyFile := config.Settings().SSLPrivateKeyFile
cert := config.Settings().SSLCertFile
log.Infof("Using SSLCertFile: %s", cert)
log.Infof("Using SSLPrivateKeyFile: %s", keyFile)

tlsConfig := NewTLSConfig(config.Settings())
srv := &gohttp.Server{
Addr: fmt.Sprintf(":%d", port),
Handler: router,
TLSConfig: tlsConfig,
TLSNextProto: make(map[string]func(*gohttp.Server, *tls.Conn, gohttp.Handler), 0),
}
if err = srv.ListenAndServeTLS(cert, keyFile); err != nil {
log.Fatale(err)
}
} else {
log.Infof("Starting HTTP server on port %d", port)
err := gohttp.ListenAndServe(fmt.Sprintf(":%d", port), router)
if err != nil {
log.Fatale(err)
}
}
return nil
}

// NewTLSConfig returns an initialized TLS configuration
func NewTLSConfig(conf *config.ConfigurationSettings) *tls.Config {
return &tls.Config{
MinVersion: tls.VersionTLS12,
CurvePreferences: []tls.CurveID{tls.CurveP521, tls.CurveP384, tls.CurveP256},
PreferServerCipherSuites: true,
CipherSuites: []uint16{
tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
tls.TLS_RSA_WITH_AES_128_CBC_SHA,
tls.TLS_RSA_WITH_AES_256_CBC_SHA,
},
InsecureSkipVerify: conf.SSLSkipVerify,
}
}

func printHelp() {
Expand Down
4 changes: 4 additions & 0 deletions go/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ type ConfigurationSettings struct {
MemcacheServers []string // if given, freno will report to aggregated values to given memcache
MemcachePath string // use as prefix to metric path in memcache key, e.g. if `MemcachePath` is "myprefix" the key would be "myprefix/mysql/maincluster". Default: "freno"
Stores StoresSettings
UseSSL bool
SSLCertFile string
SSLPrivateKeyFile string
SSLSkipVerify bool
}

func newConfigurationSettings() *ConfigurationSettings {
Expand Down