black-internet-days-ahead/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2024-11-30 04:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve usages of json.Unmarshal

Browse source
This commit is contained in:
世界 2024-07-22 12:10:22 +08:00
parent bfab769d08
commit 77115831d0
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
option/json.go
View file

@ -1,8 +1,6 @@
package option package option
import ( import (
"bytes"
"github.com/sagernet/sing/common" "github.com/sagernet/sing/common"
E "github.com/sagernet/sing/common/exceptions" E "github.com/sagernet/sing/common/exceptions"
"github.com/sagernet/sing/common/json" "github.com/sagernet/sing/common/json"
@ -69,7 +67,5 @@ func UnmarshallExcluded(inputContent []byte, parentObject any, object any) error
if err != nil { if err != nil {
return err return err
} }
decoder := json.NewDecoder(bytes.NewReader(inputContent)) return json.UnmarshalDisallowUnknownFields(inputContent, object)
decoder.DisallowUnknownFields()
return decoder.Decode(object)
} }

4
option/types.go
View file

@ -128,12 +128,12 @@ func (l Listable[T]) MarshalJSON() ([]byte, error) {
} }
func (l *Listable[T]) UnmarshalJSON(content []byte) error { func (l *Listable[T]) UnmarshalJSON(content []byte) error {
err := json.Unmarshal(content, (*[]T)(l)) err := json.UnmarshalDisallowUnknownFields(content, (*[]T)(l))
if err == nil { if err == nil {
return nil return nil
} }
var singleItem T var singleItem T
newError := json.Unmarshal(content, &singleItem) newError := json.UnmarshalDisallowUnknownFields(content, &singleItem)
if newError != nil { if newError != nil {
return E.Errors(err, newError) return E.Errors(err, newError)
} }

2
option/udp_over_tcp.go
View file

@ -26,5 +26,5 @@ func (o *UDPOverTCPOptions) UnmarshalJSON(bytes []byte) error {
if err == nil { if err == nil {
return nil return nil
} }
return json.Unmarshal(bytes, (*_UDPOverTCPOptions)(o)) return json.UnmarshalDisallowUnknownFields(bytes, (*_UDPOverTCPOptions)(o))
} }