archives/snowflake
2
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git synced 2025-10-13 20:11:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disallow unknown bridge list file field

Browse source
This commit is contained in:
Shelikhoo 2022-05-18 12:19:21 +01:00
parent c5e5b45b06
commit 8ab45651d0
No known key found for this signature in database
GPG key ID: C4D5E79D22B25316
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
broker/bridge-list.go
View file

@ -2,11 +2,13 @@ package main
import (
"bufio"
"bytes"
"encoding/json"
"errors"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/bridgefingerprint"
"io"
"sync"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/bridgefingerprint"
)
var ErrBridgeNotFound = errors.New("bridge not found")
@ -50,7 +52,9 @@ func (h *bridgeListHolder) LoadBridgeInfo(reader io.Reader) error {
for inputScanner.Scan() {
inputLine := inputScanner.Bytes()
bridgeInfo := BridgeInfo{}
if err := json.Unmarshal(inputLine, &bridgeInfo); err != nil {
decoder := json.NewDecoder(bytes.NewReader(inputLine))
decoder.DisallowUnknownFields()
if err := decoder.Decode(&bridgeInfo); err != nil {
return err
}