tor-commits May 2012

tor-commits@lists.torproject.org

20 participants
844 discussions

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 03 May '12

03 May '12

commit 4f3bd9f3d2a2a775f29a1a14a830faa73f216d92 Merge: 21d3ebc b4ced8a Author: Erinn Clark <erinn(a)torproject.org> Date: Thu May 3 07:53:25 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/prefs.js | 4 ---- build-scripts/install-mozbuild.bat | 4 ++++ build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 7 ++----- build-scripts/windows.mk | 4 ++-- 6 files changed, 10 insertions(+), 13 deletions(-)

1 0

[torbrowser/master] remove useless betterprivacy firefox prefs (closes: #5722)
by erinn＠torproject.org 03 May '12

03 May '12

commit b4ced8a054bef342b6a7fbc7d48cbc3775fa77e5 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu May 3 07:39:44 2012 -0300 remove useless betterprivacy firefox prefs (closes: #5722) --- build-scripts/config/prefs.js | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/build-scripts/config/prefs.js b/build-scripts/config/prefs.js index 593db73..46825b5 100644 --- a/build-scripts/config/prefs.js +++ b/build-scripts/config/prefs.js @@ -56,10 +56,6 @@ user_pref("dom.event.contextmenu.enabled", false); user_pref("dom.storage.enabled", false); user_pref("extensions.autoDisableScopes", 0); user_pref("extensions.bootstrappedAddons", "{}"); -user_pref("extensions.bprivacy.DataDir", "/Users/erinn/Library/Preferences/Macromedia"); -user_pref("extensions.bprivacy.donotaskforfolder", true); -user_pref("extensions.bprivacy.donotaskonexit", true); -user_pref("extensions.bprivacy.initiated", true); user_pref("extensions.checkCompatibility.4.*", false); user_pref("extensions.checkUpdateSecurity", true); user_pref("extensions.databaseSchema", 3);

1 0

[torbrowser/master] Win: Fix qmake path setting for Vidalia's build
by erinn＠torproject.org 03 May '12

03 May '12

commit 098270c72b78537324bb9a229902e45d84df4466 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue May 1 18:02:25 2012 +0200 Win: Fix qmake path setting for Vidalia's build --- build-scripts/windows.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 200d6d2..855e211 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -78,7 +78,7 @@ build-qt: build-zlib build-openssl $(QT_DIR) cd $(QT_DIR) && make install touch $(STAMP_DIR)/build-qt -VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_MAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB) +VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++ -Wl,--nxcompat -Wl,--dynamicbase" -DWIN2K=1 -DQT_QMAKE_EXECUTABLE=/c/Qt/$(QT_VER)/bin/qmake -DCMAKE_BUILD_TYPE=minsizerel -DMINGW_BINARY_DIR=$(MING) -DOPENSSL_BINARY_DIR=$(OPENSSL) -DWIX_BINARY_DIR=$(WIX_LIB) # XXX Once we build qt on windows, we'll want to add build-qt here build-vidalia: build-openssl $(VIDALIA_DIR) -mkdir $(VIDALIA_DIR)/build

1 0

[torbrowser/master] Move the tor prefix declaration into version.mk
by erinn＠torproject.org 03 May '12

03 May '12

commit 411aa8543d050d7c3b56e044d2965319ded0d905 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed May 2 04:55:24 2012 +0200 Move the tor prefix declaration into version.mk --- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 2 +- build-scripts/windows.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 86adbc5..f8e87ea 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -77,7 +77,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) cd $(LIBEVENT_DIR) && make install touch $(STAMP_DIR)/build-libevent -TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) +TOR_OPTS=--with-openssl-dir=$(BUILT_DIR) --with-zlib-dir=$(BUILT_DIR) --with-libevent-dir=$(BUILT_DIR)/lib build-pidgin: echo "We're not building pidgin yet!" diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 259039b..4a01376 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -97,7 +97,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) TOR_CFLAGS="-arch $(ARCH_TYPE) -I$(BUILT_DIR)/include $(MIN_VERSION) $(CF_MIN_VERSION)" TOR_LDFLAGS="-L$(BUILT_DIR)/lib $(LD_MIN_VERSION)" -TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) --disable-dependency-tracking $(CC) +TOR_OPTS=--enable-static-openssl --enable-static-libevent --with-openssl-dir=$(BUILT_DIR)/lib --with-libevent-dir=$(BUILT_DIR)/lib --disable-dependency-tracking $(CC) build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE) cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index d837576..91e3aa7 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -229,7 +229,7 @@ $(OBFSPROXY_DIR): $(FETCH_DIR)/$(OBFSPROXY_PACKAGE) | $(BUILD_DIR) # Common build functionality. Modified by variables set in OS-specific makefiles build-tor: build-zlib build-openssl build-libevent $(TOR_DIR) - cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) --enable-gcc-warnings-advisory + cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS) --enable-gcc-warnings-advisory --prefix=$(BUILT_DIR) cd $(TOR_DIR) && make -j $(NUM_CORES) cd $(TOR_DIR) && make install touch $(STAMP_DIR)/build-tor diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 855e211..c126d90 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -97,7 +97,7 @@ build-libevent: build-zlib build-openssl $(LIBEVENT_DIR) TOR_CFLAGS="-I$(BUILT_DIR)/include" TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" -TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) +TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib build-tor:PATH+=:$(BUILT_DIR)/bin build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat | $(PYTHON) $(PYMAKE_DIR)

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 03 May '12

