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

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 02 Aug '14

02 Aug '14

commit ca74beea9a2d7453449f6e0538a6446cbc729d00 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 2 10:45:59 2014 +0000 Update translations for abouttor-homepage --- nn/aboutTor.dtd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nn/aboutTor.dtd b/nn/aboutTor.dtd index 0c9a160..d804ac9 100644 --- a/nn/aboutTor.dtd +++ b/nn/aboutTor.dtd @@ -4,7 +4,7 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title "About Tor"> +<!ENTITY aboutTor.title "Om Tor"> <!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> <!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> @@ -12,11 +12,11 @@ <!ENTITY aboutTor.check.label "Test Tor Network Settings"> -<!ENTITY aboutTor.success.label "Congratulations!"> -<!ENTITY aboutTor.success2.label "This browser is configured to use Tor."> -<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> -<!ENTITY aboutTor.failure.label "Something Went Wrong!"> -<!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> +<!ENTITY aboutTor.success.label "Me gratulerer!"> +<!ENTITY aboutTor.success2.label "Denne nettlesaren er sett opp for å bruka Tor."> +<!ENTITY aboutTor.success3.label "Du er no fri til å surfa anonymt på nettet."> +<!ENTITY aboutTor.failure.label "Noko gjekk gale!"> +<!ENTITY aboutTor.failure2.label "Tor fungerer ikkje med denne nettlesaren."> <!ENTITY aboutTor.failure3prefix.label "For assistance, please contact "> <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label "."> @@ -26,8 +26,8 @@ <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> -<!ENTITY aboutTor.torInfo1.label "Additional Info:"> -<!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> +<!ENTITY aboutTor.torInfo1.label "Tilleggsinfo:"> +<!ENTITY aboutTor.torInfo2.label "Land og IP-adresse:"> <!ENTITY aboutTor.torInfo3.label "Exit Node:"> <!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> <!ENTITY aboutTor.whatnextQuestion.label "What Next?">

1 0

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

02 Aug '14

commit c12194e6383d198950614a6fe83b6f9a499250d3 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 2 10:45:54 2014 +0000 Update translations for tails-misc --- nn.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nn.po b/nn.po index 1b6b0d1..e903d7a 100644 --- a/nn.po +++ b/nn.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-08 19:08+0200\n" -"PO-Revision-Date: 2014-06-30 15:51+0000\n" +"POT-Creation-Date: 2014-07-21 01:59+0200\n" +"PO-Revision-Date: 2014-08-02 10:40+0000\n" "Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" "MIME-Version: 1.0\n" @@ -350,7 +350,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 msgid "Error" -msgstr "" +msgstr "Feil" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:40 msgid "" @@ -413,32 +413,32 @@ msgstr "" msgid "Failed to setup chroot." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:175 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:215 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:204 msgid "Shutting down the Unsafe Browser..." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:216 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:205 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:228 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:217 msgid "Failed to restart Tor." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:225 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:249 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:238 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager."

1 0

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

02 Aug '14

