samthor · February 16, 2025 09:39 · Aug 1, 2019 · Apr 11, 2018 · Apr 11, 2018 · Apr 11, 2018
diff --git a/autocert-server.go b/autocert-server.go
@@ -15,7 +15,7 @@ import (
 
 func main() {
         // setup a simple handler which sends a HTHS header for six months (!)
-        http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) 
+        http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
                 w.Header().Set("Strict-Transport-Security", "max-age=15768000 ; includeSubDomains")
                 fmt.Fprintf(w, "Hello, HTTPS world!")
         })

diff --git a/autocert-server.go b/autocert-server.go
@@ -14,8 +14,9 @@ import (
 )
 
 func main() {
-        // setup a simple handler which sends a HTHS header
-        http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+        // setup a simple handler which sends a HTHS header for six months (!)
+        http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) 
+                w.Header().Set("Strict-Transport-Security", "max-age=15768000 ; includeSubDomains")
                 fmt.Fprintf(w, "Hello, HTTPS world!")
         })
 

diff --git a/autocert-server.go b/autocert-server.go
@@ -57,10 +57,10 @@ func main() {
         log.Fatal(server.ListenAndServeTLS("", ""))
 }
 
-// cacheDir makes a consiste        nt cache directory inside /tmp. Returns "" on error.
+// cacheDir makes a consistent cache directory inside /tmp. Returns "" on error.
 func cacheDir() (dir string) {
         if u, _ := user.Current(); u != nil {
-        dir = filepath.Join(os.TempDir(), "cache-golang-autocert-"+u.Username)
+                dir = filepath.Join(os.TempDir(), "cache-golang-autocert-"+u.Username)
                 if err := os.MkdirAll(dir, 0700); err == nil {
                         return dir
                 }

diff --git a/autocert-server.go b/autocert-server.go
@@ -57,10 +57,10 @@ func main() {
         log.Fatal(server.ListenAndServeTLS("", ""))
 }
 
-// cacheDir makes a consistent cache directory inside /tmp. Returns "" on error.
+// cacheDir makes a consiste        nt cache directory inside /tmp. Returns "" on error.
 func cacheDir() (dir string) {
         if u, _ := user.Current(); u != nil {
-                dir = filepath.Join(os.TempDir(), "cache-golang-autocert-"+u.Username)
+        dir = filepath.Join(os.TempDir(), "cache-golang-autocert-"+u.Username)
                 if err := os.MkdirAll(dir, 0700); err == nil {
                         return dir
                 }

diff --git a/autocert-server.go b/autocert-server.go
@@ -2,13 +2,13 @@ package main
 
 import (
         "crypto/tls"
-        "os"
-        "os/user"
         "flag"
-        "path/filepath"
         "fmt"
         "log"
         "net/http"
+        "os"
+        "os/user"
+        "path/filepath"
 
         "golang.org/x/crypto/acme/autocert"
 )
@@ -60,10 +60,10 @@ func main() {
 // cacheDir makes a consistent cache directory inside /tmp. Returns "" on error.
 func cacheDir() (dir string) {
         if u, _ := user.Current(); u != nil {
-                dir = filepath.Join(os.TempDir(), "cache-golang-autocert-" + u.Username)
+                dir = filepath.Join(os.TempDir(), "cache-golang-autocert-"+u.Username)
                 if err := os.MkdirAll(dir, 0700); err == nil {
                         return dir
                 }
         }
         return ""
-}
+}
diff --git a/autocert-server.go b/autocert-server.go
@@ -0,0 +1,69 @@
+package main
+
+import (
+        "crypto/tls"
+        "os"
+        "os/user"
+        "flag"
+        "path/filepath"
+        "fmt"
+        "log"
+        "net/http"
+
+        "golang.org/x/crypto/acme/autocert"
+)
+
+func main() {
+        // setup a simple handler which sends a HTHS header
+        http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+                fmt.Fprintf(w, "Hello, HTTPS world!")
+        })
+
+        // look for the domains to be served from command line args
+        flag.Parse()
+        domains := flag.Args()
+        if len(domains) == 0 {
+                log.Fatalf("fatal; specify domains as arguments")
+        }
+
+        // create the autocert.Manager with domains and path to the cache
+        certManager := autocert.Manager{
+                Prompt:     autocert.AcceptTOS,
+                HostPolicy: autocert.HostWhitelist(domains...),
+        }
+
+        // optionally use a cache dir
+        dir := cacheDir()
+        if dir != "" {
+                certManager.Cache = autocert.DirCache(dir)
+        }
+
+        // create the server itself
+        server := &http.Server{
+                Addr: ":https",
+                TLSConfig: &tls.Config{
+                        GetCertificate: certManager.GetCertificate,
+                },
+        }
+
+        log.Printf("Serving http/https for domains: %+v", domains)
+        go func() {
+                // serve HTTP, which will redirect automatically to HTTPS
+                h := certManager.HTTPHandler(nil)
+                log.Fatal(http.ListenAndServe(":http", h))
+        }()
+
+        // serve HTTPS!
+        log.Fatal(server.ListenAndServeTLS("", ""))
+}
+
+// cacheDir makes a consistent cache directory inside /tmp. Returns "" on error.
+func cacheDir() (dir string) {
+        if u, _ := user.Current(); u != nil {
+                dir = filepath.Join(os.TempDir(), "cache-golang-autocert-" + u.Username)
+                if err := os.MkdirAll(dir, 0700); err == nil {
+                        return dir
+                }
+        }
+        return ""
+}