Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
The Tor Project
Anti-censorship
Pluggable Transports
Snowflake
Commits
8ab45651
Verified
Commit
8ab45651
authored
May 18, 2022
by
shelikhoo
Browse files
Disallow unknown bridge list file field
parent
c5e5b45b
Changes
1
Hide whitespace changes
Inline
Side-by-side
broker/bridge-list.go
View file @
8ab45651
...
...
@@ -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
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment