February 2016 - tor-commits - lists.torproject.org

[translation/tor-messenger-privproperties_completed] Update translations for tor-messenger-privproperties_completed
by translation＠torproject.org 10 Feb '16

10 Feb '16

commit 7b12611687ab8e28a2e451d76ecfe2e709eb6776 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 11 01:46:41 2016 +0000 Update translations for tor-messenger-privproperties_completed --- fr/priv.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/fr/priv.properties b/fr/priv.properties index ac633c7..72d764e 100644 --- a/fr/priv.properties +++ b/fr/priv.properties @@ -1 +1,2 @@ priv.account=Génération d'une clé privée pour %S (%S) ... +priv.failed=La génération des clés a échoué : %S

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 10 Feb '16

10 Feb '16

commit 1ad52d227c747163091017f11e4044658232c1fe Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 11 01:45:16 2016 +0000 Update translations for https_everywhere --- fr/https-everywhere.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index 933c79e..4a986e9 100644 --- a/fr/https-everywhere.dtd +++ b/fr/https-everywhere.dtd @@ -38,6 +38,6 @@ <!ENTITY https-everywhere.prefs.view_xml_source "Voir le code source XML"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> -<!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> -<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules"> +<!ENTITY https-everywhere.chrome.stable_rules_description "Forcer le chiffrement des connexions pour les sites internet suivant:"> +<!ENTITY https-everywhere.chrome.experimental_rules "Règles expérimentales"> <!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default.">

1 0

[snowflake/master] Complete broker spec cases
by serene＠torproject.org 10 Feb '16

10 Feb '16