commit eff37dacab5258fd9cd2366a214913a7e73bebb8 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 2 10:45:48 2014 +0000 Update translations for tor-launcher-network-settings --- sk_SK/network-settings.dtd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sk_SK/network-settings.dtd b/sk_SK/network-settings.dtd index 9437c05..e042853 100644 --- a/sk_SK/network-settings.dtd +++ b/sk_SK/network-settings.dtd @@ -23,20 +23,20 @@ <!ENTITY torSettings.firewallHelp "Ak neviete, ako máte odpovedať na túto otázku, zvoľte Nie. Ak sa vyskytne problém s pripojením do Tor network, zmeňte toto nastavenie."> <!ENTITY torSettings.enterFirewall "Zadajte čísla portov oddelené medzerou, ktoré sú povolené na firewalle."> <!ENTITY torSettings.bridgeQuestion "Blokuje váš poskytovateľ internetového pripojenia (ISP) alebo inak cenzuruje pripojenia do siete Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeHelp "Ak si nie ste istí, ako odpovedať, zvoľte Nie.  Ak zvolíte Áno, bude potrebné nakonfigurovať Tor Bridges, čo sú nikde nezapísané relé, použitie ktorých robí blokovanie pripojenia do Tor Network ešte obtiažnejšie."> <!ENTITY torSettings.bridgeSettingsPrompt "Môžete použiť poskytnutú sadu bridges alebo si môžete zaobstarať a zadať vlastnú sadu bridges.">  <!ENTITY torsettings.startingTor "Čakanie na štart Toru..."> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Reštartovať Tor"> -<!ENTITY torsettings.optional "Voliteľne"> +<!ENTITY torsettings.optional "Voliteľné"> -<!ENTITY torsettings.useProxy.checkbox "Tento počítač potrebuje použiť proxy pre prístup na internet"> +<!ENTITY torsettings.useProxy.checkbox "Tento počítač potrebuje pre prístup na Internet použiť proxy"> <!ENTITY torsettings.useProxy.type "Typ proxy:"> <!ENTITY torsettings.useProxy.address "Adresa:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP adresa alebo hostname"> +<!ENTITY torsettings.useProxy.address.placeholder "IP adresa alebo názov hostiteľa"> <!ENTITY torsettings.useProxy.port "Port:"> <!ENTITY torsettings.useProxy.username "Užívateľské meno:"> <!ENTITY torsettings.useProxy.password "Heslo:"> @@ -46,9 +46,9 @@ <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Povolené porty:"> <!ENTITY torsettings.useBridges.checkbox "Môj poskytovateľ internetového pripojenia blokuje spojenie do siete Tor"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> +<!ENTITY torsettings.useBridges.default "Pripojiť sa cez dodané bridges"> +<!ENTITY torsettings.useBridges.type "Typ transportu:"> +<!ENTITY torsettings.useBridges.custom "Zadajte vlastné bridges"> <!ENTITY torsettings.useBridges.label "Zadaj jeden alebo viac premosťovacích relays (jednu na riadok)."> <!ENTITY torsettings.useBridges.placeholder "type address:port">

1 0

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

02 Aug '14

commit a8a12713ad6b8dde1bd298eacdf6c54d43273491 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 2 10:45:32 2014 +0000 Update translations for tails-persistence-setup --- nn/nn.po | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/nn/nn.po b/nn/nn.po index 895b568..00099d3 100644 --- a/nn/nn.po +++ b/nn/nn.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Bjørn I. <bjorn.svindseth(a)online.no>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-04-16 21:26+0200\n" -"PO-Revision-Date: 2014-04-29 02:40+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-07-01 22:15+0200\n" +"PO-Revision-Date: 2014-08-02 10:40+0000\n" +"Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -83,15 +84,15 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "Printers" -msgstr "" +msgstr "Skrivarar" #: ../lib/Tails/Persistence/Configuration/Presets.pm:130 msgid "Printers configuration" -msgstr "" +msgstr "Skrivaroppsett" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "APT Packages" -msgstr "" +msgstr "APT-pakkar" #: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Packages downloaded by APT" @@ -118,67 +119,67 @@ msgstr "" msgid "Setup Tails persistent volume" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:337 +#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:452 +msgid "Error" +msgstr "Feil" + +#: ../lib/Tails/Persistence/Setup.pm:339 #, perl-format msgid "Device %s already has a persistent volume." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:345 +#: ../lib/Tails/Persistence/Setup.pm:347 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367 +#: ../lib/Tails/Persistence/Setup.pm:355 ../lib/Tails/Persistence/Setup.pm:369 #, perl-format msgid "Device %s has no persistent volume." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:359 +#: ../lib/Tails/Persistence/Setup.pm:361 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:378 +#: ../lib/Tails/Persistence/Setup.pm:380 msgid "Persistence volume is not unlocked." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:383 +#: ../lib/Tails/Persistence/Setup.pm:385 msgid "Persistence volume is not mounted." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:388 +#: ../lib/Tails/Persistence/Setup.pm:390 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:393 +#: ../lib/Tails/Persistence/Setup.pm:395 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:402 +#: ../lib/Tails/Persistence/Setup.pm:404 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:408 +#: ../lib/Tails/Persistence/Setup.pm:410 #, perl-format msgid "Device %s is optical." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:415 +#: ../lib/Tails/Persistence/Setup.pm:417 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:450 -msgid "Error" -msgstr "" - -#: ../lib/Tails/Persistence/Setup.pm:670 +#: ../lib/Tails/Persistence/Setup.pm:677 msgid "Persistence wizard - Finished" msgstr "" -#: ../lib/Tails/Persistence/Setup.pm:673 +#: ../lib/Tails/Persistence/Setup.pm:680 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -281,7 +282,7 @@ msgstr "Lagre" #: ../lib/Tails/Persistence/Step/Configure.pm:143 msgid "Saving..." -msgstr "" +msgstr "Lagrar " #: ../lib/Tails/Persistence/Step/Configure.pm:146 msgid "Saving persistence configuration..." @@ -303,11 +304,11 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Delete.pm:54 msgid "Delete" -msgstr "" +msgstr "Slett" #: ../lib/Tails/Persistence/Step/Delete.pm:101 msgid "Deleting..." -msgstr "" +msgstr "Slettar " #: ../lib/Tails/Persistence/Step/Delete.pm:104 msgid "Deleting the persistent volume..."

