aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-03-10 09:45:01 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-03-10 09:45:01 +0100
commitff2aec58ecce937232840391177e4f10d42e4085 (patch)
tree218f4ff403806b4f4c7f5b747223114d4d9554e0
parent3d02f4993743b6d4010c87afc168bfd08ffd1e70 (diff)
Drop Desire type
-rw-r--r--authorize.go6
-rw-r--r--cmd/acme/main.go15
-rw-r--r--desire.go17
3 files changed, 13 insertions, 25 deletions
diff --git a/authorize.go b/authorize.go
index 42a9039..00378e7 100644
--- a/authorize.go
+++ b/authorize.go
@@ -44,7 +44,7 @@ func (a Authorization) Supported(sols Solvers) []Challenge {
return nil
}
-func (p *Provider) Authorize(s Signer, d *Desire, domain string) error {
+func (p *Provider) Authorize(s Signer, sols Solvers, domain string) error {
req := &Authorization{
Resource: ResNewAuthz,
Identifier: Identifier{
@@ -59,8 +59,8 @@ func (p *Provider) Authorize(s Signer, d *Desire, domain string) error {
if err := parseJson(resp, req); err != nil {
return err
}
- for _, ch := range req.Supported(d.solver) {
- if err := p.Solve(s, ch, d.solver[ch.Type]); err != nil {
+ for _, ch := range req.Supported(sols) {
+ if err := p.Solve(s, ch, sols[ch.Type]); err != nil {
return err
}
}
diff --git a/cmd/acme/main.go b/cmd/acme/main.go
index cda91e0..b6ee054 100644
--- a/cmd/acme/main.go
+++ b/cmd/acme/main.go
@@ -84,17 +84,22 @@ func requestCert(prov *acme.Provider, acc *acme.Account, d domain) error {
}
}
- des := acme.NewDesire()
+ sols := make(acme.Solvers)
+
if d.Webroot != "" {
- des.RegisterSolver(acme.NewWebrootSolver(d.Webroot))
+ sols[acme.ChallengeHTTP] = acme.NewWebrootSolver(d.Webroot)
} else {
- des.RegisterSolver(httpSol)
- des.RegisterSolver(tlsSol)
+ if httpSol != nil {
+ sols[acme.ChallengeHTTP] = httpSol
+ }
+ if tlsSol != nil {
+ sols[acme.ChallengeTLS] = tlsSol
+ }
}
for _, an := range d.Altnames {
log.Println("Authorize", an)
- if err := prov.Authorize(acc, des, an); err != nil {
+ if err := prov.Authorize(acc, sols, an); err != nil {
return err
}
}
diff --git a/desire.go b/desire.go
deleted file mode 100644
index 056c9c9..0000000
--- a/desire.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package acme
-
-type Desire struct {
- solver Solvers
-}
-
-func NewDesire() *Desire {
- return &Desire{
- solver: make(Solvers),
- }
-}
-
-func (d *Desire) RegisterSolver(s Solver) {
- if s != nil {
- d.solver[s.Type()] = s
- }
-}