commit 4f18340c163c18d4bcad249b4e4976d3106cd014 Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Feb 10 13:05:21 2016 -0800 Complete broker spec cases --- proxy/broker.coffee | 67 +++++++++++++++--------------- proxy/spec/broker.spec.coffee | 94 +++++++++++++++++++++++++++++++------------ 2 files changed, 102 insertions(+), 59 deletions(-) diff --git a/proxy/broker.coffee b/proxy/broker.coffee index 71fe6eb..e989d57 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -9,6 +9,9 @@ STATUS_OK = 200 STATUS_GONE = 410 STATUS_GATEWAY_TIMEOUT = 504 +MESSAGE_TIMEOUT = 'Timed out waiting for a client offer.' +MESSAGE_UNEXPECTED = 'Unexpected status.' + genSnowflakeID = -> Math.random().toString(36).substring(2) @@ -17,7 +20,6 @@ class Broker clients: 0 id: null - request: null # When interacting with the Broker, snowflake must generate a unique session # ID so the Broker can keep track of which signalling channel it's speaking @@ -29,53 +31,35 @@ class Broker @url = 'https://' + @url if 0 != @url.indexOf('https://', 0) @url += '/' if '/' != @url.substr -1 - # Snowflake registers with the broker using an HTTP POST request, and expects - # a response from the broker containing some client offer. + # Promises some client SDP Offer. + # Registers this Snowfalke with the broker using an HTTP POST request, and + # waits for a response containing some client offer that the Broker chooses + # for this proxy.. # TODO: Actually support multiple clients. getClientOffer: => new Promise (fulfill, reject) => xhr = new XMLHttpRequest() - @request = xhr - @fulfill = fulfill - # @request.onreadystatechange = @processOffer - xhr.onreadystatechange = => + xhr.onreadystatechange = -> return if xhr.DONE != xhr.readyState switch xhr.status when STATUS_OK fulfill xhr.responseText # Should contain offer. when STATUS_GATEWAY_TIMEOUT - reject 'Timed out waiting for a client to serve.' + reject MESSAGE_TIMEOUT else log 'Broker ERROR: Unexpected ' + xhr.status + ' - ' + xhr.statusText - Status.set ' failure. Please refresh.' - @sendRequest() - - sendRequest: => - try - @request.open 'POST', @url + 'proxy' - @request.setRequestHeader('X-Session-ID', @id) - catch err - ### - An exception happens here when, for example, NoScript allows the domain - on which the proxy badge runs, but not the domain to which it's trying - to make the HTTP request. The exception message is like "Component - returned failure code: 0x805e0006 [nsIXMLHttpRequest.open]" on Firefox. - ### - log 'Broker: exception while connecting: ' + err.message - return - @request.send @id + snowflake.ui.setStatus ' failure. Please refresh.' + reject MESSAGE_UNEXPECTED + @_xhr = xhr # Used by spec to fake async Broker interaction + @_postRequest xhr, 'proxy', @id + # Assumes getClientOffer happened, and a WebRTC SDP answer has been generated. + # Sends it back to the broker, which passes it to back to the original client. sendAnswer: (answer) -> dbg @id + ' - Sending answer back to broker...\n' dbg answer.sdp xhr = new XMLHttpRequest() - try - xhr.open 'POST', @url + 'answer' - xhr.setRequestHeader('X-Session-ID', @id) - catch err - log 'Broker: exception while connecting: ' + err.message - return xhr.onreadystatechange = -> return if xhr.DONE != xhr.readyState switch xhr.status @@ -87,5 +71,22 @@ class Broker else dbg 'Broker ERROR: Unexpected ' + xhr.status + ' - ' + xhr.statusText - Status.set ' failure. Please refresh.' - xhr.send JSON.stringify(answer) + snowflake.ui.setStatus ' failure. Please refresh.' + @_postRequest xhr, 'answer', JSON.stringify(answer) + + # urlSuffix for the broker is different depending on what action + # is desired. + _postRequest: (xhr, urlSuffix, payload) => + try + xhr.open 'POST', @url + urlSuffix + xhr.setRequestHeader('X-Session-ID', @id) + catch err + ### + An exception happens here when, for example, NoScript allows the domain + on which the proxy badge runs, but not the domain to which it's trying + to make the HTTP xhr. The exception message is like "Component + returned failure code: 0x805e0006 [nsIXMLHttpRequest.open]" on Firefox. + ### + log 'Broker: exception while connecting: ' + err.message + return + xhr.send payload diff --git a/proxy/spec/broker.spec.coffee b/proxy/spec/broker.spec.coffee index 3b47cd3..db936c1 100644 --- a/proxy/spec/broker.spec.coffee +++ b/proxy/spec/broker.spec.coffee @@ -19,32 +19,74 @@ describe 'Broker', -> expect(b.url).toEqual 'https://fake/' expect(b.id).not.toBeNull() - it 'polls and promises a client offer', (done) -> - b = new Broker 'fake' - # fake successful request - spyOn(b, 'sendRequest').and.callFake -> - b.request.readyState = b.request.DONE - b.request.status = STATUS_OK - b.request.responseText = 'test' - b.request.onreadystatechange() - poll = b.getClientOffer() - expect(poll).not.toBeNull() - poll.then (desc) => - expect(desc).toEqual 'test' - done() - - it 'requests correctly', -> - b = new Broker 'fake' - b.request = new XMLHttpRequest() - spyOn(b.request, 'open') - spyOn(b.request, 'setRequestHeader') - spyOn(b.request, 'send') - b.sendRequest() - expect(b.request.open).toHaveBeenCalled() - expect(b.request.setRequestHeader).toHaveBeenCalled() - expect(b.request.send).toHaveBeenCalled() + describe 'getClientOffer', -> + it 'polls and promises a client offer', (done) -> + b = new Broker 'fake' + # fake successful request and response from broker. + spyOn(b, '_postRequest').and.callFake -> + b._xhr.readyState = b._xhr.DONE + b._xhr.status = STATUS_OK + b._xhr.responseText = 'fake offer' + b._xhr.onreadystatechange() + poll = b.getClientOffer() + expect(poll).not.toBeNull() + expect(b._postRequest).toHaveBeenCalled() + poll.then (desc) -> + expect(desc).toEqual 'fake offer' + done() + .catch -> + fail 'should not reject on STATUS_OK' + done() + + it 'rejects if the broker timed-out', (done) -> + b = new Broker 'fake' + # fake timed-out request from broker + spyOn(b, '_postRequest').and.callFake -> + b._xhr.readyState = b._xhr.DONE + b._xhr.status = STATUS_GATEWAY_TIMEOUT + b._xhr.onreadystatechange() + poll = b.getClientOffer() + expect(poll).not.toBeNull() + expect(b._postRequest).toHaveBeenCalled() + poll.then (desc) -> + fail 'should not fulfill on GATEWAY_TIMEOUT' + done() + , (err) -> + expect(err).toBe MESSAGE_TIMEOUT + done() + + it 'rejects on any other status', (done) -> + b = new Broker 'fake' + # fake timed-out request from broker + spyOn(b, '_postRequest').and.callFake -> + b._xhr.readyState = b._xhr.DONE + b._xhr.status = 1337 + b._xhr.onreadystatechange() + poll = b.getClientOffer() + expect(poll).not.toBeNull() + expect(b._postRequest).toHaveBeenCalled() + poll.then (desc) -> + fail 'should not fulfill on non-OK status' + done() + , (err) -> + expect(err).toBe MESSAGE_UNEXPECTED + expect(b._xhr.status).toBe 1337 + done() it 'responds to the broker with answer', -> - # TODO: fix b = new Broker 'fake' - b.sendAnswer 'foo' + spyOn(b, '_postRequest') + b.sendAnswer 123 + expect(b._postRequest).toHaveBeenCalledWith( + jasmine.any(Object), 'answer', '123') + + it 'POST XMLHttpRequests to the broker', -> + b = new Broker 'fake' + b._xhr = new XMLHttpRequest() + spyOn(b._xhr, 'open') + spyOn(b._xhr, 'setRequestHeader') + spyOn(b._xhr, 'send') + b._postRequest b._xhr, 'test', 'data' + expect(b._xhr.open).toHaveBeenCalled() + expect(b._xhr.setRequestHeader).toHaveBeenCalled() + expect(b._xhr.send).toHaveBeenCalled()

