August 2014 - tor-commits - lists.torproject.org

[tor-launcher/master] Bug 11199 fixup: Improve behavior if tor exits.
by brade＠torproject.org 14 Aug '14

14 Aug '14

commit 3aa4860244adf99ba09911708ba8faa05a6cfa14 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 14 16:37:53 2014 -0400 Bug 11199 fixup: Improve behavior if tor exits. Improved alert/error messages and button labels. --- src/chrome/content/network-settings-wizard.xul | 2 +- src/chrome/content/network-settings.js | 7 ++++++- src/chrome/content/network-settings.xul | 2 +- src/chrome/locale/en/torlauncher.properties | 6 +++--- … [View More]src/chrome/skin/network-settings.css | 1 + src/components/tl-process.js | 18 ++++++++++++++---- src/modules/tl-util.jsm | 8 +++++--- 7 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 6a3b8fc..70d1bcf 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -168,7 +168,7 @@ <spring flex="1" /> <hbox> <spring flex="1" /> - <description id="errorPanelMessage" /> + <description id="errorPanelMessage" flex="1" /> <spring flex="1" /> </hbox> <separator/> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index fdd565e..0e84f92 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -491,15 +491,20 @@ function showErrorMessage(aTorExited, aErrorMsg) if (aTorExited) { // Show "Tor exited" message and "Restart Tor" button. - aErrorMsg = TorLauncherUtil.getLocalizedString("tor_exited"); + aErrorMsg = TorLauncherUtil.getLocalizedString("tor_exited") + + "\n\n" + TorLauncherUtil.getLocalizedString("tor_exited2"); if (btn) btn.removeAttribute("hidden"); + if (elem) + elem.style.textAlign = "start"; } else { if (btn) btn.setAttribute("hidden", true); + if (elem) + elem.style.textAlign = "center"; } if (elem) diff --git a/src/chrome/content/network-settings.xul b/src/chrome/content/network-settings.xul index 937db71..a81a5f0 100644 --- a/src/chrome/content/network-settings.xul +++ b/src/chrome/content/network-settings.xul @@ -67,7 +67,7 @@ <spring flex="1" /> <hbox> <spring flex="1" /> - <description id="errorPanelMessage" /> + <description id="errorPanelMessage" flex="1" /> <spring flex="1" /> </hbox> <separator/> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index bf2426a..816d831 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Tor Launcher -torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.tor_connection_lost=Your connection to the Tor Network has been lost. +torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. +torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -30,7 +30,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) torlauncher.connect=Connect -torlauncher.reconnect=Reconnect +torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index a823914..03f84d7 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -105,6 +105,7 @@ wizardpage[pageid="errorPanel"] description, font-size: 120%; font-weight: bold; white-space: pre-wrap; + text-align: center; } #restartButton { diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 619a32c..cc5d654 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -148,11 +148,21 @@ TorProcessService.prototype = { this.mProtocolSvc.TorCleanupConnection(); - var s = TorLauncherUtil.getLocalizedString("tor_exited"); + var s = TorLauncherUtil.getLocalizedString("tor_exited") + "\n\n" + + TorLauncherUtil.getLocalizedString("tor_exited2"); TorLauncherLogger.log(4, s); - s += "\n" + TorLauncherUtil.getLocalizedString("tor_connection_lost"); - var btnLabel = TorLauncherUtil.getLocalizedString("reconnect"); - if (TorLauncherUtil.showConfirm(null, s, btnLabel) && !this.mIsQuitting) + var defaultBtnLabel = TorLauncherUtil.getLocalizedString("restart_tor"); + var cancelBtnLabel = "OK"; + try + { + const kSysBundleURI = "chrome://global/locale/commonDialogs.properties"; + var sysBundle = Cc["@mozilla.org/intl/stringbundle;1"] + .getService(Ci.nsIStringBundleService).createBundle(kSysBundleURI); + cancelBtnLabel = sysBundle.GetStringFromName(cancelBtnLabel); + } catch(e) {} + + if (TorLauncherUtil.showConfirm(null, s, defaultBtnLabel, cancelBtnLabel) + && !this.mIsQuitting) { this._startTor(); this._controlTor(); diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 1b8c809..834d260 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -64,7 +64,8 @@ let TorLauncherUtil = // Public // Returns true if user confirms; false if not. // Note that no prompt is shown (and false is returned) if the Network Settings // window is open. - showConfirm: function(aParentWindow, aMsg, aOKButtonLabel) + showConfirm: function(aParentWindow, aMsg, aDefaultButtonLabel, + aCancelButtonLabel) { try { @@ -84,11 +85,12 @@ let TorLauncherUtil = // Public var title = this.getLocalizedString("error_title"); var btnFlags = (ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING) + ps.BUTTON_POS_0_DEFAULT - + (ps.BUTTON_POS_1 * ps.BUTTON_TITLE_CANCEL); + + (ps.BUTTON_POS_1 * ps.BUTTON_TITLE_IS_STRING); var notUsed = { value: false }; var btnIndex = ps.confirmEx(aParentWindow, title, aMsg, btnFlags, - aOKButtonLabel, null, null, null, notUsed); + aDefaultButtonLabel, aCancelButtonLabel, + null, null, notUsed); return (0 == btnIndex); } catch (e) [View Less]

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 14 Aug '14

14 Aug '14

commit a0f4557b8ef999e7006c6b7b7ecc9281f43bb116 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 14 17:15:40 2014 +0000 Update translations for tails-greeter_completed --- be/be.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be/be.po b/be/be.po index 430365d..40f6785 100644 --- a/be/be.po +++ b/be/be.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-20 … [View More]

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 14 Aug '14

14 Aug '14

commit ebd62dcd0474d9ef1b3a16ae8e56b45f4f066307 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 14 17:15:37 2014 +0000 Update translations for tails-greeter --- be/be.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be/be.po b/be/be.po index 430365d..40f6785 100644 --- a/be/be.po +++ b/be/be.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-20 18:36+… [View More]

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 14 Aug '14

14 Aug '14

commit 3db004274511629c4525108096b5dfc9c9d3f250 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 14 17:15:33 2014 +0000 Update translations for tails-persistence-setup --- be/be.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be/be.po b/be/be.po index 696b1a7..6fe50d2 100644 --- a/be/be.po +++ b/be/be.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.… [View More]

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 14 Aug '14

14 Aug '14

commit aca48a520f6f8ea2b58db6258aa1832f8dff5a37 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 14 17:15:03 2014 +0000 Update translations for bridgedb --- be/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be/LC_MESSAGES/bridgedb.po b/be/LC_MESSAGES/bridgedb.po index d2845db..b0231d0 100644 --- a/be/LC_MESSAGES/bridgedb.po +++ b/be/LC_MESSAGES/bridgedb.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The … [View More]

1 0

[ooni-probe/master] Write changelog entry for 1.1.0
by art＠torproject.org 14 Aug '14

14 Aug '14

commit a4f54c57c65e3d74ad5e7706e539120488413d64 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Aug 14 14:01:10 2014 +0200 Write changelog entry for 1.1.0 --- ChangeLog.md | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index 0ce2a43..40368bc 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,47 @@ +## v1.1.0 + +In this new release of ooniprobe we have added a new command line tool for +listing … [View More]

1 0

[ooni-probe/master] Bump version to 1.1.0-rc1
by art＠torproject.org 14 Aug '14

14 Aug '14

commit 3c18956ca5480cf7d983de8d96fc0fb48bb34fa9 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Aug 14 19:00:47 2014 +0200 Bump version to 1.1.0-rc1 --- ooni/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/__init__.py b/ooni/__init__.py index f44ca57..c3c8050 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- __author__ = "Open Observatory of Network Interference" -__version__ = "1.0.2" +… [View More]

1 0

[ooni-probe/master] Disconnect immediately after connecting to control and socks port so to leave the reactor clean.
by art＠torproject.org 14 Aug '14

14 Aug '14

commit 6e225ce2e6fdd238f82a8b5a230052e1c423da00 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Aug 14 15:11:43 2014 +0200 Disconnect immediately after connecting to control and socks port so to leave the reactor clean. --- ooni/settings.py | 7 ++++--- ooni/tests/test_settings.py | 2 +- ooni/utils/net.py | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ooni/settings.py b/ooni/settings.py index dd31801..08150f0 100644 --- a/… [View More]ooni/settings.py +++ b/ooni/settings.py @@ -3,12 +3,13 @@ import sys import yaml import getpass -from twisted.internet import defer, reactor, protocol +from twisted.internet import defer, reactor from twisted.internet.endpoints import TCP4ClientEndpoint, connectProtocol from os.path import abspath, expanduser from scapy.all import get_if_list +from ooni.utils.net import ConnectAndCloseProtocol from ooni import otime, geoip from ooni.utils import Storage, log from ooni import errors @@ -148,7 +149,7 @@ class OConfig(object): "localhost", self.tor.socks_port) try: - yield connectProtocol(socks_port_ep, protocol.Protocol()) + yield connectProtocol(socks_port_ep, ConnectAndCloseProtocol()) except Exception: incoherent.append('tor:socks_port') @@ -157,7 +158,7 @@ class OConfig(object): "localhost", self.tor.control_port) try: - yield connectProtocol(control_port_ep, protocol.Protocol()) + yield connectProtocol(control_port_ep, ConnectAndCloseProtocol()) except Exception: incoherent.append('tor:control_port') diff --git a/ooni/tests/test_settings.py b/ooni/tests/test_settings.py index 02a8503..e022a64 100644 --- a/ooni/tests/test_settings.py +++ b/ooni/tests/test_settings.py @@ -117,7 +117,7 @@ class TestSettings(ConfigTestCase): def test_check_tor_silly_listener(self): self.conf.advanced.start_tor = False self.conf.tor.socks_port = 9999 - self.conf.tor.control_port = 9998 + self.conf.tor.control_port = None self.run_silly_server() try: yield self.conf.check_tor() diff --git a/ooni/utils/net.py b/ooni/utils/net.py index 7580616..51d55e5 100644 --- a/ooni/utils/net.py +++ b/ooni/utils/net.py @@ -113,6 +113,10 @@ class Downloader(protocol.Protocol): self.finished.callback(None) +class ConnectAndCloseProtocol(protocol.Protocol): + def connectionMade(self): + self.transport.loseConnection() + def getSystemResolver(): """ XXX implement a function that returns the resolver that is currently [View Less]

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 14 Aug '14

14 Aug '14

commit 3e60b2f3dde2d77d7ca831adc01a98a83cafaa87 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 14 16:45:47 2014 +0000 Update translations for tor-launcher-network-settings --- be/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/be/network-settings.dtd b/be/network-settings.dtd index f46473e..19e3c8b 100644 --- a/be/network-settings.dtd +++ b/be/network-settings.dtd @@ -4,8 +4,8 @@ <!ENTITY … [View More]

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 14 Aug '14

14 Aug '14

commit e341b0789d0d941419f976eeeb66c363201c2175 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 14 16:45:39 2014 +0000 Update translations for mat-gui --- be.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be.po b/be.po index 957c503..31fc32c 100644 --- a/be.po +++ b/be.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-19 14:48+0000\n" -"PO-Revision-… [View More]

1 0