03 May '12

1 0

[flashproxy/master] Whitespace.
by dcf＠torproject.org 03 May '12

03 May '12

commit 5318a46a611070ca35f121c337bea58bf8b7da58 Author: David Fifield <david(a)bamsoftware.com> Date: Thu May 3 00:28:23 2012 -0700 Whitespace. --- doc/websocket-transport.txt | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/websocket-transport.txt b/doc/websocket-transport.txt index 65b4e9c..ad1eef5 100644 --- a/doc/websocket-transport.txt +++ b/doc/websocket-transport.txt @@ -93,11 +93,11 @@ Examples Here are examples of WebSocket handshakes and the beginning of data transfer. The data is the beginning of a Tor connection (i.e., it - begins with a TLS handshake). Data are shown using C string syntax. "> - " at the beginning of a line indicates client-to-server communication; - "< " is server-to-client. "[...]" indicates contents omitted for - brevity. Newlines in the presentation are not significant. This - section is non-normative. + begins with a TLS handshake). Data are shown using C string syntax. + "> " at the beginning of a line indicates client-to-server + communication; "< " is server-to-client. "[...]" indicates contents + omitted for brevity. Newlines in the presentation are not significant. + This section is non-normative. Using "hybi"/RFC 6455 WebSocket with binary frames:

1 0

[flashproxy/master] Wording on buffering.
by dcf＠torproject.org 03 May '12

03 May '12

commit b7bd6a2338a32fd70e5068cf2d61c01537f939e9 Author: David Fifield <david(a)bamsoftware.com> Date: Thu May 3 00:24:44 2012 -0700 Wording on buffering. --- doc/websocket-transport.txt | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/doc/websocket-transport.txt b/doc/websocket-transport.txt index 45de461..65b4e9c 100644 --- a/doc/websocket-transport.txt +++ b/doc/websocket-transport.txt @@ -176,13 +176,12 @@ Considerations specific to pluggable transports messages SHOULD be sent in a single frame. Endpoints MUST limit the size of messages and frames that they will - buffer. Upon receiving such a message (when the sum of the length of - already-buffered data and the length of the next frame exceeds the - limit), the endpoint MUST close the connection and SHOULD do so with a - status code of 1009 (see RFC 6455 section 7.4.1). Endpoints MUST be - capable of receiving messages containing 1500 octets of binary data; - this may require buffering up to 2026 bytes of UTF-8–encoded base64 - text. + buffer. When the sum of the length of already-buffered data and the + length of the next frame exceeds the limit, the endpoint MUST close + the connection and SHOULD do so with a status code of 1009 (see RFC + 6455 section 7.4.1). Endpoints MUST be capable of receiving messages + containing up to 1500 octets of binary data; this may require + buffering up to 2026 bytes of UTF-8–encoded base64 text. Questions/extensions

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 03 May '12

