- tor-commits - lists.torproject.org

[metrics-db/master] Always copy files to rsync/ and keep last modified time.
by karsten＠torproject.org 14 Jan '12

14 Jan '12

commit 81dd6f373afa9a0ea1af222ad900681ca632e890 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Jan 14 11:29:45 2012 +0100 Always copy files to rsync/ and keep last modified time. --- src/org/torproject/ernie/db/RsyncDataProvider.java | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/ernie/db/RsyncDataProvider.java b/src/org/torproject/ernie/db/RsyncDataProvider.java index 1f0d68f..455d6dd 100644 --- a/src/org/torproject/ernie/db/RsyncDataProvider.java +++ b/src/org/torproject/ernie/db/RsyncDataProvider.java @@ -123,9 +123,6 @@ public class RsyncDataProvider { } private void copyFile(File from, File to) { - if (to.exists()) { - return; - } try { to.getParentFile().mkdirs(); FileInputStream fis = new FileInputStream(from); @@ -138,6 +135,7 @@ public class RsyncDataProvider { } bis.close(); fos.close(); + to.setLastModified(from.lastModified()); } catch (IOException e) { e.printStackTrace(); }

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 14 Jan '12

14 Jan '12

commit 471d7294d851603f9431a92011711070e36264ab Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 14 09:45:13 2012 +0000 Update translations for orbot --- values-ar/strings.xml | 3 +++ values-ca/strings.xml | 3 +++ values-de/strings.xml | 3 +++ values-el/strings.xml | 3 +++ values-es/strings.xml | 3 +++ values-eu/strings.xml | 3 +++ values-fa/strings.xml | 3 +++ values-fr/strings.xml | 3 +++ values-hu/strings.xml | 3 +++ values-it/strings.xml | 3 +++ values-mk/strings.xml | 3 +++ values-nb/strings.xml | 3 +++ values-nl/strings.xml | 3 +++ values-pl/strings.xml | 3 +++ values-pt/strings.xml | 3 +++ values-ru/strings.xml | 3 +++ values-sv/strings.xml | 3 +++ values-zh/strings.xml | 3 +++ values/strings.xml | 3 +++ 19 files changed, 57 insertions(+), 0 deletions(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index 5be5f99..b1c2d7d 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -194,4 +194,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-ca/strings.xml b/values-ca/strings.xml index e13a6ed..39c6268 100644 --- a/values-ca/strings.xml +++ b/values-ca/strings.xml @@ -194,4 +194,7 @@ Visita\'ns a https://guardianproject.info/apps/orbot o envia\'ns un correu elect <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-de/strings.xml b/values-de/strings.xml index ee0977b..6ae2765 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -195,4 +195,7 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="hidden_service_on">Verstckte Dienste auf:</string> <string name="unable_to_read_hidden_service_name">Kann den Namen des versteckten Dienstes nicht lesen</string> <string name="unable_to_start_tor">Kann Tor nicht starten:</string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-el/strings.xml b/values-el/strings.xml index 401482d..f44522d 100644 --- a/values-el/strings.xml +++ b/values-el/strings.xml @@ -184,4 +184,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-es/strings.xml b/values-es/strings.xml index 093878d..77d9710 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -194,4 +194,7 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec <string name="hidden_service_on">Servicio oculto en:</string> <string name="unable_to_read_hidden_service_name">No se puede leer el nombre del servicio oculto</string> <string name="unable_to_start_tor">ADVERTENCIA: No Puedo iniciar la Red Tor:</string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-eu/strings.xml b/values-eu/strings.xml index f80e370..d02f3d6 100644 --- a/values-eu/strings.xml +++ b/values-eu/strings.xml @@ -184,4 +184,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-fa/strings.xml b/values-fa/strings.xml index b84edf5..5cd9c6d 100644 --- a/values-fa/strings.xml +++ b/values-fa/strings.xml @@ -184,4 +184,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-fr/strings.xml b/values-fr/strings.xml index 56e157c..71385df 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -189,4 +189,7 @@ <string name="hidden_service_on">service caché sur :</string> <string name="unable_to_read_hidden_service_name">impossible de lire le nom du service caché</string> <string name="unable_to_start_tor">Impossible de démarrer Tor :</string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-hu/strings.xml b/values-hu/strings.xml index 46d1e7a..a4e1499 100644 --- a/values-hu/strings.xml +++ b/values-hu/strings.xml @@ -188,4 +188,7 @@ <string name="hidden_service_on">rejtett szolgáltatás itt:</string> <string name="unable_to_read_hidden_service_name">nem olvasható a rejtett szolgáltatás neve</string> <string name="unable_to_start_tor">Sikertelen a Tor elindítása:</string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-it/strings.xml b/values-it/strings.xml index bf48d3c..ff13966 100644 --- a/values-it/strings.xml +++ b/values-it/strings.xml @@ -189,4 +189,7 @@ Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una ma <string name="hidden_service_on">servizio nascosto attivo:</string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor">Impossibile avviare Tor:</string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-mk/strings.xml b/values-mk/strings.xml index f27f24f..62283a1 100644 --- a/values-mk/strings.xml +++ b/values-mk/strings.xml @@ -188,4 +188,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-nb/strings.xml b/values-nb/strings.xml index 217e5f6..55ef32c 100644 --- a/values-nb/strings.xml +++ b/values-nb/strings.xml @@ -184,4 +184,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-nl/strings.xml b/values-nl/strings.xml index fb5ed30..8b10f6b 100644 --- a/values-nl/strings.xml +++ b/values-nl/strings.xml @@ -194,4 +194,7 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai <string name="hidden_service_on">hidden service op:</string> <string name="unable_to_read_hidden_service_name">Kan hidden service naam niet lezen.</string> <string name="unable_to_start_tor">Kan Tor niet starten:</string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-pl/strings.xml b/values-pl/strings.xml index 98cdcb6..1d59f18 100644 --- a/values-pl/strings.xml +++ b/values-pl/strings.xml @@ -188,4 +188,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-pt/strings.xml b/values-pt/strings.xml index e06ca97..dea597c 100644 --- a/values-pt/strings.xml +++ b/values-pt/strings.xml @@ -184,4 +184,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-ru/strings.xml b/values-ru/strings.xml index acadd9a..c11deda 100644 --- a/values-ru/strings.xml +++ b/values-ru/strings.xml @@ -188,4 +188,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-sv/strings.xml b/values-sv/strings.xml index eea56c4..dcd60a2 100644 --- a/values-sv/strings.xml +++ b/values-sv/strings.xml @@ -184,4 +184,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values-zh/strings.xml b/values-zh/strings.xml index 3e64485..84c3b44 100644 --- a/values-zh/strings.xml +++ b/values-zh/strings.xml @@ -187,4 +187,7 @@ <string name="hidden_service_on"></string> <string name="unable_to_read_hidden_service_name"></string> <string name="unable_to_start_tor"></string> + <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_summary"></string> + <string name="error_installing_binares"></string> </resources> diff --git a/values/strings.xml b/values/strings.xml index d4bd0ef..3aca1ee 100644 --- a/values/strings.xml +++ b/values/strings.xml @@ -188,4 +188,7 @@ <string name="hidden_service_on">hidden service on:</string> <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string> <string name="unable_to_start_tor">Unable to start Tor:</string> + <string name="pref_use_sys_iptables_title">Use Default Iptables</string> + <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string> + <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string> </resources>

1 0

[translation/vidalia_installer] Update translations for vidalia_installer
by translation＠torproject.org 14 Jan '12

14 Jan '12

commit 6acd1217757b99d8308a1596d07fc5e33ff5e363 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 14 04:15:23 2012 +0000 Update translations for vidalia_installer --- ko/vidalia_ko.po | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/ko/vidalia_ko.po b/ko/vidalia_ko.po index fd3e284..ab639d0 100755 --- a/ko/vidalia_ko.po +++ b/ko/vidalia_ko.po @@ -1,13 +1,14 @@ # # Translators: +# <cwt967(a)naver.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-07-12 05:29+0000\n" -"PO-Revision-Date: 2010-12-05 20:21+0000\n" -"Last-Translator: \n" +"PO-Revision-Date: 2012-01-14 04:09+0000\n" +"Last-Translator: cwt96 <cwt967(a)naver.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,6 +34,17 @@ msgid "" "\n" "$_CLICK" msgstr "" +"이 마법사는 Tor, Vidalia, Polipo, Torbutton의 설치를 도와줄 것입니다. \n" +"\n" +"Tor는 익명 웹 브라우징과 인스턴트 메시징, IRC 등을 도와줌으로써 인터넷을 익명으로 사용할 수 있게 해 주는 시스템입니다. Vidalia는 Tor를 제어하고, 모니터하고, 설정할 수 있게 해 주는 GUI입니다. \n" +"\n" +"Polopo는 Tor을 통한 웹 브라우징의 성능을 향상시키기위해서 캐싱하는 웹 프록시입니다. \n" +"\n" +"Torbutton은 익명 웹 브라우징을 빨리 활성화시키고, 비활성화시키기 위한 파이어폭스 확장 기능입니다. \n" +"\n" +"만약 이전에 Tor나 Vidalia, Polipo, Firefox를 설치했다면, 이 설치를 계속하기 전에 작동을 정지시켜 주십시오. \n" +"\n" +"$_CLICK" msgctxt "BundleWelcomeTitle" msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard" @@ -40,7 +52,7 @@ msgstr "환영합니다. ${BUNDLE_NAME} 설치 마법사" msgctxt "BundleLinkText" msgid "${TOR_NAME} installation documentation" -msgstr "설치 설명서" +msgstr "${TOR_NAME} 설치 문서" msgctxt "BundleFinishText" msgid "" @@ -49,9 +61,11 @@ msgid "" "\n" "If you installed Torbutton, you will need to restart Firefox." msgstr "" -"설치가 완료됩니다. \\ n자세한 내용은 https://www.torproject.org/docs/tor-doc-windows토르를 사용하여 응용 프로그램을 구성하는 방법을 배울 수있습니다.\n" +"설치가 완료되었습니다. \n" +"\n" +"자세한 내용은 https://www.torproject.org/docs/tor-doc-windows에서 토르를 사용하여 응용 프로그램을 구성하는 방법을 배울 수있습니다.\n" "\n" -"Torbutton 설치되어있는 경우, 당신은 파이어 폭스를 다시 시작해야 할 것입니다." +"Torbutton을 설치하신 경우, Firefox를 다시 시작하십시오. " msgctxt "BundleRunNow" msgid "Run installed components now" @@ -59,7 +73,7 @@ msgstr "" msgctxt "VidaliaGroupDesc" msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor." -msgstr "" +msgstr "Vidalia는 Tor를 제어하고, 모니터하고, 설정할 수 있게 해 주는 GUI입니다" msgctxt "VidaliaUninstDesc" msgid "Remove ${VIDALIA_DESC}." @@ -86,7 +100,7 @@ msgstr "" msgctxt "VidaliaAppDesc" msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor." -msgstr "" +msgstr "Vidalia는 Tor를 제어하고, 모니터하고, 설정할 수 있게 해 주는 GUI입니다" msgctxt "VidaliaStartup" msgid "Run At Startup" @@ -113,6 +127,7 @@ msgid "" "Tor is a system for using the Internet anonymously, helping you anonymize " "Web browsing and publishing, instant messaging, IRC, and more." msgstr "" +"Tor는 익명 웹 브라우징과 인스턴트 메시징, IRC 등을 도와줌으로써 인터넷을 익명으로 사용할 수 있게 해 주는 시스템입니다." msgctxt "TorUninstDesc" msgid "Remove ${TOR_DESC}."

1 0

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

14 Jan '12

commit 280983bc20dcb8c15490e1cd2ea90cec47b362ac Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 14 03:45:02 2012 +0000 Update translations for bridgedb --- ko/bridgedb.po | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 0 deletions(-) diff --git a/ko/bridgedb.po b/ko/bridgedb.po new file mode 100644 index 0000000..6c98caf --- /dev/null +++ b/ko/bridgedb.po @@ -0,0 +1,75 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <cwt967(a)naver.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-01-01 07:48-0800\n" +"PO-Revision-Date: 2012-01-14 03:36+0000\n" +"Last-Translator: cwt96 <cwt967(a)naver.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ko\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#: lib/bridgedb/I18n.py:21 +msgid "Here are your bridge relays: " +msgstr "여기 귀하의 브릿지 중계가 있습니다. " + +#: lib/bridgedb/I18n.py:23 +msgid "" +"Bridge relays (or \"bridges\" for short) are Tor relays that aren't listed\n" +"in the main directory. Since there is no complete public list of them,\n" +"even if your ISP is filtering connections to all the known Tor relays,\n" +"they probably won't be able to block all the bridges." +msgstr "" + +#: lib/bridgedb/I18n.py:28 +msgid "" +"To use the above lines, go to Vidalia's Network settings page, and click\n" +"\"My ISP blocks connections to the Tor network\". Then add each bridge\n" +"address one at a time." +msgstr "" + +#: lib/bridgedb/I18n.py:32 +msgid "" +"Configuring more than one bridge address will make your Tor connection\n" +"more stable, in case some of the bridges become unreachable." +msgstr "" + +#: lib/bridgedb/I18n.py:35 +msgid "" +"Another way to find public bridge addresses is to send mail to\n" +"bridges(a)torproject.org with the line \"get bridges\" by itself in the body\n" +"of the mail. However, so we can make it harder for an attacker to learn\n" +"lots of bridge addresses, you must send this request from an email address at\n" +"one of the following domains:" +msgstr "" + +#: lib/bridgedb/I18n.py:41 +msgid "[This is an automated message; please do not reply.]" +msgstr "" + +#: lib/bridgedb/I18n.py:43 +msgid "" +"Another way to find public bridge addresses is to visit\n" +"https://bridges.torproject.org/. The answers you get from that page\n" +"will change every few days, so check back periodically if you need more\n" +"bridge addresses." +msgstr "" + +#: lib/bridgedb/I18n.py:48 +msgid "(no bridges currently available)" +msgstr "" + +#: lib/bridgedb/I18n.py:50 +msgid "(e-mail requests not currently supported)" +msgstr "" + +

1 0

[orbot/master] added multiple root-detect options
by n8fr8＠torproject.org 14 Jan '12

14 Jan '12

commit c23c7b52174adf21af5c121c05b4de56d33cb167 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jan 13 19:02:55 2012 -0500 added multiple root-detect options --- .../android/service/TorServiceUtils.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index fa27c58..faf7989 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -24,7 +24,13 @@ public class TorServiceUtils implements TorServiceConstants { try { // Check if Superuser.apk exists - //File file = new File("/system/app/Superuser.apk"); + File fileSU = new File("/system/app/Superuser.apk"); + if (fileSU.exists()) + return true; + + fileSU = new File("/system/bin/su"); + if (fileSU.exists()) + return true; //Check for 'su' binary String[] cmd = {"which su"};

1 0

[orbot/master] updated version
by n8fr8＠torproject.org 14 Jan '12

14 Jan '12

commit edcaeee231639b579bc2e1faa70ff6727dc10c95 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jan 13 19:19:18 2012 -0500 updated version --- AndroidManifest.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index aefb1d7..1c3e67b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" android:versionName="0.2.3.10-alpha-orbot-1.0.7-RC3" android:versionCode="25"> + package="org.torproject.android" android:versionName="0.2.3.10-alpha-orbot-1.0.7-RC4" android:versionCode="26"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

1 0

[orbot/master] improved root detect and binary installation
by n8fr8＠torproject.org 14 Jan '12

14 Jan '12

commit f14ca9a2d98dce14022b0c92ab428165f07b38d1 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jan 13 19:19:04 2012 -0500 improved root detect and binary installation --- src/org/torproject/android/Orbot.java | 2 +- .../android/service/TorBinaryInstaller.java | 3 -- src/org/torproject/android/service/TorService.java | 34 ++++++++++++------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 5452a5a..c2a7408 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -72,7 +72,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants //if Tor binary is not running, then start the service up //might want to look at whether we need to call this every time //or whether binding to the service is enough - startService(new Intent(INTENT_TOR_SERVICE)); + startService(new Intent(INTENT_TOR_SERVICE)); //something to play with on the UI branch setTheme(android.R.style.Theme_Black_NoTitleBar); diff --git a/src/org/torproject/android/service/TorBinaryInstaller.java b/src/org/torproject/android/service/TorBinaryInstaller.java index 93325db..9a56004 100644 --- a/src/org/torproject/android/service/TorBinaryInstaller.java +++ b/src/org/torproject/android/service/TorBinaryInstaller.java @@ -249,9 +249,6 @@ public class TorBinaryInstaller implements TorServiceConstants { } */ - if (changed) { - Toast.makeText(ctx, R.string.status_install_success, Toast.LENGTH_LONG).show(); - } return true; } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 50ddb01..2d1698a 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -206,23 +206,32 @@ public class TorService extends Service implements TorServiceConstants, TorConst Log.i(TAG, "service started: " + intent.getAction()); - try { - checkTorBinaries (false); - } catch (Exception e) { - - logNotice("unable to find tor binaries: " + e.getMessage()); - showToolbarNotification(getString(R.string.error_installing_binares), NOTIFY_ID, R.drawable.tornotificationerr); - - Log.e(TAG, "error checking tor binaries", e); - } + + Thread thread = new Thread () + { + + public void run () + { + try { + checkTorBinaries (false); + } catch (Exception e) { + + logNotice("unable to find tor binaries: " + e.getMessage()); + showToolbarNotification(getString(R.string.error_installing_binares), NOTIFY_ID, R.drawable.tornotificationerr); + + Log.e(TAG, "error checking tor binaries", e); + } + } + }; + + thread.start(); if (intent.getAction()!=null && intent.getAction().equals("onboot")) { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - boolean startOnBoot = prefs.getBoolean("pref_start_boot",true); + boolean startOnBoot = prefs.getBoolean("pref_start_boot",false); if (startOnBoot) { @@ -474,8 +483,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice(getString(R.string.status_install_success)); - showToolbarNotification(getString(R.string.status_install_success), NOTIFY_ID, R.drawable.tornotification); - + //showToolbarNotification(getString(R.string.status_install_success), NOTIFY_ID, R.drawable.tornotification); torBinaryPath = fileTor.getAbsolutePath(); privoxyPath = filePrivoxy.getAbsolutePath();

1 0

[stem/master] Skipping integ that need ptrace when inaccessable
by atagar＠torproject.org 13 Jan '12

13 Jan '12

commit 4a0e1a755e43802340020b663f6982536bd57ecf Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 13 08:46:19 2012 -0800 Skipping integ that need ptrace when inaccessable When the tor connection is inaccessable I'm skipping the system integ tests that need ptrace support, since we can't check if it's enabled or not. --- test/integ/util/system.py | 24 ++++++++++++++++-------- test/runner.py | 6 +++--- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 70d73ae..e06c05b 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -135,7 +135,9 @@ class TestSystem(unittest.TestCase): self.skipTest("(multiple tor instances)") elif not stem.util.system.is_available("lsof"): self.skipTest("(lsof unavailable)") - elif runner.is_debugging_prevented(): + elif not runner.is_accessible(): + self.skipTest("(unable to check for DisableDebuggerAttachment)") + elif not runner.is_ptraceable(): self.skipTest("(DisableDebuggerAttachment is set)") lsof_prefix = stem.util.system.GET_PID_BY_NAME_LSOF % "" @@ -149,7 +151,7 @@ class TestSystem(unittest.TestCase): runner = test.runner.get_runner() if not self._has_port(): self.skipTest("(test instance has no port)") - elif runner.is_debugging_prevented(): + elif not runner.is_ptraceable(): self.skipTest("(DisableDebuggerAttachment is set)") tor_pid, tor_port = runner.get_pid(), test.runner.CONTROL_PORT @@ -168,7 +170,7 @@ class TestSystem(unittest.TestCase): self.skipTest("(netstat unavailable)") elif stem.util.system.is_bsd(): self.skipTest("(linux only)") - elif runner.is_debugging_prevented(): + elif not runner.is_ptraceable(): self.skipTest("(DisableDebuggerAttachment is set)") netstat_cmd = stem.util.system.GET_PID_BY_PORT_NETSTAT @@ -186,7 +188,7 @@ class TestSystem(unittest.TestCase): self.skipTest("(sockstat unavailable)") elif not stem.util.system.is_bsd(): self.skipTest("(bsd only)") - elif runner.is_debugging_prevented(): + elif not runner.is_ptraceable(): self.skipTest("(DisableDebuggerAttachment is set)") sockstat_prefix = stem.util.system.GET_PID_BY_PORT_SOCKSTAT % "" @@ -202,7 +204,7 @@ class TestSystem(unittest.TestCase): self.skipTest("(test instance has no port)") elif not stem.util.system.is_available("lsof"): self.skipTest("(lsof unavailable)") - elif runner.is_debugging_prevented(): + elif not runner.is_ptraceable(): self.skipTest("(DisableDebuggerAttachment is set)") lsof_cmd = stem.util.system.GET_PID_BY_PORT_LSOF @@ -229,7 +231,9 @@ class TestSystem(unittest.TestCase): runner = test.runner.get_runner() - if runner.is_debugging_prevented(): + if not runner.is_accessible(): + self.skipTest("(unable to check for DisableDebuggerAttachment)") + elif not runner.is_ptraceable(): self.skipTest("(DisableDebuggerAttachment is set)") self.assertEquals(runner.get_tor_cwd(), stem.util.system.get_cwd(runner.get_pid())) @@ -243,7 +247,9 @@ class TestSystem(unittest.TestCase): runner = test.runner.get_runner() if not stem.util.system.is_available("pwdx"): self.skipTest("(pwdx unavailable)") - elif runner.is_debugging_prevented(): + elif not runner.is_accessible(): + self.skipTest("(unable to check for DisableDebuggerAttachment)") + elif not runner.is_ptraceable(): self.skipTest("(DisableDebuggerAttachment is set)") # filter the call function to only allow this command @@ -261,7 +267,9 @@ class TestSystem(unittest.TestCase): runner = test.runner.get_runner() if not stem.util.system.is_available("lsof"): self.skipTest("(lsof unavailable)") - elif runner.is_debugging_prevented(): + elif not runner.is_accessible(): + self.skipTest("(unable to check for DisableDebuggerAttachment)") + elif not runner.is_ptraceable(): self.skipTest("(DisableDebuggerAttachment is set)") # filter the call function to only allow this command diff --git a/test/runner.py b/test/runner.py index 5841154..36c41ce 100644 --- a/test/runner.py +++ b/test/runner.py @@ -11,7 +11,7 @@ Runner - Runtime context for our integration tests. |- stop - stops our tor instance and cleans up any temporary files |- is_running - checks if our tor test instance is running |- is_accessible - checks if our tor instance can be connected to - |- is_debugging_prevented - checks if DisableDebuggerAttachment is set + |- is_ptraceable - checks if DisableDebuggerAttachment is set |- get_test_dir - testing directory path |- get_torrc_path - path to our tor instance's torrc |- get_torrc_contents - contents of our tor instance's torrc @@ -273,7 +273,7 @@ class Runner: conn_opts = self.get_connection_options() return OPT_PORT in conn_opts or OPT_SOCKET in conn_opts - def is_debugging_prevented(self): + def is_ptraceable(self): """ Checks if tor's 'DisableDebuggerAttachment' option is set. This feature has a lot of adverse side effects as per... @@ -292,7 +292,7 @@ class Runner: getconf_response = control_socket.recv() control_socket.close() - return str(getconf_response) == "DisableDebuggerAttachment=1" + return str(getconf_response) != "DisableDebuggerAttachment=1" def get_test_dir(self): """

1 0

[stem/master] Integ target for running with ptrace
by atagar＠torproject.org 13 Jan '12

13 Jan '12

commit 19491fb8a411a5737ca438b9dc943a13f8eb44b8 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 13 09:15:49 2012 -0800 Integ target for running with ptrace Integraion target that runs with 'DisableDebuggerAttachment 0'. This allows us to exercise use cases that require ptrace with newer tor versions. If 'DisableDebuggerAttachment' isn't supported then we skip the target. --- run_tests.py | 13 ++++++++++++- stem/version.py | 1 + test/integ/connection/protocolinfo.py | 2 ++ test/runner.py | 4 +++- test/testrc.sample | 5 ++++- 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/run_tests.py b/run_tests.py index f458a80..64bde44 100755 --- a/run_tests.py +++ b/run_tests.py @@ -62,7 +62,7 @@ INTEG_TESTS = ( ) # Integration tests above the basic suite. -TARGETS = stem.util.enum.Enum(*[(v, v) for v in ("ONLINE", "RELATIVE", "CONN_NONE", "CONN_OPEN", "CONN_PASSWORD", "CONN_COOKIE", "CONN_MULTIPLE", "CONN_SOCKET", "CONN_SCOOKIE", "CONN_ALL")]) +TARGETS = stem.util.enum.Enum(*[(v, v) for v in ("ONLINE", "RELATIVE", "CONN_NONE", "CONN_OPEN", "CONN_PASSWORD", "CONN_COOKIE", "CONN_MULTIPLE", "CONN_SOCKET", "CONN_SCOOKIE", "CONN_PTRACE", "CONN_ALL")]) TARGET_ATTR = { TARGETS.ONLINE: ("test.integ.target.online", "Includes tests that require network activity."), @@ -74,6 +74,7 @@ TARGET_ATTR = { TARGETS.CONN_MULTIPLE: ("test.integ.target.connection.multiple", "Configuration with both password and cookie authentication."), TARGETS.CONN_SOCKET: ("test.integ.target.connection.socket", "Configuration with a control socket."), TARGETS.CONN_SCOOKIE: ("test.integ.target.connection.scookie", "Configuration with a control socket and authentication cookie."), + TARGETS.CONN_PTRACE: ("test.integ.target.connection.ptrace", "Configuration with an open control port and 'DisableDebuggerAttachment 0'"), TARGETS.CONN_ALL: ("test.integ.target.connection.all", "Runs integration tests for all connection configurations."), } @@ -256,6 +257,7 @@ if __name__ == '__main__': "multiple": test.runner.TorConnection.MULTIPLE, "socket": test.runner.TorConnection.SOCKET, "scookie": test.runner.TorConnection.SCOOKIE, + "ptrace": test.runner.TorConnection.PTRACE, } for type_key in conn_type_mappings: @@ -267,6 +269,15 @@ if __name__ == '__main__': connection_types = [test.runner.TorConnection.OPEN] for connection_type in connection_types: + if connection_type == test.runner.TorConnection.PTRACE: + our_version = stem.version.get_system_tor_version(tor_cmd) + req_version = stem.version.Requirement.DISABLE_DEBUGGER_ATTACHMENT + + if our_version < req_version: + print term.format("Unable to run CONN_PTRACE target: DisableDebuggerAttachment was added in %s" % req_version, term.Color.RED, term.Attr.BOLD) + print + continue + try: integ_runner.start(tor_cmd, connection_type = connection_type) diff --git a/stem/version.py b/stem/version.py index 0b57301..e5b9997 100644 --- a/stem/version.py +++ b/stem/version.py @@ -143,5 +143,6 @@ class Version: Requirement = stem.util.enum.Enum( ("GETINFO_CONFIG_TEXT", Version("0.2.2.7-alpha")), ("CONTROL_SOCKET", Version("0.2.0.30")), + ("DISABLE_DEBUGGER_ATTACHMENT", Version("0.2.3.9")), ) diff --git a/test/integ/connection/protocolinfo.py b/test/integ/connection/protocolinfo.py index 6f036c8..0214534 100644 --- a/test/integ/connection/protocolinfo.py +++ b/test/integ/connection/protocolinfo.py @@ -161,6 +161,8 @@ class TestProtocolInfo(unittest.TestCase): auth_methods = (stem.connection.AuthMethod.NONE,) elif connection_type == test.runner.TorConnection.SCOOKIE: auth_methods = (stem.connection.AuthMethod.COOKIE,) + elif connection_type == test.runner.TorConnection.PTRACE: + auth_methods = (stem.connection.AuthMethod.NONE,) else: self.fail("Unrecognized connection type: %s" % connection_type) diff --git a/test/runner.py b/test/runner.py index 36c41ce..4d163bf 100644 --- a/test/runner.py +++ b/test/runner.py @@ -50,7 +50,7 @@ DEFAULT_CONFIG = { # Methods for connecting to tor. General integration tests only run with the # DEFAULT_TOR_CONNECTION, but expanded integ tests will run with all of them. -TorConnection = stem.util.enum.Enum("NONE", "OPEN", "PASSWORD", "COOKIE", "MULTIPLE", "SOCKET", "SCOOKIE") +TorConnection = stem.util.enum.Enum("NONE", "OPEN", "PASSWORD", "COOKIE", "MULTIPLE", "SOCKET", "SCOOKIE", "PTRACE") DEFAULT_TOR_CONNECTION = TorConnection.OPEN STATUS_ATTR = (term.Color.BLUE, term.Attr.BOLD) @@ -78,6 +78,7 @@ OPT_PORT = "ControlPort %i" % CONTROL_PORT OPT_COOKIE = "CookieAuthentication 1" OPT_PASSWORD = "HashedControlPassword 16:8C423A41EF4A542C6078985270AE28A4E04D056FB63F9F201505DB8E06" OPT_SOCKET = "ControlSocket %s" % CONTROL_SOCKET_PATH +OPT_PTRACE = "DisableDebuggerAttachment 0" # mapping of TorConnection to their options @@ -89,6 +90,7 @@ CONNECTION_OPTS = { TorConnection.MULTIPLE: [OPT_PORT, OPT_PASSWORD, OPT_COOKIE], TorConnection.SOCKET: [OPT_SOCKET], TorConnection.SCOOKIE: [OPT_SOCKET, OPT_COOKIE], + TorConnection.PTRACE: [OPT_PORT, OPT_PTRACE], } def get_runner(): diff --git a/test/testrc.sample b/test/testrc.sample index f0b917d..d5a9326 100644 --- a/test/testrc.sample +++ b/test/testrc.sample @@ -23,8 +23,10 @@ # test.integ.target.connection.open # test.integ.target.connection.password # test.integ.target.connection.cookie -# test.integ.target.connection.muiltipe +# test.integ.target.connection.multiple # test.integ.target.connection.socket +# test.integ.target.connection.scookie +# test.integ.target.connection.ptrace # test.integ.target.connection.all # Runs the integration test suite for all of the given connection and # authentication configurations. If the 'all' option is set then the other @@ -41,5 +43,6 @@ test.integ.target.connection.cookie false test.integ.target.connection.muiltipe false test.integ.target.connection.socket false test.integ.target.connection.scookie false +test.integ.target.connection.ptrace false test.integ.target.connection.all false

1 0

[stem/master] Making explicit checks for tor accessibility
by atagar＠torproject.org 13 Jan '12

13 Jan '12

commit 0071fadd8b69eda81cdd9826719037fafdebbb74 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 13 08:28:32 2012 -0800 Making explicit checks for tor accessibility Several 'test/runner.py' functions query against our tor instance. However, in some integ tests we don't have any method for doing that. Rather than returning a default value I'm raising in those cases, and adding an is_accessible method to make our tests more readable. --- test/integ/socket/control_message.py | 30 +++++++++-------- test/runner.py | 57 +++++++++++++++++++++++++--------- 2 files changed, 58 insertions(+), 29 deletions(-) diff --git a/test/integ/socket/control_message.py b/test/integ/socket/control_message.py index d0c44dc..33a54bf 100644 --- a/test/integ/socket/control_message.py +++ b/test/integ/socket/control_message.py @@ -20,13 +20,14 @@ class TestControlMessage(unittest.TestCase): Checks message parsing when we have a valid but unauthenticated socket. """ - control_socket = test.runner.get_runner().get_tor_socket(False) - if not control_socket: self.skipTest("(no control socket)") + runner = test.runner.get_runner() + if not runner.is_accessible(): self.skipTest("(no control socket)") # If an unauthenticated connection gets a message besides AUTHENTICATE or # PROTOCOLINFO then tor will give an 'Authentication required.' message and # hang up. + control_socket = runner.get_tor_socket(False) control_socket.send("GETINFO version") auth_required_response = control_socket.recv() @@ -66,8 +67,9 @@ class TestControlMessage(unittest.TestCase): Parses the response for a command which doesn't exist. """ - control_socket = test.runner.get_runner().get_tor_socket() - if not control_socket: self.skipTest("(no control socket)") + runner = test.runner.get_runner() + if not runner.is_accessible(): self.skipTest("(no control socket)") + control_socket = runner.get_tor_socket() control_socket.send("blarg") unrecognized_command_response = control_socket.recv() @@ -83,8 +85,9 @@ class TestControlMessage(unittest.TestCase): Parses the response for a GETINFO query which doesn't exist. """ - control_socket = test.runner.get_runner().get_tor_socket() - if not control_socket: self.skipTest("(no control socket)") + runner = test.runner.get_runner() + if not runner.is_accessible(): self.skipTest("(no control socket)") + control_socket = runner.get_tor_socket() control_socket.send("GETINFO blarg") unrecognized_key_response = control_socket.recv() @@ -102,9 +105,8 @@ class TestControlMessage(unittest.TestCase): runner = test.runner.get_runner() torrc_dst = runner.get_torrc_path() - + if not runner.is_accessible(): self.skipTest("(no control socket)") control_socket = runner.get_tor_socket() - if not control_socket: self.skipTest("(no control socket)") control_socket.send("GETINFO config-file") config_file_response = control_socket.recv() @@ -122,9 +124,10 @@ class TestControlMessage(unittest.TestCase): runner = test.runner.get_runner() req_version = stem.version.Requirement.GETINFO_CONFIG_TEXT - our_version = runner.get_tor_version() - if our_version and our_version < req_version: + if not runner.is_accessible(): + self.skipTest("(no control socket)") + elif runner.get_tor_version() < req_version: self.skipTest("(requires %s)" % req_version) # We can't be certain of the order, and there may be extra config-text @@ -142,8 +145,6 @@ class TestControlMessage(unittest.TestCase): torrc_contents.append(line) control_socket = runner.get_tor_socket() - if not control_socket: self.skipTest("(no control socket)") - control_socket.send("GETINFO config-text") config_text_response = control_socket.recv() @@ -169,8 +170,9 @@ class TestControlMessage(unittest.TestCase): Issues 'SETEVENTS BW' and parses a few events. """ - control_socket = test.runner.get_runner().get_tor_socket() - if not control_socket: self.skipTest("(no control socket)") + runner = test.runner.get_runner() + if not runner.is_accessible(): self.skipTest("(no control socket)") + control_socket = runner.get_tor_socket() control_socket.send("SETEVENTS BW") setevents_response = control_socket.recv() diff --git a/test/runner.py b/test/runner.py index d5f4a91..5841154 100644 --- a/test/runner.py +++ b/test/runner.py @@ -10,11 +10,13 @@ Runner - Runtime context for our integration tests. |- start - prepares and starts a tor instance for our tests to run against |- stop - stops our tor instance and cleans up any temporary files |- is_running - checks if our tor test instance is running + |- is_accessible - checks if our tor instance can be connected to |- is_debugging_prevented - checks if DisableDebuggerAttachment is set |- get_test_dir - testing directory path |- get_torrc_path - path to our tor instance's torrc |- get_torrc_contents - contents of our tor instance's torrc |- get_connection_type - method by which controllers can connect to tor + |- get_connection_options - connection related options we're running with |- get_pid - process id of our tor process |- get_tor_socket - provides a socket to the tor instance +- get_tor_version - provides the version of tor we're running against @@ -129,6 +131,10 @@ class RunnerStopped(Exception): "Raised when we try to use a Runner that doesn't have an active tor instance" pass +class TorInaccessable(Exception): + "Raised when information is needed from tor but the instance we have is inaccessable" + pass + class Runner: def __init__(self): self._config = dict(DEFAULT_CONFIG) @@ -256,6 +262,17 @@ class Runner: return is_running + def is_accessible(self): + """ + Checks if our tor instance has a method of being connected to or not. + + Returns: + True if tor has a control socket or port, False otherwise + """ + + conn_opts = self.get_connection_options() + return OPT_PORT in conn_opts or OPT_SOCKET in conn_opts + def is_debugging_prevented(self): """ Checks if tor's 'DisableDebuggerAttachment' option is set. This feature has @@ -263,14 +280,14 @@ class Runner: https://trac.torproject.org/projects/tor/ticket/3313 Returns: - True if debugger attachment is disallowd, False otherwise, and None if - tor can't be checked + True if debugger attachment is disallowd, False otherwise + + Raises: + TorInaccessable if this can't be determined """ # TODO: replace higher level GETCONF query when we have a controller class control_socket = self.get_tor_socket() - if control_socket == None: return None - control_socket.send("GETCONF DisableDebuggerAttachment") getconf_response = control_socket.recv() control_socket.close() @@ -349,6 +366,16 @@ class Runner: return self._connection_type + def get_connection_options(self): + """ + Provides the connection related options we're running with. + + Returns: + list of connection contstants (test.runner.OPT_*) we're running with + """ + + return CONNECTION_OPTS[self.get_connection_type()] + def get_pid(self): """ Provides the process id of the tor process. @@ -371,20 +398,19 @@ class Runner: authenticate (bool) - if True then the socket is authenticated Returns: - stem.socket.ControlSocket connected with our testing instance, returning - None if we either don't have a test instance or it can't be connected to - """ + stem.socket.ControlSocket connected with our testing instance - connection_type, cookie_path = self.get_connection_type(), self.get_auth_cookie_path() - if connection_type == None: return None + Raises: + TorInaccessable if tor can't be connected to + """ - conn_opts = CONNECTION_OPTS[connection_type] + conn_opts = self.get_connection_options() if OPT_PORT in conn_opts: control_socket = stem.socket.ControlPort(control_port = CONTROL_PORT) elif OPT_SOCKET in conn_opts: control_socket = stem.socket.ControlSocketFile(CONTROL_SOCKET_PATH) - else: return None + else: raise TorInaccessable("Unable to connect to tor") if authenticate: stem.connection.authenticate(control_socket, CONTROL_PASSWORD) @@ -396,15 +422,16 @@ class Runner: Queries our test instance for tor's version. Returns: - stem.version.Version for our test instance, None if we're unable to - connect to it + stem.version.Version for our test instance + + Raises: + TorInaccessable if this can't be determined """ # TODO: replace with higher level functions when we've completed a basic # controller class control_socket = self.get_tor_socket() - if not control_socket: return None control_socket.send("GETINFO version") version_response = control_socket.recv() @@ -466,7 +493,7 @@ class Runner: # resides in is only accessable by the tor user (and refuses to finish # starting if it isn't). - if OPT_SOCKET in CONNECTION_OPTS[self._connection_type]: + if OPT_SOCKET in self.get_connection_options(): try: socket_dir = os.path.dirname(CONTROL_SOCKET_PATH) _print_status(" making control socket directory (%s)... " % socket_dir, STATUS_ATTR, quiet)

1 0