January 2020 - tor-commits - lists.torproject.org

[gettor/master] Fix edge case where config file never declared
by cohosh＠torproject.org 23 Jan '20

23 Jan '20

commit 34e912bbb3b9815469f1d2afe30c34bb6d588a4b Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Jan 20 17:27:03 2020 -0500 Fix edge case where config file never declared This commit fixes an edge case in which the config filename is never declared if the config is set but the file does not exist on disk. --- gettor/utils/settings.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gettor/utils/settings.py b/gettor/utils/settings.py index 67c31ec..4583b6a 100644 --- a/gettor/utils/settings.py +++ b/gettor/utils/settings.py @@ -28,9 +28,8 @@ class Settings(object): # If a readable config file was provided, use that instead - if config: - if os.path.isfile(config): - self.filename = config + if config and os.path.isfile(config): + self.filename = config else: # Default config default_config = "/home/gettor/gettor/gettor.conf.json"

1 0

[gettor/master] Create a test database with gettor links
by cohosh＠torproject.org 23 Jan '20

23 Jan '20

commit c1672a3f8d07e105793bd0f0eb247e9474622f5f Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Jan 20 17:51:27 2020 -0500 Create a test database with gettor links --- tests/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/__init__.py b/tests/__init__.py index e69de29..f323d24 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -0,0 +1,4 @@ +import subprocess + +# Create temporary database +subprocess.run(["./scripts/add_links_to_db", "-f", "tests/gettor.db"])

1 0

[gettor/master] Update tests to load a test config
by cohosh＠torproject.org 23 Jan '20

23 Jan '20

commit 2ef6773bec29b9e671d698ec671201fbb6eb3493 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Jan 20 17:50:03 2020 -0500 Update tests to load a test config --- tests/test.conf.json | 20 ++++++++++++++++++++ tests/test_email_service.py | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/tests/test.conf.json b/tests/test.conf.json new file mode 100644 index 0000000..8f296cc --- /dev/null +++ b/tests/test.conf.json @@ -0,0 +1,20 @@ +{ + "platforms": ["linux", "osx", "windows"], + "dbname": "gettor.db", + "email_parser_logfile": "email_parser.log", + "email_requests_limit": 30, + "twitter_requests_limit": 1, + "sendmail_interval": 10, + "twitter_interval": 10, + "sendmail_addr": "gettor(a)torproject.org", + "sendmail_host": "localhost", + "sendmail_port": 587, + "consumer_key": "", + "consumer_secret": "", + "access_key": "", + "access_secret": "", + "test_hid": "80d7054da0d3826563c7babb5453e18f3e42f932e562c5ab0434aec9df7b0625", + "twitter_handle": "get_tor", + "twitter_messages_endpoint": "https://api.twitter.com/1.1/direct_messages/events/list.json", + "twitter_new_message_endpoint": "https://api.twitter.com/1.1/direct_messages/events/new.json" +} diff --git a/tests/test_email_service.py b/tests/test_email_service.py index ff364f0..187711e 100644 --- a/tests/test_email_service.py +++ b/tests/test_email_service.py @@ -13,7 +13,7 @@ class EmailServiceTests(unittest.TestCase): # Fail any tests which take longer than 15 seconds. timeout = 15 def setUp(self): - self.settings = conftests.options.parse_settings("en","./gettor.conf.json") + self.settings = conftests.options.parse_settings("en","tests/test.conf.json") self.sm_client = conftests.Sendmail(self.settings) self.locales = conftests.strings.get_locales() self.links = [

1 0

[gettor/master] Change es string test to match json file
by cohosh＠torproject.org 23 Jan '20

23 Jan '20

commit 9bbda2ab504f7ffe9c4a31c17c741379d190ddb8 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Jan 20 20:00:03 2020 -0500 Change es string test to match json file We haven't translated any es or pt strings, so use the English translation for now until we update those files. --- tests/test_locales.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_locales.py b/tests/test_locales.py index d4e52c5..54e0598 100644 --- a/tests/test_locales.py +++ b/tests/test_locales.py @@ -28,7 +28,7 @@ class LocalesTests(unittest.TestCase): def test_load_es_strings(self): conftests.strings.load_strings("es") - self.assertEqual(conftests.strings._("smtp_help_subject"), "[GetTor] Ayuda") + self.assertEqual(conftests.strings._("smtp_help_subject"), "[GetTor] Help") def test_locale_supported(self): self.assertEqual(self.locales['en']['language'], "English")

1 0

[gettor/master] Remove twitter test that requires auth
by cohosh＠torproject.org 23 Jan '20

