ch4.3\
This commit is contained in:
@@ -7,6 +7,7 @@ import (
|
|||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/julienschmidt/httprouter"
|
"github.com/julienschmidt/httprouter"
|
||||||
)
|
)
|
||||||
@@ -41,11 +42,17 @@ func (app *application) writeJSON(w http.ResponseWriter, status int, data envelo
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (app *application) readJSON(w http.ResponseWriter, r *http.Request, dst any) error {
|
func (app *application) readJSON(w http.ResponseWriter, r *http.Request, dst any) error {
|
||||||
err := json.NewDecoder(r.Body).Decode(dst)
|
maxBytes := 1_048_576
|
||||||
|
r.Body = http.MaxBytesReader(w, r.Body, int64(maxBytes))
|
||||||
|
dec := json.NewDecoder(r.Body)
|
||||||
|
dec.DisallowUnknownFields()
|
||||||
|
|
||||||
|
err := dec.Decode(dst)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
var syntaxError *json.SyntaxError
|
var syntaxError *json.SyntaxError
|
||||||
var unmarshalTypeError *json.UnmarshalTypeError
|
var unmarshalTypeError *json.UnmarshalTypeError
|
||||||
var invalidMarshallError *json.InvalidUnmarshalError
|
var invalidMarshallError *json.InvalidUnmarshalError
|
||||||
|
var maxBytesError *http.MaxBytesError
|
||||||
|
|
||||||
switch {
|
switch {
|
||||||
case errors.As(err, &syntaxError):
|
case errors.As(err, &syntaxError):
|
||||||
@@ -59,11 +66,20 @@ func (app *application) readJSON(w http.ResponseWriter, r *http.Request, dst any
|
|||||||
return fmt.Errorf("body contains incorrect JSON type for field (at character %d)", unmarshalTypeError.Offset)
|
return fmt.Errorf("body contains incorrect JSON type for field (at character %d)", unmarshalTypeError.Offset)
|
||||||
case errors.Is(err, io.EOF):
|
case errors.Is(err, io.EOF):
|
||||||
return errors.New("body must be not empty")
|
return errors.New("body must be not empty")
|
||||||
|
case strings.HasPrefix(err.Error(), "json: unknown field"):
|
||||||
|
fieldName := strings.TrimPrefix(err.Error(), "json: unknown field")
|
||||||
|
return fmt.Errorf("body contains unknown key %s", fieldName)
|
||||||
|
case errors.As(err, &maxBytesError):
|
||||||
|
return fmt.Errorf("body must not be larger than %d bytes", maxBytesError.Limit)
|
||||||
case errors.As(err, &invalidMarshallError):
|
case errors.As(err, &invalidMarshallError):
|
||||||
panic(err)
|
panic(err)
|
||||||
default:
|
default:
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
err = dec.Decode(&struct{}{})
|
||||||
|
if err != io.EOF {
|
||||||
|
return errors.New("body must only contain a single JSON value")
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user