03 May '12

commit dd8a108b8a9077475a9f4f31c2c80c988fa38550 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 3 06:45:26 2012 +0000 Update translations for https_everywhere --- ko/https-everywhere.dtd | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/ko/https-everywhere.dtd b/ko/https-everywhere.dtd new file mode 100644 index 0000000..d4166f3 --- /dev/null +++ b/ko/https-everywhere.dtd @@ -0,0 +1,38 @@ +<!ENTITY https-everywhere.about.title "HTTPS Everywhere에 대하여 +"> +<!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> +<!ENTITY https-everywhere.about.ext_description ""> +<!ENTITY https-everywhere.about.version "Version"> +<!ENTITY https-everywhere.about.created_by ""> +<!ENTITY https-everywhere.about.librarians ""> +<!ENTITY https-everywhere.about.thanks ""> +<!ENTITY https-everywhere.about.contribute ""> +<!ENTITY https-everywhere.about.donate_tor ""> +<!ENTITY https-everywhere.about.tor_lang_code ""> +<!ENTITY https-everywhere.about.donate_eff ""> + +<!ENTITY https-everywhere.menu.about ""> +<!ENTITY https-everywhere.menu.observatory ""> +<!ENTITY https-everywhere.menu.globalEnable ""> +<!ENTITY https-everywhere.menu.globalDisable ""> + +<!ENTITY https-everywhere.prefs.title ""> +<!ENTITY https-everywhere.prefs.enable_all ""> +<!ENTITY https-everywhere.prefs.disable_all ""> +<!ENTITY https-everywhere.prefs.reset_defaults ""> +<!ENTITY https-everywhere.prefs.search ""> +<!ENTITY https-everywhere.prefs.site ""> +<!ENTITY https-everywhere.prefs.notes ""> +<!ENTITY https-everywhere.prefs.list_caption ""> +<!ENTITY https-everywhere.prefs.enabled ""> +<!ENTITY https-everywhere.prefs.ruleset_howto ""> +<!ENTITY https-everywhere.prefs.here_link ""> +<!ENTITY https-everywhere.prefs.toggle ""> +<!ENTITY https-everywhere.prefs.reset_default ""> +<!ENTITY https-everywhere.prefs.view_xml_source ""> + +<!ENTITY https-everywhere.source.downloading ""> +<!ENTITY https-everywhere.source.filename ""> +<!ENTITY https-everywhere.source.unable_to_download ""> + +

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 03 May '12

03 May '12

commit b7c9ca1369de09a244b0af8c8cbc06d53e26aad7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 3 02:15:28 2012 +0000 Update translations for https_everywhere --- eo/https-everywhere.dtd | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eo/https-everywhere.dtd b/eo/https-everywhere.dtd index 5933a1c..848a195 100644 --- a/eo/https-everywhere.dtd +++ b/eo/https-everywhere.dtd @@ -5,10 +5,10 @@ <!ENTITY https-everywhere.about.created_by "Kreita de"> <!ENTITY https-everywhere.about.librarians ""> <!ENTITY https-everywhere.about.thanks "Dankon al"> -<!ENTITY https-everywhere.about.contribute ""> -<!ENTITY https-everywhere.about.donate_tor ""> -<!ENTITY https-everywhere.about.tor_lang_code ""> -<!ENTITY https-everywhere.about.donate_eff ""> +<!ENTITY https-everywhere.about.contribute "Se vi volas "HTTPS Everywhere", vi devus konsideri"> +<!ENTITY https-everywhere.about.donate_tor "Donacante al Tor"> +<!ENTITY https-everywhere.about.tor_lang_code "en"> +<!ENTITY https-everywhere.about.donate_eff "Donacante al EFF"> <!ENTITY https-everywhere.menu.about "Pri HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory ""> @@ -21,7 +21,7 @@ <!ENTITY https-everywhere.prefs.reset_defaults ""> <!ENTITY https-everywhere.prefs.search "Serĉi"> <!ENTITY https-everywhere.prefs.site "Retejo"> -<!ENTITY https-everywhere.prefs.notes "Rimarko"> +<!ENTITY https-everywhere.prefs.notes "Rimarkoj"> <!ENTITY https-everywhere.prefs.list_caption ""> <!ENTITY https-everywhere.prefs.enabled "Ŝaltita"> <!ENTITY https-everywhere.prefs.ruleset_howto ""> @@ -30,8 +30,8 @@ <!ENTITY https-everywhere.prefs.reset_default ""> <!ENTITY https-everywhere.prefs.view_xml_source ""> -<!ENTITY https-everywhere.source.downloading ""> -<!ENTITY https-everywhere.source.filename ""> -<!ENTITY https-everywhere.source.unable_to_download ""> +<!ENTITY https-everywhere.source.downloading "Elŝutante"> +<!ENTITY https-everywhere.source.filename "Arĥivonomo"> +<!ENTITY https-everywhere.source.unable_to_download "Ne eblas elŝuti la arĥivon">

