[tor-commits] [snowflake/master] Use http.RoundTripper for connections to broker

[cohosh@xxxxxxxxxxxxxx]

commit 446f39a9e5a0e47f70234bc3fbce422a34fb040a
Author: Cecylia Bocovich <cohosh@xxxxxxxxxxxxxx>
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{
 			{



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits