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

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

11 Aug '14

commit c1f1e4d9da9414a1096fa0bb975a5dd695221d4f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 11 18:15:03 2014 +0000 Update translations for bridgedb --- es_AR/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po index 4200cc0..09ba179 100644 --- a/es_AR/LC_MESSAGES/bridgedb.po +++ b/es_AR/LC_MESSAGES/bridgedb.po @@ -11,7 +11,7 @@ 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-08-10 16:08+0000\n" +"PO-Revision-Date: 2014-08-11 17:47+0000\n" "Last-Translator: ezemelano <melanoeze(a)gmail.com>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n"

1 0

[torsocks/master] Update version to v2.0.0
by dgoulet＠torproject.org 11 Aug '14

11 Aug '14

commit ea105bb76ea1e9f9660dd2307639b75ca6d76569 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Mon Aug 11 12:44:46 2014 -0400 Update version to v2.0.0 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- ChangeLog | 5 +++++ configure.ac | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 41a93b3..0b5d0d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-08-11 torsocks 2.0.0 + * Fix: compilation issue on Debian kfreebsd-i386 + * Fix: add LICENSE file to repository + * Fix: add compilation requirements to README.md + 2014-04-04 torsocks 2.0.0-rc7 * Fix: fix NULL dereference on error * Fix: memory leak in connect error path diff --git a/configure.ac b/configure.ac index 1e8982e..3eb9060 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ ############################################################################## # Process this file with autoconf to produce a configure script. -AC_INIT([torsocks], [2.0.0-rc7],[dgoulet@ev0ke.net],[],[https://torproject.org]) +AC_INIT([torsocks], [2.0.0],[dgoulet@ev0ke.net],[],[https://torproject.org]) AC_CONFIG_AUX_DIR([config]) AC_CANONICAL_TARGET # Get hostname and other information.

1 0

[torspec/master] Tweak proposals 220 and 224 to make them work with trunnel
by nickm＠torproject.org 11 Aug '14

11 Aug '14