1 0

[snowflake/master] Fix jasmine spec for broker async request
by serene＠torproject.org 10 Feb '16

10 Feb '16

commit bb9eb721e26f6809cc596746112298c646b74775 Author: Serene Han <keroserene+git(a)gmail.com> Date: Tue Feb 9 18:13:54 2016 -0800 Fix jasmine spec for broker async request --- proxy/broker.coffee | 35 +++++++++++++++++-------------- proxy/spec/broker.spec.coffee | 48 +++++++++++++++++++++++++++---------------- 2 files changed, 50 insertions(+), 33 deletions(-) diff --git a/proxy/broker.coffee b/proxy/broker.coffee index b196df5..71fe6eb 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -32,23 +32,13 @@ class Broker # Snowflake registers with the broker using an HTTP POST request, and expects # a response from the broker containing some client offer. # TODO: Actually support multiple clients. - getClientOffer: -> + getClientOffer: => new Promise (fulfill, reject) => xhr = new XMLHttpRequest() @request = xhr - try - xhr.open 'POST', @url + 'proxy' - xhr.setRequestHeader('X-Session-ID', @id) - catch err - ### - An exception happens here when, for example, NoScript allows the domain - on which the proxy badge runs, but not the domain to which it's trying - to make the HTTP request. The exception message is like "Component - returned failure code: 0x805e0006 [nsIXMLHttpRequest.open]" on Firefox. - ### - log 'Broker: exception while connecting: ' + err.message - return - xhr.onreadystatechange = -> + @fulfill = fulfill + # @request.onreadystatechange = @processOffer + xhr.onreadystatechange = => return if xhr.DONE != xhr.readyState switch xhr.status when STATUS_OK @@ -59,7 +49,22 @@ class Broker log 'Broker ERROR: Unexpected ' + xhr.status + ' - ' + xhr.statusText Status.set ' failure. Please refresh.' - xhr.send @id + @sendRequest() + + sendRequest: => + try + @request.open 'POST', @url + 'proxy' + @request.setRequestHeader('X-Session-ID', @id) + catch err + ### + An exception happens here when, for example, NoScript allows the domain + on which the proxy badge runs, but not the domain to which it's trying + to make the HTTP request. The exception message is like "Component + returned failure code: 0x805e0006 [nsIXMLHttpRequest.open]" on Firefox. + ### + log 'Broker: exception while connecting: ' + err.message + return + @request.send @id sendAnswer: (answer) -> dbg @id + ' - Sending answer back to broker...\n' diff --git a/proxy/spec/broker.spec.coffee b/proxy/spec/broker.spec.coffee index 2844cdb..3b47cd3 100644 --- a/proxy/spec/broker.spec.coffee +++ b/proxy/spec/broker.spec.coffee @@ -3,36 +3,48 @@ jasmine tests for Snowflake broker ### # fake xhr +# class XMLHttpRequest class XMLHttpRequest + constructor: -> + @onreadystatechange = null open: -> + setRequestHeader: -> send: -> - onreadystatechange: -> DONE: 1 describe 'Broker', -> it 'can be created', -> - b = new Broker('fake') + b = new Broker 'fake' expect(b.url).toEqual 'https://fake/' expect(b.id).not.toBeNull() - it 'polls for client offer', (done) -> - b = new Broker('fake') - # TODO: fix this + it 'polls and promises a client offer', (done) -> + b = new Broker 'fake' + # fake successful request + spyOn(b, 'sendRequest').and.callFake -> + b.request.readyState = b.request.DONE + b.request.status = STATUS_OK + b.request.responseText = 'test' + b.request.onreadystatechange() poll = b.getClientOffer() - spyOn(b.request, 'open') - spyOn(b.request, 'send').and.callFake -> - b.onreadystatechange() - poll.then = -> - done() expect(poll).not.toBeNull() - # expect(b.request.open).toHaveBeenCalled() - # expect(b.request.send).toHaveBeenCalled() - # fake successful poll - b.request.readyState = XMLHttpRequest.DONE - b.request.status = STATUS_OK - b.request.responseText = 'test' - done() + poll.then (desc) => + expect(desc).toEqual 'test' + done() + + it 'requests correctly', -> + b = new Broker 'fake' + b.request = new XMLHttpRequest() + spyOn(b.request, 'open') + spyOn(b.request, 'setRequestHeader') + spyOn(b.request, 'send') + b.sendRequest() + expect(b.request.open).toHaveBeenCalled() + expect(b.request.setRequestHeader).toHaveBeenCalled() + expect(b.request.send).toHaveBeenCalled() it 'responds to the broker with answer', -> - # TODO + # TODO: fix + b = new Broker 'fake' + b.sendAnswer 'foo'