1 0

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

02 Aug '14

commit 5a06711747224da78f402c94751a127469e6aca7 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 2 10:45:03 2014 +0000 Update translations for bridgedb --- nn/LC_MESSAGES/bridgedb.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nn/LC_MESSAGES/bridgedb.po b/nn/LC_MESSAGES/bridgedb.po index 0372dc2..03721bf 100644 --- a/nn/LC_MESSAGES/bridgedb.po +++ b/nn/LC_MESSAGES/bridgedb.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-07-26 09:42+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-08-02 10:40+0000\n" +"Last-Translator: Bjørn I. <bjorn.svindseth(a)online.no>\n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/torproject/language/nn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,7 +57,7 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: lib/bridgedb/strings.py:28 msgid "Welcome to BridgeDB!" -msgstr "" +msgstr "Velkomen til BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: lib/bridgedb/strings.py:30 @@ -170,7 +170,7 @@ msgstr "" #: lib/bridgedb/strings.py:104 msgid "Get Bridges!" -msgstr "" +msgstr "Få bruer!" #: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" @@ -264,11 +264,11 @@ msgstr "Kjeldekode" #: lib/bridgedb/templates/base.html:97 msgid "Changelog" -msgstr "" +msgstr "Endringslogg" #: lib/bridgedb/templates/base.html:99 msgid "Contact" -msgstr "" +msgstr "Kontakt" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example,

1 0

[orbot/master] remove this, as torrc.custom is built at runtime
by n8fr8＠torproject.org 02 Aug '14

02 Aug '14

commit 0709b0e486af716f46eb892b44dfe6b3d9985fef Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Aug 2 01:14:43 2014 -0400 remove this, as torrc.custom is built at runtime --- res/raw/torrctether | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/res/raw/torrctether b/res/raw/torrctether deleted file mode 100644 index 4d8fbc6..0000000 --- a/res/raw/torrctether +++ /dev/null @@ -1,18 +0,0 @@ -SocksPort 9050 -SOCKSListenAddress 0.0.0.0 -SafeSocks 0 -TestSocks 1 -WarnUnsafeSocks 1 -Log notice stdout -ControlPort 9051 -ControlListenAddress 0.0.0.0 -CookieAuthentication 1 -RelayBandwidthRate 100 KBytes -RelayBandwidthBurst 100 KBytes -UseBridges 0 -AutomapHostsOnResolve 1 -TransListenAddress 0.0.0.0 -TransPort 9040 -DNSListenAddress 0.0.0.0 -DNSPort 5400 -AvoidDiskWrites 1 \ No newline at end of file

1 0

[orbot/master] fixes for transparent proxy tethering
by n8fr8＠torproject.org 02 Aug '14

02 Aug '14

