ec667a7ed1
This patch adds code to only parse the HTTP response body as JSON if the
content-type header advertises the content as JSON. In my case, the
directory server was unavailable: it returned a 503 HTTP response code
with an HTML document, and the only thing lego reported was:
2016/04/04 19:12:56 Could not create client: get directory at 'https://acme-v01.api.letsencrypt.org/directory': invalid character '<' looking for beginning of value
This was caused by trying to parse the document body (HTML) as JSON,
without looking at the content-type header and returning the JSON parse
error.
77 lines
1.8 KiB
Go
77 lines
1.8 KiB
Go
package acme
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"strings"
|
|
)
|
|
|
|
const (
|
|
tosAgreementError = "Must agree to subscriber agreement before any further actions"
|
|
)
|
|
|
|
// RemoteError is the base type for all errors specific to the ACME protocol.
|
|
type RemoteError struct {
|
|
StatusCode int `json:"status,omitempty"`
|
|
Type string `json:"type"`
|
|
Detail string `json:"detail"`
|
|
}
|
|
|
|
func (e RemoteError) Error() string {
|
|
return fmt.Sprintf("acme: Error %d - %s - %s", e.StatusCode, e.Type, e.Detail)
|
|
}
|
|
|
|
// TOSError represents the error which is returned if the user needs to
|
|
// accept the TOS.
|
|
// TODO: include the new TOS url if we can somehow obtain it.
|
|
type TOSError struct {
|
|
RemoteError
|
|
}
|
|
|
|
type domainError struct {
|
|
Domain string
|
|
Error error
|
|
}
|
|
|
|
type challengeError struct {
|
|
RemoteError
|
|
records []validationRecord
|
|
}
|
|
|
|
func (c challengeError) Error() string {
|
|
|
|
var errStr string
|
|
for _, validation := range c.records {
|
|
errStr = errStr + fmt.Sprintf("\tValidation for %s:%s\n\tResolved to:\n\t\t%s\n\tUsed: %s\n\n",
|
|
validation.Hostname, validation.Port, strings.Join(validation.ResolvedAddresses, "\n\t\t"), validation.UsedAddress)
|
|
}
|
|
|
|
return fmt.Sprintf("%s\nError Detail:\n%s", c.RemoteError.Error(), errStr)
|
|
}
|
|
|
|
func handleHTTPError(resp *http.Response) error {
|
|
var errorDetail RemoteError
|
|
|
|
// try to decode the content as JSON
|
|
if resp.Header.Get("Content-Type") == "application/json" {
|
|
decoder := json.NewDecoder(resp.Body)
|
|
err := decoder.Decode(&errorDetail)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
errorDetail.StatusCode = resp.StatusCode
|
|
|
|
// Check for errors we handle specifically
|
|
if errorDetail.StatusCode == http.StatusForbidden && errorDetail.Detail == tosAgreementError {
|
|
return TOSError{errorDetail}
|
|
}
|
|
|
|
return errorDetail
|
|
}
|
|
|
|
func handleChallengeError(chlng challenge) error {
|
|
return challengeError{chlng.Error, chlng.ValidationRecords}
|
|
}
|