From 6d0e780f951789cdac7f9f60ca5b373ab8d44ca1 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 26 Jan 2016 18:57:38 +0100 Subject: Switch to lib-internal solver --- cmd/acme/main.go | 14 ++++++++++---- cmd/acme/solve_http.go | 41 ----------------------------------------- cmd/acme/solve_tls.go | 1 - 3 files changed, 10 insertions(+), 46 deletions(-) delete mode 100644 cmd/acme/solve_http.go delete mode 100644 cmd/acme/solve_tls.go (limited to 'cmd') diff --git a/cmd/acme/main.go b/cmd/acme/main.go index 67271b8..00c209f 100644 --- a/cmd/acme/main.go +++ b/cmd/acme/main.go @@ -63,9 +63,6 @@ func satisfice(des *desire) error { } } - hs := &httpChallenge{Webroot: des.Webroot} - des.RegisterSolver(acme.ChallengeHTTP, hs) - err = des.provider.Authz(des.account, des.Desire) if err != nil { return err @@ -92,8 +89,17 @@ func main() { if err := prepare(conf); err != nil { log.Fatal(err) } - httpSolver(conf.Defaults.Listen) + + httpSol := acme.NewHTTPSolver(conf.Defaults.Listen) + for k, des := range conf.Desire { + if des.Webroot != "" { + wrSol := acme.NewWebrootSolver(des.Webroot) + des.RegisterSolver(acme.ChallengeHTTP, wrSol) + } else { + des.RegisterSolver(acme.ChallengeHTTP, httpSol) + } + log.Println("satisfice", k) if err := satisfice(des); err != nil { log.Fatal(err) diff --git a/cmd/acme/solve_http.go b/cmd/acme/solve_http.go deleted file mode 100644 index f01f1b4..0000000 --- a/cmd/acme/solve_http.go +++ /dev/null @@ -1,41 +0,0 @@ -package main - -import ( - "io" - "net/http" - "path" - - "dim13.org/acme" -) - -type httpChallenge struct { - Webroot string -} - -var httpSrv http.Server - -func httpSolver(addr string) { - httpSrv = http.Server{Addr: addr} - go httpSrv.ListenAndServe() -} - -func (c *httpChallenge) Solve(token, keyAuth string) error { - if c.Webroot != "" { - p := path.Join(c.Webroot, acme.WellKnown, token) - fd, err := acme.CreatePubFile(p) - if err != nil { - return err - } - defer fd.Close() - _, err = io.WriteString(fd, keyAuth) - return err - } else { - p := path.Join(acme.WellKnown, token) - http.HandleFunc(p, func(w http.ResponseWriter, r *http.Request) { - io.WriteString(w, keyAuth) - }) - return nil - } -} - -func (c *httpChallenge) Solved() error { return nil } diff --git a/cmd/acme/solve_tls.go b/cmd/acme/solve_tls.go deleted file mode 100644 index 06ab7d0..0000000 --- a/cmd/acme/solve_tls.go +++ /dev/null @@ -1 +0,0 @@ -package main -- cgit v1.2.3