aboutsummaryrefslogtreecommitdiff
path: root/authorize.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2016-03-10 00:01:04 +0100
committerDimitri Sokolyuk <demon@dim13.org>2016-03-10 00:01:04 +0100
commit8d51356c1fafb05dde958104354214d2a06bdc36 (patch)
tree58b8ef61377c9e6417b7c5426215fb5a779cee59 /authorize.go
parent97b7adf257057ff146bcb9f8430250cef0f71528 (diff)
Cleanup
Diffstat (limited to 'authorize.go')
-rw-r--r--authorize.go22
1 files changed, 10 insertions, 12 deletions
diff --git a/authorize.go b/authorize.go
index 55e8edf..32c5d57 100644
--- a/authorize.go
+++ b/authorize.go
@@ -44,7 +44,7 @@ func (a Authorization) Supported(sol map[ChalType]Solver) []Challenge {
return nil
}
-func (p *Provider) authorize(s Signer, domain string, sol map[ChalType]Solver) ([]Challenge, error) {
+func (p *Provider) authorize(s Signer, domain string, sol map[ChalType]Solver) error {
req := &Authorization{
Resource: ResNewAuthz,
Identifier: Identifier{
@@ -54,27 +54,25 @@ func (p *Provider) authorize(s Signer, domain string, sol map[ChalType]Solver) (
}
resp, err := p.post(p.NewAuthz, s, req)
if err != nil {
- return nil, err
+ return err
}
err = parseJson(resp, req)
if err != nil {
- return nil, err
+ return err
}
- return req.Supported(sol), nil
+ for _, ch := range req.Supported(sol) {
+ if err := p.Solve(s, ch, sol[ch.Type]); err != nil {
+ return err
+ }
+ }
+ return nil
}
func (p *Provider) Authorize(s Signer, d *Desire) error {
for _, domain := range d.altnames {
- chal, err := p.authorize(s, domain, d.solver)
- if err != nil {
+ if err := p.authorize(s, domain, d.solver); err != nil {
return err
}
- for _, ch := range chal {
- sol := d.solver[ch.Type]
- if err := p.Solve(s, ch, sol); err != nil {
- return err
- }
- }
}
return nil
}