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

[tor-browser-bundle/maint-3.6] Bug 11630: Backport the fix from HTTPS-E trunk.
by gk＠torproject.org 07 Jun '14

07 Jun '14

commit 3e9088694cb0bed1780914b775570151ebf7f2bf Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 7 10:27:57 2014 +0000 Bug 11630: Backport the fix from HTTPS-E trunk. --- gitian/descriptors/linux/gitian-bundle.yml | 2 ++ gitian/descriptors/mac/gitian-bundle.yml | 2 ++ gitian/descriptors/windows/gitian-bundle.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml … [View More]index c16589a..214b9a2 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -92,6 +92,8 @@ script: | # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 rm -f .git/refs/heads/master + # Backport the fix for #11630 from HTTPS-Everywhere trunk. + sed 's/conn.commit()/&\nconn.execute("VACUUM")/' -i utils/make-sqlite.py ./makexpi.sh cp pkg/*.xpi ../tor-browser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd .. diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 263ca57..d5da018 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -99,6 +99,8 @@ script: | # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 rm -f .git/refs/heads/master + # Backport the fix for #11630 from HTTPS-Everywhere trunk. + sed 's/conn.commit()/&\nconn.execute("VACUUM")/' -i utils/make-sqlite.py ./makexpi.sh cp pkg/*.xpi ../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd .. diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 457fa7b..ec128be 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -82,6 +82,8 @@ script: | # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 rm -f .git/refs/heads/master + # Backport the fix for #11630 from HTTPS-Everywhere trunk. + sed 's/conn.commit()/&\nconn.execute("VACUUM")/' -i utils/make-sqlite.py ./makexpi.sh cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd .. [View Less]

1 0

r26819: {website} fix a confusing line in the faq, and also bump up all the ac (website/trunk/docs/en)
by Roger Dingledine 07 Jun '14

07 Jun '14

Author: arma Date: 2014-06-07 03:43:23 +0000 (Sat, 07 Jun 2014) New Revision: 26819 Modified: website/trunk/docs/en/faq.wml Log: fix a confusing line in the faq, and also bump up all the accountingmax numbers so people don't think 1 gigabyte per day is useful. Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2014-06-06 20:03:20 UTC (rev 26818) +++ website/trunk/docs/en/faq.wml 2014-06-07 03:43:23 … [View More]

1 0

[orbot/master] keep SOCKS port as default 9050 (instead of 'auto')
by n8fr8＠torproject.org 07 Jun '14

07 Jun '14