commit 803620957a09ed873cd08cbff0b39df505037d4b Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Aug 2 01:15:01 2014 -0400 fixes for transparent proxy tethering --- .../android/service/TorResourceInstaller.java | 5 ----- src/org/torproject/android/service/TorService.java | 15 ++++++++------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/org/torproject/android/service/TorResourceInstaller.java b/src/org/torproject/android/service/TorResourceInstaller.java index 923e841..3c0563b 100644 --- a/src/org/torproject/android/service/TorResourceInstaller.java +++ b/src/org/torproject/android/service/TorResourceInstaller.java @@ -78,11 +78,6 @@ public class TorResourceInstaller implements TorServiceConstants { shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); streamToFile(is,outFile, false, false); - is = context.getResources().openRawResource(R.raw.torrctether); - outFile = new File(installFolder, TORRC_TETHER_KEY); - shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); - streamToFile(is, outFile, false, false); - is = context.getResources().openRawResource(R.raw.torpolipo); outFile = new File(installFolder, POLIPOCONFIG_ASSET_KEY); shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index a147bae..dc67433 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -642,6 +642,14 @@ public class TorService extends Service implements TorServiceConstants, TorConst String transPort = prefs.getString("pref_transport", TorServiceConstants.TOR_TRANSPROXY_PORT_DEFAULT+""); String dnsPort = prefs.getString("pref_dnsport", TorServiceConstants.TOR_DNS_PORT_DEFAULT+""); + + if (mTransProxyTethering) + { + extraLines.append("TransListenAddress 0.0.0.0").append('\n'); + extraLines.append("DNSListenAddress 0.0.0.0").append('\n'); + + } + extraLines.append("RunAsDaemon 1").append('\n'); extraLines.append("AvoidDiskWrites 1").append('\n'); @@ -850,13 +858,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst SharedPreferences prefs =TorServiceUtils.getSharedPrefs(getApplicationContext()); String torrcPath = new File(appBinHome, TORRC_ASSET_KEY).getCanonicalPath(); - - boolean transProxyTethering = prefs.getBoolean("pref_transparent_tethering", false); - - if (transProxyTethering) - { - torrcPath = new File(appBinHome, TORRC_TETHER_KEY).getCanonicalPath(); - } int torRetryWaitTimeMS = 1000;

1 0

[orbot/master] update to 14.0.5.1
by n8fr8＠torproject.org 02 Aug '14

02 Aug '14

commit 8481e6199fc04732f882b4071bd9a78fbedfad03 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Aug 2 01:34:39 2014 -0400 update to 14.0.5.1 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d1bec90..337db43 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="14.0.5" - android:versionCode="113" + android:versionName="14.0.5.1" + android:versionCode="114" android:installLocation="auto" >

1 0

[orbot/master] add new strings
by n8fr8＠torproject.org 02 Aug '14

02 Aug '14

commit 754139a5666d302c86e8d7e0d5e04f0250f291c5 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Aug 2 00:58:47 2014 -0400 add new strings --- res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/res/values/strings.xml b/res/values/strings.xml index dff9875..6ee02f8 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -277,6 +277,7 @@ <string name="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string> <string name="martus_url">https://play.google.com/store/apps/details?id=org.martus.android</string> + <string name="your_tor_public_ips_">Your Tor Public IPs:</string> </resources>

1 0

[orbot/master] Address issues related to onionoo relay/node info lookup
by n8fr8＠torproject.org 02 Aug '14

02 Aug '14

