tor-commits April 2015

tor-commits@lists.torproject.org

19 participants
1110 discussions

[tor-ramdisk/master] TODO: add note about IPv6, menu changes, screen locking.
by blueness＠torproject.org 14 Apr '15

14 Apr '15

commit 86e21444df111550814521c8465edf7f11591ab9 Author: Anthony G. Basile <blueness(a)gentoo.org> Date: Mon Apr 13 20:06:53 2015 -0400 TODO: add note about IPv6, menu changes, screen locking. --- TODO | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/TODO b/TODO index c108671..718f861 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,9 @@ +2015-04-13 + + * Add IPv6 support. + * Merge resource and entropy menu options. + * Add screen locking with passowrd. + 2015-01-14 * Add a version/information menu item which gives info

1 0

[obfs4/master] Add routines for querying the log module state.
by yawning＠torproject.org 13 Apr '15

13 Apr '15

commit 8996cb2646f2721b2d86f5f6b54b5c21d2acc71d Author: Yawning Angel <yawning(a)torproject.org> Date: Mon Apr 13 21:21:12 2015 +0000 Add routines for querying the log module state. Unless you have very good reason to do so, there should be no reason to actually call these ever, since the log messages are only generated if they will result in output being written to a log file. --- common/log/log.go | 50 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/common/log/log.go b/common/log/log.go index 5d0a146..f29b33b 100644 --- a/common/log/log.go +++ b/common/log/log.go @@ -41,13 +41,20 @@ import ( const ( elidedAddr = "[scrubbed]" - levelError = iota - levelWarn - levelInfo - levelDebug + // LevelError is the ERROR log level (NOTICE/ERROR). + LevelError = iota + + // LevelWarn is the WARN log level, (NOTICE/ERROR/WARN). + LevelWarn + + // LevelInfo is the INFO log level, (NOTICE/ERROR/WARN/INFO). + LevelInfo + + // LevelDebug is the DEBUG log level, (NOTICE/ERROR/WARN/INFO/DEBUG). + LevelDebug ) -var logLevel = levelInfo +var logLevel = LevelInfo var enableLogging bool var unsafeLogging bool @@ -66,18 +73,34 @@ func Init(enable bool, logFilePath string, unsafe bool) error { return nil } +// Enabled returns if logging is enabled. +func Enabled() bool { + return enableLogging +} + +// Unsafe returns if unsafe logging is allowed (the caller MAY skip eliding +// addresses and other bits of sensitive information). +func Unsafe() bool { + return unsafeLogging +} + +// Level returns the current log level. +func Level() int { + return logLevel +} + // SetLogLevel sets the log level to the value indicated by the given string // (case-insensitive). func SetLogLevel(logLevelStr string) error { switch strings.ToUpper(logLevelStr) { case "ERROR": - logLevel = levelError + logLevel = LevelError case "WARN": - logLevel = levelWarn + logLevel = LevelWarn case "INFO": - logLevel = levelInfo + logLevel = LevelInfo case "DEBUG": - logLevel = levelDebug + logLevel = LevelDebug default: return fmt.Errorf("invalid log level '%s'", logLevelStr) } @@ -85,6 +108,7 @@ func SetLogLevel(logLevelStr string) error { } // Noticef logs the given format string/arguments at the NOTICE log level. +// Unless logging is disabled, Noticef logs are always emitted. func Noticef(format string, a ...interface{}) { if enableLogging { msg := fmt.Sprintf(format, a...) @@ -94,7 +118,7 @@ func Noticef(format string, a ...interface{}) { // Errorf logs the given format string/arguments at the ERROR log level. func Errorf(format string, a ...interface{}) { - if enableLogging && logLevel >= levelError { + if enableLogging && logLevel >= LevelError { msg := fmt.Sprintf(format, a...) log.Print("[ERROR]: " + msg) } @@ -102,7 +126,7 @@ func Errorf(format string, a ...interface{}) { // Warnf logs the given format string/arguments at the WARN log level. func Warnf(format string, a ...interface{}) { - if enableLogging && logLevel >= levelWarn { + if enableLogging && logLevel >= LevelWarn { msg := fmt.Sprintf(format, a...) log.Print("[WARN]: " + msg) } @@ -110,7 +134,7 @@ func Warnf(format string, a ...interface{}) { // Infof logs the given format string/arguments at the INFO log level. func Infof(format string, a ...interface{}) { - if enableLogging && logLevel >= levelInfo { + if enableLogging && logLevel >= LevelInfo { msg := fmt.Sprintf(format, a...) log.Print("[INFO]: " + msg) } @@ -118,7 +142,7 @@ func Infof(format string, a ...interface{}) { // Debugf logs the given format string/arguments at the INFO log level. func Debugf(format string, a ...interface{}) { - if enableLogging && logLevel >= levelDebug { + if enableLogging && logLevel >= LevelDebug { msg := fmt.Sprintf(format, a...) log.Print("[DEBUG]: " + msg) }

1 0

[tor/master] Disable the udp_socket_trick_blackbox tests that fail due to #12377
by nickm＠torproject.org 13 Apr '15

13 Apr '15

commit e891deb02120c3756ccfb87171e36d271c3d7077 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Fri Apr 10 18:13:34 2015 +0000 Disable the udp_socket_trick_blackbox tests that fail due to #12377 Till someone writes get_interface_address6 interface enumeration that is routing table aware, these tests will continue to fail on certain systems because the get_interface_address6() code is broken. --- src/test/test_address.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index 317119c..5236162 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -585,6 +585,7 @@ test_address_udp_socket_trick_blackbox(void *arg) (void)arg; +#if 0 retval_reference = get_interface_address6(LOG_DEBUG,AF_INET,&addr4); retval = get_interface_address6_via_udp_socket_hack(LOG_DEBUG, AF_INET, @@ -594,10 +595,6 @@ test_address_udp_socket_trick_blackbox(void *arg) tt_assert( (retval == -1 && retval_reference == -1) || (tor_addr_compare(&addr4,&addr4_to_check,CMP_EXACT) == 0) ); - //[XXX: Skipping the AF_INET6 case because bug #12377 makes it fail.] - (void)addr6_to_check; - (void)addr6; -#if 0 retval_reference = get_interface_address6(LOG_DEBUG,AF_INET6,&addr6); retval = get_interface_address6_via_udp_socket_hack(LOG_DEBUG, AF_INET6, @@ -607,6 +604,21 @@ test_address_udp_socket_trick_blackbox(void *arg) tt_assert( (retval == -1 && retval_reference == -1) || (tor_addr_compare(&addr6,&addr6_to_check,CMP_EXACT) == 0) ); +#else + /* Both of the blackbox test cases fail horribly if: + * * The host has no external addreses. + * * There are multiple interfaces with either AF_INET or AF_INET6. + * * The last address isn't the one associated with the default route. + * + * The tests SHOULD be re-enabled when #12377 is fixed correctly, but till + * then this fails a lot, in situations we expect failures due to knowing + * about the code being broken. + */ + + (void)addr4_to_check; + (void)addr6_to_check; + (void)addr6; + (void) retval_reference; #endif /* When family is neither AF_INET nor AF_INET6, we want _hack to

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 13 Apr '15

13 Apr '15

commit adba83a28c05163f321da0acda23d1e4514b1af9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 13 13:15:45 2015 +0000 Update translations for torbutton-torbuttonproperties --- hu/torbutton.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hu/torbutton.properties b/hu/torbutton.properties index 9ed6871..b865cd5 100644 --- a/hu/torbutton.properties +++ b/hu/torbutton.properties @@ -55,10 +55,10 @@ torbutton.popup.confirm_plugins = A kiegészítők, , mint a Flash sérthetik az torbutton.popup.never_ask_again = Ne kérdezze többé torbutton.popup.confirm_newnym = A Tor Böngésző becsukja az összes ablakot és fület. Minden weboldalkapcsolat megszakad.\n\nÚjraindítsuk a Tor Böngészőt, hogy alaphelyzetbe állítsuk személyazonosságát?\n\n -torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = A zöld onion menüben most már megtalálható egy biztonsági csuszka amellyel szabályozhatja a biztonsági szintet. Tekintse meg! +torbutton.slider_notification_button = Biztonsági beállítások megnyitása -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = A Tor Böngésző teljes méretűvé állítása engedélyt adhat a weboldalaknak arra, hogy megállapítsák a monitor méretét, amit felhasználhatnak az Ön követéséhez. Azt javasoljuk, hogy tartsa meg a Tor Böngésző alapértelmezett ablakméretét. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Ez az oldal (%S) megpróbál HTML5 képvászon adatokat kicsomagolni, ami a számítógépe egyedi azonosítására lehet alkalmas.\n\nMegengedje a Tor böngésző a HTML5 vászon kép információk kiemelését?

1 0

[orbot/master] update changelog for v15 rc 3
by n8fr8＠torproject.org 13 Apr '15

13 Apr '15

commit ddecd0ce8215f3bbbda0180dbcd35b31abba67ed Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Apr 13 08:37:28 2015 -0400 update changelog for v15 rc 3 --- CHANGELOG | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 66fb9f3..c4688d1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,16 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +/** 15.0.0 RC 3 / 13-Apr-2015 / b941a1c7d5588db7efd9fab672ec518a69f76f84 **/ + +b941a1c show warning about bridge limits on Intel x86/ATOM devices +325ca1f only ARM chips can support the new Obfs4, Meek bridges so hide the UI options that promote them, and just request standard bri +3c6f173 make buttons not resize weirdly with long strings +421764b make socksbypass local port random +4ab1854 update resource installer to handle different architecture +e7a7d8c support variable arch builds to support x86 move asset builds to /assets folder +74deb39 support building tun2socks for x86 +933b2e9 Small VPN and socket monitoring related fixes + /** 15.0.0 RC 2 / 9-Apr-2015 / 60f19ca **/ d6c51bc Fixes for bridge setup, and root/shell interaction - If you paste bridge addresses from Gmail, you get some strange characters

1 0

[orbot/master] show warning about bridge limits on Intel x86/ATOM devices
by n8fr8＠torproject.org 13 Apr '15

13 Apr '15

commit b941a1c7d5588db7efd9fab672ec518a69f76f84 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Apr 13 08:36:01 2015 -0400 show warning about bridge limits on Intel x86/ATOM devices --- res/values/strings.xml | 2 ++ src/org/torproject/android/OrbotMainActivity.java | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 0318cac..64ab5fc 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -339,4 +339,6 @@ <string name="install_orweb">Install Orweb</string> <string name="standard_browser">Standard Browser</string> + + <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTE: Only standard Tor bridges work on Intel X86/ATOM devices</string> </resources> diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 2ed81da..26750ea 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -293,6 +293,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon } else { + Toast.makeText(OrbotMainActivity.this, R.string.note_only_standard_tor_bridges_work_on_intel_x86_atom_devices, Toast.LENGTH_LONG).show(); showGetBridgePrompt(""); //if other chip ar, only stock bridges are supported } } @@ -945,9 +946,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon { @Override public void onClick(DialogInterface dialog, int which) { - - //mBtnBridges.setChecked(false); - + //do nothing } }) .setNeutralButton(R.string.get_bridges_email, new Dialog.OnClickListener ()

1 0

[orbot/master] only ARM chips can support the new Obfs4, Meek bridges
by n8fr8＠torproject.org 13 Apr '15

13 Apr '15

commit 325ca1f809e125760f58395d029df8ef2e6fadcb Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Apr 12 22:56:16 2015 -0400 only ARM chips can support the new Obfs4, Meek bridges so hide the UI options that promote them, and just request standard bridges --- src/org/torproject/android/OrbotMainActivity.java | 25 ++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 0900178..2ed81da 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -274,19 +274,27 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon }); + mBtnBridges = (ToggleButton)findViewById(R.id.btnBridges); boolean useBridges = mPrefs.getBoolean("pref_bridges_enabled", false); mBtnBridges.setChecked(useBridges); + + mBtnBridges.setOnClickListener(new View.OnClickListener () { @Override public void onClick(View v) { - - promptSetupBridges (); - + if (Build.CPU_ABI.contains("arm")) + { + promptSetupBridges (); //if ARM processor, show all bridge options + } + else + { + showGetBridgePrompt(""); //if other chip ar, only stock bridges are supported + } } @@ -302,11 +310,9 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon @Override public boolean onTouch(View v, MotionEvent event) { return mGestureDetector.onTouchEvent(event); - } - /* * Create the UI Options Menu (non-Javadoc) * @see android.app.Activity#onCreateOptionsMenu(android.view.Menu) @@ -487,7 +493,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon private void doTorCheck () { - openBrowser(URL_TOR_CHECK); + openBrowser(URL_TOR_CHECK,false); } @@ -681,13 +687,12 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon /* * Launch the system activity for Uri viewing with the provided url */ - private void openBrowser(final String browserLaunchUrl) + private void openBrowser(final String browserLaunchUrl,boolean forceExternal) { boolean isOrwebInstalled = appInstalledOrNot("info.guardianproject.browser"); boolean isTransProxy = mPrefs.getBoolean("pref_transparent", false); - - if (mBtnVPN.isChecked()) + if (mBtnVPN.isChecked()||forceExternal) { //use the system browser since VPN is on Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl)); @@ -964,7 +969,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon @Override public void onClick(DialogInterface dialog, int which) { - openBrowser(URL_TOR_BRIDGES + type); + openBrowser(URL_TOR_BRIDGES + type,true); }

1 0

[orbot/master] make buttons not resize weirdly with long strings
by n8fr8＠torproject.org 13 Apr '15

13 Apr '15

commit 3c6f173edeef4ece6383bc53ec18299fb08e3239 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Apr 11 21:19:42 2015 -0400 make buttons not resize weirdly with long strings --- res/layout/layout_main.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index a3f0a97..1b46e55 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -172,28 +172,34 @@ android:background="@drawable/button" android:layout_margin="3dp" + android:ellipsize="end" + android:singleLine="true" /> <ToggleButton android:id="@+id/btnVPN" - android:layout_width="wrap_content" + android:layout_width="80dp" android:layout_height="wrap_content" android:textOff="@string/menu_vpn" android:textOn="@string/menu_vpn" android:background="@drawable/toggle" android:layout_margin="3dp" + android:ellipsize="end" + android:singleLine="true" /> <ToggleButton android:id="@+id/btnBridges" - android:layout_width="wrap_content" + android:layout_width="80dp" android:layout_height="wrap_content" android:textOff="@string/bridges" android:textOn="@string/bridges" android:background="@drawable/toggle" android:layout_margin="3dp" + android:ellipsize="end" + android:singleLine="true" /> </LinearLayout>

1 0

[orbot/master] update to v15 RC3
by n8fr8＠torproject.org 13 Apr '15

13 Apr '15

commit 8cbdf187334c8838cd5cca1aaf05eaa067c792d4 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Apr 11 21:20:52 2015 -0400 update to v15 RC3 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b569adb..d4badeb 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="15.0.0-RC-2" - android:versionCode="15104" + android:versionName="15.0.0-RC-3" + android:versionCode="150003" android:installLocation="auto" >

1 0

[orbot/master] make socksbypass local port random
by n8fr8＠torproject.org 13 Apr '15

13 Apr '15

commit 421764bf3304fd641d1e1a1a7c382ccacf8e5f8b Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Apr 11 21:16:56 2015 -0400 make socksbypass local port random --- src/org/torproject/android/service/TorService.java | 19 ++++++++++--------- src/org/torproject/android/vpn/OrbotVpnService.java | 4 +--- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index e26dca2..1a48c46 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -96,8 +96,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private int mPortHTTP = 8118; private int mPortSOCKS = 9050; - private int mVpnProxyPort = 9099; - private static final int NOTIFY_ID = 1; private static final int TRANSPROXY_NOTIFY_ID = 2; private static final int ERROR_NOTIFY_ID = 3; @@ -640,6 +638,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon mNumberFormat = NumberFormat.getInstance(Locale.getDefault()); //localized numbers! + if (OrbotVpnService.mSocksProxyPort == -1) + OrbotVpnService.mSocksProxyPort = (int)((Math.random()*1000)+10000); + } catch (Exception e) { @@ -821,7 +822,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (useBridges) if (mUseVPN && !mIsLollipop) - customEnv.add("TOR_PT_PROXY=socks5://127.0.0.1:" + mVpnProxyPort); + customEnv.add("TOR_PT_PROXY=socks5://127.0.0.1:" + OrbotVpnService.mSocksProxyPort); String baseDirectory = fileTor.getParent(); Shell shellUser = Shell.startShell(customEnv, baseDirectory); @@ -1462,7 +1463,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon intent.setAction("start"); if (!mIsLollipop) - intent.putExtra("proxyPort",mVpnProxyPort); + intent.putExtra("proxyPort",OrbotVpnService.mSocksProxyPort); startService(intent); @@ -1474,7 +1475,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon try { - // conn.setConf("DisableNetwork", "1"); + conn.setConf("DisableNetwork", "1"); Intent intent = new Intent(TorService.this, OrbotVpnService.class); intent.setAction("refresh"); @@ -1486,7 +1487,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon saveConfiguration(); - // conn.setConf("DisableNetwork", "0"); + conn.setConf("DisableNetwork", "0"); } catch (Exception ioe) { @@ -2208,14 +2209,14 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (mUseVPN) //set the proxy here if we aren't using a bridge { - /* + if (!mIsLollipop) { String proxyType = "socks5"; String proxyHost = "127.0.0.1"; - extraLines.append(proxyType + "Proxy" + ' ' + proxyHost + ':' + mVpnProxyPort).append('\n'); + extraLines.append(proxyType + "Proxy" + ' ' + proxyHost + ':' + OrbotVpnService.mSocksProxyPort).append('\n'); }; - */ + } else { diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index 4c214ed..1096906 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -51,7 +51,7 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { private String mSessionName = "OrbotVPN"; private ParcelFileDescriptor mInterface; - private int mSocksProxyPort = -1; + public static int mSocksProxyPort = -1; private ProxyServer mSocksProxyServer; private final static int VPN_MTU = 1500; @@ -60,8 +60,6 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { private boolean isRestart = false; - - @Override public int onStartCommand(Intent intent, int flags, int startId) {

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits April 2015