October 2019 - tor-commits - lists.torproject.org

[snowflake/master] Handle generated errors in server-webrtc
by cohosh＠torproject.org 08 Oct '19

08 Oct '19

commit 3ec9dd19faa8584dd76ba3b85eb71a03b8ee25c0 Author: Shane Howearth <Shane.h.1(a)gmail.com> Date: Thu Sep 26 09:19:22 2019 +1000 Handle generated errors in server-webrtc --- client/lib/snowflake.go | 15 +++++++++---- server-webrtc/http.go | 11 ++++++++-- server-webrtc/snowflake.go | 53 ++++++++++++++++++++++++++++++++-------------- 3 files changed, 57 insertions(+), 22 deletions(-) diff --git a/client/lib/snowflake.go b/client/lib/snowflake.go index 900af88..4af3d88 100644 --- a/client/lib/snowflake.go +++ b/client/lib/snowflake.go @@ -13,7 +13,7 @@ const ( SnowflakeTimeout = 30 ) -// When a connection handler starts, +1 is written to this channel; when it +// HandlerChan - When a connection handler starts, +1 is written to this channel; when it // ends, -1 is written. var HandlerChan = make(chan int) @@ -27,7 +27,10 @@ func Handler(socks SocksConnector, snowflakes SnowflakeCollector) error { // Obtain an available WebRTC remote. May block. snowflake := snowflakes.Pop() if nil == snowflake { - socks.Reject() + if err := socks.Reject(); err != nil { + log.Printf("socks.Reject returned error: %v", err) + } + return errors.New("handler: Received invalid Snowflake") } defer socks.Close() @@ -57,11 +60,15 @@ func copyLoop(a, b io.ReadWriter) { var wg sync.WaitGroup wg.Add(2) go func() { - io.Copy(b, a) + if _, err := io.Copy(ORPort, WebRTC); err != nil { + log.Printf("copying WebRTC to ORPort resulted in error: %v", err) + } wg.Done() }() go func() { - io.Copy(a, b) + if _, err := io.Copy(WebRTC, ORPort); err != nil { + log.Printf("copying ORPort to WebRTC resulted in error: %v", err) + } wg.Done() }() wg.Wait() diff --git a/server-webrtc/http.go b/server-webrtc/http.go index f0ecb88..1232239 100644 --- a/server-webrtc/http.go +++ b/server-webrtc/http.go @@ -23,11 +23,14 @@ func (h *httpHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { case "GET": w.Header().Set("Content-Type", "text/plain; charset=utf-8") w.WriteHeader(http.StatusOK) - w.Write([]byte(`HTTP signaling channel + _, err := w.Write([]byte(`HTTP signaling channel Send a POST request containing an SDP offer. The response will contain an SDP answer. `)) + if err != nil { + log.Printf("GET request write failed with error: %v", err) + } return case "POST": break @@ -57,7 +60,11 @@ contain an SDP answer. log.Println("answering HTTP POST") w.WriteHeader(http.StatusOK) - w.Write([]byte(pc.LocalDescription().Serialize())) + _, err = w.Write([]byte(pc.LocalDescription().Serialize())) + if err != nil { + log.Printf("answering HTTP POST write failed with error %v", err) + } + } func receiveSignalsHTTP(addr string, config *webrtc.Configuration) error { diff --git a/server-webrtc/snowflake.go b/server-webrtc/snowflake.go index 5923d6b..cf1c888 100644 --- a/server-webrtc/snowflake.go +++ b/server-webrtc/snowflake.go @@ -13,7 +13,7 @@ import ( "syscall" "time" - "git.torproject.org/pluggable-transports/goptlib.git" + pt "git.torproject.org/pluggable-transports/goptlib.git" "github.com/keroserene/go-webrtc" ) @@ -25,15 +25,19 @@ var logFile *os.File // when it ends, -1 is written. var handlerChan = make(chan int) -func copyLoop(a, b net.Conn) { +func copyLoop(WebRTC, ORPort net.Conn) { var wg sync.WaitGroup wg.Add(2) go func() { - io.Copy(b, a) + if _, err := io.Copy(ORPort, WebRTC); err != nil { + log.Printf("copy WebRTC to ORPort error in copyLoop: %v", err) + } wg.Done() }() go func() { - io.Copy(a, b) + if _, err := io.Copy(WebRTC, ORPort); err != nil { + log.Printf("copy ORPort to WebRTC error in copyLoop: %v", err) + } wg.Done() }() wg.Wait() @@ -79,14 +83,17 @@ func (c *webRTCConn) RemoteAddr() net.Addr { } func (c *webRTCConn) SetDeadline(t time.Time) error { + // nolint:golint return fmt.Errorf("SetDeadline not implemented") } func (c *webRTCConn) SetReadDeadline(t time.Time) error { + // nolint:golint return fmt.Errorf("SetReadDeadline not implemented") } func (c *webRTCConn) SetWriteDeadline(t time.Time) error { + // nolint:golint return fmt.Errorf("SetWriteDeadline not implemented") } @@ -139,9 +146,12 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc. } dc.OnMessage = func(msg []byte) { log.Printf("OnMessage <--- %d bytes", len(msg)) - n, err := pw.Write(msg) + var n int + n, err = pw.Write(msg) if err != nil { - pw.CloseWithError(err) + if inerr := pw.CloseWithError(err); inerr != nil { + log.Printf("close with error returned error: %v", inerr) + } } if n != len(msg) { panic("short write") @@ -153,7 +163,9 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc. err = pc.SetRemoteDescription(sdp) if err != nil { - pc.Destroy() + if err = pc.Destroy(); err != nil { + log.Printf("pc.Destroy returned an error: %v", err) + } return nil, fmt.Errorf("accept: SetRemoteDescription: %s", err) } log.Println("sdp offer successfully received.") @@ -161,18 +173,24 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc. log.Println("Generating answer...") answer, err := pc.CreateAnswer() if err != nil { - pc.Destroy() + if err = pc.Destroy(); err != nil { + log.Printf("pc.Destroy returned an error: %v", err) + } return nil, err } if answer == nil { - pc.Destroy() - return nil, fmt.Errorf("Failed gathering ICE candidates.") + if err = pc.Destroy(); err != nil { + log.Printf("pc.Destroy returned an error: %v", err) + } + return nil, fmt.Errorf("failed gathering ICE candidates") } err = pc.SetLocalDescription(answer) if err != nil { - pc.Destroy() + if err = pc.Destroy(); err != nil { + log.Printf("pc.Destroy returned an error: %v", err) + } return nil, err } @@ -180,7 +198,6 @@ func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc. } func main() { - var err error var httpAddr string var logFilename string @@ -200,7 +217,7 @@ func main() { log.Println("starting") webrtc.SetLoggingVerbosity(1) - + var err error ptInfo, err = pt.ServerSetup(nil) if err != nil { log.Fatal(err) @@ -222,12 +239,14 @@ func main() { bindaddr.Addr.Port = 12345 // lies!!! pt.Smethod(bindaddr.MethodName, bindaddr.Addr) default: - pt.SmethodError(bindaddr.MethodName, "no such method") + if err := pt.SmethodError(bindaddr.MethodName, "no such method"); err != nil { + log.Printf("SmethodError returned error: %v", err) + } } } pt.SmethodsDone() - var numHandlers int = 0 + var numHandlers int var sig os.Signal sigChan := make(chan os.Signal, 1) signal.Notify(sigChan, syscall.SIGTERM) @@ -236,7 +255,9 @@ func main() { // This environment variable means we should treat EOF on stdin // just like SIGTERM: https://bugs.torproject.org/15435. go func() { - io.Copy(ioutil.Discard, os.Stdin) + if _, err := io.Copy(ioutil.Discard, os.Stdin); err != nil { + log.Printf("error copying os.Stdin to ioutil.Discard: %v", err) + } log.Printf("synthesizing SIGTERM because of stdin close") sigChan <- syscall.SIGTERM }()

