October 2013 - tor-commits - lists.torproject.org

[tor-browser/tor-browser-17.0.9esr-1] fixup! Change the default Firefox profile directory to be TBB-relative.
by mikeperry＠torproject.org 18 Oct '13

18 Oct '13

commit 0cfceec079329cfedff3baf9f681cfd5860b428d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Oct 17 11:14:01 2013 -0400 fixup! Change the default Firefox profile directory to be TBB-relative. Fix problem where profile was not found. --- toolkit/xre/nsXREDirProvider.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp index aae1e2f..b122f85 100644 --- a/toolkit/xre/nsXREDirProvider.cpp +++ b/toolkit/xre/nsXREDirProvider.cpp @@ -1295,16 +1295,15 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, #if defined (XP_MACOSX) if (!profile.IsEmpty()) { rv = AppendProfileString(aFile, profile.get()); + NS_ENSURE_SUCCESS(rv, rv); } - NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_WIN) || defined(XP_OS2) if (!profile.IsEmpty()) { rv = AppendProfileString(aFile, profile.get()); + NS_ENSURE_SUCCESS(rv, rv); } - NS_ENSURE_SUCCESS(rv, rv); - #elif defined(ANDROID) // The directory used for storing profiles // The parent of this directory is set in GetUserDataDirectoryHome @@ -1315,9 +1314,6 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, rv = aFile->AppendNative(nsDependentCString("mozilla")); NS_ENSURE_SUCCESS(rv, rv); #elif defined(XP_UNIX) - // Make it hidden (i.e. using the ".") - nsCAutoString folder("."); - if (!profile.IsEmpty()) { // Skip any leading path characters const char* profileStart = profile.get(); @@ -1329,17 +1325,14 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile, if (*profileStart == '.') profileStart++; + // Make it hidden (i.e. using the ".") + nsCAutoString folder("."); folder.Append(profileStart); ToLowerCase(folder); rv = AppendProfileString(aFile, folder.BeginReading()); + NS_ENSURE_SUCCESS(rv, rv); } - else { - ToLowerCase(folder); - - rv = aFile->AppendNative(folder); - } - NS_ENSURE_SUCCESS(rv, rv); #else #error "Don't know how to get profile path on your platform"

1 0

[tor-browser/tor-browser-17.0.9esr-1] Merge remote-tracking branch 'brade/bug9173' into tor-browser-17.0.9esr-1
by mikeperry＠torproject.org 18 Oct '13

18 Oct '13

commit f24ed2d49e08ce23f231cb963b2c45a2ced46535 Merge: 4c2763a 0cfceec Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 17 17:38:16 2013 -0700 Merge remote-tracking branch 'brade/bug9173' into tor-browser-17.0.9esr-1 toolkit/xre/nsXREDirProvider.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-)

1 0

[tor-browser/tor-browser-17.0.9esr-1] fixup! Do not expose system colors to CSS or canvas.
by mikeperry＠torproject.org 18 Oct '13

18 Oct '13