commit 451cfed0ac1ba204619e9a426a77001563ad21ff Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 6 17:01:18 2014 -0400 keep SOCKS port as default 9050 (instead of 'auto') --- res/xml/preferences.xml | 2 +- src/org/torproject/android/service/TorService.java | 4 +--- src/org/torproject/android/service/TorServiceConstants.java | 2 +- src/org/torproject/android/service/TorTransProxy.java | 2 +- 4 files … [View More]changed, 4 insertions(+), 6 deletions(-) diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 8f0778b..e4984e2 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -201,7 +201,7 @@ android:dialogTitle="@string/pref_proxy_password_dialog" android:title="@string/pref_socks_title" android:summary="@string/pref_socks_summary" android:dialogTitle="@string/pref_socks_dialog" -android:defaultValue="auto" +android:defaultValue="9050" /> <CheckBoxPreference diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 3c04d97..f1b80ed 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -19,7 +19,6 @@ import java.net.Socket; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; -import java.util.LinkedHashMap; import java.util.List; import java.util.StringTokenizer; import java.util.Timer; @@ -122,7 +121,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void logMessage(String msg) { if (ENABLE_DEBUG_LOG) - { Log.d(TAG,msg); sendCallbackLogMessage(msg); @@ -1702,7 +1700,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - String socksConfig = prefs.getString(TorConstants.PREF_SOCKS, "auto"); + String socksConfig = prefs.getString(TorConstants.PREF_SOCKS, TorServiceConstants.PORT_SOCKS_DEFAULT); enableSocks (socksConfig,false); diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 3a0db5e..da67936 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -49,7 +49,7 @@ public interface TorServiceConstants { public final static int PORT_HTTP = 8118; //just like Privoxy! //Socks port client connects to, server is the Tor binary - public final static int PORT_SOCKS = 9050; + public final static String PORT_SOCKS_DEFAULT = "9050"; //what is says! public final static String IP_LOCALHOST = "127.0.0.1"; diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 5722612..4999777 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -711,7 +711,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -A ").append(srcChainName); script.append(" -p tcp"); script.append(" -m tcp"); - script.append(" --dport ").append(PORT_SOCKS); + script.append(" --dport ").append(PORT_SOCKS_DEFAULT); script.append(" -j ACCEPT"); executeCommand (shell, script.toString()); [View Less]

1 0

[orbot/master] update changelog
by n8fr8＠torproject.org 07 Jun '14

07 Jun '14

commit 98ea6d50930426dcdb865e3249245699f59face2 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 6 21:50:49 2014 -0400 update changelog --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index f274b21..a727064 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,8 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +5776a87 update to 14.0.0-RC3 +bf6a1da … [View More]

1 0

[orbot/master] update to 14.0.0-RC3
by n8fr8＠torproject.org 07 Jun '14

07 Jun '14

commit 5776a870cea5c77389cdd96dd6b0c69e01e054f8 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 6 21:50:00 2014 -0400 update to 14.0.0-RC3 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4c5c02e..d7b1da8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.… [View More]

1 0

[orbot/master] update state when service connects
by n8fr8＠torproject.org 07 Jun '14

07 Jun '14

commit bf6a1da3faa1e9a7afdbe9186f997694cc6f49c9 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 6 21:49:21 2014 -0400 update state when service connects --- src/org/torproject/android/Orbot.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 81a8575..2f80ea1 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -1209,… [View More]

1 0

[bridgedb/master] Set the SMTPAutoresponder factory's domain name to our FQDN.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 80f10af226387017d37560513d8fe40629560296 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jun 4 17:17:15 2014 +0000 Set the SMTPAutoresponder factory's domain name to our FQDN. --- lib/bridgedb/email/autoresponder.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/email/autoresponder.py b/lib/bridgedb/email/autoresponder.py index 41e811b..9be7e7d 100644 --- a/lib/bridgedb/email/autoresponder.py +++ b/lib/bridgedb/email/autoresponder.py @@ -639,6 +… [View More]

1 0

[bridgedb/master] Add try/except around parent class errback call in SMTPAutoresponder.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit 9861fdf7ebcc5fdfe613a9600e0273615e1a4255 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jun 4 17:15:53 2014 +0000 Add try/except around parent class errback call in SMTPAutoresponder. --- lib/bridgedb/email/autoresponder.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/email/autoresponder.py b/lib/bridgedb/email/autoresponder.py index d5dadae..41e811b 100644 --- a/lib/bridgedb/email/autoresponder.py +++ b/lib/… [View More]

1 0

[bridgedb/master] Consider it a fatal error if we can't listen on the configured EMAIL_PORT.
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit d777231c1ea31f9748a84ab068b5d5c86bbdac6b Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jun 4 17:18:59 2014 +0000 Consider it a fatal error if we can't listen on the configured EMAIL_PORT. --- lib/bridgedb/email/server.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/email/server.py b/lib/bridgedb/email/server.py index 50c5987..11af8df 100644 --- a/lib/bridgedb/email/server.py +++ b/lib/bridgedb/email/server.py @@ -23,6 +… [View More]

1 0

[bridgedb/master] Split unittest for SMTPAutoresponder DKIM runChecks().
by isis＠torproject.org 06 Jun '14

06 Jun '14

commit e9aa7bbacfadc700b5fb88548009d669c60c33aa Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Jun 5 02:55:38 2014 +0000 Split unittest for SMTPAutoresponder DKIM runChecks(). We should specifically check that a received email containing a X-DKIM-Authentication-Results: dunno header doesn't successfully pass the domain checks called in SMTPAutoresponder.runChecks(). * CHANGE test_SMTPAutoresponder_runChecks_badDKIM() into … [View More] test_SMTPAutoresponder_runChecks_DKIM_dunno() and test_SMTPAutoresponder_runChecks_DKIM_bad(). --- lib/bridgedb/test/test_email_autoresponder.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/test/test_email_autoresponder.py b/lib/bridgedb/test/test_email_autoresponder.py index ed22a72..880afa6 100644 --- a/lib/bridgedb/test/test_email_autoresponder.py +++ b/lib/bridgedb/test/test_email_autoresponder.py @@ -535,13 +535,26 @@ class SMTPAutoresponderTests(unittest.TestCase): self.responder.incoming.canonicalFromSMTP = smtpFrom self.assertFalse(self.responder.runChecks(emailFrom)) - def test_SMTPAutoresponder_runChecks_badDKIM(self): - """runChecks() should catch emails with bad DKIM headers for canonical - domains which we've configured to check DKIM verification results for. + def test_SMTPAutoresponder_runChecks_DKIM_dunno(self): + """runChecks() should catch emails with bad DKIM headers + (``"X-DKIM-Authentication-Results: dunno"``) for canonical domains + which we're configured to check DKIM verification results for. """ - emailFrom = Address('dkimlikewat(a)gmail.com') + emailFrom = Address('dkimlikedunno(a)gmail.com') header = "X-DKIM-Authentication-Results: dunno" self._getIncomingLines(str(emailFrom)) self.message.lines.insert(3, header) self._setUpResponder() self.assertFalse(self.responder.runChecks(emailFrom)) + + def test_SMTPAutoresponder_runChecks_DKIM_bad(self): + """runChecks() should catch emails with bad DKIM headers + (``"X-DKIM-Authentication-Results: dunno"``) for canonical domains + which we're configured to check DKIM verification results for. + """ + emailFrom = Address('dkimlikewat(a)gmail.com') + header = "X-DKIM-Authentication-Results: wowie zowie there's a sig here" + self._getIncomingLines(str(emailFrom)) + self.message.lines.insert(3, header) + self._setUpResponder() + self.assertFalse(self.responder.runChecks(emailFrom)) [View Less]

1 0