commit d611d8ab60e7a8a5fdc051fc70ecb69042cb1da7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 11 12:58:15 2014 -0400 Tweak proposals 220 and 224 to make them work with trunnel --- proposals/220-ecc-id-keys.txt | 11 ++++++----- proposals/224-rend-spec-ng.txt | 28 +++++++++++++--------------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/proposals/220-ecc-id-keys.txt b/proposals/220-ecc-id-keys.txt index d4ed4e8..95ed4dd 100644 --- a/proposals/220-ecc-id-keys.txt +++ b/proposals/220-ecc-id-keys.txt @@ -75,7 +75,7 @@ Status: Draft VERSION [1 Byte] CERT_TYPE [1 Byte] - EXPIRATION_DATE [3 Bytes] + EXPIRATION_DATE [4 Bytes] CERT_KEY_TYPE [1 byte] CERTIFIED_KEY [32 Bytes] N_EXTENSIONS [1 byte] @@ -88,8 +88,8 @@ Status: Draft CERT_KEY_TYPE is [01], or a SHA256 hash of some other key type depending on the value of CERT_KEY_TYPE. The EXPIRATION_DATE is a date, given in HOURS since the epoch, after which this - certificate isn't valid. (A three-byte field here will work fine - until 5797 A.D.) + certificate isn't valid. (A four-byte field here will work fine + until 10136 A.D.) The EXTENSIONS field contains zero or more extensions, each of the format: @@ -142,8 +142,9 @@ Status: Draft IDENTITY_KEY [32 Bytes] REVOKED_KEY [32 Bytes] PUBLISHED [8 Bytes] - REV_EXTENSIONS [variable length, up to length of revocation - document minus 64 bytes] + N_EXTENSIONS [1 Byte] + N_EXTENSIONS_TIMES: + EXTENSIONS [N_EXTENSIONS times] SIGNATURE [64 Bytes] FIXED_PREFIX is "REVOKEID" or "REVOKESK". VERSION is [01]. KEYTYPE is diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index b8f0f04..01c682a 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -968,11 +968,11 @@ Status: Draft AUTH_KEY_TYPE [1 byte] AUTH_KEY_LEN [1 byte] AUTH_KEY [AUTH_KEY_LEN bytes] - Any number of times: + N_EXTENSIONS [1 byte] + N_EXTENSIONS times: EXT_FIELD_TYPE [1 byte] EXT_FIELD_LEN [1 byte] EXT_FIELD [EXTRA_FIELD_LEN bytes] - ZERO [1 byte] HANDSHAKE_AUTH [MAC_LEN bytes] SIGLEN [1 byte] SIG [SIGLEN bytes] @@ -998,9 +998,6 @@ Status: Draft future extensions to the introduction protocol. Extensions with unrecognized EXT_FIELD_TYPE values must be ignored. - The ZERO field contains the byte zero; it marks the end of the - extension fields. - The HANDSHAKE_AUTH field contains the MAC of all earlier fields in the cell using as its key the shared per-circuit material ("KH") generated during the circuit extension protocol; see tor-spec.txt @@ -1170,11 +1167,11 @@ Status: Draft AUTH_KEYID [32 bytes] ENC_KEYID [8 bytes] - Any number of times: + N_EXTENSIONS [1 Byte] + N_EXTENSIONS times: EXT_FIELD_TYPE [1 byte] EXT_FIELD_LEN [1 byte] EXT_FIELD [EXTRA_FIELD_LEN bytes] - ZERO [1 byte] ENCRYPTED [Up to end of relay payload] [TODO: Should we have a field to determine the type of ENCRYPTED, or @@ -1204,8 +1201,9 @@ Status: Draft 3.2.2. INTRODUCE_ACK cell format. [INTRO_ACK] An INTRODUCE_ACK cell has the following fields: - STATUS [2 bytes] - Any number of times: + STATUS [2 bytes] + N_EXTENSIONS [1 bytes] + N_EXTENSIONS times: EXT_FIELD_TYPE [1 byte] EXT_FIELD_LEN [1 byte] EXT_FIELD [EXTRA_FIELD_LEN bytes] @@ -1231,11 +1229,11 @@ Status: Draft AUTH_KEYID_HASH [20 bytes] ENC_KEYID [8 bytes] - Any number of times: + EXT_FIELD_TYPE [1 byte] EXT_FIELD_LEN [1 byte] EXT_FIELD [EXTRA_FIELD_LEN bytes] - ZERO [1 byte] + ENCRYPTED [Up to end of relay payload] Here, AUTH_KEYID_HASH is the hash of the introduction point @@ -1270,11 +1268,11 @@ Status: Draft The decrypted plaintext must have the form: RENDEZVOUS_COOKIE [20 bytes] - Any number of times: + N_EXTENSIONS [1 byte] + N_EXTENSIONS times: EXT_FIELD_TYPE [1 byte] EXT_FIELD_LEN [1 byte] EXT_FIELD [EXTRA_FIELD_LEN bytes] - ZERO [1 byte] ONION_KEY_TYPE [2 bytes] ONION_KEY [depends on ONION_KEY_TYPE] NSPEC (Number of link specifiers) [1 byte] @@ -1377,11 +1375,11 @@ Status: Draft AUTH_KEYID [32 bytes] ENC_KEYID [8 bytes] - Any number of times: + N_EXTENSIONS [1 bytes] + N_EXTENSIONS times: EXT_FIELD_TYPE [1 byte] EXT_FIELD_LEN [1 byte] EXT_FIELD [EXTRA_FIELD_LEN bytes] - ZERO [1 byte] ENCRYPTED: CLIENT_PK [G_LENGTH bytes] ENCRYPTED_DATA [Padded to length of plaintext]

1 0

[torsocks/master] Fix: compilation issue on Debian kfreebsd-i386
by dgoulet＠torproject.org 11 Aug '14

11 Aug '14

commit 17ec92ff5b1ede59b9a8a285e3a827bfcf0dff4b Author: David Goulet <dgoulet(a)ev0ke.net> Date: Mon Aug 11 12:30:43 2014 -0400 Fix: compilation issue on Debian kfreebsd-i386 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/lib/syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/syscall.c b/src/lib/syscall.c index 36d28ad..9226f86 100644 --- a/src/lib/syscall.c +++ b/src/lib/syscall.c @@ -68,7 +68,7 @@ static LIBC_CONNECT_RET_TYPE handle_connect(va_list args) return tsocks_connect(sockfd, addr, addrlen); } -#if (defined(__linux__) || defined(__darwin__)) +#if (defined(__linux__) || defined(__darwin__) || (defined(__FreeBSD_kernel__) && defined(__i386__))) /* * Handle mmap(2) syscall. */

1 0

[orbot/master] make expanded notif off by default; handle exceptions better
by n8fr8＠torproject.org 11 Aug '14

11 Aug '14

commit 0d424797a2ba3c4f5646a95ffc5af9bfb217886f Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Aug 11 10:10:18 2014 -0400 make expanded notif off by default; handle exceptions better - some devices seem to not like these new expanded/remoteviews notifications, so we are turning them off by default. This will also help with load issues on onionoo servers --- res/layout/layout_notification_expanded.xml | 23 +------- res/values/strings.xml | 6 ++ res/xml/preferences.xml | 7 +++ src/org/torproject/android/service/TorService.java | 62 ++++++++++---------- 4 files changed, 46 insertions(+), 52 deletions(-) diff --git a/res/layout/layout_notification_expanded.xml b/res/layout/layout_notification_expanded.xml index c208583..c2a9c9e 100644 --- a/res/layout/layout_notification_expanded.xml +++ b/res/layout/layout_notification_expanded.xml @@ -55,20 +55,7 @@ android:textStyle="bold" android:textAppearance="@style/NotificationTitle" /> - <ViewStub android:id="@+id/time" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:visibility="gone" - android:layout="@layout/notification_template_part_time" - /> - <ViewStub android:id="@+id/chronometer" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="0" - android:visibility="gone" - android:layout="@layout/notification_template_part_chronometer" - /> + </LinearLayout> <LinearLayout android:id="@+id/line3" @@ -131,13 +118,5 @@ android:layout_marginStart="8dp" android:fadingEdge="horizontal" /> - <ProgressBar - android:id="@android:id/progress" - android:layout_width="match_parent" - android:layout_height="12dp" - android:layout_marginStart="8dp" - android:visibility="gone" - style="?android:attr/progressBarStyleHorizontal" - /> </LinearLayout> </FrameLayout> diff --git a/res/values/strings.xml b/res/values/strings.xml index 91264a8..155dbdd 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -227,9 +227,15 @@ <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> + <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string> <string name="pref_use_persistent_notifications_title">Always-On Notifications</string> + + <string name="pref_use_expanded_notifications">Show expanded notification with Tor exit country and IP</string> + <string name="pref_use_expanded_notifications_title">Expanded Notifications</string> + <string name="notification_using_bridges">Bridges enabled!</string> <string name="default_bridges"/> <string name="set_locale_title">Set Locale</string> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 22502b6..2b10ac4 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -23,6 +23,13 @@ android:summary="@string/pref_use_persistent_notifications" android:enabled="true" android:title="@string/pref_use_persistent_notifications_title"/> +<CheckBoxPreference +android:defaultValue="false" +android:key="pref_expanded_notifications" +android:summary="@string/pref_use_expanded_notifications" +android:enabled="true" +android:title="@string/pref_use_expanded_notifications_title"/> + <ListPreference android:title="@string/set_locale_title" android:key="pref_default_locale" diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index acdb134..c3b6b39 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -128,6 +128,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private NotificationManager mNotificationManager = null; private Builder mNotifyBuilder; private Notification mNotification; + private boolean mShowExpandedNotifications = false; private boolean mHasRoot = false; private boolean mEnableTransparentProxy = false; @@ -270,7 +271,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst mNotification = mNotifyBuilder.build(); - if (Build.VERSION.SDK_INT >= 16) { + if (Build.VERSION.SDK_INT >= 16 && mShowExpandedNotifications) { // Create remote view that needs to be set as bigContentView for the notification. @@ -317,8 +318,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst expandedView.setTextViewText(R.id.title, getString(R.string.app_name)); - // expandedView.setTextViewText(R.id.info, infoMessage.toString()); - // expandedView.setOnClickPendingIntent(R.id._tor_notificationBT, pendIntent); expandedView.setImageViewResource(R.id.icon, icon); mNotification.bigContentView = expandedView; } @@ -723,6 +722,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst mEnableTransparentProxy = prefs.getBoolean("pref_transparent", false); mTransProxyAll = prefs.getBoolean("pref_transparent_all", false); mTransProxyTethering = prefs.getBoolean("pref_transparent_tethering", false); + mShowExpandedNotifications = prefs.getBoolean("pref_expanded_notifications", false); ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",false); Log.i(TAG,"debug logging:" + ENABLE_DEBUG_LOG); @@ -766,7 +766,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst * * the idea is that if Tor is off then transproxy is off */ - protected boolean enableTransparentProxy (boolean proxyAll, boolean enableTether) throws Exception + private boolean enableTransparentProxy (boolean proxyAll, boolean enableTether) throws Exception { if (mTransProxy == null) @@ -1124,7 +1124,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { logNotice("unable to get control port; file not found"); } - catch (IOException e) + catch (Exception e) { logNotice("unable to read control port config file"); } @@ -1170,7 +1170,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst }*/ - public void addEventHandler () throws IOException + public void addEventHandler () throws Exception { // We extend NullEventHandler so that we don't need to provide empty // implementations for all the events we don't care about. @@ -1386,31 +1386,33 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice(sb.toString()); - //get IP from last nodename - if(status.equals("BUILT")){ - - if (node.ipAddress == null) - mExecutor.execute(new ExternalIPFetcher(node)); - - hmBuiltNodes.put(node.id, node); - } - - if (status.equals("CLOSED")) + if (mShowExpandedNotifications) { - hmBuiltNodes.remove(node.id); - - //how check the IP's of any other nodes we have - for (String nodeId : hmBuiltNodes.keySet()) - { - node = hmBuiltNodes.get(nodeId); + //get IP from last nodename + if(status.equals("BUILT")){ if (node.ipAddress == null) mExecutor.execute(new ExternalIPFetcher(node)); - + + hmBuiltNodes.put(node.id, node); } - - } + 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)); + + } + + } + } } @@ -1585,9 +1587,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst } } - catch(IOException ioe) + catch(Exception ioe) { - Log.e(TAG,"Unable to get Tor information",ioe); + // Log.e(TAG,"Unable to get Tor information",ioe); logNotice("Unable to get Tor information"+ioe.getMessage()); } return null; @@ -1621,7 +1623,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst return result.toString(); } } - catch (IOException ioe) + catch (Exception ioe) { logException("Unable to get Tor configuration: " + ioe.getMessage(),ioe); @@ -1678,7 +1680,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst //checkAddressAndCountry(); } - catch (IOException ioe){ + catch (Exception ioe){ debug("error requesting newnym: " + ioe.getLocalizedMessage()); } } @@ -1855,7 +1857,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } }; - private boolean processSettingsImpl () throws RemoteException, IOException + private boolean processSettingsImpl () throws Exception { logNotice(getString(R.string.updating_settings_in_tor_service));

1 0

[orbot/master] reduce the onionoo lookup to just the required fields
by n8fr8＠torproject.org 11 Aug '14

11 Aug '14

commit 11d3f5954377fd5df250106868a9c45c8f57c67f Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Aug 7 15:54:12 2014 -0400 reduce the onionoo lookup to just the required fields --- src/org/torproject/android/service/TorService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 963d52d..acdb134 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1430,6 +1430,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private Node mNode; private int MAX_ATTEMPTS = 3; + private final static String ONIONOO_BASE_URL = "https://onionoo.torproject.org/details?fields=country_name,as_name,or_addre…"; public ExternalIPFetcher (Node node) { @@ -1450,7 +1451,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst //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); + URLConnection conn = new URL(ONIONOO_BASE_URL + mNode.id).openConnection(proxy); conn.setRequestProperty("Connection","Close"); conn.setConnectTimeout(60000); conn.setReadTimeout(60000);

1 0

[orbot/master] enable transproxy refresh feature, default off
by n8fr8＠torproject.org 11 Aug '14

11 Aug '14

commit ade617214501ec8e941445843ea5b8443ea56bfa Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Aug 11 11:18:46 2014 -0400 enable transproxy refresh feature, default off --- res/values/strings.xml | 3 +++ res/xml/preferences.xml | 7 +++++++ src/org/torproject/android/service/TorService.java | 15 +++++++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 155dbdd..fa4a731 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -287,5 +287,8 @@ <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">"Please disable this app in Android->Settings->Apps if you are having problems with Orbot: "</string> <string name="app_conflict">App Conflict</string> + + <string name="pref_transproxy_refresh_title">Transproxy Auto-Refresh</string> + <string name="pref_transproxy_refresh_summary">Re-apply Transproxy rules when the network state changes</string> </resources> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 2b10ac4..95d8f84 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -256,6 +256,13 @@ android:summary="@string/pref_disable_network_summary" android:enabled="true" android:title="@string/pref_disable_network_title"/> +<CheckBoxPreference +android:defaultValue="false" +android:key="pref_transproxy_refresh" +android:summary="@string/pref_transproxy_refresh_summary" +android:enabled="true" +android:title="@string/pref_transproxy_refresh_title"/> + <!-- <CheckBoxPreference diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index c3b6b39..2736fbe 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -134,7 +134,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst private boolean mEnableTransparentProxy = false; private boolean mTransProxyAll = false; private boolean mTransProxyTethering = false; - + private boolean mTransProxyNetworkRefresh = false; + private ExecutorService mExecutor = Executors.newCachedThreadPool(); public void debug(String msg) @@ -719,9 +720,12 @@ public class TorService extends Service implements TorServiceConstants, TorConst SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); mHasRoot = prefs.getBoolean(PREF_HAS_ROOT,false); - mEnableTransparentProxy = prefs.getBoolean("pref_transparent", false); + + mEnableTransparentProxy = prefs.getBoolean("pref_transparent", false); mTransProxyAll = prefs.getBoolean("pref_transparent_all", false); mTransProxyTethering = prefs.getBoolean("pref_transparent_tethering", false); + mTransProxyNetworkRefresh = prefs.getBoolean("pref_transproxy_refresh", false); + mShowExpandedNotifications = prefs.getBoolean("pref_expanded_notifications", false); ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",false); @@ -1843,8 +1847,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice(context.getString(R.string.network_connectivity_is_good_waking_tor_up_)); showToolbarNotification(getString(R.string.status_activated),NOTIFY_ID,R.drawable.ic_stat_tor); - //if (mHasRoot && mEnableTransparentProxy) - //enableTransparentProxy(mTransProxyAll, mTransProxyTethering); + if (mHasRoot && mEnableTransparentProxy && mTransProxyNetworkRefresh) + { + disableTransparentProxy(); + enableTransparentProxy(mTransProxyAll, mTransProxyTethering); + } } }

1 0

[orbot/master] multiple fixes for status check and new transproxy calls
by n8fr8＠torproject.org 11 Aug '14

11 Aug '14

commit 3e58ee9b75bbcef9006abef48a384d4513d1d7e3 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Aug 7 15:34:16 2014 -0400 multiple fixes for status check and new transproxy calls - update to the new transproxy selective calls - improve status resume/check code --- src/org/torproject/android/service/TorService.java | 66 ++++++++++---------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 88806ac..963d52d 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -52,6 +52,7 @@ import org.torproject.android.R; import org.torproject.android.TorConstants; import org.torproject.android.Utils; import org.torproject.android.settings.AppManager; +import org.torproject.android.settings.TorifiedApp; import android.annotation.SuppressLint; import android.app.Application; @@ -172,15 +173,14 @@ public class TorService extends Service implements TorServiceConstants, TorConst mLastProcessId = initControlConnection(1); - if (mLastProcessId != -1) + if (mLastProcessId != -1 && conn != null) { sendCallbackLogMessage (getString(R.string.found_existing_tor_process)); - String state = conn.getInfo("dormant"); - if (state != null && Integer.parseInt(state) == 0) - currentStatus = STATUS_ON; - else - currentStatus = STATUS_CONNECTING; + String msg = conn.getInfo("status/circuit-established"); + sendCallbackLogMessage(msg); + + currentStatus = STATUS_ON; return true; } @@ -799,19 +799,26 @@ public class TorService extends Service implements TorServiceConstants, TorConst debug ("Transparent Proxying: clearing existing rules..."); //clear rules first - mTransProxy.clearTransparentProxyingAll(this); + // mTransProxy.clearTransparentProxyingAll(this); if(proxyAll) { // showToolbarNotification(getString(R.string.setting_up_full_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor); - code = mTransProxy.setTransparentProxyingAll(this); + //clear existing rules + //code = mTransProxy.setTransparentProxyingAll(this, false); + + code = mTransProxy.setTransparentProxyingAll(this, true); } else { //showToolbarNotification(getString(R.string.setting_up_app_based_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor); + ArrayList<TorifiedApp> apps = AppManager.getApps(this, TorServiceUtils.getSharedPrefs(getApplicationContext())); + + //clear exiting rules + //code = mTransProxy.setTransparentProxyingByApp(this,apps, false); - code = mTransProxy.setTransparentProxyingByApp(this,AppManager.getApps(this, TorServiceUtils.getSharedPrefs(getApplicationContext()))); + code = mTransProxy.setTransparentProxyingByApp(this,apps, true); } @@ -856,7 +863,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (mTransProxy == null) mTransProxy = new TorTransProxy(this, fileXtables); - mTransProxy.clearTransparentProxyingAll(this); + if (mTransProxyAll) + mTransProxy.setTransparentProxyingAll(this, false); + else + { + ArrayList<TorifiedApp> apps = AppManager.getApps(this, TorServiceUtils.getSharedPrefs(getApplicationContext())); + mTransProxy.setTransparentProxyingByApp(this, apps, false); + } return true; } @@ -986,24 +999,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst { int i = 0; int controlPort = -1; - File fileCookie = new File(appCacheHome, TOR_CONTROL_COOKIE); - - if (conn != null) - { - - if (fileCookie.exists()) - { - byte[] cookie = new byte[(int)fileCookie.length()]; - DataInputStream fis = new DataInputStream(new FileInputStream(fileCookie)); - fis.read(cookie); - fis.close(); - conn.authenticate(cookie); - - String torProcId = conn.getInfo("process/pid"); - return Integer.parseInt(torProcId); - - } - } int attempt = 0; @@ -1025,7 +1020,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice( "SUCCESS connected to Tor control port"); - fileCookie = new File(appCacheHome, TOR_CONTROL_COOKIE); + File fileCookie = new File(appCacheHome, TOR_CONTROL_COOKIE); if (fileCookie.exists()) { @@ -1052,8 +1047,15 @@ public class TorService extends Service implements TorServiceConstants, TorConst File fileLog2 = new File(getFilesDir(),"orbot-tor-log.txt"); conn.setConf("Log", "debug file " + fileLog2.getCanonicalPath()); + } + String state = conn.getInfo("dormant"); + if (state != null && Integer.parseInt(state) == 0) + currentStatus = STATUS_ON; + else + currentStatus = STATUS_CONNECTING; + return Integer.parseInt(torProcId); } @@ -1075,7 +1077,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { logNotice("waiting..."); - Thread.sleep(5000); } + Thread.sleep(1000); } catch (Exception e){} } @@ -1838,8 +1840,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice(context.getString(R.string.network_connectivity_is_good_waking_tor_up_)); showToolbarNotification(getString(R.string.status_activated),NOTIFY_ID,R.drawable.ic_stat_tor); - if (mHasRoot && mEnableTransparentProxy) - enableTransparentProxy(mTransProxyAll, mTransProxyTethering); + //if (mHasRoot && mEnableTransparentProxy) + //enableTransparentProxy(mTransProxyAll, mTransProxyTethering); } }

1 0

[orbot/master] selectively disable/enable transproxy rules
by n8fr8＠torproject.org 11 Aug '14

11 Aug '14

commit 6955c44e3673751c34e85a48305f1f1de6449dff Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Aug 7 15:33:57 2014 -0400 selectively disable/enable transproxy rules --- .../torproject/android/service/TorTransProxy.java | 86 ++++++++------------ 1 file changed, 32 insertions(+), 54 deletions(-) diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index db97777..f0117e1 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -336,14 +336,18 @@ public class TorTransProxy implements TorServiceConstants { return code; }*/ - public int setTransparentProxyingByApp(Context context, ArrayList<TorifiedApp> apps) throws Exception + public int setTransparentProxyingByApp(Context context, ArrayList<TorifiedApp> apps, boolean enableRule) throws Exception { String ipTablesPath = getIpTablesPath(context); //StringBuilder script = new StringBuilder(); + String action = " -A "; String srcChainName = "OUTPUT"; + if (!enableRule) + action = " -D "; + //run the delete commands in a separate process as it might error out //String[] cmdExecClear = {script.toString()}; //code = TorServiceUtils.doShellCommand(cmdExecClear, res, runRoot, waitFor); @@ -376,7 +380,7 @@ public class TorTransProxy implements TorServiceConstants { // Allow loopback script.append(ipTablesPath); script.append(" -t filter"); - script.append(" -A ").append(srcChainName); + script.append(action).append(srcChainName); script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); script.append(" -o lo"); @@ -388,7 +392,7 @@ public class TorTransProxy implements TorServiceConstants { // Set up port redirection script.append(ipTablesPath); script.append(" -t nat"); - script.append(" -A ").append(srcChainName); + script.append(action).append(srcChainName); script.append(" -p tcp"); script.append(ALLOW_LOCAL); script.append(" -m owner --uid-owner "); @@ -403,7 +407,7 @@ public class TorTransProxy implements TorServiceConstants { // Same for DNS script.append(ipTablesPath); script.append(" -t nat"); - script.append(" -A ").append(srcChainName); + script.append(action).append(srcChainName); script.append(" -p udp"); script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); @@ -418,7 +422,7 @@ public class TorTransProxy implements TorServiceConstants { // Reject all other outbound packets script.append(ipTablesPath); script.append(" -t filter"); - script.append(" -A ").append(srcChainName); + script.append(action).append(srcChainName); script.append(" -m owner --uid-owner "); script.append(tApp.getUid()); script.append(ALLOW_LOCAL); @@ -500,40 +504,7 @@ public class TorTransProxy implements TorServiceConstants { mTorService.debug(msg); } - public int clearTransparentProxyingAll(Context context) throws Exception - { - String ipTablesPath = getIpTablesPath(context); - - StringBuilder script = new StringBuilder(); - - Shell shell = Shell.startRootShell(); - - String chainName = "OUTPUT"; - - script = new StringBuilder(); - script.append(ipTablesPath); - script.append(" -t nat"); - script.append(" -F ").append(chainName); //delete previous user-defined chain - - executeCommand (shell, script.toString()); - script = new StringBuilder(); - - - script = new StringBuilder(); - - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -F ").append(chainName); //delete previous user-defined chain - - int lastExit = executeCommand (shell, script.toString()); - - shell.close(); - - clearAllIPv6Filters(context); - - return lastExit; - } public int fixTransproxyLeak (Context context) throws Exception { @@ -609,18 +580,25 @@ public class TorTransProxy implements TorServiceConstants { return lastExit; } - public int setTransparentProxyingAll(Context context) throws Exception + public int setTransparentProxyingAll(Context context, boolean enable) throws Exception { + + String action = " -A "; + String srcChainName = "OUTPUT"; + + if (!enable) + action = " -D "; - dropAllIPv6Traffic(context,-1); + if (enable) + dropAllIPv6Traffic(context,-1); + else + clearAllIPv6Filters(context); String ipTablesPath = getIpTablesPath(context); Shell shell = Shell.startRootShell(); int torUid = context.getApplicationInfo().uid; - - String srcChainName = "OUTPUT"; StringBuilder script = new StringBuilder(); @@ -628,7 +606,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(ipTablesPath); script.append(" -t nat"); - script.append(" -A ").append(srcChainName); + script.append(action).append(srcChainName); script.append(" -m owner --uid-owner "); script.append(torUid); script.append(" -j ACCEPT"); @@ -640,7 +618,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(ipTablesPath); script.append(" -t nat"); - script.append(" -A ").append(srcChainName); + script.append(action).append(srcChainName); script.append(" -o lo"); script.append(" -j ACCEPT"); @@ -650,7 +628,7 @@ public class TorTransProxy implements TorServiceConstants { // Set up port redirection script.append(ipTablesPath); script.append(" -t nat"); - script.append(" -A ").append(srcChainName); + script.append(action).append(srcChainName); script.append(" -p tcp"); script.append(ALLOW_LOCAL); //allow access to localhost script.append(" -m owner ! --uid-owner "); @@ -665,7 +643,7 @@ public class TorTransProxy implements TorServiceConstants { // Same for DNS script.append(ipTablesPath); script.append(" -t nat"); - script.append(" -A ").append(srcChainName); + script.append(action).append(srcChainName); script.append(" -p udp"); script.append(ALLOW_LOCAL); //allow access to localhost script.append(" -m owner ! --uid-owner "); @@ -684,7 +662,7 @@ public class TorTransProxy implements TorServiceConstants { //XXX: Comment the following rules for non-debug builds script.append(ipTablesPath); script.append(" -t filter"); - script.append(" -A ").append(srcChainName); + script.append(action).append(srcChainName); script.append(" -p udp"); script.append(" --dport "); script.append(STANDARD_DNS_PORT); @@ -697,7 +675,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(ipTablesPath); script.append(" -t filter"); - script.append(" -A ").append(srcChainName); + script.append(action).append(srcChainName); script.append(" -p tcp"); script.append(" -j LOG"); script.append(" --log-prefix='ORBOT_TCPLEAK_PROTECTION'"); @@ -711,7 +689,7 @@ public class TorTransProxy implements TorServiceConstants { //allow access to transproxy port script.append(ipTablesPath); script.append(" -t filter"); - script.append(" -A ").append(srcChainName); + script.append(action).append(srcChainName); script.append(" -p tcp"); script.append(" -m tcp"); script.append(" --dport ").append(mTransProxyPort); @@ -723,7 +701,7 @@ public class TorTransProxy implements TorServiceConstants { //allow access to local SOCKS port script.append(ipTablesPath); script.append(" -t filter"); - script.append(" -A ").append(srcChainName); + script.append(action).append(srcChainName); script.append(" -p tcp"); script.append(" -m tcp"); script.append(" --dport ").append(PORT_SOCKS_DEFAULT); @@ -735,7 +713,7 @@ public class TorTransProxy implements TorServiceConstants { //allow access to local SOCKS port script.append(ipTablesPath); script.append(" -t filter"); - script.append(" -A ").append(srcChainName); + script.append(action).append(srcChainName); script.append(" -p tcp"); script.append(" -m tcp"); script.append(" --dport ").append(PORT_HTTP); @@ -747,7 +725,7 @@ public class TorTransProxy implements TorServiceConstants { //allow access to local DNS port script.append(ipTablesPath); script.append(" -t filter"); - script.append(" -A ").append(srcChainName); + script.append(action).append(srcChainName); script.append(" -p udp"); script.append(" -m udp"); script.append(" --dport ").append(mDNSPort); @@ -759,7 +737,7 @@ public class TorTransProxy implements TorServiceConstants { //allow access to local DNS port script.append(ipTablesPath); script.append(" -t filter"); - script.append(" -A ").append(srcChainName); + script.append(action).append(srcChainName); script.append(" -p udp"); script.append(" -m udp"); script.append(" --dport ").append(mDNSPort); @@ -772,7 +750,7 @@ public class TorTransProxy implements TorServiceConstants { // Reject all other packets script.append(ipTablesPath); script.append(" -t filter"); - script.append(" -A ").append(srcChainName); + script.append(action).append(srcChainName); script.append(" -m owner ! --uid-owner "); script.append(torUid); script.append(ALLOW_LOCAL); //allow access to localhost

1 0

[orbot/master] bump to 14.0.5.4
by n8fr8＠torproject.org 11 Aug '14

11 Aug '14

commit 73d4297d05d7926fb96e90c9b6cf3ea08d17c2af Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Aug 11 11:35:50 2014 -0400 bump to 14.0.5.4 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3fd3b4f..d4b5b57 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.3" - android:versionCode="116" + android:versionName="14.0.5.4" + android:versionCode="117" android:installLocation="auto" >

1 0