tor-commits November 2019

tor-commits@lists.torproject.org

20 participants
2923 discussions

[tor/master] practracker: Don't read editor temp files, attempt 2
by teor＠torproject.org 14 Nov '19

14 Nov '19

commit 3b4a360ed0decaf7285c825cfab7712d6d5ebb37 Author: teor <teor(a)torproject.org> Date: Thu Nov 14 16:12:19 2019 +1000 practracker: Don't read editor temp files, attempt 2 (Or any files that start with "." or "#".) Obviously correct changes to already-reviewed code. --- scripts/maint/practracker/util.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/maint/practracker/util.py b/scripts/maint/practracker/util.py index c38e4c8dd..db02a983f 100644 --- a/scripts/maint/practracker/util.py +++ b/scripts/maint/practracker/util.py @@ -33,10 +33,13 @@ def get_tor_c_files(tor_topdir, include_dirs=None): # We only care about .c and .h files if not (filename.endswith(".c") or filename.endswith(".h")): continue + if filename in EXCLUDE_FILES: + continue # Avoid editor temporary files - if filename.startswith("."): + bname = os.path.basename(filename) + if bname.startswith("."): continue - if filename in EXCLUDE_FILES: + if bname.startswith("#"): continue full_path = os.path.join(root,filename)

1 0

[tor/master] changes: Update the changes file for 32410
by teor＠torproject.org 14 Nov '19

14 Nov '19

commit b2b61b0268f5ddac347b5487ea677a7202b95c50 Author: teor <teor(a)torproject.org> Date: Thu Nov 14 15:39:40 2019 +1000 changes: Update the changes file for 32410 When the relay module is disabled, we change the ClientOnly default to 1. But we forgot to mention that in the changes file. --- changes/ticket32410 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changes/ticket32410 b/changes/ticket32410 index 56368fe55..3b516d7a8 100644 --- a/changes/ticket32410 +++ b/changes/ticket32410 @@ -1,3 +1,3 @@ o Minor features (relay): - - When the relay module is disabled, make "DirCache 0" the default. - Closes ticket 32410. + - When the relay module is disabled, change the default config so that + DirCache is 0, and ClientOnly is 1. Closes ticket 32410.

1 0

[translation/tails-iuk] https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk
by translation＠torproject.org 14 Nov '19

14 Nov '19

commit 028dd6bc48b707d50f23e40bf261f78716d0fd02 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 14 00:18:30 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk --- de.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/de.po b/de.po index b0e636d91..17579ad27 100644 --- a/de.po +++ b/de.po @@ -8,6 +8,7 @@ # Ettore Atalan <atalanttore(a)googlemail.com>, 2018 # max weber, 2015 # noble <noble(a)posteo.de>, 2013 +# Not AName <atzeje(a)web.de>, 2019 # rike, 2014 # spriver, 2018 # sycamoreone <sycamoreone(a)riseup.net>, 2014 @@ -21,8 +22,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2019-10-21 09:17+0200\n" -"PO-Revision-Date: 2019-11-01 01:54+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2019-11-14 00:01+0000\n" +"Last-Translator: Not AName <atzeje(a)web.de>\n" "Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -144,7 +145,7 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/upgrade/#manual" -msgstr "" +msgstr "<b>Sie sollten eine manuelle Aktualisierung auf %{name}s %{version}s vornehmen.</b>\n\nFür weitere Informationen zur neuen Version besuchen Sie bitte %{details_url}s.\n\nEs ist nicht möglich, automatisch auf diese neue Version zu aktualisieren: %{explanation}s.\n\nUm zu lernen, wie man eine manuelle Aktualisierung vornimmt, besuchen Sie \nbitte https://tails.boum.org/doc/upgrade/#manual" #: ../lib/Tails/IUK/Frontend.pm:412 msgid "New version available"

1 0

[snowflake/master] Remove unnecessary logging at broker
by cohosh＠torproject.org 13 Nov '19

13 Nov '19

