Switch to HTTPS with auto-generated self-signed certificate
This commit is contained in:
@@ -31,7 +31,7 @@ func main() {
|
|||||||
debugBMD := flag.Bool("debug-bmd", false, "debug Blackmagic discovery")
|
debugBMD := flag.Bool("debug-bmd", false, "debug Blackmagic discovery")
|
||||||
debugShure := flag.Bool("debug-shure", false, "debug Shure discovery")
|
debugShure := flag.Bool("debug-shure", false, "debug Shure discovery")
|
||||||
debugYamaha := flag.Bool("debug-yamaha", false, "debug Yamaha discovery")
|
debugYamaha := flag.Bool("debug-yamaha", false, "debug Yamaha discovery")
|
||||||
httpPort := flag.String("http", ":80", "HTTP server port (empty to disable)")
|
enableHTTPS := flag.Bool("https", false, "enable HTTPS server on port 443")
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
t := tendrils.New()
|
t := tendrils.New()
|
||||||
@@ -59,6 +59,6 @@ func main() {
|
|||||||
t.DebugBMD = *debugBMD
|
t.DebugBMD = *debugBMD
|
||||||
t.DebugShure = *debugShure
|
t.DebugShure = *debugShure
|
||||||
t.DebugYamaha = *debugYamaha
|
t.DebugYamaha = *debugYamaha
|
||||||
t.HTTPPort = *httpPort
|
t.EnableHTTPS = *enableHTTPS
|
||||||
t.Run()
|
t.Run()
|
||||||
}
|
}
|
||||||
|
|||||||
88
http.go
88
http.go
@@ -1,14 +1,28 @@
|
|||||||
package tendrils
|
package tendrils
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"crypto/ecdsa"
|
||||||
|
"crypto/elliptic"
|
||||||
|
"crypto/rand"
|
||||||
|
"crypto/x509"
|
||||||
|
"crypto/x509/pkix"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"encoding/pem"
|
||||||
"log"
|
"log"
|
||||||
|
"math/big"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"os"
|
||||||
"sort"
|
"sort"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/fvbommel/sortorder"
|
"github.com/fvbommel/sortorder"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
certFile = "cert.pem"
|
||||||
|
keyFile = "key.pem"
|
||||||
|
)
|
||||||
|
|
||||||
type StatusResponse struct {
|
type StatusResponse struct {
|
||||||
Nodes []*Node `json:"nodes"`
|
Nodes []*Node `json:"nodes"`
|
||||||
Links []*Link `json:"links"`
|
Links []*Link `json:"links"`
|
||||||
@@ -18,7 +32,12 @@ type StatusResponse struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (t *Tendrils) startHTTPServer() {
|
func (t *Tendrils) startHTTPServer() {
|
||||||
if t.HTTPPort == "" {
|
if !t.EnableHTTPS {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := ensureCert(); err != nil {
|
||||||
|
log.Printf("[ERROR] failed to ensure certificate: %v", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -27,14 +46,75 @@ func (t *Tendrils) startHTTPServer() {
|
|||||||
mux.HandleFunc("/api/config", t.handleAPIConfig)
|
mux.HandleFunc("/api/config", t.handleAPIConfig)
|
||||||
mux.Handle("/", http.FileServer(http.Dir("static")))
|
mux.Handle("/", http.FileServer(http.Dir("static")))
|
||||||
|
|
||||||
log.Printf("[http] listening on %s", t.HTTPPort)
|
log.Printf("[https] listening on :443")
|
||||||
go func() {
|
go func() {
|
||||||
if err := http.ListenAndServe(t.HTTPPort, mux); err != nil {
|
if err := http.ListenAndServeTLS(":443", certFile, keyFile, mux); err != nil {
|
||||||
log.Printf("[ERROR] http server failed: %v", err)
|
log.Printf("[ERROR] https server failed: %v", err)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func ensureCert() error {
|
||||||
|
if _, err := os.Stat(certFile); err == nil {
|
||||||
|
if _, err := os.Stat(keyFile); err == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Printf("[https] generating self-signed certificate")
|
||||||
|
|
||||||
|
priv, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
serialNumber, err := rand.Int(rand.Reader, new(big.Int).Lsh(big.NewInt(1), 128))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
template := x509.Certificate{
|
||||||
|
SerialNumber: serialNumber,
|
||||||
|
Subject: pkix.Name{
|
||||||
|
Organization: []string{"Tendrils"},
|
||||||
|
},
|
||||||
|
NotBefore: time.Now(),
|
||||||
|
NotAfter: time.Now().AddDate(10, 0, 0),
|
||||||
|
KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
|
||||||
|
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
|
||||||
|
BasicConstraintsValid: true,
|
||||||
|
}
|
||||||
|
|
||||||
|
certDER, err := x509.CreateCertificate(rand.Reader, &template, &template, &priv.PublicKey, priv)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
certOut, err := os.Create(certFile)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer certOut.Close()
|
||||||
|
if err := pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: certDER}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
keyOut, err := os.Create(keyFile)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer keyOut.Close()
|
||||||
|
keyDER, err := x509.MarshalECPrivateKey(priv)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if err := pem.Encode(keyOut, &pem.Block{Type: "EC PRIVATE KEY", Bytes: keyDER}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func (t *Tendrils) handleAPIStatus(w http.ResponseWriter, r *http.Request) {
|
func (t *Tendrils) handleAPIStatus(w http.ResponseWriter, r *http.Request) {
|
||||||
status := t.GetStatus()
|
status := t.GetStatus()
|
||||||
w.Header().Set("Content-Type", "application/json")
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ type Tendrils struct {
|
|||||||
DebugBMD bool
|
DebugBMD bool
|
||||||
DebugShure bool
|
DebugShure bool
|
||||||
DebugYamaha bool
|
DebugYamaha bool
|
||||||
HTTPPort string
|
EnableHTTPS bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func New() *Tendrils {
|
func New() *Tendrils {
|
||||||
|
|||||||
Reference in New Issue
Block a user