commit 31cf9816fb64e2afaeb5eda052079c543308d179 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Aug 2 00:57:18 2014 -0400 Address issues related to onionoo relay/node info lookup -Ensure streams, files are closed -Add timeout values to socket, streams -Change torrc CircuitStreamTimeout to 120 --- src/org/torproject/android/service/TorService.java | 263 +++++++++++--------- .../android/service/TorServiceUtils.java | 2 +- 2 files changed, 150 insertions(+), 115 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 88e8082..a147bae 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -17,6 +17,7 @@ import java.io.FileNotFoundException; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; import java.io.PrintStream; import java.io.PrintWriter; @@ -33,6 +34,8 @@ import java.util.List; import java.util.Properties; import java.util.Set; import java.util.StringTokenizer; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; import java.util.concurrent.TimeoutException; import java.util.regex.Pattern; @@ -62,10 +65,8 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; -import android.graphics.Color; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import android.os.AsyncTask; import android.os.Build; import android.os.IBinder; import android.os.RemoteException; @@ -132,6 +133,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst private boolean mTransProxyAll = false; private boolean mTransProxyTethering = false; + private ExecutorService mExecutor = Executors.newCachedThreadPool(); + public void debug(String msg) { if (ENABLE_DEBUG_LOG) @@ -251,7 +254,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (hmBuiltNodes.size() > 0) { - sbInfo.append("Your Tor Public IPs:\n"); + //sbInfo.append(getString(R.string.your_tor_public_ips_) + '\n'); + Set<String> itBuiltNodes = hmBuiltNodes.keySet(); for (String key : itBuiltNodes) { @@ -303,7 +307,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (notifyType != NOTIFY_ID) { mNotifyBuilder.setTicker(notifyMsg); - mNotifyBuilder.setLights(Color.GREEN, 1000, 1000); + // mNotifyBuilder.setLights(Color.GREEN, 1000, 1000); + } + else + { + mNotifyBuilder.setTicker(null); } mNotifyBuilder.setOngoing(prefPersistNotifications); @@ -330,7 +338,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { - new startTorOperation().execute(intent); + mExecutor.execute (new TorStarter(intent)); return Service.START_STICKY; @@ -343,45 +351,46 @@ public class TorService extends Service implements TorServiceConstants, TorConst } + private class TorStarter implements Runnable + { + Intent mIntent; + + public TorStarter (Intent intent) + { + mIntent = intent; + } + + public void run () + { + try + { + + if (mNotificationManager == null) + { + + IntentFilter mNetworkStateFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION); + registerReceiver(mNetworkStateReceiver , mNetworkStateFilter); + + mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); + + if (mIntent != null && mIntent.getAction()!=null && mIntent.getAction().equals(Intent.ACTION_BOOT_COMPLETED)) + { + setTorProfile(PROFILE_ON); + } + } + } + catch (Exception e) + { + Log.e(TAG,"error onBind",e); + } + } + } + @Override public void onTaskRemoved(Intent rootIntent) { logNotice("Orbot was swiped away... background service will keep running"); } - private class startTorOperation extends AsyncTask<Intent, Void, Boolean> { - @Override - protected Boolean doInBackground(Intent... params) { - - try - { - Intent intent = params[0]; - - if (mNotificationManager == null) - { - - IntentFilter mNetworkStateFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION); - registerReceiver(mNetworkStateReceiver , mNetworkStateFilter); - - mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - - if (intent != null && intent.getAction()!=null && intent.getAction().equals(Intent.ACTION_BOOT_COMPLETED)) - { - setTorProfile(PROFILE_ON); - } - } - } - catch (Exception e) - { - Log.e(TAG,"error onBind",e); - } - - - return true; - } - - } - - @@ -561,6 +570,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void onCreate() { super.onCreate(); +// android.os.Debug.waitForDebugger(); + try { initBinariesAndDirectories(); @@ -635,6 +646,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst extraLines.append("AvoidDiskWrites 1").append('\n'); + extraLines.append("CircuitStreamTimeout 120").append('\n'); extraLines.append("SOCKSPort ").append(socksPort).append('\n'); extraLines.append("SafeSocks 0").append('\n'); @@ -909,7 +921,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst props.store(new FileWriter(file), "updated"); - props.list(System.out); } @@ -1371,7 +1382,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst //get IP from last nodename if(status.equals("BUILT")){ - new getExternalIP().execute(node); + + if (node.ipAddress == null) + mExecutor.execute(new ExternalIPFetcher(node)); hmBuiltNodes.put(node.id, node); } @@ -1379,6 +1392,16 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (status.equals("CLOSED")) { hmBuiltNodes.remove(node.id); + + //how check the IP's of any other nodes we have + for (String nodeId : hmBuiltNodes.keySet()) + { + node = hmBuiltNodes.get(nodeId); + + if (node.ipAddress == null) + mExecutor.execute(new ExternalIPFetcher(node)); + + } } @@ -1397,49 +1420,74 @@ public class TorService extends Service implements TorServiceConstants, TorConst String organization; } - private class getExternalIP extends AsyncTask<Node, Void, Void>{ + private class ExternalIPFetcher implements Runnable { + private Node mNode; + private int MAX_ATTEMPTS = 3; - @Override - protected Void doInBackground(Node... nodes) { + public ExternalIPFetcher (Node node) + { + mNode = node; + } + + public void run () + { - if (conn != null) + if (mNode.ipAddress != null) + return; + + for (int i = 0; i < MAX_ATTEMPTS; i++) { - try { - //String nodeDetails = conn.getInfo("ns/id/"+nodes[0].id); - Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 8118)); - - URLConnection conn = new URL("https://onionoo.torproject.org/details?lookup=" + nodes[0].id).openConnection(proxy); - // getting JSON string from URL - - StringBuffer json = new StringBuffer(); - String line = null; - BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream())); - while ((line = reader.readLine())!=null) - json.append(line); - - JSONObject jsonNodeInfo = new org.json.JSONObject(json.toString()); + if (conn != null) + { + try { + //String nodeDetails = conn.getInfo("ns/id/"+nodes[0].id); + Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 8118)); + + URLConnection conn = new URL("https://onionoo.torproject.org/details?lookup=" + mNode.id).openConnection(proxy); + conn.setRequestProperty("Connection","Close"); + conn.setConnectTimeout(60000); + conn.setReadTimeout(60000); - JSONArray jsonRelays = jsonNodeInfo.getJSONArray("relays"); - if (jsonRelays.length() > 0) - { - nodes[0].ipAddress = jsonRelays.getJSONObject(0).getJSONArray("or_addresses").getString(0).split(":")[0]; + InputStream is = conn.getInputStream(); + + BufferedReader reader = new BufferedReader(new InputStreamReader(is)); + + // getting JSON string from URL + + StringBuffer json = new StringBuffer(); + String line = null; + + while ((line = reader.readLine())!=null) + json.append(line); + + JSONObject jsonNodeInfo = new org.json.JSONObject(json.toString()); + + JSONArray jsonRelays = jsonNodeInfo.getJSONArray("relays"); + if (jsonRelays.length() > 0) + { + mNode.ipAddress = jsonRelays.getJSONObject(0).getJSONArray("or_addresses").getString(0).split(":")[0]; + + mNode.country = jsonRelays.getJSONObject(0).getString("country_name"); + mNode.organization = jsonRelays.getJSONObject(0).getString("as_name"); + + + + } + + reader.close(); + is.close(); - nodes[0].country = jsonRelays.getJSONObject(0).getString("country_name"); - nodes[0].organization = jsonRelays.getJSONObject(0).getString("as_name"); + break; + } catch (Exception e) { + + debug ("Error getting node details from onionoo: " + e.getMessage()); } - - return null; - - } catch (Exception e) { - - logException ("Error getting node details from onionoo",e); } } - return null; } @@ -1461,30 +1509,26 @@ public class TorService extends Service implements TorServiceConstants, TorConst public IBinder onBind(Intent intent) { - new initTorOperation().execute(true); + mExecutor.execute(new Runnable () + { + public void run () + { + try + { + findExistingProc (); + } + catch (Exception e) + { + Log.e(TAG,"error onBind",e); + } + + } + }); return mBinder; } - private class initTorOperation extends AsyncTask<Boolean, Void, Boolean> { - @Override - protected Boolean doInBackground(Boolean... params) { - - try - { - findExistingProc (); - } - catch (Exception e) - { - Log.e(TAG,"error onBind",e); - } - - - return true; - } - - } - + /** * The IRemoteInterface is defined through IDL @@ -1495,29 +1539,20 @@ public class TorService extends Service implements TorServiceConstants, TorConst return getTorStatus(); } - public void setProfile (int profile) + + public void setProfile (final int profileNew) { - - new AsyncTask<Integer, Void, Boolean>() { - @Override - protected Boolean doInBackground(Integer... params) { - - try - { - - setTorProfile(params[0].intValue()); - - } - catch (Exception e) - { - Log.e(TAG,"error onBind",e); - } - - - return true; - } - - }.execute(profile); + + mExecutor.execute(new Runnable() + { + + @Override + public void run() { + setTorProfile(profileNew); + } + + }); + } diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index af83709..18ae550 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -90,7 +90,7 @@ public class TorServiceUtils implements TorServiceConstants { if (line.contains("PID")) continue; - if (line.contains(processKey)) + if (line.contains('/' + processKey)) { String[] lineParts = line.split("\\s+");

1 0