1
0
Fork 0
mirror of https://github.com/gocsaf/csaf.git synced 2025-12-22 05:40:11 +01:00

Rewrite function from scratch
Some checks failed
Go / build (push) Has been cancelled
Go / run_modver (push) Has been cancelled

This commit is contained in:
JanHoefelmeyer 2025-07-03 10:58:32 +02:00
parent fc3837d655
commit e7c08d05cd

View file

@ -3,8 +3,8 @@
// //
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
// //
// SPDX-FileCopyrightText: 2023 German Federal Office for Information Security (BSI) <https://www.bsi.bund.de> // SPDX-FileCopyrightText: 2025 German Federal Office for Information Security (BSI) <https://www.bsi.bund.de>
// Software-Engineering: 2023 Intevation GmbH <https://intevation.de> // Software-Engineering: 2025 Intevation GmbH <https://intevation.de>
package misc package misc
@ -14,20 +14,23 @@ import (
"io" "io"
) )
// StrictJSONParse provides JSON parsing with stronger validation. // StrictJSONParse creates a JSON decoder that decodes an interface
// while not allowing unknown fields nor trailing data
func StrictJSONParse(jsonData io.Reader, target interface{}) error { func StrictJSONParse(jsonData io.Reader, target interface{}) error {
decoder := json.NewDecoder(jsonData) decoder := json.NewDecoder(jsonData)
// Don't allow unknown fields
decoder.DisallowUnknownFields() decoder.DisallowUnknownFields()
err := decoder.Decode(target) if err := decoder.Decode(target); err != nil {
if err != nil { return fmt.Errorf("JSON decoding error: %w", err)
return fmt.Errorf("strictJSONParse: %w", err)
} }
token, err := decoder.Token() // Check for any trailing data after the main JSON structure
if err != io.EOF { if _, err := decoder.Token(); err != io.EOF {
return fmt.Errorf("strictJSONParse: unexpected trailing data after JSON: token: %v, err: %v", token, err) if err != nil {
return fmt.Errorf("error reading trailing data: %w", err)
}
return fmt.Errorf("unexpected trailing data after JSON object")
} }
return nil return nil