commit 282e8971589f6bfe222b86983d6dc8acb538a72e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 17 17:34:48 2013 -0700 fixup! Do not expose system colors to CSS or canvas. Check to make sure we have a theme pointer before accessing it. --- layout/base/nsLayoutUtils.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index 65515d9..00a4994 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -3171,8 +3171,9 @@ nsLayoutUtils::GetNativeTextColor(nsIFrame* aFrame, nscolor& aColor) const nsStyleDisplay* displayData = bgFrame->GetStyleDisplay(); uint8_t widgetType = displayData->mAppearance; nsITheme *theme = presContext->GetTheme(); - if (widgetType && theme->ThemeSupportsWidget(presContext, bgFrame, - widgetType)) { + if (theme && widgetType && theme->ThemeSupportsWidget(presContext, + bgFrame, + widgetType)) { bool isDisabled = false; nsIContent* frameContent = bgFrame->GetContent(); if (frameContent && frameContent->IsElement()) {

1 0

[tor-browser/tor-browser-17.0.9esr-1] fixup! Isolate the Image Cache per url bar domain.
by mikeperry＠torproject.org 18 Oct '13

18 Oct '13

commit 4c2763a742edd30dc711bfb8b365fcf39ab36981 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 17 17:35:36 2013 -0700 fixup! Isolate the Image Cache per url bar domain. Fix a potential memory leak due to extra addrefs. --- image/src/imgLoader.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/image/src/imgLoader.cpp b/image/src/imgLoader.cpp index 3a26cf4..a5bfa46 100644 --- a/image/src/imgLoader.cpp +++ b/image/src/imgLoader.cpp @@ -978,6 +978,7 @@ NS_IMETHODIMP imgLoader::FindEntryProperties(nsIURI *uri, nsIProperties **_retva *_retval = request->Properties(); NS_ADDREF(*_retval); + break; } } }

1 0

[flashproxy/master] Remove unused FACILITATOR_REG_URL_ADDR.
by dcf＠torproject.org 17 Oct '13

17 Oct '13

commit fd692bd26e6db7ed86dd24615904970da20768c8 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Oct 17 13:10:22 2013 -0700 Remove unused FACILITATOR_REG_URL_ADDR. This was left over from when facilitator.cgi used to talk directly to facilitator-reg-daemon (then called facilitator-reg-url). --- facilitator/facilitator.cgi | 1 - 1 file changed, 1 deletion(-) diff --git a/facilitator/facilitator.cgi b/facilitator/facilitator.cgi index f967555..e4e9bdf 100755 --- a/facilitator/facilitator.cgi +++ b/facilitator/facilitator.cgi @@ -9,7 +9,6 @@ import urllib import fac FACILITATOR_ADDR = ("127.0.0.1", 9002) -FACILITATOR_REG_URL_ADDR = ("127.0.0.1", 9003) def output_status(status): print """\

1 0

[flashproxy/master] Fix a symbolic link in the drupal directory.
by dcf＠torproject.org 17 Oct '13

17 Oct '13

commit bc5aebf4e104ab8272e593c9c4103136dab88518 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Oct 17 05:20:01 2013 -0700 Fix a symbolic link in the drupal directory. Broken since /modules moved to /proxy/modules. --- proxy/modules/drupal/flashproxy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/modules/drupal/flashproxy.js b/proxy/modules/drupal/flashproxy.js index 710e470..db0eda6 120000 --- a/proxy/modules/drupal/flashproxy.js +++ b/proxy/modules/drupal/flashproxy.js @@ -1 +1 @@ -../../proxy/flashproxy.js \ No newline at end of file +../../flashproxy.js \ No newline at end of file

1 0

[flashproxy/master] use with-syntax for locks
by dcf＠torproject.org 17 Oct '13

17 Oct '13

commit d12075cffa76b634a3e7f7e290cc09a9b6e5684a Author: Ximin Luo <infinity0(a)gmx.com> Date: Mon Oct 7 12:08:45 2013 +0100 use with-syntax for locks --- facilitator/facilitator | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 7bb3819..27d0f02 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -71,12 +71,9 @@ def safe_str(s): log_lock = threading.Lock() def log(msg): - log_lock.acquire() - try: + with log_lock: print >> options.log_file, (u"%s %s" % (time.strftime(LOG_DATE_FORMAT), msg)).encode("UTF-8") options.log_file.flush() - finally: - log_lock.release() class TCPReg(object): def __init__(self, host, port):

1 0

[flashproxy/master] Change facilitator-test port from 9002 to 39002.
by dcf＠torproject.org 17 Oct '13

17 Oct '13

commit 6433b215369aac2ef65842b8e39490a5b1c7b500 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 16 21:21:57 2013 -0700 Change facilitator-test port from 9002 to 39002. So as not to conflict with a production facilitator running on the same host. Sniped from "make tests work against the new interfaces" https://github.com/infinity0/flashproxy/commit/a3a6b832c9d3db2b24251f09741a… --- facilitator/facilitator-test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/facilitator/facilitator-test b/facilitator/facilitator-test index d80c655..9265fa6 100755 --- a/facilitator/facilitator-test +++ b/facilitator/facilitator-test @@ -8,7 +8,7 @@ import unittest import fac FACILITATOR_HOST = "127.0.0.1" -FACILITATOR_PORT = 9002 +FACILITATOR_PORT = 39002 # diff port to not conflict with production service FACILITATOR_ADDR = (FACILITATOR_HOST, FACILITATOR_PORT) def gimme_socket(host, port):

1 0

[flashproxy/master] Factor out common code in returning logged errors.
by dcf＠torproject.org 17 Oct '13

17 Oct '13

commit b16cbe58788f56594b0da7a9c7d86fbbbf03adbc Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 16 21:51:47 2013 -0700 Factor out common code in returning logged errors. Adapted from "report more detailed errors and show stacktraces when unsafe logging" https://github.com/infinity0/flashproxy/commit/c1af35b2e2d57cb8850b1cf345d2… --- facilitator/facilitator | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/facilitator/facilitator b/facilitator/facilitator index 27d0f02..dfa5660 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -199,9 +199,7 @@ class Handler(SocketServer.StreamRequestHandler): try: command, params = fac.parse_transaction(line[:-1]) except ValueError, e: - log("fac.parse_transaction: %s" % e) - self.send_error() - return False + return self.error("fac.parse_transaction: %s" % e) if command == "GET": return self.do_GET(params) @@ -217,25 +215,24 @@ class Handler(SocketServer.StreamRequestHandler): def send_error(self): print >> self.wfile, "ERROR" + def error(self, log_msg): + log(log_msg) + self.send_error() + return False + def do_GET(self, params): proxy_spec = fac.param_first("FROM", params) if proxy_spec is None: - log(u"GET missing FROM param") - self.send_error() - return False + return self.error(u"GET missing FROM param") try: proxy_addr = fac.parse_addr_spec(proxy_spec, defport=0) except ValueError, e: - log(u"syntax error in proxy address %s: %s" % (safe_str(repr(proxy_spec)), safe_str(repr(str(e))))) - self.send_error() - return False + return self.error(u"syntax error in proxy address %s: %s" % (safe_str(repr(proxy_spec)), safe_str(repr(str(e))))) try: reg = get_reg_for_proxy(proxy_addr) except Exception, e: - log(u"error getting reg for proxy address %s: %s" % (safe_str(repr(proxy_spec)), safe_str(repr(str(e))))) - self.send_error() - return False + return self.error(u"error getting reg for proxy address %s: %s" % (safe_str(repr(proxy_spec)), safe_str(repr(str(e))))) check_back_in = get_check_back_in_for_proxy(proxy_addr) if reg: log(u"proxy gets %s, relay %s (now %d)" % @@ -249,25 +246,19 @@ class Handler(SocketServer.StreamRequestHandler): def do_PUT(self, params): client_spec = fac.param_first("CLIENT", params) if client_spec is None: - log(u"PUT missing CLIENT param") - self.send_error() - return False + return self.error(u"PUT missing CLIENT param") # FROM try: reg = Reg.parse(client_spec) except ValueError, e: - log(u"syntax error in %s: %s" % (safe_str(repr(client_spec)), safe_str(repr(str(e))))) - self.send_error() - return False + return self.error(u"syntax error in %s: %s" % (safe_str(repr(client_spec)), safe_str(repr(str(e))))) try: ok = put_reg(reg) except Exception, e: - log(u"error putting reg %s: %s" % (safe_str(repr(client_spec)), safe_str(repr(str(e))))) - self.send_error() - return False + return self.error(u"error putting reg %s: %s" % (safe_str(repr(client_spec)), safe_str(repr(str(e))))) if ok: log(u"client %s (now %d)" % (safe_str(unicode(reg)), num_regs())) else:

1 0

[flashproxy/master] - note flaky test
by dcf＠torproject.org 17 Oct '13

17 Oct '13

commit d82013c9f8528a9da011d94f9ca31513bc8f6c39 Author: Ximin Luo <infinity0(a)gmx.com> Date: Mon Oct 7 16:47:36 2013 +0100 - note flaky test --- facilitator/facilitator-test | 1 + 1 file changed, 1 insertion(+) diff --git a/facilitator/facilitator-test b/facilitator/facilitator-test index cbd45f8..d80c655 100755 --- a/facilitator/facilitator-test +++ b/facilitator/facilitator-test @@ -60,6 +60,7 @@ class FacilitatorTest(unittest.TestCase): while buflen + 1024 < 200000: s.send("X" * 1024) buflen += 1024 + # TODO(dcf1): sometimes no error is raised, and this test fails self.fail("should have raised a socket error") except socket.error: pass

1 0