From a268d91c061bbba1f8303ba88b1884f9a88f2fd5 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 26 Jan 2016 13:36:57 +0100 Subject: KISS --- messages.go | 2 -- provider.go | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/messages.go b/messages.go index c0209aa..f1bda5f 100644 --- a/messages.go +++ b/messages.go @@ -61,7 +61,6 @@ func (a Authorization) Supported(sol map[ChalType]Solver) []Challenge { var c []Challenge for _, n := range com { ch := a.Challenges[n] - ch.Solver = sol[ch.Type] c = append(c, ch) } return c @@ -86,7 +85,6 @@ type Challenge struct { Validated *time.Time `json:"validated,omitempty"` KeyAuthorization string `json:"keyAuthorization,omitempty"` Err *Problem `json:"error,omitempty"` - Solver `json:"-"` } // Problem description diff --git a/provider.go b/provider.go index 5c1cf18..06b5c80 100644 --- a/provider.go +++ b/provider.go @@ -155,17 +155,17 @@ func (p *Provider) Register(s Signer, c Contacts) error { return nil } -func (p *Provider) solve(s Signer, ch Challenge) error { +func (p *Provider) solve(s Signer, ch Challenge, sol Solver) error { ka, err := s.KeyAuth(ch.Token) if err != nil { return err } - err = ch.Solve(ch.Token, ka) + err = sol.Solve(ch.Token, ka) if err != nil { return err } - defer ch.Solved() + defer sol.Solved() // update challenge ch.Resource = ResChallenge @@ -202,7 +202,7 @@ func (p *Provider) authz(s Signer, domain string, sol map[ChalType]Solver) error } // second step: choose and start solver for _, ch := range r.Supported(sol) { - if err = p.solve(s, ch); err != nil { + if err = p.solve(s, ch, sol[ch.Type]); err != nil { return err } } -- cgit v1.2.3