felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

cmd/ursrv: Remove useless static TLS cert handling

Browse Source
This commit is contained in:
Jakob Borg
2023-07-10 08:39:30 +02:00
parent 2fcf7006e6
commit c55b205a0b
1 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/ursrv/main.go
+3 -22
View File
@@ -8,7 +8,6 @@ package main
import ( import (
"bytes" "bytes"
"crypto/tls"
"database/sql" "database/sql"
"embed" "embed"
"encoding/json" "encoding/json"
@@ -37,12 +36,9 @@ import (
) )
type CLI struct { type CLI struct {
UseHTTP bool `env:"UR_USE_HTTP"`
Debug bool `env:"UR_DEBUG"` Debug bool `env:"UR_DEBUG"`
KeyFile string `env:"UR_KEY_FILE" default:"key.pem"`
CertFile string `env:"UR_CRT_FILE" default:"crt.pem"`
DBConn string `env:"UR_DB_URL" default:"postgres://user:password@localhost/ur?sslmode=disable"` DBConn string `env:"UR_DB_URL" default:"postgres://user:password@localhost/ur?sslmode=disable"`
Listen string `env:"UR_LISTEN" default:"0.0.0.0:8443"` Listen string `env:"UR_LISTEN" default:"0.0.0.0:8080"`
GeoIPPath string `env:"UR_GEOIP" default:"GeoLite2-City.mmdb"` GeoIPPath string `env:"UR_GEOIP" default:"GeoLite2-City.mmdb"`
} }
@@ -194,24 +190,9 @@ func main() {
log.Fatalln("database:", err) log.Fatalln("database:", err)
} }
// TLS & Listening // Listening
var listener net.Listener listener, err := net.Listen("tcp", cli.Listen)
if cli.UseHTTP {
listener, err = net.Listen("tcp", cli.Listen)
} else {
var cert tls.Certificate
cert, err = tls.LoadX509KeyPair(cli.CertFile, cli.KeyFile)
if err != nil {
log.Fatalln("tls:", err)
}
cfg := &tls.Config{
Certificates: []tls.Certificate{cert},
SessionTicketsDisabled: true,
}
listener, err = tls.Listen("tcp", cli.Listen, cfg)
}
if err != nil { if err != nil {
log.Fatalln("listen:", err) log.Fatalln("listen:", err)
} }