January 2012 - tor-commits - lists.torproject.org

[orbot/master] only load GeoIP when you need it
by n8fr8＠torproject.org 13 Jan '12

13 Jan '12

commit ce0ea902cae3fc2141a93a3522eb4593769b120f Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 12 21:53:30 2012 -0500 only load GeoIP when you need it --- src/org/torproject/android/service/TorService.java | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 3954ab8..94929f0 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1309,9 +1309,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst boolean enableHiddenServices = prefs.getBoolean("pref_hs_enable", false); boolean enableStrictNodes = prefs.getBoolean("pref_strict_nodes", false); - String entranceNodes = prefs.getString("pref_entrance_nodes", null); - String exitNodes = prefs.getString("pref_exit_nodes", null); - String excludeNodes = prefs.getString("pref_exclude_nodes", null); + String entranceNodes = prefs.getString("pref_entrance_nodes", ""); + String exitNodes = prefs.getString("pref_exit_nodes", ""); + String excludeNodes = prefs.getString("pref_exclude_nodes", ""); String proxyType = prefs.getString("pref_proxy_type", null); if (proxyType != null) @@ -1325,13 +1325,18 @@ public class TorService extends Service implements TorServiceConstants, TorConst } } - File fileGeoIP = new File(appBinHome,"geoip"); - mBinder.updateConfiguration("GeoIPFile", fileGeoIP.getAbsolutePath(), false); + if (entranceNodes.length() > 0 || exitNodes.length() > 0 || excludeNodes.length() > 0) + { + //only apple GeoIP if you need it + File fileGeoIP = new File(appBinHome,"geoip"); + mBinder.updateConfiguration("GeoIPFile", fileGeoIP.getAbsolutePath(), false); + } + mBinder.updateConfiguration("EntryNodes", entranceNodes, false); mBinder.updateConfiguration("ExitNodes", exitNodes, false); mBinder.updateConfiguration("ExcludeNodes", excludeNodes, false); mBinder.updateConfiguration("StrictNodes", enableStrictNodes ? "1" : "0", false); - + if (useBridges) { String bridgeList = prefs.getString(TorConstants.PREF_BRIDGES_LIST,"");

1 0

[orbot/master] added new error state strings
by n8fr8＠torproject.org 13 Jan '12

13 Jan '12

commit 5ff9e40851865c4e4be6a7412f7717a2b3bbd00f Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jan 13 10:24:42 2012 -0500 added new error state strings --- res/values/strings.xml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 2ca91be..4e1ff74 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -252,4 +252,5 @@ <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

[orbot/master] flush iptables immediately when disabled in settings
by n8fr8＠torproject.org 13 Jan '12

13 Jan '12

commit fbfa2d1d7ac7bb462ebfc1374cc8586a316f6e1f Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jan 12 21:53:42 2012 -0500 flush iptables immediately when disabled in settings --- .../android/settings/SettingsPreferences.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/android/settings/SettingsPreferences.java b/src/org/torproject/android/settings/SettingsPreferences.java index bb5b24b..55134ab 100644 --- a/src/org/torproject/android/settings/SettingsPreferences.java +++ b/src/org/torproject/android/settings/SettingsPreferences.java @@ -5,6 +5,7 @@ package org.torproject.android.settings; import org.torproject.android.R; import org.torproject.android.R.xml; +import org.torproject.android.TorConstants; import org.torproject.android.service.TorServiceUtils; import org.torproject.android.service.TorTransProxy; @@ -18,6 +19,7 @@ import android.preference.PreferenceManager; import android.preference.Preference.OnPreferenceClickListener; import android.preference.PreferenceActivity; import android.preference.PreferenceCategory; +import android.util.Log; import android.widget.Toast; @@ -145,11 +147,21 @@ public class SettingsPreferences prefcBTransProxyAll.setEnabled(prefCBTransProxy.isChecked()); prefTransProxyApps.setEnabled(prefCBTransProxy.isChecked() && (!prefcBTransProxyAll.isChecked())); + if (!prefCBTransProxy.isChecked()) + clearTransProxyState (); + } return true; } - + private void clearTransProxyState () + { + try { + new TorTransProxy().flushIptables(this); + } catch (Exception e) { + Log.e(TorConstants.TAG,"error flushing iptables",e); + } + } }

