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

Handle generated errors in broker

Browse source
This commit is contained in:
Shane Howearth 2019-09-20 11:12:59 +10:00 • committed by Cecylia Bocovich
parent ed3d42e1ec
commit 3cfceb3755
4 changed files with 39 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
broker/snowflake-broker_test.go
View file

@ -3,7 +3,6 @@ package main
import (
"bytes"
"container/heap"
. "github.com/smartystreets/goconvey/convey"
"io/ioutil"
"log"
"net"
@ -12,6 +11,8 @@ import (
"os"
"testing"
"time"
. "github.com/smartystreets/goconvey/convey"
)
func NullLogger() *log.Logger {
@ -181,7 +182,7 @@ func TestBroker(t *testing.T) {
})
Convey("with error if the proxy writes too much data", func() {
data := bytes.NewReader(make([]byte, 100001, 100001))
data := bytes.NewReader(make([]byte, 100001))
r, err := http.NewRequest("POST", "snowflake.broker/answer", data)
r.Header.Set("X-Session-ID", "test")
So(err, ShouldBeNil)
@ -385,7 +386,9 @@ func TestGeoip(t *testing.T) {
// Make sure things behave properly if geoip file fails to load
ctx := NewBrokerContext(NullLogger())
ctx.metrics.LoadGeoipDatabases("invalid_filename", "invalid_filename6")
if err := ctx.metrics.LoadGeoipDatabases("invalid_filename", "invalid_filename6"); err != nil {
log.Printf("loading geo ip databases returned error: %v", err)
}
ctx.metrics.UpdateCountryStats("127.0.0.1")
So(ctx.metrics.tablev4, ShouldEqual, nil)
@ -504,6 +507,9 @@ func TestMetrics(t *testing.T) {
data = bytes.NewReader([]byte("test"))
r, err = http.NewRequest("POST", "snowflake.broker/proxy", data)
if err != nil {
log.Printf("unable to get NewRequest with error: %v", err)
}
r.Header.Set("X-Session-ID", "test")
r.RemoteAddr = "129.97.208.23:8888" //CA geoip
go func(ctx *BrokerContext) {