1 0

[torbrowser/master] Add patch for #5741.
by mikeperry＠torproject.org 03 May '12

03 May '12

commit acaa131ffbc78c4355e49b7476941a1ad2c9da51 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed May 2 17:57:33 2012 -0700 Add patch for #5741. --- .../firefox/0018-Prevent-WebSocket-DNS-leak.patch | 132 ++++++++++++++++++++ 1 files changed, 132 insertions(+), 0 deletions(-) diff --git a/src/current-patches/firefox/0018-Prevent-WebSocket-DNS-leak.patch b/src/current-patches/firefox/0018-Prevent-WebSocket-DNS-leak.patch new file mode 100644 index 0000000..9b30987 --- /dev/null +++ b/src/current-patches/firefox/0018-Prevent-WebSocket-DNS-leak.patch @@ -0,0 +1,132 @@ +From 93199734c06485660fb922c61f740191648a6dc6 Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Wed, 2 May 2012 17:44:39 -0700 +Subject: [PATCH 18/18] Prevent WebSocket DNS leak. + +This is due to an improper implementation of the WebSocket spec by Mozilla. + +"There MUST be no more than one connection in a CONNECTING state. If multiple +connections to the same IP address are attempted simultaneously, the client +MUST serialize them so that there is no more than one connection at a time +running through the following steps. + +If the client cannot determine the IP address of the remote host (for +example, because all communication is being done through a proxy server that +performs DNS queries itself), then the client MUST assume for the purposes of +this step that each host name refers to a distinct remote host," + +https://tools.ietf.org/html/rfc6455#page-15 + +They implmented the first paragraph, but not the second... + +While we're at it, we also prevent the DNS service from being used to look up +anything other than IP addresses if socks_remote_dns is set to true, so this +bug can't turn up in other components or due to 3rd party addons. +--- + netwerk/dns/nsDNSService2.cpp | 24 ++++++++++++++++++++++- + netwerk/dns/nsDNSService2.h | 1 + + netwerk/protocol/websocket/WebSocketChannel.cpp | 8 +++++- + 3 files changed, 30 insertions(+), 3 deletions(-) + +diff --git a/netwerk/dns/nsDNSService2.cpp b/netwerk/dns/nsDNSService2.cpp +index 1bd5f38..eda0e48 100644 +--- a/netwerk/dns/nsDNSService2.cpp ++++ b/netwerk/dns/nsDNSService2.cpp +@@ -404,6 +404,7 @@ nsDNSService::Init() + bool enableIDN = true; + bool disableIPv6 = false; + bool disablePrefetch = false; ++ bool disableDNS = false; + int proxyType = nsIProtocolProxyService::PROXYCONFIG_DIRECT; + + nsAdoptingCString ipv4OnlyDomains; +@@ -427,6 +428,10 @@ nsDNSService::Init() + + // If a manual proxy is in use, disable prefetch implicitly + prefs->GetIntPref("network.proxy.type", &proxyType); ++ ++ // If the user wants remote DNS, we should fail any lookups that still ++ // make it here. ++ prefs->GetBoolPref("network.proxy.socks_remote_dns", &disableDNS); + } + + if (mFirstTime) { +@@ -444,7 +449,7 @@ nsDNSService::Init() + + // Monitor these to see if there is a change in proxy configuration + // If a manual proxy is in use, disable prefetch implicitly +- prefs->AddObserver("network.proxy.type", this, false); ++ prefs->AddObserver("network.proxy.", this, false); + } + } + +@@ -473,6 +478,7 @@ nsDNSService::Init() + mIDN = idn; + mIPv4OnlyDomains = ipv4OnlyDomains; // exchanges buffer ownership + mDisableIPv6 = disableIPv6; ++ mDisableDNS = disableDNS; + + // Disable prefetching either by explicit preference or if a manual proxy is configured + mDisablePrefetch = disablePrefetch || (proxyType == nsIProtocolProxyService::PROXYCONFIG_MANUAL); +@@ -584,6 +590,14 @@ nsDNSService::AsyncResolve(const nsACString &hostname, + if (mDisablePrefetch && (flags & RESOLVE_SPECULATE)) + return NS_ERROR_DNS_LOOKUP_QUEUE_FULL; + ++ PRNetAddr tempAddr; ++ if (mDisableDNS) { ++ // Allow IP lookups through, but nothing else. ++ if (PR_StringToNetAddr(hostname.BeginReading(), &tempAddr) != PR_SUCCESS) { ++ return NS_ERROR_UNKNOWN_PROXY_HOST; // XXX: NS_ERROR_NOT_IMPLEMENTED? ++ } ++ } ++ + res = mResolver; + idn = mIDN; + } +@@ -670,6 +684,14 @@ nsDNSService::Resolve(const nsACString &hostname, + MutexAutoLock lock(mLock); + res = mResolver; + idn = mIDN; ++ ++ PRNetAddr tempAddr; ++ if (mDisableDNS) { ++ // Allow IP lookups through, but nothing else. ++ if (PR_StringToNetAddr(hostname.BeginReading(), &tempAddr) != PR_SUCCESS) { ++ return NS_ERROR_UNKNOWN_PROXY_HOST; // XXX: NS_ERROR_NOT_IMPLEMENTED? ++ } ++ } + } + NS_ENSURE_TRUE(res, NS_ERROR_OFFLINE); + +diff --git a/netwerk/dns/nsDNSService2.h b/netwerk/dns/nsDNSService2.h +index 1749b41..3ec8eba 100644 +--- a/netwerk/dns/nsDNSService2.h ++++ b/netwerk/dns/nsDNSService2.h +@@ -70,4 +70,5 @@ private: + bool mDisableIPv6; + bool mDisablePrefetch; + bool mFirstTime; ++ bool mDisableDNS; + }; +diff --git a/netwerk/protocol/websocket/WebSocketChannel.cpp b/netwerk/protocol/websocket/WebSocketChannel.cpp +index 22873d3..0875c12 100644 +--- a/netwerk/protocol/websocket/WebSocketChannel.cpp ++++ b/netwerk/protocol/websocket/WebSocketChannel.cpp +@@ -1875,8 +1875,12 @@ WebSocketChannel::ApplyForAdmission() + LOG(("WebSocketChannel::ApplyForAdmission: checking for concurrent open\n")); + nsCOMPtr<nsIThread> mainThread; + NS_GetMainThread(getter_AddRefs(mainThread)); +- dns->AsyncResolve(hostName, 0, this, mainThread, getter_AddRefs(mDNSRequest)); +- NS_ENSURE_SUCCESS(rv, rv); ++ rv = dns->AsyncResolve(hostName, 0, this, mainThread, getter_AddRefs(mDNSRequest)); ++ if (NS_FAILED(rv)) { ++ // Fall back to hostname on dispatch failure ++ mDNSRequest = nsnull; ++ OnLookupComplete(nsnull, nsnull, rv); ++ } + + return NS_OK; + } +-- +1.7.5.4 +

1 0

← Newer
1
...
76
77
78
79
80
81
82
...
85
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2012