- tor-commits - lists.torproject.org

[orbot/master] updated change log for v11 RC1
by n8fr8＠torproject.org 04 Oct '12

04 Oct '12

commit 433f1cdeb95908a4f2181de91e8d2a316cba5e2c Author: n8fr8 <nathan(a)freitas.net> Date: Mon Oct 1 13:21:57 2012 +0530 updated change log for v11 RC1 --- CHANGELOG | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f01f6de..fafc51a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,17 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +1.0.11 +- Tor updated to 0.2.4-alpha +- libevent2 on 2.2.1-alpha +- added data up/down speed and totals display +- added new "Log" SlideDrawer log display +- added ability to copy logs by touching log (for emailing, debugging) +- fixed iptables Android 4/Jellybean compatible binary detection +- iptables add/delete now on specific rules; no more global FLUSHing +- transproxy ensures that UDP is blocked properly for all or selected apps +- wizard display is centered +- added network connectivity monitor to set Tor's DisableNetwork value + 1.0.9 - Tor now updated to 0.2.3.17-beta - Privoxy updated to 3.0.12

1 0

[orbot/master] collection of submitted patches
by n8fr8＠torproject.org 04 Oct '12

04 Oct '12

commit 3ff65d2eed91922ac5a88bd6a1c51cd412d8a271 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Oct 4 11:28:47 2012 +0530 collection of submitted patches --- patches/UDP-block.patch | 243 +++++++++++++++++++++++++++++++++++++ patches/udptransproxyfinal.patch | 247 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 490 insertions(+), 0 deletions(-) diff --git a/patches/UDP-block.patch b/patches/UDP-block.patch new file mode 100644 index 0000000..e16a957 --- /dev/null +++ b/patches/UDP-block.patch @@ -0,0 +1,243 @@ +From c2620d6939713762e30badc3ed5da981e296b742 Mon Sep 17 00:00:00 2001 +From: patch <patrickbx(a)gmail.com> +Date: Mon, 23 Jul 2012 16:12:55 -0400 +Subject: [PATCH] Modified iptables rules for transproxying. UDP is now + blocked. Also removed some redundant rules and reordered + others. I reordered by the idea that its generally easier + to specifically allow traffic before your reject it. + +--- + .../torproject/android/service/TorTransProxy.java | 133 ++++++++++---------- + 1 file changed, 64 insertions(+), 69 deletions(-) + +diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java +index 2571123..c248a9f 100644 +--- a/src/org/torproject/android/service/TorTransProxy.java ++++ b/src/org/torproject/android/service/TorTransProxy.java +@@ -224,6 +224,15 @@ public class TorTransProxy implements TorServiceConstants { + + int torUid = context.getApplicationInfo().uid; + ++ // Allow everything for Tor ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -m owner --uid-owner "); ++ script.append(torUid); ++ script.append(" -j ACCEPT"); ++ script.append(" || exit\n"); ++ + //build up array of shell cmds to execute under one root context + for (TorifiedApp tApp:apps) + { +@@ -235,9 +244,9 @@ public class TorTransProxy implements TorServiceConstants { + { + + TorService.logMessage("enabling transproxy for app: " + tApp.getUsername() + "(" + tApp.getUid() + ")"); +- +- // Set up port redirection +- script.append(ipTablesPath); ++ ++ // Set up port redirection ++ script.append(ipTablesPath); + script.append(" -t nat"); + script.append(" -A OUTPUT -p tcp"); + script.append(" ! -d 127.0.0.1"); //allow access to localhost +@@ -251,14 +260,28 @@ public class TorTransProxy implements TorServiceConstants { + // Same for DNS + script.append(ipTablesPath); + script.append(" -t nat"); +- script.append(" -A OUTPUT -p udp -m owner --uid-owner "); ++ script.append(" -A OUTPUT -p udp"); ++ script.append(" -m owner --uid-owner "); + script.append(tApp.getUid()); + script.append(" -m udp --dport "); + script.append(STANDARD_DNS_PORT); + script.append(" -j REDIRECT --to-ports "); + script.append(TOR_DNS_PORT); + script.append(" || exit\n"); +- ++ ++ // Allow loopback ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -m owner --uid-owner "); ++ script.append(tApp.getUid()); ++ script.append(" -o lo"); ++ script.append(" -j ACCEPT"); ++ script.append(" || exit\n"); ++ ++ /* ++ //Outgoing loopback already allowed (23/7/12) ++ + int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; + + for (int port : ports) +@@ -276,53 +299,32 @@ public class TorTransProxy implements TorServiceConstants { + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + } +- +- // Allow loopback ++ */ ++ ++ // Reject all other outbound TCP packets + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -m owner --uid-owner "); + script.append(tApp.getUid()); + script.append(" -p tcp"); +- script.append(" -o lo"); +- script.append(" -j ACCEPT"); +- script.append(" || exit\n"); +- +- // Reject DNS that is not from Tor (order is important - first matched rule counts!) +- script.append(ipTablesPath); +- script.append(" -t filter"); +- script.append(" -A OUTPUT"); +- script.append(" -m owner --uid-owner "); +- script.append(tApp.getUid()); +- script.append(" -p udp"); +- script.append(" --dport "); +- script.append(STANDARD_DNS_PORT); + script.append(" -j REJECT"); + script.append(" || exit\n"); +- +- // Reject all other outbound TCP packets ++ ++ // Reject all other outbound UDP packets + script.append(ipTablesPath); + script.append(" -t filter"); + script.append(" -A OUTPUT"); + script.append(" -m owner --uid-owner "); + script.append(tApp.getUid()); +- script.append(" -p tcp"); ++ script.append(" -p udp"); + script.append(" -j REJECT"); + script.append(" || exit\n"); ++ + + } + } +- + +- // Allow everything for Tor +- script.append(ipTablesPath); +- script.append(" -t filter"); +- script.append(" -A OUTPUT"); +- script.append(" -m owner --uid-owner "); +- script.append(torUid); +- script.append(" -j ACCEPT"); +- script.append(" || exit\n"); +- + String[] cmdAdd = {script.toString()}; + + code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor); +@@ -450,8 +452,8 @@ public class TorTransProxy implements TorServiceConstants { + + int torUid = context.getApplicationInfo().uid; + +- // Set up port redirection +- script.append(ipTablesPath); ++ // Set up port redirection ++ script.append(ipTablesPath); + script.append(" -t nat"); + script.append(" -A OUTPUT -p tcp"); + script.append(" ! -d 127.0.0.1"); //allow access to localhost +@@ -465,14 +467,36 @@ public class TorTransProxy implements TorServiceConstants { + // Same for DNS + script.append(ipTablesPath); + script.append(" -t nat"); +- script.append(" -A OUTPUT -p udp -m owner ! --uid-owner "); ++ script.append(" -A OUTPUT -p udp"); ++ script.appent(" -m owner ! --uid-owner "); + script.append(torUid); + script.append(" -m udp --dport "); + script.append(STANDARD_DNS_PORT); + script.append(" -j REDIRECT --to-ports "); + script.append(TOR_DNS_PORT); + script.append(" || exit\n"); ++ ++ // Allow loopback ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -o lo"); ++ script.append(" -j ACCEPT"); ++ script.append(" || exit\n"); + ++ // Allow everything for Tor ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -m owner --uid-owner "); ++ script.append(torUid); ++ script.append(" -j ACCEPT"); ++ script.append(" || exit\n"); ++ ++ ++ /* ++ //Outgoing loopback already allowed (23/7/12) ++ + int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; + + for (int port : ports) +@@ -490,25 +514,8 @@ public class TorTransProxy implements TorServiceConstants { + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + +- } +- +- // Allow loopback +- script.append(ipTablesPath); +- script.append(" -t filter"); +- script.append(" -A OUTPUT"); +- script.append(" -p tcp"); +- script.append(" -o lo"); +- script.append(" -j ACCEPT"); +- script.append(" || exit\n"); ++ } */ + +- // Allow everything for Tor +- script.append(ipTablesPath); +- script.append(" -t filter"); +- script.append(" -A OUTPUT"); +- script.append(" -m owner --uid-owner "); +- script.append(torUid); +- script.append(" -j ACCEPT"); +- script.append(" || exit\n"); + + if (TorService.ENABLE_DEBUG_LOG) + { +@@ -532,23 +539,11 @@ public class TorTransProxy implements TorServiceConstants { + script.append(" --log-uid"); + script.append(" || exit\n"); + } +- +- // Reject DNS that is not from Tor (order is important - first matched rule counts!) +- script.append(ipTablesPath); +- script.append(" -t filter"); +- script.append(" -A OUTPUT"); +- script.append(" -p udp"); +- script.append(" --dport "); +- script.append(STANDARD_DNS_PORT); +- script.append(" -j REJECT"); +- script.append(" || exit\n"); +- +- // Reject all other outbound TCP packets ++ ++ // Reject all other outbound packets by default + script.append(ipTablesPath); + script.append(" -t filter"); +- script.append(" -A OUTPUT"); +- script.append(" -p tcp"); +- script.append(" -j REJECT"); ++ script.append(" -P OUTPUT DROP"); + script.append(" || exit\n"); + + String[] cmdAdd = {script.toString()}; +-- +1.7.9.5 + diff --git a/patches/transproxy.patch b/patches/transproxy.patch new file mode 100644 index 0000000..e69de29 diff --git a/patches/udptransproxyfinal.patch b/patches/udptransproxyfinal.patch new file mode 100644 index 0000000..32cc0e2 --- /dev/null +++ b/patches/udptransproxyfinal.patch @@ -0,0 +1,247 @@ +From a81741afe06ac2309b4306dedbd5a0ebf755b7e1 Mon Sep 17 00:00:00 2001 +From: patch <patrickbx(a)gmail.com> +Date: Fri, 31 Aug 2012 17:25:52 -0400 +Subject: [PATCH] Addendum to the last commit on UDP transproxy rules. Trying + to simplfy the iptables rules didn't work out so this is a + minimal change from the original TorTransProxy.java file. + UDP is blocked and tested as working. + +--- + .../torproject/android/service/TorTransProxy.java | 144 ++++++++++++-------- + 1 file changed, 84 insertions(+), 60 deletions(-) + +diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java +index c248a9f..90bdc34 100644 +--- a/src/org/torproject/android/service/TorTransProxy.java ++++ b/src/org/torproject/android/service/TorTransProxy.java +@@ -224,15 +224,6 @@ public class TorTransProxy implements TorServiceConstants { + + int torUid = context.getApplicationInfo().uid; + +- // Allow everything for Tor +- script.append(ipTablesPath); +- script.append(" -t filter"); +- script.append(" -A OUTPUT"); +- script.append(" -m owner --uid-owner "); +- script.append(torUid); +- script.append(" -j ACCEPT"); +- script.append(" || exit\n"); +- + //build up array of shell cmds to execute under one root context + for (TorifiedApp tApp:apps) + { +@@ -244,9 +235,9 @@ public class TorTransProxy implements TorServiceConstants { + { + + TorService.logMessage("enabling transproxy for app: " + tApp.getUsername() + "(" + tApp.getUid() + ")"); +- +- // Set up port redirection +- script.append(ipTablesPath); ++ ++ // Set up port redirection ++ script.append(ipTablesPath); + script.append(" -t nat"); + script.append(" -A OUTPUT -p tcp"); + script.append(" ! -d 127.0.0.1"); //allow access to localhost +@@ -260,28 +251,14 @@ public class TorTransProxy implements TorServiceConstants { + // Same for DNS + script.append(ipTablesPath); + script.append(" -t nat"); +- script.append(" -A OUTPUT -p udp"); +- script.append(" -m owner --uid-owner "); ++ script.append(" -A OUTPUT -p udp -m owner --uid-owner "); + script.append(tApp.getUid()); + script.append(" -m udp --dport "); + script.append(STANDARD_DNS_PORT); + script.append(" -j REDIRECT --to-ports "); + script.append(TOR_DNS_PORT); + script.append(" || exit\n"); +- +- // Allow loopback +- script.append(ipTablesPath); +- script.append(" -t filter"); +- script.append(" -A OUTPUT"); +- script.append(" -m owner --uid-owner "); +- script.append(tApp.getUid()); +- script.append(" -o lo"); +- script.append(" -j ACCEPT"); +- script.append(" || exit\n"); +- +- /* +- //Outgoing loopback already allowed (23/7/12) +- ++ + int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; + + for (int port : ports) +@@ -299,8 +276,30 @@ public class TorTransProxy implements TorServiceConstants { + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + } +- */ +- ++ ++ // Allow loopback ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -m owner --uid-owner "); ++ script.append(tApp.getUid()); ++ script.append(" -p tcp"); ++ script.append(" -o lo"); ++ script.append(" -j ACCEPT"); ++ script.append(" || exit\n"); ++ ++ // Reject DNS that is not from Tor (order is important - first matched rule counts!) ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -m owner --uid-owner "); ++ script.append(tApp.getUid()); ++ script.append(" -p udp"); ++ script.append(" --dport "); ++ script.append(STANDARD_DNS_PORT); ++ script.append(" -j REJECT"); ++ script.append(" || exit\n"); ++ + // Reject all other outbound TCP packets + script.append(ipTablesPath); + script.append(" -t filter"); +@@ -321,10 +320,19 @@ public class TorTransProxy implements TorServiceConstants { + script.append(" -j REJECT"); + script.append(" || exit\n"); + +- + } + } ++ + ++ // Allow everything for Tor ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -m owner --uid-owner "); ++ script.append(torUid); ++ script.append(" -j ACCEPT"); ++ script.append(" || exit\n"); ++ + String[] cmdAdd = {script.toString()}; + + code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor); +@@ -452,8 +460,8 @@ public class TorTransProxy implements TorServiceConstants { + + int torUid = context.getApplicationInfo().uid; + +- // Set up port redirection +- script.append(ipTablesPath); ++ // Set up port redirection ++ script.append(ipTablesPath); + script.append(" -t nat"); + script.append(" -A OUTPUT -p tcp"); + script.append(" ! -d 127.0.0.1"); //allow access to localhost +@@ -467,36 +475,14 @@ public class TorTransProxy implements TorServiceConstants { + // Same for DNS + script.append(ipTablesPath); + script.append(" -t nat"); +- script.append(" -A OUTPUT -p udp"); +- script.appent(" -m owner ! --uid-owner "); ++ script.append(" -A OUTPUT -p udp -m owner ! --uid-owner "); + script.append(torUid); + script.append(" -m udp --dport "); + script.append(STANDARD_DNS_PORT); + script.append(" -j REDIRECT --to-ports "); + script.append(TOR_DNS_PORT); + script.append(" || exit\n"); +- +- // Allow loopback +- script.append(ipTablesPath); +- script.append(" -t filter"); +- script.append(" -A OUTPUT"); +- script.append(" -o lo"); +- script.append(" -j ACCEPT"); +- script.append(" || exit\n"); + +- // Allow everything for Tor +- script.append(ipTablesPath); +- script.append(" -t filter"); +- script.append(" -A OUTPUT"); +- script.append(" -m owner --uid-owner "); +- script.append(torUid); +- script.append(" -j ACCEPT"); +- script.append(" || exit\n"); +- +- +- /* +- //Outgoing loopback already allowed (23/7/12) +- + int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; + + for (int port : ports) +@@ -514,8 +500,25 @@ public class TorTransProxy implements TorServiceConstants { + script.append(" -j ACCEPT"); + script.append(" || exit\n"); + +- } */ ++ } ++ ++ // Allow loopback ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -p tcp"); ++ script.append(" -o lo"); ++ script.append(" -j ACCEPT"); ++ script.append(" || exit\n"); + ++ // Allow everything for Tor ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -m owner --uid-owner "); ++ script.append(torUid); ++ script.append(" -j ACCEPT"); ++ script.append(" || exit\n"); + + if (TorService.ENABLE_DEBUG_LOG) + { +@@ -539,13 +542,34 @@ public class TorTransProxy implements TorServiceConstants { + script.append(" --log-uid"); + script.append(" || exit\n"); + } +- +- // Reject all other outbound packets by default ++ ++ // Reject DNS that is not from Tor (order is important - first matched rule counts!) + script.append(ipTablesPath); + script.append(" -t filter"); +- script.append(" -P OUTPUT DROP"); ++ script.append(" -A OUTPUT"); ++ script.append(" -p udp"); ++ script.append(" --dport "); ++ script.append(STANDARD_DNS_PORT); ++ script.append(" -j REJECT"); + script.append(" || exit\n"); + ++ // Reject all other outbound TCP packets ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -p tcp"); ++ script.append(" -j REJECT"); ++ script.append(" || exit\n"); ++ ++ // Reject all other outbound UDP packets ++ script.append(ipTablesPath); ++ script.append(" -t filter"); ++ script.append(" -A OUTPUT"); ++ script.append(" -p udp"); ++ script.append(" -j REJECT"); ++ script.append(" || exit\n"); ++ ++ + String[] cmdAdd = {script.toString()}; + + code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor); +-- +1.7.9.5 +

1 0

[orbot/master] cleaning up git
by n8fr8＠torproject.org 04 Oct '12

04 Oct '12

commit 7f1ef4eab6e76daf78751e52bb4c7507fe6c2fd3 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Oct 4 11:29:58 2012 +0530 cleaning up git --- .gitignore | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3a7c5c0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,19 @@ +external/bin/ +external/include/ +external/iptables.foo/ +external/iptables/ +external/jtorctl-build-stamp +external/lib/ +external/libevent-build-stamp +external/obfsproxy-build-stamp +external/openssl-static-build-stamp +external/privoxy-build-stamp +external/privoxy/ +external/test.c +external/test.h.gch +external/tor-build-stamp +external/translation/ +bin +gen +native +local.properties

1 0

[orbot/master] adding obfuscation config
by n8fr8＠torproject.org 04 Oct '12

04 Oct '12

commit 46bdcf0995106fd788dc9a248276bb398485fbd9 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Oct 4 11:29:42 2012 +0530 adding obfuscation config --- proguard-project.txt | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/proguard-project.txt b/proguard-project.txt new file mode 100644 index 0000000..f2fe155 --- /dev/null +++ b/proguard-project.txt @@ -0,0 +1,20 @@ +# To enable ProGuard in your project, edit project.properties +# to define the proguard.config property as described in that file. +# +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ${sdk.dir}/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the ProGuard +# include property in project.properties. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#}

1 0

[orbot/master] 1.0.11 RC2 release
by n8fr8＠torproject.org 04 Oct '12

04 Oct '12

commit 15ce48cf1023159803269f352575307d0acf8d58 Author: n8fr8 <nathan(a)freitas.net> Date: Thu Oct 4 11:47:32 2012 +0530 1.0.11 RC2 release --- AndroidManifest.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9ff495c..6d334b3 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="0.2.4.3-alpha-1.0.11" - android:versionCode="45" + android:versionName="0.2.4.3-alpha-1.0.11-RC2" + android:versionCode="47" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" />

1 0

r25836: {website} network got bigger (website/trunk/about/en)
by Roger Dingledine 04 Oct '12

04 Oct '12

Author: arma Date: 2012-10-04 03:07:01 +0000 (Thu, 04 Oct 2012) New Revision: 25836 Modified: website/trunk/about/en/jobs-browserhacker.wml website/trunk/about/en/jobs-coredev.wml website/trunk/about/en/jobs-pluggabletransport.wml website/trunk/about/en/jobs-projectcoordinator.wml website/trunk/about/en/jobs.wml Log: network got bigger Modified: website/trunk/about/en/jobs-browserhacker.wml =================================================================== --- website/trunk/about/en/jobs-browserhacker.wml 2012-10-04 03:05:42 UTC (rev 25835) +++ website/trunk/about/en/jobs-browserhacker.wml 2012-10-04 03:07:01 UTC (rev 25836) @@ -161,7 +161,7 @@ About the company:<br> The Tor Project is a US 501(c)(3) non-profit dedicated to research, development, and education about online anonymity and privacy. The Tor - network's 3000 volunteer relays carry 14 Gbps for upwards of half a + network's 3000 volunteer relays carry 16 Gbps for upwards of half a million daily users, including ordinary citizens who want protection from identity theft and prying corporations, corporations who want to look at a competitor's website in private, people around the world Modified: website/trunk/about/en/jobs-coredev.wml =================================================================== --- website/trunk/about/en/jobs-coredev.wml 2012-10-04 03:05:42 UTC (rev 25835) +++ website/trunk/about/en/jobs-coredev.wml 2012-10-04 03:07:01 UTC (rev 25836) @@ -117,7 +117,7 @@ About the company:<br> The Tor Project is a US 501(c)(3) non-profit dedicated to research, development, and education about online anonymity and privacy. The Tor - network's 3000 volunteer relays carry 14 Gbps for upwards of half a + network's 3000 volunteer relays carry 16 Gbps for upwards of half a million daily users, including ordinary citizens who want protection from identity theft and prying corporations, corporations who want to look at a competitor's website in private, people around the world Modified: website/trunk/about/en/jobs-pluggabletransport.wml =================================================================== --- website/trunk/about/en/jobs-pluggabletransport.wml 2012-10-04 03:05:42 UTC (rev 25835) +++ website/trunk/about/en/jobs-pluggabletransport.wml 2012-10-04 03:07:01 UTC (rev 25836) @@ -135,7 +135,7 @@ About the company:<br> The Tor Project is a US 501(c)(3) non-profit dedicated to research, development, and education about online anonymity and privacy. The Tor - network's 3000 volunteer relays carry 14 Gbps for upwards of half a + network's 3000 volunteer relays carry 16 Gbps for upwards of half a million daily users, including ordinary citizens who want protection from identity theft and prying corporations, corporations who want to look at a competitor's website in private, people around the world Modified: website/trunk/about/en/jobs-projectcoordinator.wml =================================================================== --- website/trunk/about/en/jobs-projectcoordinator.wml 2012-10-04 03:05:42 UTC (rev 25835) +++ website/trunk/about/en/jobs-projectcoordinator.wml 2012-10-04 03:07:01 UTC (rev 25836) @@ -97,7 +97,7 @@ About the company:<br> The Tor Project is a US 501(c)(3) non-profit dedicated to research, development, and education about online anonymity and privacy. The Tor - network's 3000 volunteer relays carry 14 Gbps for upwards of half a + network's 3000 volunteer relays carry 16 Gbps for upwards of half a million daily users, including ordinary citizens who want protection from identity theft and prying corporations, corporations who want to look at a competitor's website in private, people around the world Modified: website/trunk/about/en/jobs.wml =================================================================== --- website/trunk/about/en/jobs.wml 2012-10-04 03:05:42 UTC (rev 25835) +++ website/trunk/about/en/jobs.wml 2012-10-04 03:07:01 UTC (rev 25836) @@ -32,7 +32,7 @@ About the company:<br> The Tor Project is a US 501(c)(3) non-profit dedicated to research, development, and education about online anonymity and privacy. The Tor - network's 3000 volunteer relays carry 14 Gbps for upwards of half a million + network's 3000 volunteer relays carry 16 Gbps for upwards of half a million daily users, including ordinary citizens who want protection from identity theft and prying corporations, corporations who want to look at a competitor's website in private, people around the world whose Internet

1 0

r25835: {website} include a few more ticket states (website/trunk/about/en)
by Roger Dingledine 04 Oct '12

04 Oct '12

Author: arma Date: 2012-10-04 03:05:42 +0000 (Thu, 04 Oct 2012) New Revision: 25835 Modified: website/trunk/about/en/jobs-pluggabletransport.wml Log: include a few more ticket states Modified: website/trunk/about/en/jobs-pluggabletransport.wml =================================================================== --- website/trunk/about/en/jobs-pluggabletransport.wml 2012-10-04 01:23:21 UTC (rev 25834) +++ website/trunk/about/en/jobs-pluggabletransport.wml 2012-10-04 03:05:42 UTC (rev 25835) @@ -38,7 +38,7 @@ This link will display open flash proxy tickets, giving an idea of the tasks we want done. <blockquote> -<a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">Open +<a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">Open Flashproxy tickets</a> </blockquote> </p>

1 0

r25834: {website} three jobs means it's time for a sidenav (website/trunk/about/en)
by Roger Dingledine 04 Oct '12

04 Oct '12

Author: arma Date: 2012-10-04 01:23:21 +0000 (Thu, 04 Oct 2012) New Revision: 25834 Modified: website/trunk/about/en/sidenav.wmi Log: three jobs means it's time for a sidenav Modified: website/trunk/about/en/sidenav.wmi =================================================================== --- website/trunk/about/en/sidenav.wmi 2012-10-04 01:12:22 UTC (rev 25833) +++ website/trunk/about/en/sidenav.wmi 2012-10-04 01:23:21 UTC (rev 25834) @@ -38,11 +38,23 @@ }, {'url' => 'about/contributors', 'txt' => 'Past Contributors', - }, - {'url' => 'about/jobs', - 'txt' => 'Jobs', }] }, + + {'url' => 'about/jobs', + 'txt' => 'Jobs', + 'subelements' => [ + {'url' => 'about/jobs-projectcoordinator', + 'txt' => 'Project coordinator', + }, + {'url' => 'about/jobs-pluggabletransport', + 'txt' => 'Pluggable transport dev', + }, + {'url' => 'about/jobs-browserhacker', + 'txt' => 'Browser Hacker', + }] + }, + {'url' => 'about/sponsors', 'txt' => 'Sponsors', },

1 0

r25833: {website} add the text for dcf's flashproxy position (but call it plug (website/trunk/about/en)
by Roger Dingledine 04 Oct '12

04 Oct '12

Author: arma Date: 2012-10-04 01:12:22 +0000 (Thu, 04 Oct 2012) New Revision: 25833 Added: website/trunk/about/en/jobs-pluggabletransport.wml Modified: website/trunk/about/en/corepeople.wml website/trunk/about/en/jobs.wml Log: add the text for dcf's flashproxy position (but call it pluggable transports, since flash isn't the skillset we want and since i hope to make the position something broader once flashproxy rules the earth). Modified: website/trunk/about/en/corepeople.wml =================================================================== --- website/trunk/about/en/corepeople.wml 2012-10-02 17:36:18 UTC (rev 25832) +++ website/trunk/about/en/corepeople.wml 2012-10-04 01:12:22 UTC (rev 25833) @@ -50,7 +50,7 @@ researchers.</dd> <dt>David Fifield, Developer</dt> <dd>Developer and co-inventor of <a - href="http://crypto.stanford.edu/flashproxy/">FlashProxy</a> (<a + href="https://crypto.stanford.edu/flashproxy/">FlashProxy</a> (<a href="https://gitweb.torproject.org/flashproxy.git">git</a>), a set of tools to route Tor traffic via web browsers for better blocking-resistance.</dd> Added: website/trunk/about/en/jobs-pluggabletransport.wml =================================================================== --- website/trunk/about/en/jobs-pluggabletransport.wml (rev 0) +++ website/trunk/about/en/jobs-pluggabletransport.wml 2012-10-04 01:12:22 UTC (rev 25833) @@ -0,0 +1,159 @@ +#include "head.wmi" TITLE="Tor Project: Jobs (pluggable transport developer)" CHARSET="UTF-8" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Home » </a> + <a href="<page about/overview>">About » </a> + <a href="<page about/jobs>">Jobs</a> + </div> + <div id="maincol"> +<h1>The Tor Project is looking for a pluggable transport developer!</h1> + +<p> +This job is for the development and maintenance of the +<a href="https://crypto.stanford.edu/flashproxy/">flash proxy</a> +circumvention system, with a focus on deployment and getting tools in +the hands of users. If it goes well, we might have you branch out into +improving usability and deployability of other Tor pluggable transports. +</p> + +<p> +Applicants must be familiar with Python, JavaScript, and web +technologies, particularly WebSocket. You will do usability testing and +be in charge of producing binary packages of client software for +GNU/Linux, Windows, and OS X. The system's supporting infrastructure is +already in place, but may require changes depending on the future +development of the client programs. There also is the potential for the +development and implementation of new covert rendezvous methods that may +have broader use outside the flash proxy system. +</p> + +<p> +You will be assisted and mentored by David Fifield, the primary +developer of the flash proxy software and co-author of its +<a href="https://crypto.stanford.edu/flashproxy/flashproxy.pdf">research +paper</a>, and all-around good guy. +</p> + +<p> +This link will display open flash proxy tickets, giving an idea of the +tasks we want done. +<blockquote> +<a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">Open +Flashproxy tickets</a> +</blockquote> +</p> + +<p> +All candidates must: +</p> + +<ul> + +<li> +Know Python and JavaScript. At least two years of experience, or less if +you have a few years' experience with other programming languages. +</li> + +<li> +Have experience in packaging software. In particular, it is likely that +you will need to use py2exe to make Windows packages, and you should +know how to use makefiles. +</li> + +<li> +Be self-directed: The best candidates can solve problems on their own +but also know when to ask for help. Communication with other developers +will happen over email, instant messaging, and IRC. +</li> + +</ul> + +<p> +An ideal candidate would also: +</p> + +<ul> + +<li> +Know about Tor +<a href="https://www.torproject.org/docs/pluggable-transports.html.en">pluggable +transports</a> and their +<a href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/proposals/180-pluggabl…">specification</a>. +</li> + +<li> +Have run the +<a href="https://gitweb.torproject.org/flashproxy.git/blob/HEAD:/README">sample +commands in the README</a>, and made notes about the process. One of +your early tasks will be to do such testing so that the packages you +make will be effectively usable. +</li> + +<li> +Have an idea of real-world censorship regimes and the threat model faced +by circumvention tools. +</li> + +<li> +Have basic familiarity with distributed version control systems. +</li> + +</ul> + +<p> +Other notes: +</p> + +<ul> + <li>Tor developers don't have an office; you can work from + wherever you want, in basically any country. You'll need to be + comfortable in this environment! We coordinate via IRC, email, + and bug trackers.</li> + <li>Academic degrees are great, but not required if you have + the right experience.</li> + <li>We only write free and open source software, and we don't + believe in software patents.</li> +</ul> + +<p> +How to apply: +</p> + +<ul> + <li>Link to a sample of code you've written in the past that + you're allowed to show us.</li> + <li>Provide a CV explaining your background, experience, skills, + and other relevant qualifications.</li> + <li>List some people who can tell us more about you: these + references could be employers or coworkers, open source projects, + etc.</li> + <li>Email the above to jobs at torproject.org, specifying the + "flash proxy" position.</li> +</ul> + +<p> +About the company:<br> + The Tor Project is a US 501(c)(3) non-profit dedicated to research, + development, and education about online anonymity and privacy. The Tor + network's 3000 volunteer relays carry 14 Gbps for upwards of half a + million daily users, including ordinary citizens who want protection + from identity theft and prying corporations, corporations who want + to look at a competitor's website in private, people around the world + whose Internet connections are censored, and even governments and law + enforcement. Tor has a staff of 14 paid developers, researchers, and + advocates, plus many dozen volunteers who help out on a daily basis. Tor + is funded in part by government research and development grants, and + in part by individual and corporate donations. +</p> + + </div> +  + <div id = "sidecol"> +#include "side.wmi" +#include "info.wmi" + </div> +  +</div> + +#include <foot.wmi> + Modified: website/trunk/about/en/jobs.wml =================================================================== --- website/trunk/about/en/jobs.wml 2012-10-02 17:36:18 UTC (rev 25832) +++ website/trunk/about/en/jobs.wml 2012-10-04 01:12:22 UTC (rev 25833) @@ -17,6 +17,7 @@ <ul> <li><a href="<page about/jobs-projectcoordinator>">Project coordinator</a></li> +<li><a href="<page about/jobs-pluggabletransport>">Pluggable transport developer</a></li> <li><a href="<page about/jobs-browserhacker>">Browser hacker</a></li> </ul>

1 0

[flashproxy/master] Use UIDs to identify messages in FETCH and COPY commands.
by dcf＠torproject.org 04 Oct '12

04 Oct '12

commit b3e627d4ca8d91d8ddc6e960cdb76d47c67e07e2 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 3 15:01:04 2012 -0700 Use UIDs to identify messages in FETCH and COPY commands. Otherwise there is a race condition; what we think of as message 1 could change between FETCH and COPY. --- facilitator/facilitator-email-poller | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index cfae523..9c9b7d4 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -5,6 +5,7 @@ import getopt import imaplib import math import os +import re import socket import ssl import stat @@ -239,6 +240,17 @@ def handle_message(msg): log(u"registering %s" % safe_str(fac.format_addr(client_addr))) fac.put_reg(FACILITATOR_ADDR, client_addr) +def imap_get_uid(imap, index): + typ, data = imap.fetch(str(index), "(UID)") + if data[0] is None: + return None + assert typ == "OK" + # This grepping for the UID is bogus, but imaplib doesn't properly break up + # the list of name-value pairs for us. + m = re.match(r'^\d+\s+$.*\bUID\s+(\d+)\b.*$\s*$', data[0]) + assert m is not None + return m.group(1) + def imap_empty_trash(imap): typ, data = imap.select("[Gmail]/Trash") imap.store("1:*", "+FLAGS", "\\Deleted") @@ -266,17 +278,20 @@ def imap_loop(imap): while True: # Grab message 1 on each iteration; remaining messages shift down so # the next message we process is also message 1. - typ, data = imap.fetch(1, "(BODY[])") - if data[0] is None: + uid = imap_get_uid(imap, "1") + if uid is None: break + typ, data = imap.uid("FETCH", uid, "(BODY[])") + assert typ == "OK" + try: msg = email.message_from_string(data[0][1]) handle_message(msg) except Exception, e: log("Error processing message, deleting anyway: %s" % str(e)) - imap.copy(1, "[Gmail]/Trash") + imap.uid("COPY", uid, "[Gmail]/Trash") # Attempting to delete from All Mail here would have no effect. # Messages disappear from All Mail when they are deleted from Trash # in the next step.

1 0