Merge pull request #20 from 9072997/master

alash3al · web-flow · commit 2dbabfac17bc · 2021-08-29T05:10:41.000+02:00
Allow alternate ACME URLs
diff --git a/hosts.go b/hosts.go
@@ -76,10 +76,8 @@ func watchHostsChanges(filename string, fn func()) error {
 	watcher.Add(filename)
 
 	for {
-		select {
-		case <-watcher.Events:
-			fn()
-		}
+		<-watcher.Events
+		fn()
 	}
 }
 
diff --git a/main.go b/main.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
+	"golang.org/x/crypto/acme"
 	"golang.org/x/crypto/acme/autocert"
 )
 
@@ -13,6 +14,10 @@ func main() {
 	e.HideBanner = true
 	e.AutoTLSManager.HostPolicy = autocert.HostWhitelist(getAvailableHosts()...)
 	e.AutoTLSManager.Cache = autocert.DirCache(*flagAutocertCacheDir)
+	e.AutoTLSManager.Client = &acme.Client{
+		DirectoryURL: *flagACMEDirectory,
+		UserAgent:    "https://github.com/alash3al/httpsify",
+	}
 
 	e.Use(middleware.HTTPSRedirect())
 	e.Use(middleware.Logger())
diff --git a/vars.go b/vars.go
@@ -6,6 +6,7 @@ import (
 	"sync/atomic"
 
 	"github.com/mitchellh/go-homedir"
+	"golang.org/x/crypto/acme/autocert"
 )
 
 var (
@@ -18,5 +19,6 @@ var (
 	flagHTTPAddr         = flag.String("http", ":80", "the port to listen for http requests on, it is recommended to leave it as is")
 	flagAutocertCacheDir = flag.String("certs", path.Join(homeDir, ".httpsify/certs"), "the certs directory")
 	flagHostsFile        = flag.String("hosts", path.Join(homeDir, ".httpsify/hosts.json"), "the file containing hosts mappings to upstreams")
+	flagACMEDirectory    = flag.String("acme-directory", autocert.DefaultACMEDirectory, "the server to request certificates from")
 	flagSendXSecuredBy   = flag.Bool("x-secured-by", true, "whether to enable x-secured-by header or not")
 )

Original file line number	Diff line number	Diff line change
`@@ -76,10 +76,8 @@ func watchHostsChanges(filename string, fn func()) error {`
`76`	`76`	`watcher.Add(filename)`
`77`	`77`
`78`	`78`	`for {`
`79`		`- select {`
`80`		`- case <-watcher.Events:`
`81`		`- fn()`
`82`		`- }`
	`79`	`+ <-watcher.Events`
	`80`	`+ fn()`
`83`	`81`	`}`
`84`	`82`	`}`
`85`	`83`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`	`"sync/atomic"`
`7`	`7`
`8`	`8`	`"github.com/mitchellh/go-homedir"`
	`9`	`+ "golang.org/x/crypto/acme/autocert"`
`9`	`10`	`)`
`10`	`11`
`11`	`12`	`var (`
`@@ -18,5 +19,6 @@ var (`
`18`	`19`	`flagHTTPAddr = flag.String("http", ":80", "the port to listen for http requests on, it is recommended to leave it as is")`
`19`	`20`	`flagAutocertCacheDir = flag.String("certs", path.Join(homeDir, ".httpsify/certs"), "the certs directory")`
`20`	`21`	`flagHostsFile = flag.String("hosts", path.Join(homeDir, ".httpsify/hosts.json"), "the file containing hosts mappings to upstreams")`
	`22`	`+ flagACMEDirectory = flag.String("acme-directory", autocert.DefaultACMEDirectory, "the server to request certificates from")`
`21`	`23`	`flagSendXSecuredBy = flag.Bool("x-secured-by", true, "whether to enable x-secured-by header or not")`
`22`	`24`	`)`