Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions http/codegen/templates/partial/query_map_conversion.go.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
{{- if eq .Type.KeyType.Type.Name "string" }}
key{{ .Loop }} = keyRaw[openIdx+1 : closeIdx]
Expand Down
8 changes: 4 additions & 4 deletions http/codegen/testdata/multipart_code.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ func NewServiceMultipartWithParamMethodMultipartWithParamDecoder(mux goahttp.Mux
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keyaRaw := keyRaw[openIdx+1 : closeIdx]
v, err2 := strconv.ParseInt(keyaRaw, 10, strconv.IntSize)
Expand Down Expand Up @@ -225,8 +225,8 @@ func NewServiceMultipartWithParamsAndHeadersMethodMultipartWithParamsAndHeadersD
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keyaRaw := keyRaw[openIdx+1 : closeIdx]
v, err2 := strconv.ParseInt(keyaRaw, 10, strconv.IntSize)
Expand Down
108 changes: 54 additions & 54 deletions http/codegen/testdata/payload_decode_functions.go
Original file line number Diff line number Diff line change
Expand Up @@ -1539,8 +1539,8 @@ func DecodeMethodQueryMapStringStringRequest(mux goahttp.Muxer, decoder func(*ht
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keya = keyRaw[openIdx+1 : closeIdx]
}
Expand Down Expand Up @@ -1583,8 +1583,8 @@ func DecodeMethodQueryMapStringStringValidateRequest(mux goahttp.Muxer, decoder
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keya = keyRaw[openIdx+1 : closeIdx]
}
Expand Down Expand Up @@ -1634,8 +1634,8 @@ func DecodeMethodQueryMapStringBoolRequest(mux goahttp.Muxer, decoder func(*http
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keya = keyRaw[openIdx+1 : closeIdx]
}
Expand Down Expand Up @@ -1687,8 +1687,8 @@ func DecodeMethodQueryMapStringBoolValidateRequest(mux goahttp.Muxer, decoder fu
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keya = keyRaw[openIdx+1 : closeIdx]
}
Expand Down Expand Up @@ -1747,8 +1747,8 @@ func DecodeMethodQueryMapBoolStringRequest(mux goahttp.Muxer, decoder func(*http
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keyaRaw := keyRaw[openIdx+1 : closeIdx]
v, err2 := strconv.ParseBool(keyaRaw)
Expand Down Expand Up @@ -1796,8 +1796,8 @@ func DecodeMethodQueryMapBoolStringValidateRequest(mux goahttp.Muxer, decoder fu
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keyaRaw := keyRaw[openIdx+1 : closeIdx]
v, err2 := strconv.ParseBool(keyaRaw)
Expand Down Expand Up @@ -1852,8 +1852,8 @@ func DecodeMethodQueryMapBoolBoolRequest(mux goahttp.Muxer, decoder func(*http.R
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keyaRaw := keyRaw[openIdx+1 : closeIdx]
v, err2 := strconv.ParseBool(keyaRaw)
Expand Down Expand Up @@ -1910,8 +1910,8 @@ func DecodeMethodQueryMapBoolBoolValidateRequest(mux goahttp.Muxer, decoder func
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keyaRaw := keyRaw[openIdx+1 : closeIdx]
v, err2 := strconv.ParseBool(keyaRaw)
Expand Down Expand Up @@ -1976,8 +1976,8 @@ func DecodeMethodQueryMapStringArrayStringRequest(mux goahttp.Muxer, decoder fun
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keya = keyRaw[openIdx+1 : closeIdx]
}
Expand Down Expand Up @@ -2020,8 +2020,8 @@ func DecodeMethodQueryMapStringArrayStringValidateRequest(mux goahttp.Muxer, dec
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keya = keyRaw[openIdx+1 : closeIdx]
}
Expand Down Expand Up @@ -2072,8 +2072,8 @@ func DecodeMethodQueryMapStringArrayBoolRequest(mux goahttp.Muxer, decoder func(
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keya = keyRaw[openIdx+1 : closeIdx]
}
Expand Down Expand Up @@ -2127,8 +2127,8 @@ func DecodeMethodQueryMapStringArrayBoolValidateRequest(mux goahttp.Muxer, decod
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keya = keyRaw[openIdx+1 : closeIdx]
}
Expand Down Expand Up @@ -2190,8 +2190,8 @@ func DecodeMethodQueryMapBoolArrayStringRequest(mux goahttp.Muxer, decoder func(
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keyaRaw := keyRaw[openIdx+1 : closeIdx]
v, err2 := strconv.ParseBool(keyaRaw)
Expand Down Expand Up @@ -2237,8 +2237,8 @@ func DecodeMethodQueryMapBoolArrayStringValidateRequest(mux goahttp.Muxer, decod
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keyaRaw := keyRaw[openIdx+1 : closeIdx]
v, err2 := strconv.ParseBool(keyaRaw)
Expand Down Expand Up @@ -2294,8 +2294,8 @@ func DecodeMethodQueryMapBoolArrayBoolRequest(mux goahttp.Muxer, decoder func(*h
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keyaRaw := keyRaw[openIdx+1 : closeIdx]
v, err2 := strconv.ParseBool(keyaRaw)
Expand Down Expand Up @@ -2354,8 +2354,8 @@ func DecodeMethodQueryMapBoolArrayBoolValidateRequest(mux goahttp.Muxer, decoder
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keyaRaw := keyRaw[openIdx+1 : closeIdx]
v, err2 := strconv.ParseBool(keyaRaw)
Expand Down Expand Up @@ -2556,8 +2556,8 @@ func DecodeMethodQueryPrimitiveMapStringArrayStringValidateRequest(mux goahttp.M
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keya = keyRaw[openIdx+1 : closeIdx]
}
Expand Down Expand Up @@ -2611,8 +2611,8 @@ func DecodeMethodQueryPrimitiveMapStringBoolValidateRequest(mux goahttp.Muxer, d
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keya = keyRaw[openIdx+1 : closeIdx]
}
Expand Down Expand Up @@ -2672,8 +2672,8 @@ func DecodeMethodQueryPrimitiveMapBoolArrayBoolValidateRequest(mux goahttp.Muxer
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keyaRaw := keyRaw[openIdx+1 : closeIdx]
v, err2 := strconv.ParseBool(keyaRaw)
Expand Down Expand Up @@ -2747,8 +2747,8 @@ func DecodeMethodQueryMapStringMapIntStringValidateRequest(mux goahttp.Muxer, de
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keya = keyRaw[openIdx+1 : closeIdx]
keyRaw = keyRaw[closeIdx+1:]
Expand All @@ -2761,8 +2761,8 @@ func DecodeMethodQueryMapStringMapIntStringValidateRequest(mux goahttp.Muxer, de
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keybRaw := keyRaw[openIdx+1 : closeIdx]
v, err2 := strconv.ParseInt(keybRaw, 10, strconv.IntSize)
Expand Down Expand Up @@ -2814,8 +2814,8 @@ func DecodeMethodQueryMapIntMapStringArrayIntValidateRequest(mux goahttp.Muxer,
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keyaRaw := keyRaw[openIdx+1 : closeIdx]
v, err2 := strconv.ParseInt(keyaRaw, 10, strconv.IntSize)
Expand All @@ -2833,8 +2833,8 @@ func DecodeMethodQueryMapIntMapStringArrayIntValidateRequest(mux goahttp.Muxer,
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keyb = keyRaw[openIdx+1 : closeIdx]
}
Expand Down Expand Up @@ -5161,8 +5161,8 @@ func DecodeMapQueryPrimitivePrimitiveRequest(mux goahttp.Muxer, decoder func(*ht
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keya = keyRaw[openIdx+1 : closeIdx]
}
Expand Down Expand Up @@ -5203,8 +5203,8 @@ func DecodeMapQueryPrimitiveArrayRequest(mux goahttp.Muxer, decoder func(*http.R
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keya = keyRaw[openIdx+1 : closeIdx]
}
Expand Down Expand Up @@ -5662,8 +5662,8 @@ func DecodeMethodARequest(mux goahttp.Muxer, decoder func(*http.Request) goahttp
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keyaRaw := keyRaw[openIdx+1 : closeIdx]
v, err2 := strconv.ParseFloat(keyaRaw, 32)
Expand Down Expand Up @@ -5717,8 +5717,8 @@ func DecodeMethodARequest(mux goahttp.Muxer, decoder func(*http.Request) goahttp
{
openIdx := strings.IndexRune(keyRaw, '[')
closeIdx := strings.IndexRune(keyRaw, ']')
if closeIdx == -1 {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: missing closing bracket"))
if openIdx == -1 || closeIdx == -1 || closeIdx <= openIdx {
err = goa.MergeErrors(err, goa.DecodePayloadError("invalid query string: malformed brackets"))
} else {
keyaRaw := keyRaw[openIdx+1 : closeIdx]
v, err2 := strconv.ParseFloat(keyaRaw, 32)
Expand Down