commit 7557e96a8d41c778a0b039b03969c66f91bd108a Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Nov 13 15:01:03 2019 -0500 Remove unnecessary logging at broker --- broker/broker.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index 4343de8..13d2575 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -161,7 +161,6 @@ func proxyPolls(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { sid, err := messages.DecodePollRequest(body) if err != nil { - log.Println("Invalid data.") w.WriteHeader(http.StatusBadRequest) return } @@ -259,7 +258,6 @@ func proxyAnswers(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { answer, id, err := messages.DecodeAnswerRequest(body) if err != nil || answer == "" { - log.Println("Invalid data.") w.WriteHeader(http.StatusBadRequest) return }

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 13 Nov '19

13 Nov '19

commit 14e4a76467c4e9ff3b8a9f9c20e69070febaa2f9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 13 19:53:18 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/contents+es.po b/contents+es.po index 57b378698..dcd62813f 100644 --- a/contents+es.po +++ b/contents+es.po @@ -5246,9 +5246,9 @@ msgid "" "updated. If you use them, you will miss important stability and security " "fixes." msgstr "" -"No utilices los paquetes de los repositorios de Ubuntu. Éstos seguramente no" -" están actualizados. Si los usas, perderás importantes parches de " -"estabilidad y seguridad." +"* No utilices los paquetes de los repositorios de Ubuntu. Seguramente no " +"están actualizados. Si los usas, perderás importantes parches de estabilidad" +" y seguridad." #: https//support.torproject.org/operators/operators-4/ #: (content/operators/operators-4/contents+en.lrquestion.description) @@ -7107,8 +7107,8 @@ msgid "" "network." msgstr "" "El protocolo de transferencia de hipertexto seguro es la versión " -"[encrypted](#encryption) del canal HTTP utilizado para transferir archivos y" -" datos entre dispositivos en una red." +"[encriptada](#encryption) del canal HTTP utilizado para transferir archivos " +"y datos entre dispositivos en una red." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7187,8 +7187,8 @@ msgid "" "[Tor Browser](#tor-browser) obscures your location by making it look like " "your [traffic](#traffic) is coming from an IP address that is not your own." msgstr "" -"[Navegador Tor](#tor-browser) oculta tu ubicación haciendo que parezca que " -"tu [traffic](#traffic) proviene de una dirección IP que no es la tuya." +"El [Navegador Tor](#tor-browser) oculta tu ubicación haciendo que parezca " +"que tu [tráfico](#traffic) proviene de una dirección IP que no es la tuya." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7238,7 +7238,7 @@ msgstr "## L" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### little-t tor" -msgstr "### little-t tor (ton en minúscula)" +msgstr "### little-t tor (tor en minúscula)" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7404,7 +7404,7 @@ msgid "" msgstr "" "[Navegador Tor](#tor-browser) incluye un [add-on](#add-on-extension-or-" "plugin) llamado NoScript, al que se accede a través del icono \"S\" en la " -"parte superior izquierda de la ventana, que le permite controlar el " +"parte superior izquierda de la ventana, que te permite controlar el " "[JavaScript](#javascript) que se ejecuta en páginas web individuales, o " "bloquearlo completamente." @@ -7717,7 +7717,8 @@ msgid "" "The private portion of a [public/private key pair](#public-key-" "cryptography)." msgstr "" -"La parte privada de una [public/private key pair](#public-key-cryptography)." +"La parte privada de un [par de llaves pública/privada](#public-key-" +"cryptography)." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7762,7 +7763,8 @@ msgstr "### public key" msgid "" "The public portion of a [public/private key pair](#public-key-cryptography)." msgstr "" -"La parte pública de un [public/private key pair](#public-key-cryptography)." +"La parte pública de un [par de llaves pública/privada](#public-key-" +"cryptography)." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -8164,7 +8166,7 @@ msgid "" "By default, Tor Browser does not keep any [browsing history](#browsing-" "history)." msgstr "" -"Por defecto, el Navegador Tor no mantiene ningún [browsing history" +"Por defecto, el Navegador Tor no mantiene ningún [historial de navegación" "](#browsing-history)." #: https//support.torproject.org/misc/glossary/

1 0

[snowflake/master] Renamed existing test file
by cohosh＠torproject.org 13 Nov '19

13 Nov '19

commit 3ec2e8b89e6e8e1e8ac1315fc9431870003bfb9d Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Jun 12 11:33:11 2019 -0400 Renamed existing test file --- proxy-go/{webrtc_test.go => proxy-go_test.go} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/proxy-go/webrtc_test.go b/proxy-go/proxy-go_test.go similarity index 100% rename from proxy-go/webrtc_test.go rename to proxy-go/proxy-go_test.go

1 0

[snowflake/master] Created tests for proxy-go utility functions
by cohosh＠torproject.org 13 Nov '19

13 Nov '19

commit 574c57cc98bd10571bc8c6feb6d3889de533f70e Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Nov 4 15:09:25 2019 -0500 Created tests for proxy-go utility functions --- proxy-go/proxy-go_test.go | 63 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/proxy-go/proxy-go_test.go b/proxy-go/proxy-go_test.go index c6df31c..d969acb 100644 --- a/proxy-go/proxy-go_test.go +++ b/proxy-go/proxy-go_test.go @@ -1,6 +1,7 @@ package main import ( + "io" "net" "strings" "testing" @@ -187,5 +188,67 @@ func TestSessionDescriptions(t *testing.T) { func TestUtilityFuncs(t *testing.T) { Convey("LimitedRead", t, func() { + c, s := net.Pipe() + Convey("Successful read", func() { + go func() { + bytes := make([]byte, 50) + c.Write(bytes) + c.Close() + }() + bytes, err := limitedRead(s, 60) + So(len(bytes), ShouldEqual, 50) + So(err, ShouldBeNil) + }) + Convey("Large read", func() { + go func() { + bytes := make([]byte, 50) + c.Write(bytes) + c.Close() + }() + bytes, err := limitedRead(s, 49) + So(len(bytes), ShouldEqual, 49) + So(err, ShouldEqual, io.ErrUnexpectedEOF) + }) + Convey("Failed read", func() { + s.Close() + bytes, err := limitedRead(s, 49) + So(len(bytes), ShouldEqual, 0) + So(err, ShouldEqual, io.ErrClosedPipe) + }) + }) + Convey("Tokens", t, func() { + tokens = make(chan bool, 2) + for i := uint(0); i < 2; i++ { + tokens <- true + } + So(len(tokens), ShouldEqual, 2) + getToken() + So(len(tokens), ShouldEqual, 1) + retToken() + So(len(tokens), ShouldEqual, 2) + }) + Convey("SessionID Generation", t, func() { + sid1 := genSessionID() + sid2 := genSessionID() + So(sid1, ShouldNotEqual, sid2) + }) + Convey("CopyLoop", t, func() { + c1, s1 := net.Pipe() + c2, s2 := net.Pipe() + go CopyLoop(s1, s2) + go func() { + bytes := []byte("Hello!") + c1.Write(bytes) + }() + bytes := make([]byte, 6) + n, err := c2.Read(bytes) + So(n, ShouldEqual, 6) + So(err, ShouldEqual, nil) + So(bytes, ShouldResemble, []byte("Hello!")) + s1.Close() + + //Check that copy loop has closed other connection + _, err = s2.Write(bytes) + So(err, ShouldNotBeNil) }) }

1 0

[snowflake/master] Test proxy-go interactions with broker
by cohosh＠torproject.org 13 Nov '19

13 Nov '19

commit 459286c143fbcaaa76e183362acd0bf69245ba79 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Jun 12 15:38:57 2019 -0400 Test proxy-go interactions with broker --- proxy-go/proxy-go_test.go | 143 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) diff --git a/proxy-go/proxy-go_test.go b/proxy-go/proxy-go_test.go index d969acb..a09dcc3 100644 --- a/proxy-go/proxy-go_test.go +++ b/proxy-go/proxy-go_test.go @@ -1,15 +1,56 @@ package main import ( + "bytes" + "fmt" "io" + "io/ioutil" "net" + "net/http" + "net/url" "strings" "testing" + "git.torproject.org/pluggable-transports/snowflake.git/common/messages" "github.com/pion/webrtc" . "github.com/smartystreets/goconvey/convey" ) +// Set up a mock broker to communicate with +type MockTransport struct { + statusOverride int + body []byte +} + +// Just returns a response with fake SDP answer. +func (m *MockTransport) RoundTrip(req *http.Request) (*http.Response, error) { + s := ioutil.NopCloser(bytes.NewReader(m.body)) + r := &http.Response{ + StatusCode: m.statusOverride, + Body: s, + } + return r, nil +} + +// Set up a mock faulty transport +type FaultyTransport struct { + statusOverride int + body []byte +} + +// Just returns a response with fake SDP answer. +func (f *FaultyTransport) RoundTrip(req *http.Request) (*http.Response, error) { + return nil, fmt.Errorf("TransportFailed") +} + +const SDP = "v=0\r\no=- 4358805017720277108 2 IN IP4 8.8.8.8\r\ns=-\r\nt=0 0\r\na=group:BUNDLE data\r\na=msid-semantic: WMS\r\nm=application 56688 DTLS/SCTP 5000\r\nc=IN IP4 8.8.8.8\r\na=candidate:3769337065 1 udp 2122260223 8.8.8.8 56688 typ host generation 0 network-id 1 network-cost 50\r\na=candidate:2921887769 1 tcp 1518280447 8.8.8.8 35441 typ host tcptype passive generation 0 network-id 1 network-cost 50\r\na=ice-ufrag:aMAZ\r\na=ice-pwd:jcHb08Jjgrazp2dzjdrvPPvV\r\na=ice-options:trickle\r\na=fingerprint:sha-256 C8:88:EE:B9:E7:02:2E:21:37:ED:7A:D1:EB:2B:A3:15:A2:3B:5B:1C:3D:D4:D5:1F:06:CF:52:40:03:F8:DD:66\r\na=setup:actpass\r\na=mid:data\r\na=sctpmap:5000 webrtc-datachannel 1024\r\n" + +const sampleSDP = `"v=0\r\no=- 4358805017720277108 2 IN IP4 8.8.8.8\r\ns=-\r\nt=0 0\r\na=group:BUNDLE data\r\na=msid-semantic: WMS\r\nm=application 56688 DTLS/SCTP 5000\r\nc=IN IP4 8.8.8.8\r\na=candidate:3769337065 1 udp 2122260223 8.8.8.8 56688 typ host generation 0 network-id 1 network-cost 50\r\na=candidate:2921887769 1 tcp 1518280447 8.8.8.8 35441 typ host tcptype passive generation 0 network-id 1 network-cost 50\r\na=ice-ufrag:aMAZ\r\na=ice-pwd:jcHb08Jjgrazp2dzjdrvPPvV\r\na=ice-options:trickle\r\na=fingerprint:sha-256 C8:88:EE:B9:E7:02:2E:21:37:ED:7A:D1:EB:2B:A3:15:A2:3B:5B:1C:3D:D4:D5:1F:06:CF:52:40:03:F8:DD:66\r\na=setup:actpass\r\na=mid:data\r\na=sctpmap:5000 webrtc-datachannel 1024\r\n"` + +var sampleOffer = `{"type":"offer","sdp":` + sampleSDP + `}` + +const sampleAnswer = `{"type":"answer","sdp":` + sampleSDP + `}` + func TestRemoteIPFromSDP(t *testing.T) { tests := []struct { sdp string @@ -186,6 +227,108 @@ func TestSessionDescriptions(t *testing.T) { }) } +func TestBrokerInteractions(t *testing.T) { + Convey("Proxy connections to broker", t, func() { + broker := new(Broker) + broker.url, _ = url.Parse("localhost") + + //Mock peerConnection + config = webrtc.Configuration{ + ICEServers: []webrtc.ICEServer{ + { + URLs: []string{"stun:stun.l.google.com:19302"}, + }, + }, + } + pc, _ := webrtc.NewPeerConnection(config) + offer := deserializeSessionDescription(sampleOffer) + pc.SetRemoteDescription(*offer) + answer, _ := pc.CreateAnswer(nil) + pc.SetLocalDescription(answer) + + Convey("polls broker correctly", func() { + var err error + + b, err := messages.EncodePollResponse(sampleOffer, true) + So(err, ShouldEqual, nil) + broker.transport = &MockTransport{ + http.StatusOK, + b, + } + + sdp := broker.pollOffer(sampleOffer) + So(sdp.SDP, ShouldEqual, SDP) + }) + Convey("handles poll error", func() { + var err error + + b := []byte("test") + So(err, ShouldEqual, nil) + broker.transport = &MockTransport{ + http.StatusOK, + b, + } + + sdp := broker.pollOffer(sampleOffer) + So(sdp, ShouldBeNil) + }) + Convey("sends answer to broker", func() { + var err error + + b, err := messages.EncodeAnswerResponse(true) + So(err, ShouldEqual, nil) + broker.transport = &MockTransport{ + http.StatusOK, + b, + } + + err = broker.sendAnswer(sampleAnswer, pc) + So(err, ShouldEqual, nil) + + b, err = messages.EncodeAnswerResponse(false) + So(err, ShouldEqual, nil) + broker.transport = &MockTransport{ + http.StatusOK, + b, + } + + err = broker.sendAnswer(sampleAnswer, pc) + So(err, ShouldNotBeNil) + }) + Convey("handles answer error", func() { + //Error if faulty transport + broker.transport = &FaultyTransport{} + err := broker.sendAnswer(sampleAnswer, pc) + So(err, ShouldNotBeNil) + + //Error if status code is not ok + broker.transport = &MockTransport{ + http.StatusGone, + []byte(""), + } + err = broker.sendAnswer("test", pc) + So(err, ShouldNotEqual, nil) + So(err.Error(), ShouldResemble, "broker returned 410") + + //Error if we can't parse broker message + broker.transport = &MockTransport{ + http.StatusOK, + []byte("test"), + } + err = broker.sendAnswer("test", pc) + So(err, ShouldNotBeNil) + + //Error if broker message surpasses read limit + broker.transport = &MockTransport{ + http.StatusOK, + make([]byte, 100001), + } + err = broker.sendAnswer("test", pc) + So(err, ShouldNotBeNil) + }) + }) +} + func TestUtilityFuncs(t *testing.T) { Convey("LimitedRead", t, func() { c, s := net.Pipe()

1 0

[snowflake/master] Add tests for session descripion functions
by cohosh＠torproject.org 13 Nov '19

13 Nov '19

commit 32bec89a848b4b5d2c9be20420e39a50190930d5 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Nov 4 13:48:22 2019 -0500 Add tests for session descripion functions Also removed some unnecessary code --- proxy-go/proxy-go_test.go | 82 +++++++++++++++++++++++++++++++++++++++++++++++ proxy-go/snowflake.go | 4 --- 2 files changed, 82 insertions(+), 4 deletions(-) diff --git a/proxy-go/proxy-go_test.go b/proxy-go/proxy-go_test.go index 2413207..c6df31c 100644 --- a/proxy-go/proxy-go_test.go +++ b/proxy-go/proxy-go_test.go @@ -4,6 +4,9 @@ import ( "net" "strings" "testing" + + "github.com/pion/webrtc" + . "github.com/smartystreets/goconvey/convey" ) func TestRemoteIPFromSDP(t *testing.T) { @@ -107,3 +110,82 @@ a=sctpmap:5000 webrtc-datachannel 1024 } } } + +func TestSessionDescriptions(t *testing.T) { + Convey("Session description deserialization", t, func() { + for _, test := range []struct { + msg string + ret *webrtc.SessionDescription + }{ + { + "test", + nil, + }, + { + `{"type":"answer"}`, + nil, + }, + { + `{"sdp":"test"}`, + nil, + }, + { + `{"type":"test", "sdp":"test"}`, + nil, + }, + { + `{"type":"answer", "sdp":"test"}`, + &webrtc.SessionDescription{ + Type: webrtc.SDPTypeAnswer, + SDP: "test", + }, + }, + { + `{"type":"pranswer", "sdp":"test"}`, + &webrtc.SessionDescription{ + Type: webrtc.SDPTypePranswer, + SDP: "test", + }, + }, + { + `{"type":"rollback", "sdp":"test"}`, + &webrtc.SessionDescription{ + Type: webrtc.SDPTypeRollback, + SDP: "test", + }, + }, + { + `{"type":"offer", "sdp":"test"}`, + &webrtc.SessionDescription{ + Type: webrtc.SDPTypeOffer, + SDP: "test", + }, + }, + } { + desc := deserializeSessionDescription(test.msg) + So(desc, ShouldResemble, test.ret) + } + }) + Convey("Session description serialization", t, func() { + for _, test := range []struct { + desc *webrtc.SessionDescription + ret string + }{ + { + &webrtc.SessionDescription{ + Type: webrtc.SDPTypeOffer, + SDP: "test", + }, + `{"type":"offer","sdp":"test"}`, + }, + } { + msg := serializeSessionDescription(test.desc) + So(msg, ShouldResemble, test.ret) + } + }) +} + +func TestUtilityFuncs(t *testing.T) { + Convey("LimitedRead", t, func() { + }) +} diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index ea2a986..9e52fd6 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -493,10 +493,6 @@ func deserializeSessionDescription(msg string) *webrtc.SessionDescription { stype = webrtc.SDPTypeRollback } - if err != nil { - log.Println(err) - return nil - } return &webrtc.SessionDescription{ Type: stype, SDP: parsed["sdp"].(string),

1 0

[snowflake/master] Use http.RoundTripper for connections to broker
by cohosh＠torproject.org 13 Nov '19

13 Nov '19

commit 446f39a9e5a0e47f70234bc3fbce422a34fb040a Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Jun 12 14:15:21 2019 -0400 Use http.RoundTripper for connections to broker This change makes it easier for us to write tests with mock transports --- proxy-go/snowflake.go | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index 9e52fd6..c4b2f0b 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -36,7 +36,7 @@ const dataChannelTimeout = 20 * time.Second const readLimit = 100000 //Maximum number of bytes to be read from an HTTP request -var brokerURL *url.URL +var broker *Broker var relayURL string const ( @@ -68,6 +68,11 @@ func remoteIPFromSDP(sdp string) net.IP { return nil } +type Broker struct { + url *url.URL + transport http.RoundTripper +} + type webRTCConn struct { dc *webrtc.DataChannel pc *webrtc.PeerConnection @@ -154,8 +159,8 @@ func limitedRead(r io.Reader, limit int64) ([]byte, error) { return p, err } -func pollOffer(sid string) *webrtc.SessionDescription { - broker := brokerURL.ResolveReference(&url.URL{Path: "proxy"}) +func (b *Broker) pollOffer(sid string) *webrtc.SessionDescription { + brokerPath := b.url.ResolveReference(&url.URL{Path: "proxy"}) timeOfNextPoll := time.Now() for { // Sleep until we're scheduled to poll again. @@ -169,14 +174,13 @@ func pollOffer(sid string) *webrtc.SessionDescription { timeOfNextPoll = now } - b, err := messages.EncodePollRequest(sid) + body, err := messages.EncodePollRequest(sid) if err != nil { log.Printf("Error encoding poll message: %s", err.Error()) return nil } - req, _ := http.NewRequest("POST", broker.String(), bytes.NewBuffer(b)) - req.Header.Set("X-Session-ID", sid) - resp, err := client.Do(req) + req, _ := http.NewRequest("POST", brokerPath.String(), bytes.NewBuffer(body)) + resp, err := b.transport.RoundTrip(req) if err != nil { log.Printf("error polling broker: %s", err) } else { @@ -204,15 +208,15 @@ func pollOffer(sid string) *webrtc.SessionDescription { } } -func sendAnswer(sid string, pc *webrtc.PeerConnection) error { - broker := brokerURL.ResolveReference(&url.URL{Path: "answer"}) +func (b *Broker) sendAnswer(sid string, pc *webrtc.PeerConnection) error { + brokerPath := b.url.ResolveReference(&url.URL{Path: "answer"}) answer := string([]byte(serializeSessionDescription(pc.LocalDescription()))) - b, err := messages.EncodeAnswerRequest(answer, sid) + body, err := messages.EncodeAnswerRequest(answer, sid) if err != nil { return err } - req, _ := http.NewRequest("POST", broker.String(), bytes.NewBuffer(b)) - resp, err := client.Do(req) + req, _ := http.NewRequest("POST", brokerPath.String(), bytes.NewBuffer(body)) + resp, err := b.transport.RoundTrip(req) if err != nil { return err } @@ -220,7 +224,7 @@ func sendAnswer(sid string, pc *webrtc.PeerConnection) error { return fmt.Errorf("broker returned %d", resp.StatusCode) } - body, err := limitedRead(resp.Body, readLimit) + body, err = limitedRead(resp.Body, readLimit) if err != nil { return fmt.Errorf("error reading broker response: %s", err) } @@ -364,7 +368,7 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config webrtc.C } func runSession(sid string) { - offer := pollOffer(sid) + offer := broker.pollOffer(sid) if offer == nil { log.Printf("bad offer from broker") retToken() @@ -377,7 +381,7 @@ func runSession(sid string) { retToken() return } - err = sendAnswer(sid, pc) + err = broker.sendAnswer(sid, pc) if err != nil { log.Printf("error sending answer to client through broker: %s", err) if inerr := pc.Close(); inerr != nil { @@ -430,7 +434,8 @@ func main() { log.Println("starting") var err error - brokerURL, err = url.Parse(rawBrokerURL) + broker = new(Broker) + broker.url, err = url.Parse(rawBrokerURL) if err != nil { log.Fatalf("invalid broker url: %s", err) } @@ -443,6 +448,7 @@ func main() { log.Fatalf("invalid relay url: %s", err) } + broker.transport = http.DefaultTransport.(*http.Transport) config = webrtc.Configuration{ ICEServers: []webrtc.ICEServer{ {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2019