mbiryukova/lego
1
0
Fork 0
forked from TrueCloudLab/lego
Code Pull requests Activity

httpError - Set detail string to the content of the HTTP response if it's not parsed as JSON

Browse source 
Fixes #188
This commit is contained in:
xenolf 2016-04-15 03:09:29 +02:00
parent cbca761215
commit 094e3d41bb
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
acme/error.go
View file

@ -3,6 +3,7 @@ package acme
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/ioutil"
"net/http" "net/http"
"strings" "strings"
) )
@ -53,13 +54,21 @@ func (c challengeError) Error() string {
func handleHTTPError(resp *http.Response) error { func handleHTTPError(resp *http.Response) error {
var errorDetail RemoteError var errorDetail RemoteError
contenType := resp.Header.Get("Content-Type")
// try to decode the content as JSON // try to decode the content as JSON
if resp.Header.Get("Content-Type") == "application/json" { if contenType == "application/json" || contenType == "application/problem+json" {
decoder := json.NewDecoder(resp.Body) decoder := json.NewDecoder(resp.Body)
err := decoder.Decode(&errorDetail) err := decoder.Decode(&errorDetail)
if err != nil { if err != nil {
return err return err
} }
} else {
detailBytes, err := ioutil.ReadAll(limitReader(resp.Body, 1024*1024))
if err != nil {
return err
}
errorDetail.Detail = string(detailBytes)
} }
errorDetail.StatusCode = resp.StatusCode errorDetail.StatusCode = resp.StatusCode