1 0

[snowflake/master] Handle generated errors in client
by cohosh＠torproject.org 08 Oct '19

08 Oct '19

commit b26c7a7a7330586c3be3ece02c68999bb279ff40 Author: Shane Howearth <Shane.h.1(a)gmail.com> Date: Tue Sep 24 09:00:13 2019 +1000 Handle generated errors in client --- client/lib/snowflake.go | 10 +++++----- client/lib/webrtc.go | 11 ++++++++--- client/snowflake.go | 21 +++++++++++++++------ 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/client/lib/snowflake.go b/client/lib/snowflake.go index 4af3d88..1c9c34d 100644 --- a/client/lib/snowflake.go +++ b/client/lib/snowflake.go @@ -56,18 +56,18 @@ func Handler(socks SocksConnector, snowflakes SnowflakeCollector) error { // Exchanges bytes between two ReadWriters. // (In this case, between a SOCKS and WebRTC connection.) -func copyLoop(a, b io.ReadWriter) { +func copyLoop(WebRTC, SOCKS io.ReadWriter) { var wg sync.WaitGroup wg.Add(2) go func() { - if _, err := io.Copy(ORPort, WebRTC); err != nil { - log.Printf("copying WebRTC to ORPort resulted in error: %v", err) + if _, err := io.Copy(SOCKS, WebRTC); err != nil { + log.Printf("copying WebRTC to SOCKS resulted in error: %v", err) } wg.Done() }() go func() { - if _, err := io.Copy(WebRTC, ORPort); err != nil { - log.Printf("copying ORPort to WebRTC resulted in error: %v", err) + if _, err := io.Copy(WebRTC, SOCKS); err != nil { + log.Printf("copying SOCKS to WebRTC resulted in error: %v", err) } wg.Done() }() diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index 7d361ef..84494d5 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -138,7 +138,8 @@ func (c *WebRTCPeer) Connect() error { } err = c.establishDataChannel() if err != nil { - return errors.New("WebRTC: Could not establish DataChannel.") + // nolint: golint + return errors.New("WebRTC: Could not establish DataChannel") } err = c.exchangeSDP() if err != nil { @@ -151,7 +152,9 @@ func (c *WebRTCPeer) Connect() error { // Create and prepare callbacks on a new WebRTC PeerConnection. func (c *WebRTCPeer) preparePeerConnection() error { if nil != c.pc { - c.pc.Close() + if err := c.pc.Close(); err != nil { + log.Printf("c.pc.Close returned error: %v", err) + } c.pc = nil } @@ -267,7 +270,9 @@ func (c *WebRTCPeer) establishDataChannel() error { if err != nil { // TODO: Maybe shouldn't actually close. log.Println("Error writing to SOCKS pipe") - c.writePipe.CloseWithError(err) + if inerr := c.writePipe.CloseWithError(err); inerr != nil { + log.Printf("c.writePipe.CloseWithError returned error: %v", inerr) + } } if n != len(msg.Data) { log.Println("Error: short write") diff --git a/client/snowflake.go b/client/snowflake.go index 01c89d8..883a665 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -45,7 +45,7 @@ func ConnectLoop(snowflakes sf.SnowflakeCollector) { } // Accept local SOCKS connections and pass them to the handler. -func socksAcceptLoop(ln *pt.SocksListener, snowflakes sf.SnowflakeCollector) error { +func socksAcceptLoop(ln *pt.SocksListener, snowflakes sf.SnowflakeCollector) { defer ln.Close() log.Println("Started SOCKS listener.") for { @@ -55,7 +55,8 @@ func socksAcceptLoop(ln *pt.SocksListener, snowflakes sf.SnowflakeCollector) err if e, ok := err.(net.Error); ok && e.Temporary() { continue } - return err + log.Printf("SOCKS accept error: %s", err) + break } log.Println("SOCKS accepted: ", conn.Req) err = sf.Handler(conn, snowflakes) @@ -155,7 +156,9 @@ func main() { log.Fatal(err) } if ptInfo.ProxyURL != nil { - pt.ProxyError("proxy is not supported") + if err := pt.ProxyError("proxy is not supported"); err != nil { + log.Printf("call to pt.ProxyError generated error: %v", err) + } os.Exit(1) } listeners := make([]net.Listener, 0) @@ -165,14 +168,18 @@ func main() { // TODO: Be able to recover when SOCKS dies. ln, err := pt.ListenSocks("tcp", "127.0.0.1:0") if err != nil { - pt.CmethodError(methodName, err.Error()) + if inerr := pt.CmethodError(methodName, err.Error()); inerr != nil { + log.Printf("handling error generated by pt.ListenSocks with pt.CmethodError generated error: %v", inerr) + } break } go socksAcceptLoop(ln, snowflakes) pt.Cmethod(methodName, ln.Version(), ln.Addr()) listeners = append(listeners, ln) default: - pt.CmethodError(methodName, "no such method") + if err := pt.CmethodError(methodName, "no such method"); err != nil { + log.Printf("calling pt.CmethodError generated error: %v", err) + } } } pt.CmethodsDone() @@ -186,7 +193,9 @@ func main() { // This environment variable means we should treat EOF on stdin // just like SIGTERM: https://bugs.torproject.org/15435. go func() { - io.Copy(ioutil.Discard, os.Stdin) + if _, err := io.Copy(ioutil.Discard, os.Stdin); err != nil { + log.Printf("calling io.Copy(ioutil.Discard, os.Stdin) returned error: %v", err) + } log.Printf("synthesizing SIGTERM because of stdin close") sigChan <- syscall.SIGTERM }()

1 0

[snowflake/master] Handle generated errors in broker
by cohosh＠torproject.org 08 Oct '19

08 Oct '19

commit 3cfceb3755a82101b4e662ff51f2d2949570bef8 Author: Shane Howearth <Shane.h.1(a)gmail.com> Date: Fri Sep 20 11:12:59 2019 +1000 Handle generated errors in broker --- broker/broker.go | 35 +++++++++++++++++++++++++---------- broker/geoip.go | 6 +++--- broker/metrics.go | 8 ++------ broker/snowflake-broker_test.go | 12 +++++++++--- 4 files changed, 39 insertions(+), 22 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index 12b4965..2a253b0 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -179,7 +179,10 @@ func proxyPolls(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusGatewayTimeout) return } - w.Write(offer) + log.Println("Passing client offer to snowflake.") + if _, err := w.Write(offer); err != nil { + log.Printf("proxyPolls unable to write offer with error: %v", err) + } } /* @@ -211,14 +214,18 @@ func clientOffers(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { select { case answer := <-snowflake.answerChannel: ctx.metrics.clientProxyMatchCount++ - w.Write(answer) + if _, err := w.Write(answer); err != nil { + log.Printf("unable to write answer with error: %v", err) + } // Initial tracking of elapsed time. ctx.metrics.clientRoundtripEstimate = time.Since(startTime) / time.Millisecond case <-time.After(time.Second * ClientTimeout): log.Println("Client: Timed out.") w.WriteHeader(http.StatusGatewayTimeout) - w.Write([]byte("timed out waiting for answer!")) + if _, err := w.Write([]byte("timed out waiting for answer!")); err != nil { + log.Printf("unable to write timeout error, failed with error: %v", err) + } } } @@ -259,12 +266,16 @@ func debugHandler(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) { } s += fmt.Sprintf("\tstandalone proxies: %d", standalones) s += fmt.Sprintf("\n\tbrowser proxies: %d", browsers) - w.Write([]byte(s)) + if _, err := w.Write([]byte(s)); err != nil { + log.Printf("writing proxy information returned error: %v ", err) + } } func robotsTxtHandler(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "text/plain; charset=utf-8") - w.Write([]byte("User-agent: *\nDisallow: /\n")) + if _, err := w.Write([]byte("User-agent: *\nDisallow: /\n")); err != nil { + log.Printf("robotsTxtHandler unable to write, with this error: %v", err) + } } func metricsHandler(metricsFilename string, w http.ResponseWriter, r *http.Request) { @@ -281,7 +292,9 @@ func metricsHandler(metricsFilename string, w http.ResponseWriter, r *http.Reque return } - io.Copy(w, metricsFile) + if _, err := io.Copy(w, metricsFile); err != nil { + log.Printf("copying metricsFile returned error: %v", err) + } } func main() { @@ -310,7 +323,7 @@ func main() { flag.Parse() var err error - var metricsFile io.Writer = os.Stdout + var metricsFile io.Writer var logOutput io.Writer = os.Stderr //We want to send the log output through our scrubber first log.SetOutput(&safelog.LogScrubber{Output: logOutput}) @@ -332,7 +345,7 @@ func main() { ctx := NewBrokerContext(metricsLogger) if !disableGeoip { - err := ctx.metrics.LoadGeoipDatabases(geoipDatabase, geoip6Database) + err = ctx.metrics.LoadGeoipDatabases(geoipDatabase, geoip6Database) if err != nil { log.Fatal(err.Error()) } @@ -361,8 +374,10 @@ func main() { go func() { for { signal := <-sigChan - log.Println("Received signal:", signal, ". Reloading geoip databases.") - ctx.metrics.LoadGeoipDatabases(geoipDatabase, geoip6Database) + log.Printf("Received signal: %s. Reloading geoip databases.", signal) + if err = ctx.metrics.LoadGeoipDatabases(geoipDatabase, geoip6Database); err != nil { + log.Fatalf("reload of Geo IP databases on signal %s returned error: %v", signal, err) + } } }() diff --git a/broker/geoip.go b/broker/geoip.go index 5a16a8a..708cdad 100644 --- a/broker/geoip.go +++ b/broker/geoip.go @@ -93,7 +93,7 @@ func (table *GeoIPv6Table) Unlock() { (*table).lock.Unlock() } func geoipStringToIP(ipStr string) (net.IP, error) { ip, err := strconv.ParseUint(ipStr, 10, 32) if err != nil { - return net.IPv4(0, 0, 0, 0), fmt.Errorf("Error parsing IP %s", ipStr) + return net.IPv4(0, 0, 0, 0), fmt.Errorf("error parsing IP %s", ipStr) } var bytes [4]byte bytes[0] = byte(ip & 0xFF) @@ -115,7 +115,7 @@ func (table *GeoIPv4Table) parseEntry(candidate string) (*GeoIPEntry, error) { parsedCandidate := strings.Split(candidate, ",") if len(parsedCandidate) != 3 { - return nil, fmt.Errorf("Provided geoip file is incorrectly formatted. Could not parse line:\n%s", parsedCandidate) + return nil, fmt.Errorf("provided geoip file is incorrectly formatted. Could not parse line:\n%s", parsedCandidate) } low, err := geoipStringToIP(parsedCandidate[0]) @@ -190,7 +190,7 @@ func GeoIPLoadFile(table GeoIPTable, pathname string) error { for scanner.Scan() { entry, err := table.parseEntry(scanner.Text()) if err != nil { - return fmt.Errorf("Provided geoip file is incorrectly formatted. Line is: %+q", scanner.Text()) + return fmt.Errorf("provided geoip file is incorrectly formatted. Line is: %+q", scanner.Text()) } if entry != nil { diff --git a/broker/metrics.go b/broker/metrics.go index 1b2032a..15a4a88 100644 --- a/broker/metrics.go +++ b/broker/metrics.go @@ -120,7 +120,6 @@ func (m *Metrics) UpdateCountryStats(addr string) { m.countryStats.counts[country]++ m.countryStats.addrs[addr] = true - return } func (m *Metrics) LoadGeoipDatabases(geoipDB string, geoip6DB string) error { @@ -132,19 +131,16 @@ func (m *Metrics) LoadGeoipDatabases(geoipDB string, geoip6DB string) error { if err != nil { m.tablev4 = nil return err - } else { - m.tablev4 = tablev4 } + m.tablev4 = tablev4 tablev6 := new(GeoIPv6Table) err = GeoIPLoadFile(tablev6, geoip6DB) if err != nil { m.tablev6 = nil return err - } else { - m.tablev6 = tablev6 } - + m.tablev6 = tablev6 return nil } diff --git a/broker/snowflake-broker_test.go b/broker/snowflake-broker_test.go index 5afbe33..4c78ecd 100644 --- a/broker/snowflake-broker_test.go +++ b/broker/snowflake-broker_test.go @@ -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) {

1 0

[snowflake/master] Bring code into line with Golangci-lint linters
by cohosh＠torproject.org 08 Oct '19

08 Oct '19

commit 8bbdb3b51aacc15a36cb44853460945b0955511c Author: Shane Howearth <Shane.h.1(a)gmail.com> Date: Wed Sep 18 16:23:30 2019 +1000 Bring code into line with Golangci-lint linters - Error strings are no longer capitalized nor end with punctuation - Alias import - Remove extraneous initilisation code (No need to provide zero value for variables, because the compiler does that anyway) --- client/lib/peers.go | 4 ++-- client/lib/rendezvous.go | 2 +- client/lib/webrtc.go | 2 +- client/snowflake.go | 6 +++--- server/server.go | 4 ++-- server/stats.go | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/lib/peers.go b/client/lib/peers.go index 21411ed..5493bfd 100644 --- a/client/lib/peers.go +++ b/client/lib/peers.go @@ -44,13 +44,13 @@ func (p *Peers) Collect() (Snowflake, error) { cnt := p.Count() s := fmt.Sprintf("Currently at [%d/%d]", cnt, p.capacity) if cnt >= p.capacity { - s := fmt.Sprintf("At capacity [%d/%d]", cnt, p.capacity) + s = fmt.Sprintf("At capacity [%d/%d]", cnt, p.capacity) return nil, errors.New(s) } log.Println("WebRTC: Collecting a new Snowflake.", s) // Engage the Snowflake Catching interface, which must be available. if nil == p.Tongue { - return nil, errors.New("Missing Tongue to catch Snowflakes with.") + return nil, errors.New("missing Tongue to catch Snowflakes with") } // BUG: some broker conflict here. connection, err := p.Tongue.Catch() diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index b13b841..0c7225b 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -144,7 +144,7 @@ func NewWebRTCDialer( // Initialize a WebRTC Connection by signaling through the broker. func (w WebRTCDialer) Catch() (Snowflake, error) { if nil == w.BrokerChannel { - return nil, errors.New("Cannot Dial WebRTC without a BrokerChannel.") + return nil, errors.New("cannot Dial WebRTC without a BrokerChannel") } // TODO: [#3] Fetch ICE server information from Broker. // TODO: [#18] Consider TURN servers here too. diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index 84494d5..9d1ba37 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -309,7 +309,7 @@ func (c *WebRTCPeer) exchangeSDP() error { } // Keep trying the same offer until a valid answer arrives. var ok bool - var answer *webrtc.SessionDescription = nil + var answer *webrtc.SessionDescription for nil == answer { go c.sendOfferToBroker() answer, ok = <-c.answerChannel // Blocks... diff --git a/client/snowflake.go b/client/snowflake.go index 883a665..18b704f 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -14,7 +14,7 @@ import ( "syscall" "time" - "git.torproject.org/pluggable-transports/goptlib.git" + pt "git.torproject.org/pluggable-transports/goptlib.git" sf "git.torproject.org/pluggable-transports/snowflake.git/client/lib" "git.torproject.org/pluggable-transports/snowflake.git/common/safelog" "github.com/pion/webrtc" @@ -102,7 +102,7 @@ func main() { // deadlock because the buffer is full. // https://bugs.torproject.org/26360 // https://bugs.torproject.org/25600#comment:14 - var logOutput io.Writer = ioutil.Discard + var logOutput = ioutil.Discard if *logFilename != "" { if *logToStateDir { stateDir, err := pt.MakeStateDir() @@ -184,7 +184,7 @@ func main() { } pt.CmethodsDone() - var numHandlers int = 0 + var numHandlers int var sig os.Signal sigChan := make(chan os.Signal, 1) signal.Notify(sigChan, syscall.SIGTERM) diff --git a/server/server.go b/server/server.go index 3100fc9..5d15df6 100644 --- a/server/server.go +++ b/server/server.go @@ -19,7 +19,7 @@ import ( "syscall" "time" - "git.torproject.org/pluggable-transports/goptlib.git" + pt "git.torproject.org/pluggable-transports/goptlib.git" "git.torproject.org/pluggable-transports/snowflake.git/common/safelog" "git.torproject.org/pluggable-transports/websocket.git/websocket" "golang.org/x/crypto/acme/autocert" @@ -390,7 +390,7 @@ func main() { } pt.SmethodsDone() - var numHandlers int = 0 + var numHandlers int var sig os.Signal sigChan := make(chan os.Signal, 1) signal.Notify(sigChan, syscall.SIGTERM) diff --git a/server/stats.go b/server/stats.go index 204e587..47aefc6 100644 --- a/server/stats.go +++ b/server/stats.go @@ -27,9 +27,9 @@ func statsThread() { select { case v := <-statsChannel: if v { - numClientIP += 1 + numClientIP++ } - numConnections += 1 + numConnections++ case <-deadline: now := time.Now() log.Printf("in the past %.f s, %d/%d connections had client_ip",

1 0

[snowflake/master] Remove unnecessary initialisation of last
by cohosh＠torproject.org 08 Oct '19

08 Oct '19

commit 01156e58eb138200eea84b4ce3f86b251b991a19 Author: Shane Howearth <Shane.h.1(a)gmail.com> Date: Thu Sep 26 13:37:32 2019 +1000 Remove unnecessary initialisation of last last was initialised twice (creating a shadow), the second time inside a case statement. The second initialisation is removed, keeping the use of last aligned to the isame style as its use other parts of the case statement. --- client/lib/util.go | 1 - 1 file changed, 1 deletion(-) diff --git a/client/lib/util.go b/client/lib/util.go index f385279..f93bcbe 100644 --- a/client/lib/util.go +++ b/client/lib/util.go @@ -54,7 +54,6 @@ func (b *BytesSyncLogger) Log() { case amount = <-b.OutboundChan: b.Outbound += amount b.OutEvents++ - last := time.Now() if time.Since(last) > time.Second*LogTimeInterval { last = time.Now() output()

1 0

[translation/liveusb-creator] https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator
by translation＠torproject.org 08 Oct '19

08 Oct '19

commit 2820fa01ca2edd40b3af47a385fe8dafbccaed55 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 8 14:16:12 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator --- mk/mk.po | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/mk/mk.po b/mk/mk.po index 7a63844a6..333566be7 100644 --- a/mk/mk.po +++ b/mk/mk.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-14 14:48+0200\n" -"PO-Revision-Date: 2019-10-06 16:33+0000\n" +"PO-Revision-Date: 2019-10-08 14:15+0000\n" "Last-Translator: Zarko Gjurov <zarkogjurov(a)gmail.com>\n" "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n" "MIME-Version: 1.0\n" @@ -264,18 +264,18 @@ msgstr "" #: ../tails_installer/creator.py:1536 msgid "Cannot find" -msgstr "" +msgstr "Не може да биде прпнајдено" #: ../tails_installer/creator.py:1537 msgid "" "Make sure to extract the entire tails-installer zip file before running this" " program." -msgstr "" +msgstr "Осигурете дека сте ја птпакувале целата tails-installer zip датотека пред да ја стартувате оваа програма." #: ../tails_installer/gui.py:69 #, python-format msgid "Unknown release: %s" -msgstr "" +msgstr "Непознато издание: %s" #: ../tails_installer/gui.py:73 #, python-format @@ -291,11 +291,11 @@ msgstr "" #: ../tails_installer/gui.py:260 #, python-format msgid "Installation complete! (%s)" -msgstr "" +msgstr "Инсталацијата заврши! (%s)" #: ../tails_installer/gui.py:265 msgid "Tails installation failed!" -msgstr "" +msgstr "Инсталацијата на Tails не успеа!" #: ../tails_installer/gui.py:369 msgid "" @@ -306,11 +306,11 @@ msgstr "" #: ../tails_installer/gui.py:381 msgid "Tails Installer" -msgstr "" +msgstr "Tails Installer" #: ../tails_installer/gui.py:441 msgid "Tails Installer is deprecated in Debian" -msgstr "" +msgstr "Tails Installer е амортизиран на Debian" #: ../tails_installer/gui.py:443 msgid "" @@ -319,27 +319,27 @@ msgid "" "\n" "To upgrade Tails, do an automatic upgrade from Tails or a manual upgrade from Debian using a second USB stick.\n" "<a href='https://tails.boum.org/upgrade/tails-overview'>See the manual upgrade instructions</a>" -msgstr "" +msgstr "За да го инсталирате Tails од почеток, користете GNOME дискови.\n<a href='https://tails.boum.org/install/linux/usb-overview'>Видете ги инструкциите за инсталација</a>\n\nЗа да го надградите Tails, направете автоматска надградба од Tails или рачна надградаба од Debian со користење на втор USB стик.\n<a href='https://tails.boum.org/upgrade/tails-overview'>Видете ги инструкциите за рачна надградба</a>" #: ../tails_installer/gui.py:450 ../data/tails-installer.ui.h:2 msgid "Clone the current Tails" -msgstr "" +msgstr "Клонирај го моменталниот Tails" #: ../tails_installer/gui.py:457 ../data/tails-installer.ui.h:3 msgid "Use a downloaded Tails ISO image" -msgstr "" +msgstr "Користи преземен Tails ISO image" #: ../tails_installer/gui.py:494 ../tails_installer/gui.py:815 msgid "Upgrade" -msgstr "" +msgstr "Надградба" #: ../tails_installer/gui.py:496 msgid "Manual Upgrade Instructions" -msgstr "" +msgstr "Инструкции за рачна надградба" #: ../tails_installer/gui.py:498 msgid "https://tails.boum.org/upgrade/" -msgstr "" +msgstr "https://tails.boum.org/upgrade/" #: ../tails_installer/gui.py:506 ../tails_installer/gui.py:727 #: ../tails_installer/gui.py:792 ../data/tails-installer.ui.h:7 @@ -348,7 +348,7 @@ msgstr "Инсталирај" #: ../tails_installer/gui.py:509 ../data/tails-installer.ui.h:1 msgid "Installation Instructions" -msgstr "" +msgstr "Инструкции за инсталација" #: ../tails_installer/gui.py:511 msgid "https://tails.boum.org/install/" @@ -361,20 +361,20 @@ msgstr "%(size)s %(vendor)s %(model)s уред (%(device)s)" #: ../tails_installer/gui.py:529 msgid "No ISO image selected" -msgstr "" +msgstr "Нема селектирано ISO image" #: ../tails_installer/gui.py:530 msgid "Please select a Tails ISO image." -msgstr "" +msgstr "Ве молиме изберете Tails ISO image." #: ../tails_installer/gui.py:572 msgid "No device suitable to install Tails could be found" -msgstr "" +msgstr "Не можеше да биде пронајден соодветен уред за да биде инсталиран Tails" #: ../tails_installer/gui.py:574 #, python-format msgid "Please plug a USB flash drive or SD card of at least %0.1f GB." -msgstr "" +msgstr "Ве молиме вклучете USB флеш уред или SD картичка ода најмалку %0.1f ГБ." #: ../tails_installer/gui.py:608 #, python-format @@ -382,29 +382,29 @@ msgid "" "The USB stick \"%(pretty_name)s\" is configured as non-removable by its " "manufacturer and Tails will fail to start from it. Please try installing on " "a different model." -msgstr "" +msgstr "USB стикот \"%(pretty_name)s\" е конфигуриран како не-отстранувачки од неговиот производител и Tails нема да може да се стартува од него, Ве молиме обидете со инсталирање на друг модел." #: ../tails_installer/gui.py:618 #, python-format msgid "" "The device \"%(pretty_name)s\" is too small to install Tails (at least " "%(size)s GB is required)." -msgstr "" +msgstr "Уредот \"%(pretty_name)s\" е премногу мал за да се инсталира Tails (потребно е најмалку %(size)s ГБ)" #: ../tails_installer/gui.py:631 #, python-format msgid "" "To upgrade device \"%(pretty_name)s\" from this Tails, you need to use a downloaded Tails ISO image:\n" "https://tails.boum.org/install/download" -msgstr "" +msgstr "За да го надградите уредот \"%(pretty_name)s\" од овој Tails, треба да користите преземен Tails ISO image:\nhttps://tails.boum.org/install/download" #: ../tails_installer/gui.py:652 msgid "An error happened while installing Tails" -msgstr "" +msgstr "Се случи грешка за време на инсталацијата на Tails" #: ../tails_installer/gui.py:664 msgid "Refreshing releases..." -msgstr "" +msgstr "Освежување на изданијата..." #: ../tails_installer/gui.py:669 msgid "Releases updated!"

1 0

[snowflake/master] Reverted logging changes that require Go 1.13
by cohosh＠torproject.org 08 Oct '19

08 Oct '19

commit 82e5753bcc719cac5b58908b9e11d14b27d5d330 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Tue Oct 8 09:58:12 2019 -0400 Reverted logging changes that require Go 1.13 --- .travis.yml | 2 +- client/lib/webrtc.go | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index cfec2a9..9ed48bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ addons: - gcc-5 go: - - 1.13.x + - 1.10.x env: - TRAVIS_NODE_VERSION="8" CC="gcc-5" CXX="g++-5" diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index e3245b6..7d361ef 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -9,7 +9,6 @@ import ( "time" "github.com/dchest/uniuri" - "github.com/pion/logging" "github.com/pion/webrtc" ) @@ -156,13 +155,7 @@ func (c *WebRTCPeer) preparePeerConnection() error { c.pc = nil } - logFactory := logging.NewDefaultLoggerFactory() - logFactory.DefaultLogLevel = logging.LogLevelError - logFactory.Writer = log.Writer() - - s := webrtc.SettingEngine{ - LoggerFactory: logFactory, - } + s := webrtc.SettingEngine{} s.SetTrickle(true) api := webrtc.NewAPI(webrtc.WithSettingEngine(s)) pc, err := api.NewPeerConnection(*c.config)

1 0

[snowflake/master] Modified proxy-go to use pion/webrtc
by cohosh＠torproject.org 08 Oct '19

08 Oct '19

commit 0428797ea09814afb36796014e96d911c2ecc554 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Jun 14 18:46:07 2019 -0400 Modified proxy-go to use pion/webrtc The API is very similar, differences were mostly due to: - closing peer connections and datachannels (no destroy/delete methods) - different way to set datachannel/peer connection callbacks - differences in whether functions take pointers or values - no serialize/deserialize functions in the API --- proxy-go/snowflake.go | 119 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 84 insertions(+), 35 deletions(-) diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index b3c863a..e0c9def 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -4,6 +4,7 @@ import ( "bytes" "crypto/rand" "encoding/base64" + "encoding/json" "flag" "fmt" "io" @@ -19,7 +20,7 @@ import ( "time" "git.torproject.org/pluggable-transports/snowflake.git/common/safelog" - "github.com/keroserene/go-webrtc" + "github.com/pion/webrtc" "golang.org/x/net/websocket" ) @@ -43,7 +44,7 @@ const ( var ( tokens chan bool - config *webrtc.Configuration + config webrtc.Configuration client http.Client ) @@ -92,7 +93,7 @@ func (c *webRTCConn) Write(b []byte) (int, error) { func (c *webRTCConn) Close() (err error) { c.once.Do(func() { - err = c.pc.Destroy() + err = c.pc.Close() }) return } @@ -103,7 +104,7 @@ func (c *webRTCConn) LocalAddr() net.Addr { func (c *webRTCConn) RemoteAddr() net.Addr { //Parse Remote SDP offer and extract client IP - clientIP := remoteIPFromSDP(c.pc.RemoteDescription().Sdp) + clientIP := remoteIPFromSDP(c.pc.RemoteDescription().SDP) if clientIP == nil { return nil } @@ -178,7 +179,7 @@ func pollOffer(sid string) *webrtc.SessionDescription { if err != nil { log.Printf("error reading broker response: %s", err) } else { - return webrtc.DeserializeSessionDescription(string(body)) + return deserializeSessionDescription(string(body)) } } } @@ -187,7 +188,7 @@ func pollOffer(sid string) *webrtc.SessionDescription { func sendAnswer(sid string, pc *webrtc.PeerConnection) error { broker := brokerURL.ResolveReference(&url.URL{Path: "answer"}) - body := bytes.NewBuffer([]byte(pc.LocalDescription().Serialize())) + body := bytes.NewBuffer([]byte(serializeSessionDescription(pc.LocalDescription()))) req, _ := http.NewRequest("POST", broker.String(), body) req.Header.Set("X-Session-ID", sid) resp, err := client.Do(req) @@ -275,71 +276,63 @@ func datachannelHandler(conn *webRTCConn, remoteAddr net.Addr) { // candidates is complete and the answer is available in LocalDescription. // Installs an OnDataChannel callback that creates a webRTCConn and passes it to // datachannelHandler. -func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config *webrtc.Configuration, dataChan chan struct{}) (*webrtc.PeerConnection, error) { +func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config webrtc.Configuration, dataChan chan struct{}) (*webrtc.PeerConnection, error) { pc, err := webrtc.NewPeerConnection(config) if err != nil { return nil, fmt.Errorf("accept: NewPeerConnection: %s", err) } - pc.OnNegotiationNeeded = func() { - panic("OnNegotiationNeeded") - } - pc.OnDataChannel = func(dc *webrtc.DataChannel) { + pc.OnDataChannel(func(dc *webrtc.DataChannel) { log.Println("OnDataChannel") close(dataChan) pr, pw := io.Pipe() conn := &webRTCConn{pc: pc, dc: dc, pr: pr} - dc.OnOpen = func() { + dc.OnOpen(func() { log.Println("OnOpen channel") - } - dc.OnClose = func() { + }) + dc.OnClose(func() { conn.lock.Lock() defer conn.lock.Unlock() log.Println("OnClose channel") conn.dc = nil - pc.DeleteDataChannel(dc) + dc.Close() pw.Close() - } - dc.OnMessage = func(msg []byte) { - log.Printf("OnMessage <--- %d bytes", len(msg)) - n, err := pw.Write(msg) + }) + dc.OnMessage(func(msg webrtc.DataChannelMessage) { + log.Printf("OnMessage <--- %d bytes", len(msg.Data)) + n, err := pw.Write(msg.Data) if err != nil { pw.CloseWithError(err) } - if n != len(msg) { + if n != len(msg.Data) { panic("short write") } - } + }) go datachannelHandler(conn, conn.RemoteAddr()) - } + }) - err = pc.SetRemoteDescription(sdp) + err = pc.SetRemoteDescription(*sdp) if err != nil { - pc.Destroy() + pc.Close() return nil, fmt.Errorf("accept: SetRemoteDescription: %s", err) } log.Println("sdp offer successfully received.") log.Println("Generating answer...") - answer, err := pc.CreateAnswer() + answer, err := pc.CreateAnswer(nil) // blocks on ICE gathering. we need to add a timeout if needed // not putting this in a separate go routine, because we need // SetLocalDescription(answer) to be called before sendAnswer if err != nil { - pc.Destroy() + pc.Close() return nil, err } - if answer == nil { - pc.Destroy() - return nil, fmt.Errorf("Failed gathering ICE candidates.") - } - err = pc.SetLocalDescription(answer) if err != nil { - pc.Destroy() + pc.Close() return nil, err } @@ -363,7 +356,7 @@ func runSession(sid string) { err = sendAnswer(sid, pc) if err != nil { log.Printf("error sending answer to client through broker: %s", err) - pc.Destroy() + pc.Close() retToken() return } @@ -375,7 +368,7 @@ func runSession(sid string) { log.Println("Connection successful.") case <-time.After(dataChannelTimeout): log.Println("Timed out waiting for client to open data channel.") - pc.Destroy() + pc.Close() retToken() } } @@ -422,7 +415,13 @@ func main() { log.Fatalf("invalid relay url: %s", err) } - config = webrtc.NewConfiguration(webrtc.OptionIceServer(stunURL)) + config = webrtc.Configuration{ + ICEServers: []webrtc.ICEServer{ + { + URLs: []string{stunURL}, + }, + }, + } tokens = make(chan bool, capacity) for i := uint(0); i < capacity; i++ { tokens <- true @@ -434,3 +433,53 @@ func main() { runSession(sessionID) } } + +func deserializeSessionDescription(msg string) *webrtc.SessionDescription { + var parsed map[string]interface{} + err := json.Unmarshal([]byte(msg), &parsed) + if nil != err { + log.Println(err) + return nil + } + if _, ok := parsed["type"]; !ok { + log.Println("Cannot deserialize SessionDescription without type field.") + return nil + } + if _, ok := parsed["sdp"]; !ok { + log.Println("Cannot deserialize SessionDescription without sdp field.") + return nil + } + + var stype webrtc.SDPType + switch parsed["type"].(string) { + default: + log.Println("Unknown SDP type") + return nil + case "offer": + stype = webrtc.SDPTypeOffer + case "pranswer": + stype = webrtc.SDPTypePranswer + case "answer": + stype = webrtc.SDPTypeAnswer + case "rollback": + stype = webrtc.SDPTypeRollback + } + + if err != nil { + log.Println(err) + return nil + } + return &webrtc.SessionDescription{ + Type: stype, + SDP: parsed["sdp"].(string), + } +} + +func serializeSessionDescription(desc *webrtc.SessionDescription) string { + bytes, err := json.Marshal(*desc) + if nil != err { + log.Println(err) + return "" + } + return string(bytes) +}

1 0

[snowflake/master] Connect pion library logger with snowflake log
by cohosh＠torproject.org 08 Oct '19

08 Oct '19

commit 2b04357550a9fd827b8c1f35164de5ec42a63c7c Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Sep 4 15:00:58 2019 -0400 Connect pion library logger with snowflake log We need to set up the pion/webrtc logger to write output to the snowflake log, otherwise the warnings we are getting from the pion library are being lost. Note: this requires go version 1.13 and later in order to use the `log.Writer()` function. --- client/lib/webrtc.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index dbc205e..e3245b6 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -9,6 +9,7 @@ import ( "time" "github.com/dchest/uniuri" + "github.com/pion/logging" "github.com/pion/webrtc" ) @@ -154,7 +155,14 @@ func (c *WebRTCPeer) preparePeerConnection() error { c.pc.Close() c.pc = nil } - s := webrtc.SettingEngine{} + + logFactory := logging.NewDefaultLoggerFactory() + logFactory.DefaultLogLevel = logging.LogLevelError + logFactory.Writer = log.Writer() + + s := webrtc.SettingEngine{ + LoggerFactory: logFactory, + } s.SetTrickle(true) api := webrtc.NewAPI(webrtc.WithSettingEngine(s)) pc, err := api.NewPeerConnection(*c.config)

1 0

[snowflake/master] Update .travis.yml for new webrtc library
by cohosh＠torproject.org 08 Oct '19

08 Oct '19

commit 6cf53c4ef017e5b79bc2a9c69f12767229f61bb6 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Tue Jun 25 16:53:33 2019 -0400 Update .travis.yml for new webrtc library --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 072f073..9ed48bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ before_install: install: - go get -u github.com/smartystreets/goconvey - go get -u github.com/keroserene/go-webrtc + - go get -u github.com/pion/webrtc - go get -u github.com/dchest/uniuri - go get -u git.torproject.org/pluggable-transports/goptlib.git - go get -u git.torproject.org/pluggable-transports/websocket.git/websocket

1 0