archives/snowflake
2
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git synced 2025-10-13 20:11:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added an option to use a conventional certificate

Browse source
This commit is contained in:
Cecylia Bocovich 2019-05-14 17:01:45 -04:00
parent d865b7c252
commit 1133e01363
1 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
broker/broker.go
View file

@ -229,9 +229,12 @@ func main() {
var acmeHostnamesCommas string var acmeHostnamesCommas string
var addr string var addr string
var disableTLS bool var disableTLS bool
var certFilename, keyFilename string
flag.StringVar(&acmeEmail, "acme-email", "", "optional contact email for Let's Encrypt notifications") flag.StringVar(&acmeEmail, "acme-email", "", "optional contact email for Let's Encrypt notifications")
flag.StringVar(&acmeHostnamesCommas, "acme-hostnames", "", "comma-separated hostnames for TLS certificate") flag.StringVar(&acmeHostnamesCommas, "acme-hostnames", "", "comma-separated hostnames for TLS certificate")
flag.StringVar(&certFilename, "cert", "", "TLS certificate file")
flag.StringVar(&keyFilename, "key", "", "TLS private key file")
flag.StringVar(&addr, "addr", ":443", "address to listen on") flag.StringVar(&addr, "addr", ":443", "address to listen on")
flag.BoolVar(&disableTLS, "disable-tls", false, "don't use HTTPS") flag.BoolVar(&disableTLS, "disable-tls", false, "don't use HTTPS")
flag.Parse() flag.Parse()
@ -258,6 +261,13 @@ func main() {
Addr: addr, Addr: addr,
} }
// Handle the various ways of setting up TLS. The legal configurations
// are:
// --acme-hostnames (with optional --acme-email)
// --cert and --key together
// --disable-tls
// The outputs of this block of code are the disableTLS,
// needHTTP01Listener, certManager, and getCertificate variables.
if acmeHostnamesCommas != "" { if acmeHostnamesCommas != "" {
acmeHostnames := strings.Split(acmeHostnamesCommas, ",") acmeHostnames := strings.Split(acmeHostnamesCommas, ",")
log.Printf("ACME hostnames: %q", acmeHostnames) log.Printf("ACME hostnames: %q", acmeHostnames)
@ -274,10 +284,15 @@ func main() {
server.TLSConfig = &tls.Config{GetCertificate: certManager.GetCertificate} server.TLSConfig = &tls.Config{GetCertificate: certManager.GetCertificate}
err = server.ListenAndServeTLS("", "") err = server.ListenAndServeTLS("", "")
} else if certFilename != "" && keyFilename != "" {
if acmeEmail != "" || acmeHostnamesCommas != "" {
log.Fatalf("The --cert and --key options are not allowed with --acme-email or --acme-hostnames.")
}
err = server.ListenAndServeTLS(certFilename, keyFilename)
} else if disableTLS { } else if disableTLS {
err = server.ListenAndServe() err = server.ListenAndServe()
} else { } else {
log.Fatal("the --acme-hostnames or --disable-tls option is required") log.Fatal("the --acme-hostnames, --cert and --key, or --disable-tls option is required")
} }
if err != nil { if err != nil {