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

autocert support #898

Open
wants to merge 2 commits 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
4 changes: 4 additions & 0 deletions config-sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -210,3 +210,7 @@ keys:
# num_tracks: -1
# # defaults to 1 GB/s, or just under 10 Gbps
# bytes_per_sec: 1_000_000_000

# autocert:
# enabled: true
# cache_dir: /tmp/certs
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ require (
github.com/urfave/negroni v1.0.0
go.uber.org/atomic v1.9.0
go.uber.org/zap v1.22.0
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
google.golang.org/protobuf v1.28.1
gopkg.in/yaml.v3 v3.0.1
Expand Down Expand Up @@ -84,7 +85,6 @@ require (
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
go.uber.org/multierr v1.6.0 // indirect
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
golang.org/x/net v0.0.0-20220708220712-1185a9018129 // indirect
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
Expand Down
7 changes: 7 additions & 0 deletions pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ type Config struct {
KeyFile string `yaml:"key_file,omitempty"`
Keys map[string]string `yaml:"keys,omitempty"`
Region string `yaml:"region,omitempty"`
Autocert AutocertConfig `yaml:"autocert,omitempty"`
// LogLevel is deprecated
LogLevel string `yaml:"log_level,omitempty"`
Logging LoggingConfig `yaml:"logging,omitempty"`
Expand Down Expand Up @@ -374,3 +375,9 @@ func (conf *Config) unmarshalKeys(keys string) error {
}
return nil
}

type AutocertConfig struct {
Domain string `yaml:"domain,omitempty"`
Enabled bool `yaml:"enabled,omitempty"`
CacheDir string `yaml:"cache_dir,omitempty"`
}
41 changes: 38 additions & 3 deletions pkg/service/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package service

import (
"context"
"crypto/tls"
"encoding/json"
"errors"
"fmt"
Expand All @@ -16,6 +17,8 @@ import (
"github.com/rs/cors"
"github.com/urfave/negroni"
"go.uber.org/atomic"
"golang.org/x/crypto/acme"
"golang.org/x/crypto/acme/autocert"
"golang.org/x/sync/errgroup"

"github.com/livekit/livekit-server/pkg/config"
Expand Down Expand Up @@ -166,9 +169,18 @@ func (s *LivekitServer) Start() error {
listeners := make([]net.Listener, 0)
promListeners := make([]net.Listener, 0)
for _, addr := range addresses {
ln, err := net.Listen("tcp", fmt.Sprintf("%s:%d", addr, s.config.Port))
if err != nil {
return err
var ln net.Listener
var err error
if s.config.Autocert.Enabled && s.config.Autocert.Domain != "" {
ln, err = asTlsListener(s.config.Autocert.CacheDir, fmt.Sprintf("0.0.0.0:%d", s.config.Port), s.config.Autocert.Domain)
if err != nil {
return err
}
} else {
ln, err = net.Listen("tcp", fmt.Sprintf("%s:%d", addr, s.config.Port))
if err != nil {
return err
}
}
listeners = append(listeners, ln)

Expand Down Expand Up @@ -336,3 +348,26 @@ func configureMiddlewares(handler http.Handler, middlewares ...negroni.Handler)
n.UseHandler(handler)
return n
}

func asTlsListener(cache string, addr string, hosts ...string) (lnTls net.Listener, err error) {
m := &autocert.Manager{
Prompt: autocert.AcceptTOS,
HostPolicy: autocert.HostWhitelist(hosts...),
Cache: autocert.DirCache(cache),
}

cfg := &tls.Config{
GetCertificate: m.GetCertificate,
NextProtos: []string{
"http/1.1", acme.ALPNProto,
},
}

ln, err := net.Listen("tcp4", addr)
if err != nil {
return
}

lnTls = tls.NewListener(ln, cfg)
return
}
49 changes: 31 additions & 18 deletions pkg/service/turn.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,25 +61,38 @@ func NewTurnServer(conf *config.Config, authHandler turn.AuthHandler) (*turn.Ser
}

if !turnConf.ExternalTLS {
cert, err := tls.LoadX509KeyPair(turnConf.CertFile, turnConf.KeyFile)
if err != nil {
return nil, errors.Wrap(err, "TURN tls cert required")
}

tlsListener, err := tls.Listen("tcp4", "0.0.0.0:"+strconv.Itoa(turnConf.TLSPort),
&tls.Config{
MinVersion: tls.VersionTLS12,
Certificates: []tls.Certificate{cert},
})
if err != nil {
return nil, errors.Wrap(err, "could not listen on TURN TCP port")
if conf.Autocert.Enabled {
tlsListener, err := asTlsListener(conf.Autocert.CacheDir, "0.0.0.0:"+strconv.Itoa(turnConf.TLSPort), turnConf.Domain)
if err != nil {
return nil, errors.Wrap(err, "could not run autocert on TURN TCP port")
}

listenerConfig := turn.ListenerConfig{
Listener: tlsListener,
RelayAddressGenerator: relayAddrGen,
}
serverConfig.ListenerConfigs = append(serverConfig.ListenerConfigs, listenerConfig)
} else {
cert, err := tls.LoadX509KeyPair(turnConf.CertFile, turnConf.KeyFile)
if err != nil {
return nil, errors.Wrap(err, "TURN tls cert required")
}

tlsListener, err := tls.Listen("tcp4", "0.0.0.0:"+strconv.Itoa(turnConf.TLSPort),
&tls.Config{
MinVersion: tls.VersionTLS12,
Certificates: []tls.Certificate{cert},
})
if err != nil {
return nil, errors.Wrap(err, "could not listen on TURN TCP port")
}

listenerConfig := turn.ListenerConfig{
Listener: tlsListener,
RelayAddressGenerator: relayAddrGen,
}
serverConfig.ListenerConfigs = append(serverConfig.ListenerConfigs, listenerConfig)
}

listenerConfig := turn.ListenerConfig{
Listener: tlsListener,
RelayAddressGenerator: relayAddrGen,
}
serverConfig.ListenerConfigs = append(serverConfig.ListenerConfigs, listenerConfig)
} else {
tcpListener, err := net.Listen("tcp4", "0.0.0.0:"+strconv.Itoa(turnConf.TLSPort))
if err != nil {
Expand Down