1 0

[orbot/master] updated chanelog for 1.0.7
by n8fr8＠torproject.org 13 Jan '12

13 Jan '12

commit 0ada0dcd3b30001488f95b829af3f454464ece47 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jan 13 11:01:50 2012 -0500 updated chanelog for 1.0.7 --- CHANGELOG | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 94ccca6..a8cb421 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ 1.0.7 +- enabled access to localhost ports for SOCKS, HTTP, etc even when transproxy is on +- improved handling of tor and privoxy binary upgrades - updated openssl to 1.0.0f to address recent SSLv3 threat - check for root mode uses "which su" command and does not look for Superuser.apk - changed tor binary res/raw storage mechanism to use the "mp3" file ext trick

1 0

[orbot/master] improved handling of binary upgrade process
by n8fr8＠torproject.org 13 Jan '12

13 Jan '12

commit 2962f584475d84e75edee12f12f59904e1bfa483 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jan 13 10:26:56 2012 -0500 improved handling of binary upgrade process --- .../android/service/TorBinaryInstaller.java | 38 ++++++++----- src/org/torproject/android/service/TorService.java | 57 ++++++++++++++++---- .../android/service/TorServiceConstants.java | 8 +++ 3 files changed, 77 insertions(+), 26 deletions(-) diff --git a/src/org/torproject/android/service/TorBinaryInstaller.java b/src/org/torproject/android/service/TorBinaryInstaller.java index 07b5049..93325db 100644 --- a/src/org/torproject/android/service/TorBinaryInstaller.java +++ b/src/org/torproject/android/service/TorBinaryInstaller.java @@ -7,6 +7,7 @@ import java.io.BufferedReader; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.File; +import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; @@ -45,28 +46,36 @@ public class TorBinaryInstaller implements TorServiceConstants { /* * Extract the Tor binary from the APK file using ZIP */ - public boolean installFromRaw () throws IOException + public boolean installFromRaw () throws IOException, FileNotFoundException { InputStream is; - + File outFile; + + is = context.getResources().openRawResource(R.raw.tor); - streamToFile(is,installFolder, TOR_BINARY_ASSET_KEY, false, true); + outFile = new File(installFolder, TOR_BINARY_ASSET_KEY); + streamToFile(is, outFile, false, true); - is = context.getResources().openRawResource(R.raw.torrc); - streamToFile(is,installFolder, TORRC_ASSET_KEY, false, false); + is = context.getResources().openRawResource(R.raw.torrc); + outFile = new File(installFolder, TORRC_ASSET_KEY); + streamToFile(is,outFile, false, false); - is = context.getResources().openRawResource(R.raw.torrctether); - streamToFile(is,installFolder, TORRC_TETHER_KEY, false, false); + is = context.getResources().openRawResource(R.raw.torrctether); + outFile = new File(installFolder, TORRC_TETHER_KEY); + streamToFile(is, outFile, false, false); - is = context.getResources().openRawResource(R.raw.privoxy); - streamToFile(is,installFolder, PRIVOXY_ASSET_KEY, false, false); + is = context.getResources().openRawResource(R.raw.privoxy); + outFile = new File(installFolder, PRIVOXY_ASSET_KEY); + streamToFile(is,outFile, false, false); - is = context.getResources().openRawResource(R.raw.privoxy_config); - streamToFile(is,installFolder, PRIVOXYCONFIG_ASSET_KEY, false, false); + is = context.getResources().openRawResource(R.raw.privoxy_config); + outFile = new File(installFolder, PRIVOXYCONFIG_ASSET_KEY); + streamToFile(is,outFile, false, false); - is = context.getResources().openRawResource(R.raw.geoip); - streamToFile(is,installFolder, GEOIP_ASSET_KEY, false, true); + is = context.getResources().openRawResource(R.raw.geoip); + outFile = new File(installFolder, GEOIP_ASSET_KEY); + streamToFile(is, outFile, false, true); return true; } @@ -88,14 +97,13 @@ public class TorBinaryInstaller implements TorServiceConstants { /* * Write the inputstream contents to the file */ - private static boolean streamToFile(InputStream stm, File folder, String targetFilename, boolean append, boolean zip) throws IOException + private static boolean streamToFile(InputStream stm, File outFile, boolean append, boolean zip) throws IOException { byte[] buffer = new byte[FILE_WRITE_BUFFER_SIZE]; int bytecount; - File outFile = new File(folder, targetFilename); OutputStream stmOut = new FileOutputStream(outFile, append); diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 94929f0..50ddb01 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -207,11 +207,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst Log.i(TAG, "service started: " + intent.getAction()); try { - checkTorBinaries (); + checkTorBinaries (false); } catch (Exception e) { logNotice("unable to find tor binaries: " + e.getMessage()); - showToolbarNotification(e.getMessage(), NOTIFY_ID, R.drawable.tornotificationerr); + showToolbarNotification(getString(R.string.error_installing_binares), NOTIFY_ID, R.drawable.tornotificationerr); Log.e(TAG, "error checking tor binaries", e); } @@ -412,24 +412,46 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - - private boolean checkTorBinaries () throws Exception + private boolean checkTorBinaries (boolean forceInstall) throws Exception { + //check and install iptables TorBinaryInstaller.assertIpTablesBinaries(this, true); - + appBinHome = getDir("bin",0); appDataHome = getCacheDir(); - // logNotice( "appHome=" + appHome); - - File fileTor = new File(appBinHome, TOR_BINARY_ASSET_KEY); + File fileTor = new File(appBinHome, TOR_BINARY_ASSET_KEY); File filePrivoxy = new File(appBinHome, PRIVOXY_ASSET_KEY); + File fileTorOld = null; + File filePrivoxyOld = null; + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + String currTorBinary = prefs.getString(TorServiceConstants.PREF_BINARY_TOR_VERSION_INSTALLED, null); + String currPrivoxyBinary = prefs.getString(TorServiceConstants.PREF_BINARY_PRIVOXY_VERSION_INSTALLED, null); + + if (currTorBinary == null || (!currTorBinary.equals(TorServiceConstants.BINARY_TOR_VERSION))) + if (fileTor.exists()) + { + killTorProcess (); + fileTorOld = new File(fileTor.getAbsolutePath() + ".old"); + fileTor.renameTo(fileTorOld); + } + + if (currPrivoxyBinary == null || (!currPrivoxyBinary.equals(TorServiceConstants.BINARY_PRIVOXY_VERSION))) + if (filePrivoxy.exists()) + { + killTorProcess (); + filePrivoxyOld = new File(filePrivoxy.getAbsolutePath() + ".old"); + filePrivoxy.renameTo(filePrivoxyOld); + } + + + logNotice( "checking Tor binaries"); - if (!(fileTor.exists() && filePrivoxy.exists())) + if ((!(fileTor.exists() && filePrivoxy.exists())) || forceInstall) { killTorProcess (); @@ -438,6 +460,18 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (success) { + + Editor edit = prefs.edit(); + edit.putString(TorServiceConstants.PREF_BINARY_TOR_VERSION_INSTALLED, TorServiceConstants.BINARY_TOR_VERSION); + edit.putString(TorServiceConstants.PREF_BINARY_PRIVOXY_VERSION_INSTALLED, TorServiceConstants.BINARY_PRIVOXY_VERSION); + edit.commit(); + + if (fileTorOld != null) + fileTorOld.delete(); + + if (filePrivoxyOld != null) + filePrivoxyOld.delete(); + logNotice(getString(R.string.status_install_success)); showToolbarNotification(getString(R.string.status_install_success), NOTIFY_ID, R.drawable.tornotification); @@ -1028,10 +1062,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst _torInstance = this; + /* try { - checkTorBinaries(); + checkTorBinaries(false); } catch (Exception e) @@ -1041,7 +1076,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst Log.d(TAG,"Unable to check for Tor binaries",e); return null; - } + }*/ findExistingProc (); diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index b06565e..bd60c1e 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -85,4 +85,12 @@ public interface TorServiceConstants { public static final int ENABLE_TOR_MSG = 2; public static final int DISABLE_TOR_MSG = 3; public static final int LOG_MSG = 4; + + public static final String BINARY_TOR_VERSION = "0.2.3.10-alpha"; + public static final String BINARY_PRIVOXY_VERSION = "1.4.13"; + public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INTALLED"; + public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED = "BINARY_PRIVOXY_VERSION_INTALLED"; + + + }

1 0

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

13 Jan '12

commit e550c4c349b1ff2fdea364e7d0462b019a5819b0 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jan 13 11:01:42 2012 -0500 updated version --- AndroidManifest.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f03e3b5..aefb1d7 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-RC2" android:versionCode="24"> + package="org.torproject.android" android:versionName="0.2.3.10-alpha-orbot-1.0.7-RC3" android:versionCode="25"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

1 0

[orbot/master] with transproxy allow localport access for proxies
by n8fr8＠torproject.org 13 Jan '12

13 Jan '12

commit 8906c31dd68f9836e4bc27dbd356d842d009c4fb Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jan 13 10:58:51 2012 -0500 with transproxy allow localport access for proxies when transproxy all is on, or when app by app proxying is on, access to the localhost transproxy, SOCKS, HTTP, tor DNS and other localhost ports should be allowed for apps that want to speak directly to tor regardless of transproxy being enabled --- .../torproject/android/service/TorTransProxy.java | 27 ++++++++++++++------ 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 462d2f0..aed3a02 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -246,6 +246,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(ipTablesPath); script.append(" -t nat"); script.append(" -A OUTPUT -p tcp"); + script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -m owner --uid-owner "); script.append(apps[i].getUid()); script.append(" -m tcp --syn"); @@ -267,6 +268,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(ipTablesPath); script.append(" -t filter"); script.append(" -A OUTPUT -p tcp"); + script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -m owner --uid-owner "); script.append(apps[i].getUid()); script.append(" -m tcp --dport "); @@ -425,6 +427,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(ipTablesPath); script.append(" -t nat"); script.append(" -A OUTPUT -p tcp"); + script.append(" ! -d 127.0.0.1"); //allow access to localhost script.append(" -m owner ! --uid-owner "); script.append(torUid); script.append(" -m tcp --syn"); @@ -443,14 +446,22 @@ public class TorTransProxy implements TorServiceConstants { script.append(TOR_DNS_PORT); script.append(" || exit\n"); - // Allow packets to localhost (contains all the port-redirected ones) - script.append(ipTablesPath); - script.append(" -t filter"); - script.append(" -A OUTPUT"); - script.append(" -p tcp"); - script.append(" -d 127.0.0.1"); - script.append(" -j ACCEPT"); - script.append(" || exit\n"); + int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; + + for (int port : ports) + { + // Allow packets to localhost (contains all the port-redirected ones) + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -p tcp"); + script.append(" -d 127.0.0.1"); + script.append(" --dport "); + script.append(port); + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + + } // Allow loopback script.append(ipTablesPath);

1 0

[obfsproxy/master] Merge remote-tracking branch 'asn/bug4899'
by nickm＠torproject.org 13 Jan '12

13 Jan '12

commit b77db2aafbc437ecf1d5b80cd855e5abeff0d5c5 Merge: b166ec6 7f75f0d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 13 10:48:15 2012 -0500 Merge remote-tracking branch 'asn/bug4899' src/container.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-)

1 0

[obfsproxy/master] Fix container.c:smartlist_ensure_capacity() overflow.
by nickm＠torproject.org 13 Jan '12

13 Jan '12

commit 7f75f0df973a6dee679e93bd2d8cae23af81728f Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Jan 13 17:38:57 2012 +0200 Fix container.c:smartlist_ensure_capacity() overflow. Fixes tor's bug #4230. --- src/container.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/container.c b/src/container.c index b66a819..e579e91 100644 --- a/src/container.c +++ b/src/container.c @@ -55,13 +55,22 @@ smartlist_clear(smartlist_t *sl) static inline void smartlist_ensure_capacity(smartlist_t *sl, int size) { +#if SIZEOF_SIZE_T > SIZEOF_INT +#define MAX_CAPACITY (INT_MAX) +#else +#define MAX_CAPACITY (int)((SIZE_MAX / (sizeof(void*)))) +#endif if (size > sl->capacity) { - int higher = sl->capacity * 2; - while (size > higher) - higher *= 2; - obfs_assert(higher > 0); /* detect overflow */ + int higher = sl->capacity; + if (size > MAX_CAPACITY/2) { + obfs_assert(size <= MAX_CAPACITY); + higher = MAX_CAPACITY; + } else { + while (size > higher) + higher *= 2; + } sl->capacity = higher; - sl->list = xrealloc(sl->list, sizeof(void*)*sl->capacity); + sl->list = xrealloc(sl->list, sizeof(void*)*((size_t)sl->capacity)); } }

1 0

[obfsproxy/master] Add new user guides.
by nickm＠torproject.org 13 Jan '12

13 Jan '12

commit a0493b492e6b6cf3bc858bc2e5de8d1e7e69f5c0 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Jan 12 15:28:40 2012 +0200 Add new user guides. Place them in doc/obfs2/howto/. Also, update doc/tor-obfs-howto.txt to redirect to doc/obfs2/howto. --- doc/obfs2/howto/README | 7 ++ doc/obfs2/howto/client-external-howto.txt | 37 ++++++++++ doc/obfs2/howto/client-managed-howto.txt | 30 ++++++++ doc/obfs2/howto/server-external-howto.txt | 42 +++++++++++ doc/obfs2/howto/server-managed-howto.txt | 45 ++++++++++++ doc/tor-obfs-howto.txt | 106 +---------------------------- 6 files changed, 162 insertions(+), 105 deletions(-) diff --git a/doc/obfs2/howto/README b/doc/obfs2/howto/README new file mode 100644 index 0000000..cb8ec83 --- /dev/null +++ b/doc/obfs2/howto/README @@ -0,0 +1,7 @@ +If you are wondering which howto guide you should follow: + +Generally, the guides named '*-managed-*.txt" are easier to follow, +and they require a tor version newer than 0.2.3.11. + +If you have an older version of tor, you can use the guides named +"*-external-*.txt". diff --git a/doc/obfs2/howto/client-external-howto.txt b/doc/obfs2/howto/client-external-howto.txt new file mode 100644 index 0000000..523984f --- /dev/null +++ b/doc/obfs2/howto/client-external-howto.txt @@ -0,0 +1,37 @@ +How to set up Tor Client with obfsproxy +======================================= + +[1] You will need: + +* a copy of obfsproxy: + git clone git://git.torproject.org/obfsproxy.git + Build it with: "./autogen.sh && ./configure && make". + You will need libevent-2 to build it. + +* a copy of Tor that supports the ClientTransportPlugin option. + Any Tor version newer than 0.2.3.2 will do the trick. + +[2] Set up obfsproxy: + +This command will setup an obfsproxy client speaking the obfs2 +protocol: + +./obfsproxy obfs2 socks 127.0.0.1:1050 + +[3] Set up tor: + +You should put the following lines in your torrc file: +--- +SocksPort 5000 +UseBridges 1 +Bridge obfs2 <bridge address>:1051 # This is provided by the bridge operator. +ClientTransportPlugin obfs2 socks5 127.0.0.1:1050 +--- +substituting <bridge address> with the IP address of your bridge +relay. + +[4] Done! + +Now to test it, launch Firefox and set it up to use a Socks server on +127.0.0.1:5000. Now browse the web. + diff --git a/doc/obfs2/howto/client-managed-howto.txt b/doc/obfs2/howto/client-managed-howto.txt new file mode 100644 index 0000000..f544189 --- /dev/null +++ b/doc/obfs2/howto/client-managed-howto.txt @@ -0,0 +1,30 @@ +How to Set up a Tor Client with obfsproxy +========================================= + +[1] You will need: + +* a copy of obfsproxy: + git clone git://git.torproject.org/obfsproxy.git + Build it with: "./autogen.sh && ./configure && make". + You will need libevent-2 to build it. + +* a copy of Tor that supports the managed ClientTransportPlugin + option. The current git master should work. + +[2] Set up tor: + +You should put the following lines in your torrc file: +""" +SocksPort 5000 +UseBridges 1 +Bridge obfs2 <bridge address>:1051 # This is provided by the bridge operator. +ClientTransportPlugin obfs2 exec <path to obfsproxy> --managed +""" +where <path to obfsproxy> is the path to the obfsproxy executable. If +you successfuly compiled obfsproxy, the executable should be in the +obfsproxy directory. + +[3] Done! + +To test it, launch Firefox and set it up to use a SOCKS server on +127.0.0.1:5000. Now browse the web. diff --git a/doc/obfs2/howto/server-external-howto.txt b/doc/obfs2/howto/server-external-howto.txt new file mode 100644 index 0000000..34fe665 --- /dev/null +++ b/doc/obfs2/howto/server-external-howto.txt @@ -0,0 +1,42 @@ +How to Set up a Tor Bridge with obfsproxy +========================================= + +[1] You will need: + +* a copy of obfsproxy: + git clone git://git.torproject.org/obfsproxy.git + Build it with: "./autogen.sh && ./configure && make". + You will need libevent-2 to build it. + +* a copy of Tor that can be configured as a bridge. + +[2] Set up obfsproxy: + +This command will setup an obfsproxy server speaking the obfs2 +protocol: + +./obfsproxy obfs2 --dest=127.0.0.1:5001 server 0.0.0.0:1051 + +Be sure to pass the value of ORPort of your bridge relay to the --dest +argument (see next section). In this example, we assumed it was '5001'. + +[3] Set up tor: + +You should put the following lines in your torrc file: +--- +ORPort 5001 +BridgeRelay 1 +ExitPolicy reject *:* +--- + +[4] Done! + +Now, instruct censored people to connect to your IP on port 1051. So, +for example, if your bridge's address is 192.0.2.42, bridge users +should connect to 192.0.2.42:1051. + +During the above process, you can use any port numbers you want, but +make sure to adjust the torrc and obfsproxy commands accordingly. + +Finally, don't forget that you might also need to set up port +forwarding. diff --git a/doc/obfs2/howto/server-managed-howto.txt b/doc/obfs2/howto/server-managed-howto.txt new file mode 100644 index 0000000..4f6c39d --- /dev/null +++ b/doc/obfs2/howto/server-managed-howto.txt @@ -0,0 +1,45 @@ +How to Set up Tor Bridge with obfsproxy +======================================= + +[1] You will need: + +* a copy of obfsproxy: + git clone git://git.torproject.org/obfsproxy.git + Build it with: "./autogen.sh && ./configure && make". + You will need libevent-2 to build it. + +* a copy of Tor that supports the managed ClientTransportPlugin + option. The current git master should work. + +[2] Set up tor: + +You should put the following lines in your torrc file: +""" +ORPort 5001 # Port on which bridge will be listening on. +BridgeRelay 1 +ExitPolicy reject *:* +ServerTransportPlugin obfs2 exec <path to obfsproxy> --managed +""" + +[3] Launch tor + +Now launch tor and monitor your logs. +You should see a message similar to: + +"[warn] Registered server transport 'obfs2' at '0.0.0.0:33578'" + +note down the port number ('33578' in this case). It's the port number +that you should tell your bridge clients to use. + +[4] Done! + +Now, instruct censored people to connect to your IP on the port you +found in the previous step (e.g 33578). So, for example, if your +bridge's address is 192.0.2.42, bridge users should connect to +192.0.2.42:33578. + +Tor will try to always spawn your transport proxy at the same port, so +you won't have to do this procedure in every Tor restart. + +Finally, don't forget that you might also need to set up port +forwarding. diff --git a/doc/tor-obfs-howto.txt b/doc/tor-obfs-howto.txt index 324a98c..dd5b8eb 100644 --- a/doc/tor-obfs-howto.txt +++ b/doc/tor-obfs-howto.txt @@ -1,105 +1 @@ -How to set up Tor with obfsproxy -================================ - - Instructions: - - "I AM A CENSORED FELLOW" - -[1] You will need: - -* a copy of obfsproxy: - git clone git://git.torproject.org/obfsproxy.git - Building it should be easy, just do "./configure && make". - -* a copy of Tor that supports the Socks5Proxy option. - Tor 0.2.2.30 - for example - will work. - -[2] Set up obfsproxy: - -This command will setup an obfsproxy client speaking the obfs2 -protocol on localhost:1050: - -./obfsproxy obfs2 socks 127.0.0.1:1050 - -[3] Set up tor: - -You should put in your torrc file: ---- -SocksPort 5000 -UseBridges 1 -Bridge <bridge address>:1051 # This is provided by the bridge operator. -Socks5Proxy 127.0.0.1:1050 # This points to the obfsproxy client. ---- - -Of course you should substitute the value of the Bridge line above, -with the information provided to you by a bridge operator. - -[4] Done! - -Alright, you are done! -Make sure you have followed the above steps on the correct order: -First launch obfsproxy and then launch tor. - -Now to test it, launch Firefox and set it up to use a Socks server on -127.0.0.1:5000. Now browse the web. - - - "I AM A BRIDGE OPERATOR THAT WANTS TO HELP CENSORED PEOPLE" - -[1] You will need: - -* a copy of obfsproxy: - git clone git://git.torproject.org/obfsproxy.git - Building it should be easy, just do "./configure && make". - -* a copy of Tor which can function as a Tor bridge. - -[2] Set up obfsproxy: - -This command will setup an obfsproxy server speaking the obfs2 -protocol on localhost:1051: - -./obfsproxy obfs2 --dest 127.0.0.1:5001 server 127.0.0.1:1051 - -Be sure to pass the value of ORPort of your bridge relay to the --dest -argument (see next section). - -[3] Set up tor: - -You should put in your torrc file: ---- -ORPort 5001 # Port on which bridge will be listening on. -BridgeRelay 1 -ExitPolicy reject *:* ---- - -[4] Done! - -Make sure you have followed the above steps on the correct order. -First launch obfsproxy and then launch tor. -You can use any port numbers you want, just be sure to adjust the -torrc and obfsproxy commands accordingly. - -Don't forget that You might need to set up port forwarding. - -Now you should tell censored people to connect to your IP on port 1051. -So, for example, if your bridge's address is 85.22.13.1, bridge users -should connect to 85.22.13.1:1051. -Pay attention that '1051' is the port where obfsproxy is listening on, -and *not* your bridge's ORPort. - - Network diagram of the above setup: - -(If you don't understand this drawing, just ignore this section.) - - 1050 1051 - +-----------+ +------------+ - ----| Proxy |------[internet]------| Server |---- - | +-----------+ +------------+ | - | | -+------------+ +--------------+ -| Tor Client | | Tor Bridge | -+------------+ +--------------+ - 5000 5001 - - +See doc/obfs2/howto/ for information on how to setup obfsproxy with obfs2.

1 0