b2700903ae
As deepmap/oapi-codegen didn't work with this newer version, upgrade to oapi-codegen/oapi-codegen v2. Mitigating CVE-2025-30153
34 lines
1,009 B
Go
34 lines
1,009 B
Go
package openapi3
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/oasdiff/yaml"
|
|
)
|
|
|
|
func unmarshalError(jsonUnmarshalErr error) error {
|
|
if before, after, found := strings.Cut(jsonUnmarshalErr.Error(), "Bis"); found && before != "" && after != "" {
|
|
before = strings.ReplaceAll(before, " Go struct ", " ")
|
|
return fmt.Errorf("%s%s", before, strings.ReplaceAll(after, "Bis", ""))
|
|
}
|
|
return jsonUnmarshalErr
|
|
}
|
|
|
|
func unmarshal(data []byte, v any, includeOrigin bool) error {
|
|
var jsonErr, yamlErr error
|
|
|
|
// See https://github.com/getkin/kin-openapi/issues/680
|
|
if jsonErr = json.Unmarshal(data, v); jsonErr == nil {
|
|
return nil
|
|
}
|
|
|
|
// UnmarshalStrict(data, v) TODO: investigate how ymlv3 handles duplicate map keys
|
|
if yamlErr = yaml.UnmarshalWithOrigin(data, v, includeOrigin); yamlErr == nil {
|
|
return nil
|
|
}
|
|
|
|
// If both unmarshaling attempts fail, return a new error that includes both errors
|
|
return fmt.Errorf("failed to unmarshal data: json error: %v, yaml error: %v", jsonErr, yamlErr)
|
|
}
|