23 Jan '20

commit 3517e54ca7d79a4e2253a73d7296767e124d2474 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Jan 20 19:55:15 2020 -0500 Remove twitter test that requires auth Removes tests that require access to secrets. --- tests/test_twitter.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/test_twitter.py b/tests/test_twitter.py index a1515d0..1ad604d 100644 --- a/tests/test_twitter.py +++ b/tests/test_twitter.py @@ -18,12 +18,6 @@ class TwitterTests(unittest.TestCase): print("tearDown()") - def test_load_messages(self): - data = self.tw_client.twitter_data() - print(data) - assert data['events'] - - def test_parse_tweet(self): e = {'type': 'message_create', 'id': '1178649287208689669', 'created_timestamp': '1569846862972', 'message_create': {'target': {'recipient_id': '2514714800'}, 'sender_id': '1467062174', 'message_data': {'text': 'windows 10', 'entities': {'hashtags': [], 'symbols': [], 'user_mentions': [], 'urls': []}}}} message_id = { 'id': e['id'], 'twitter_handle': e['message_create']['sender_id'] }

1 0

[gettor/master] Slight changes to README for tests
by cohosh＠torproject.org 23 Jan '20

23 Jan '20

commit 4005315b36180649d31111d083bc419b2846c33d Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Jan 20 20:02:53 2020 -0500 Slight changes to README for tests --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a3df81b..f31d113 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ $ ./bin/gettor_service start Running tests ================= -GetTor includes PyTest unit tests. To run the tests, first install some dependencies: +GetTor includes PyTest unit tests. To run the tests, first install the dependencies above and then run: ```

1 0

[snowflake/master] Formatting improvements.
by dcf＠torproject.org 23 Jan '20

23 Jan '20

commit d6467ff5854627dcaefbef89bdd348bfe461da12 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 24 18:01:17 2019 -0700 Formatting improvements. --- client/lib/interfaces.go | 1 - client/lib/peers.go | 9 ++++----- client/lib/rendezvous.go | 8 +++----- client/snowflake.go | 22 +++++++++++----------- server/server.go | 4 ++-- 5 files changed, 20 insertions(+), 24 deletions(-) diff --git a/client/lib/interfaces.go b/client/lib/interfaces.go index 609e610..f6e8240 100644 --- a/client/lib/interfaces.go +++ b/client/lib/interfaces.go @@ -30,7 +30,6 @@ type Tongue interface { // Interface for collecting some number of Snowflakes, for passing along // ultimately to the SOCKS handler. type SnowflakeCollector interface { - // Add a Snowflake to the collection. // Implementation should decide how to connect and maintain the webRTCConn. Collect() (Snowflake, error) diff --git a/client/lib/peers.go b/client/lib/peers.go index 5493bfd..12213e1 100644 --- a/client/lib/peers.go +++ b/client/lib/peers.go @@ -44,8 +44,7 @@ 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) - return nil, errors.New(s) + return nil, fmt.Errorf("At capacity [%d/%d]", cnt, p.capacity) } log.Println("WebRTC: Collecting a new Snowflake.", s) // Engage the Snowflake Catching interface, which must be available. @@ -68,12 +67,12 @@ func (p *Peers) Pop() Snowflake { // Blocks until an available, valid snowflake appears. var snowflake Snowflake var ok bool - for nil == snowflake { + for snowflake == nil { snowflake, ok = <-p.snowflakeChan - conn := snowflake.(*WebRTCPeer) if !ok { return nil } + conn := snowflake.(*WebRTCPeer) if conn.closed { snowflake = nil } @@ -120,5 +119,5 @@ func (p *Peers) End() { p.activePeers.Remove(e) e = next } - log.Println("WebRTC: melted all", cnt, "snowflakes.") + log.Printf("WebRTC: melted all %d snowflakes.", cnt) } diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index 0c7225b..0b15f68 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -50,13 +50,13 @@ func CreateBrokerTransport() http.RoundTripper { // to clients, and |front| is the option fronting domain. func NewBrokerChannel(broker string, front string, transport http.RoundTripper) *BrokerChannel { targetURL, err := url.Parse(broker) - if nil != err { + if err != nil { return nil } log.Println("Rendezvous using Broker at:", broker) bc := new(BrokerChannel) bc.url = targetURL - if "" != front { // Optional front domain. + if front != "" { // Optional front domain. log.Println("Domain fronting using:", front) bc.Host = bc.url.Host bc.url.Host = front @@ -109,7 +109,6 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( } answer := deserializeSessionDescription(string(body)) return answer, nil - case http.StatusServiceUnavailable: return nil, errors.New(BrokerError503) case http.StatusBadRequest: @@ -125,8 +124,7 @@ type WebRTCDialer struct { webrtcConfig *webrtc.Configuration } -func NewWebRTCDialer( - broker *BrokerChannel, iceServers []webrtc.ICEServer) *WebRTCDialer { +func NewWebRTCDialer(broker *BrokerChannel, iceServers []webrtc.ICEServer) *WebRTCDialer { var config webrtc.Configuration if iceServers != nil { config = webrtc.Configuration{ diff --git a/client/snowflake.go b/client/snowflake.go index 28bf7e9..bd53f65 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -30,9 +30,9 @@ func ConnectLoop(snowflakes sf.SnowflakeCollector) { for { // Check if ending is necessary. _, err := snowflakes.Collect() - if nil != err { - log.Println("WebRTC:", err, - " Retrying in", sf.ReconnectTimeout, "seconds...") + if err != nil { + log.Printf("WebRTC: %v Retrying in %v seconds...", + err, sf.ReconnectTimeout) } select { case <-time.After(time.Second * sf.ReconnectTimeout): @@ -52,7 +52,7 @@ func socksAcceptLoop(ln *pt.SocksListener, snowflakes sf.SnowflakeCollector) { log.Println("SOCKS listening...") conn, err := ln.AcceptSocks() if err != nil { - if e, ok := err.(net.Error); ok && e.Temporary() { + if err, ok := err.(net.Error); ok && err.Temporary() { continue } log.Printf("SOCKS accept error: %s", err) @@ -66,7 +66,7 @@ func socksAcceptLoop(ln *pt.SocksListener, snowflakes sf.SnowflakeCollector) { } } -//s is a comma-separated list of ICE server URLs +// s is a comma-separated list of ICE server URLs. func parseIceServers(s string) []webrtc.ICEServer { var servers []webrtc.ICEServer log.Println(s) @@ -98,9 +98,9 @@ func main() { log.SetFlags(log.LstdFlags | log.LUTC) - // Don't write to stderr; versions of tor earlier than about - // 0.3.5.6 do not read from the pipe, and eventually we will - // deadlock because the buffer is full. + // Don't write to stderr; versions of tor earlier than about 0.3.5.6 do + // not read from the pipe, and eventually we will deadlock because the + // buffer is full. // https://bugs.torproject.org/26360 // https://bugs.torproject.org/25600#comment:14 var logOutput = ioutil.Discard @@ -120,7 +120,7 @@ func main() { defer logFile.Close() logOutput = logFile } - //We want to send the log output through our scrubber first + // We want to send the log output through our scrubber first log.SetOutput(&safelog.LogScrubber{Output: logOutput}) log.Println("\n\n\n --- Starting Snowflake Client ---") @@ -194,10 +194,10 @@ func main() { }() } - // wait for a signal + // Wait for a signal. <-sigChan - // signal received, shut down + // Signal received, shut down. for _, ln := range listeners { ln.Close() } diff --git a/server/server.go b/server/server.go index 785b545..5ed56d3 100644 --- a/server/server.go +++ b/server/server.go @@ -345,10 +345,10 @@ func main() { }() } - // wait for a signal + // Wait for a signal. sig := <-sigChan - // signal received, shut down + // Signal received, shut down. log.Printf("caught signal %q, exiting", sig) for _, server := range servers { server.Close()

1 0

[snowflake/master] Update a comment: we no longer keep track of handlers.
by dcf＠torproject.org 23 Jan '20

23 Jan '20

commit e27709080ab423163c46e4ebf685a0b37e60862e Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 24 19:16:10 2019 -0700 Update a comment: we no longer keep track of handlers. --- client/snowflake.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/snowflake.go b/client/snowflake.go index 3c496e0..28bf7e9 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -194,7 +194,7 @@ func main() { }() } - // keep track of handlers and wait for a signal + // wait for a signal <-sigChan // signal received, shut down

1 0

[snowflake/master] Remove erroneous logging around pt.*Error calls.
by dcf＠torproject.org 23 Jan '20

23 Jan '20

commit 5ff75e1034c8d4ae4ba64f92d9aef364d09c27ac Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 20 23:57:31 2020 -0700 Remove erroneous logging around pt.*Error calls. These functions are called for their side effect of sending a PT error message on stdout; they also return a representation of the error message as an error object for the caller to use if it wishes. These functions *always* return a non-nil error object; it is not something to be logged, any more than the return value of errors.New is. The mistaken logging was added in https://bugs.torproject.org/31794 b26c7a7a7330586c3be3ece02c68999bb279ff40 3ec9dd19faa8584dd76ba3b85eb71a03b8ee25c0 ed3d42e1ec3ff852f8c4751eb4cf5e9ed4dd4a68 --- client/snowflake.go | 12 +++--------- server-webrtc/snowflake.go | 4 +--- server/server.go | 12 +++--------- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index bb7de46..3c496e0 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -157,9 +157,7 @@ func main() { log.Fatal(err) } if ptInfo.ProxyURL != nil { - if err := pt.ProxyError("proxy is not supported"); err != nil { - log.Printf("call to pt.ProxyError generated error: %v", err) - } + pt.ProxyError("proxy is not supported") os.Exit(1) } listeners := make([]net.Listener, 0) @@ -169,18 +167,14 @@ func main() { // TODO: Be able to recover when SOCKS dies. ln, err := pt.ListenSocks("tcp", "127.0.0.1:0") if err != nil { - if inerr := pt.CmethodError(methodName, err.Error()); inerr != nil { - log.Printf("handling error generated by pt.ListenSocks with pt.CmethodError generated error: %v", inerr) - } + pt.CmethodError(methodName, err.Error()) break } go socksAcceptLoop(ln, snowflakes) pt.Cmethod(methodName, ln.Version(), ln.Addr()) listeners = append(listeners, ln) default: - if err := pt.CmethodError(methodName, "no such method"); err != nil { - log.Printf("calling pt.CmethodError generated error: %v", err) - } + pt.CmethodError(methodName, "no such method") } } pt.CmethodsDone() diff --git a/server-webrtc/snowflake.go b/server-webrtc/snowflake.go index d5b1604..acdf5b1 100644 --- a/server-webrtc/snowflake.go +++ b/server-webrtc/snowflake.go @@ -230,9 +230,7 @@ func main() { bindaddr.Addr.Port = 12345 // lies!!! pt.Smethod(bindaddr.MethodName, bindaddr.Addr) default: - if err := pt.SmethodError(bindaddr.MethodName, "no such method"); err != nil { - log.Printf("SmethodError returned error: %v", err) - } + pt.SmethodError(bindaddr.MethodName, "no such method") } } pt.SmethodsDone() diff --git a/server/server.go b/server/server.go index e3f4c6f..785b545 100644 --- a/server/server.go +++ b/server/server.go @@ -282,9 +282,7 @@ func main() { servers := make([]*http.Server, 0) for _, bindaddr := range ptInfo.Bindaddrs { if bindaddr.MethodName != ptMethodName { - if err = pt.SmethodError(bindaddr.MethodName, "no such method"); err != nil { - log.Printf("pt.SmethodError returned error: %v", err) - } + pt.SmethodError(bindaddr.MethodName, "no such method") continue } @@ -296,9 +294,7 @@ func main() { lnHTTP01, err = net.ListenTCP("tcp", &addr) if err != nil { log.Printf("error opening HTTP-01 ACME listener: %s", err) - if inerr := pt.SmethodError(bindaddr.MethodName, "HTTP-01 ACME listener: "+err.Error()); inerr != nil { - log.Printf("pt.SmethodError returned error: %v", inerr) - } + pt.SmethodError(bindaddr.MethodName, "HTTP-01 ACME listener: "+err.Error()) continue } server := &http.Server{ @@ -326,9 +322,7 @@ func main() { } if err != nil { log.Printf("error opening listener: %s", err) - if inerr := pt.SmethodError(bindaddr.MethodName, err.Error()); inerr != nil { - log.Printf("pt.SmethodError returned error: %v", inerr) - } + pt.SmethodError(bindaddr.MethodName, err.Error()) continue } pt.SmethodArgs(bindaddr.MethodName, bindaddr.Addr, args)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 23 Jan '20

23 Jan '20

commit fc69fc9292c4d8625645fe321462a09575f26d08 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 23 16:53:36 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fa.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+fa.po b/contents+fa.po index be2ae2b326..f6df8a0bd3 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -2812,6 +2812,8 @@ msgid "" "This is a known and intermittent problem; it does not mean that Google " "considers Tor to be spyware." msgstr "" +"این یک مشکل متناوب و شناخته شده است. گوگل Tor را به عنوان یک جاسوس افزار نمی" +" شناسد." #: https//support.torproject.org/tbb/tbb-44/ #: (content/tbb/tbb-44/contents+en.lrquestion.description)

1 0