1 0

[snowflake/master] Update Snowflake embed, and add info page about it (close #16)
by serene＠torproject.org 10 Feb '16

10 Feb '16

commit 6fb2e4753fb72ea70ed817310ed0d8f0d7c0d0fa Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Feb 10 13:54:07 2016 -0800 Update Snowflake embed, and add info page about it (close #16) --- proxy/README.md | 9 +++++- proxy/static/embed.html | 30 ++++++++++--------- proxy/static/index.html | 78 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+), 15 deletions(-) diff --git a/proxy/README.md b/proxy/README.md index 364ac0e..5b5761d 100644 --- a/proxy/README.md +++ b/proxy/README.md @@ -1,6 +1,13 @@ This is the browser proxy component of Snowflake. -### Testing: +### Embedding + +See [keroserene.net/snowflake](http://keroserene.net/snowflake) for more info: +``` +<iframe src="http://keroserene.net/snowflake/embed.html" width="88" height="16" frameborder="0" scrolling="no"></iframe> +``` + +### Testing Unit testing with Jasmine are available with: ``` diff --git a/proxy/static/embed.html b/proxy/static/embed.html index c59809e..5d68576 100644 --- a/proxy/static/embed.html +++ b/proxy/static/embed.html @@ -6,36 +6,38 @@ <style> * { box-sizing: border-box; - -webkit-transition: all 0.3s; - -moz-transition: all 0.3s; - transition: all 0.3s; } body { - position: absolute; - width: 100%; height: 100%; top: 0; margin: 0 auto; - background-color: #424; color: #000; - font-size: 10px; letter-spacing: 1px; font-variant: small-caps; + position: absolute; width: 100%; height: 100%; + top: 0; margin: 0 auto; padding: 0; + background-color: #424; text-align: center; cursor: default; - margin: 0; padding: 0; } #badge { margin: auto; padding: 0; width: 88px; height: 16px; background-image: url('koch.jpg'); - text-shadow: 0 0 5px #fef; - font-weight: 900; + white-space: nowrap; + color: #000; + font-size: 12px; font-weight: 900; + font-variant: small-caps; + text-shadow: 0 0 5px #fef, + 0 1px 2px #fef, + 0 -1px 2px #fef; + 1px 0px 3px #fef; + -1px 0px 3px #fef; } .active { -webkit-animation: bgScroll 8s linear infinite; animation: bgScroll 8s linear infinite; } @-webkit-keyframes bgScroll { - from {background-position: 49% -4%;} - to {background-position: 49% 104%;} + from {background-position: 0 -4%;} + to {background-position: 0 104%;} } @keyframes bgScroll { - from {background-position: 49% -4%;} - to {background-position: 49% 104%;} + from {background-position: 0 -4%;} + to {background-position: 0 104%;} } </style> </head> diff --git a/proxy/static/index.html b/proxy/static/index.html new file mode 100644 index 0000000..895f67d --- /dev/null +++ b/proxy/static/index.html @@ -0,0 +1,78 @@ +<!doctype html> +<html> + +<head> +<style> +body { + text-align: center; margin: auto; + width: 50%; + min-width: 40em; +} +textarea { + width: 100%; + height: 4em; + font-size: 12px; + resize: none; + padding: 1em; +} +</style> +</head> + +<body> + +<h1>Snowflake</h1> + +<p> +<a href="https://github.com/keroserene/snowflake" target="_blank">Snowflake</a> +is a WebRTC pluggable transport for Tor. +</p> + +<p> +Minimum functionality has been achieved, and it is possible +to bootstrap a Tor client to 100% using Snowflake, and the +browsing experience using this PT is reasonable enough. +</p> + +<p> +However, Snowflake is also under active development and much work is needed. +<br/> +It is not yet stable or audited, probably has many issues, +and should not yet be relied upon!! +</p> + +See +<a href="https://lists.torproject.org/pipermail/tor-dev/2016-January/010310.html" +target="_blank"> +here</a> for more information. + +<hr> + +<p> +It is now possible to embed the Snowflake badge on any website: +</p> + +<textarea readonly> +<iframe src="http://keroserene.net/snowflake/embed.html" width="88" height="16" frameborder="0" scrolling="no"></iframe> +</textarea> + +<p> +Which looks like this: +</p> +<iframe src="http://keroserene.net/snowflake/embed.html" width="88" height="16" frameborder="0" scrolling="no"></iframe> + +<p> +If it animates, then congratulations -- you are currently acting as a Tor bridge. +</p> +<hr> + +Repo: <a target="_blank" +href="https://gitweb.torproject.org/pluggable-transports/snowflake.git/"> +gitweb.torproject.org/pluggable-transports/snowflake.git +</a> +<br/> +Last update: 2016-02-10 +<br/> +~Serene + +</body> +<html>

1 0

[snowflake/master] Begin spec for proxy-side broker interaction
by serene＠torproject.org 10 Feb '16

10 Feb '16

commit 548c100160f17e5daa78dd59810f963f362888cd Author: Serene Han <keroserene+git(a)gmail.com> Date: Mon Feb 8 19:26:58 2016 -0800 Begin spec for proxy-side broker interaction --- proxy/Cakefile | 1 + proxy/broker.coffee | 2 ++ proxy/spec/broker.spec.coffee | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/proxy/Cakefile b/proxy/Cakefile index 88d142b..045468f 100644 --- a/proxy/Cakefile +++ b/proxy/Cakefile @@ -14,6 +14,7 @@ FILES = [ FILES_SPEC = [ 'spec/util.spec.coffee' 'spec/ui.spec.coffee' + 'spec/broker.spec.coffee' 'spec/proxypair.spec.coffee' 'spec/snowflake.spec.coffee' ] diff --git a/proxy/broker.coffee b/proxy/broker.coffee index acd5a5f..b196df5 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -17,6 +17,7 @@ class Broker clients: 0 id: null + request: null # When interacting with the Broker, snowflake must generate a unique session # ID so the Broker can keep track of which signalling channel it's speaking @@ -34,6 +35,7 @@ class Broker getClientOffer: -> new Promise (fulfill, reject) => xhr = new XMLHttpRequest() + @request = xhr try xhr.open 'POST', @url + 'proxy' xhr.setRequestHeader('X-Session-ID', @id) diff --git a/proxy/spec/broker.spec.coffee b/proxy/spec/broker.spec.coffee new file mode 100644 index 0000000..2844cdb --- /dev/null +++ b/proxy/spec/broker.spec.coffee @@ -0,0 +1,38 @@ +### +jasmine tests for Snowflake broker +### + +# fake xhr +class XMLHttpRequest + open: -> + send: -> + onreadystatechange: -> + DONE: 1 + +describe 'Broker', -> + + it 'can be created', -> + b = new Broker('fake') + expect(b.url).toEqual 'https://fake/' + expect(b.id).not.toBeNull() + + it 'polls for client offer', (done) -> + b = new Broker('fake') + # TODO: fix this + poll = b.getClientOffer() + spyOn(b.request, 'open') + spyOn(b.request, 'send').and.callFake -> + b.onreadystatechange() + poll.then = -> + done() + expect(poll).not.toBeNull() + # expect(b.request.open).toHaveBeenCalled() + # expect(b.request.send).toHaveBeenCalled() + # fake successful poll + b.request.readyState = XMLHttpRequest.DONE + b.request.status = STATUS_OK + b.request.responseText = 'test' + done() + + it 'responds to the broker with answer', -> + # TODO

1 0

[tor/master] Merge remote-tracking branch 'teor/bug18208'
by nickm＠torproject.org 10 Feb '16

10 Feb '16

commit c0a6c3465270355a09a93c1b48ba496e0f36cf0c Merge: 162d202 92b1c3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 10 16:32:05 2016 -0500 Merge remote-tracking branch 'teor/bug18208' changes/bug18208 | 5 +++++ src/or/main.c | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-)

1 0

[tor/master] Update ExitPolicy when interface addresses change
by nickm＠torproject.org 10 Feb '16

10 Feb '16

commit 92b1c3b6041d3c760e5351b17d64523965ff99a1 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Tue Feb 2 15:05:59 2016 +1100 Update ExitPolicy when interface addresses change Tor exit relays reject local interface addresses in their exit policy. Make sure those policies are updated when interface addresses change. --- changes/bug18208 | 5 +++++ src/or/main.c | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/changes/bug18208 b/changes/bug18208 new file mode 100644 index 0000000..d6d194b --- /dev/null +++ b/changes/bug18208 @@ -0,0 +1,5 @@ + o Minor bug fixes (exit policies, security): + - Refresh an exit relay's exit policy when interface addresses change. + Previously, tor only refreshed the exit policy when the configured + external address changed. + Closes ticket 18208 on tor 0.2.7.3. Patch by "teor". diff --git a/src/or/main.c b/src/or/main.c index bd4f7ea..1e8c175 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2195,7 +2195,10 @@ got_libevent_error(void) void ip_address_changed(int at_interface) { - int server = server_mode(get_options()); + const or_options_t *options = get_options(); + int server = server_mode(options); + int exit_reject_private = (server && options->ExitRelay + && options->ExitPolicyRejectPrivate); if (at_interface) { if (! server) { @@ -2209,10 +2212,15 @@ ip_address_changed(int at_interface) reset_bandwidth_test(); stats_n_seconds_working = 0; router_reset_reachability(); - mark_my_descriptor_dirty("IP address changed"); } } + /* Exit relays incorporate interface addresses in their exit policies when + * ExitPolicyRejectPrivate is set */ + if (exit_reject_private || (server && !at_interface)) { + mark_my_descriptor_dirty("IP address changed"); + } + dns_servers_relaunch_checks(); }

1 0

[tor/master] Bulletproof the safe_timer_diff function
by nickm＠torproject.org 10 Feb '16

10 Feb '16

commit 601b41084af1f941c4266237e2c6df46be8981dd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 22:04:24 2016 -0500 Bulletproof the safe_timer_diff function Originally it can overflow in some weird cases. Now it should no longer be able to do so. Additionally, limit main's timers to 30 days rather than to 38 years; we don't actually want any 38-year timers. Closes bug 17682. --- src/or/main.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c index bd4f7ea..30c24e5 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1414,11 +1414,23 @@ reschedule_directory_downloads(void) periodic_event_reschedule(launch_descriptor_fetches_event); } +#define LONGEST_TIMER_PERIOD (30 * 86400) +/** Helper: Return the number of seconds between <b>now</b> and <b>next</b>, + * clipped to the range [1 second, LONGEST_TIMER_PERIOD]. */ static inline int safe_timer_diff(time_t now, time_t next) { if (next > now) { - tor_assert(next - now <= INT_MAX); + /* There were no computers at signed TIME_MIN (1902 on 32-bit systems), + * and nothing that could run Tor. It's a bug if 'next' is around then. + * On 64-bit systems with signed TIME_MIN, TIME_MIN is before the Big + * Bang. We cannot extrapolate past a singularity, but there was probably + * nothing that could run Tor then, either. + **/ + tor_assert(next > TIME_MIN + LONGEST_TIMER_PERIOD); + + if (next - LONGEST_TIMER_PERIOD > now) + return LONGEST_TIMER_PERIOD; return (int)(next - now); } else { return 1;

1 0

[tor/master] Merge branch 'bug17682_squashed'
by nickm＠torproject.org 10 Feb '16

10 Feb '16

commit 162d2022e1fa4d46480727bae9db650d50c4a21c Merge: 44ea7af 601b410 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 10 15:50:28 2016 -0500 Merge branch 'bug17682_squashed' src/or/main.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)

1 0