- tor-commits - lists.torproject.org

[torbutton/master] Bug #3928: implement reading password from CookieAuthFile
by mikeperry＠torproject.org 29 Sep '11

29 Sep '11

commit de8c53cece3a8a99a60921fd42364c0faee0d8e7 Author: Jérémy Bobbio <lunar(a)debian.org> Date: Wed Sep 14 12:07:47 2011 +0200 Bug #3928: implement reading password from CookieAuthFile Using environment variable TOR_CONTROL_COOKIE_AUTH_FILE, one can now specify the path to the Tor CookieAuthFile. The password will be read from here if the environment lacks TOR_CONTROL_PASSWD. --- src/chrome/content/torbutton.js | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 1ebd6bb..5ee1a53 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -525,6 +525,15 @@ function torbutton_init() { // FIXME: We might want a check to use to set this in the future, // but this works fine for now. m_tb_tbb = true; + } else { + var cookie_path = environ.get("TOR_CONTROL_COOKIE_AUTH_FILE"); + try { + if ("" != cookie_path) { + m_tb_control_pass = torbutton_read_authentication_cookie(cookie_path); + } + } catch(e) { + torbutton_log(4, 'unable to read authentication cookie'); + } } if (environ.exists("TOR_CONTROL_PORT")) { @@ -1304,6 +1313,27 @@ function torbutton_socket_readline(input) { return str; } +function torbutton_read_authentication_cookie(path) { + var file = Components.classes['@mozilla.org/file/local;1'] + .createInstance(Components.interfaces.nsILocalFile); + file.initWithPath(path); + var fileStream = Components.classes['@mozilla.org/network/file-input-stream;1'] + .createInstance(Components.interfaces.nsIFileInputStream); + fileStream.init(file, 1, 0, false); + var binaryStream = Components.classes['@mozilla.org/binaryinputstream;1'] + .createInstance(Components.interfaces.nsIBinaryInputStream); + binaryStream.setInputStream(fileStream); + var array = binaryStream.readByteArray(fileStream.available()); + binaryStream.close(); + fileStream.close(); + return torbutton_array_to_hexdigits(array); +} + +function torbutton_array_to_hexdigits(array) { + return array.map(function(c) { + return String("0" + c.toString(16)).slice(-2) + }).join(''); +}; // Executes a command on the control port. // Return 0 in error, 1 for success. function torbutton_send_ctrl_cmd(command) {

1 0

r25139: {website} make the ppc bundle links point to the actual ppc bundles. (website/trunk/projects/en)
by Andrew Lewman 29 Sep '11

29 Sep '11

Author: phobos Date: 2011-09-29 01:05:49 +0000 (Thu, 29 Sep 2011) New Revision: 25139 Modified: website/trunk/projects/en/vidalia.wml Log: make the ppc bundle links point to the actual ppc bundles. Modified: website/trunk/projects/en/vidalia.wml =================================================================== --- website/trunk/projects/en/vidalia.wml 2011-09-29 00:11:12 UTC (rev 25138) +++ website/trunk/projects/en/vidalia.wml 2011-09-29 01:05:49 UTC (rev 25139) @@ -66,8 +66,8 @@ (<a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-i386.dmg.asc">sig</a>) </li> <li> - <a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-i386.dmg">Mac OS X PPC Only</a> - (<a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-i386.dmg.asc">sig</a>) + <a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-ppc.dmg">Mac OS X PPC Only</a> + (<a href="../dist/vidalia-bundles/vidalia-bundle-<version-stable>-<version-vidalia-stable>-ppc.dmg.asc">sig</a>) </li> <li> <a href="<page docs/debian-vidalia>">Instructions for Debian/Ubuntu/Knoppix Repositories</a>

1 0

r25138: {website} minor fixes (website/trunk/docs/en)
by Roger Dingledine 29 Sep '11

29 Sep '11

Author: arma Date: 2011-09-29 00:11:12 +0000 (Thu, 29 Sep 2011) New Revision: 25138 Modified: website/trunk/docs/en/faq.wml Log: minor fixes Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2011-09-28 23:38:14 UTC (rev 25137) +++ website/trunk/docs/en/faq.wml 2011-09-29 00:11:12 UTC (rev 25138) @@ -739,7 +739,8 @@ <hr> <a id="TBBFlash"></a> -<h3><a class="anchor" href="#TBBFlash">Why doesn't Flash work?</a></h3> +<h3><a class="anchor" href="#TBBFlash">I can't view videos on YouTube +and other Flash-based sites. Why?</a></h3> <p> <a href="https://www.torproject.org/torbutton/torbutton-faq.html.en#noflash">Answer</a> @@ -754,7 +755,7 @@ <p> We build Firefox from source in order to include our <a href="https://gitweb.torproject.org/torbrowser.git/tree/maint-2.2:/src/current-pa…">Firefox -privacy fixes</>. The default Firefox build process calls the resulting +privacy fixes</a>. The default Firefox build process calls the resulting browser "Aurora". </p>

1 0

[torbrowser/maint-2.2] add build options to make vidalia use DEP/ASLR on windows
by erinn＠torproject.org 28 Sep '11

28 Sep '11

commit 689b151a56a5ba4e547dc8d168142078ce40248e Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Sep 29 00:41:55 2011 +0100 add build options to make vidalia use DEP/ASLR on windows --- 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 09299a2..741887c 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -82,7 +82,7 @@ build-openssl: cd $(OPENSSL_DIR) && make install VIDALIA_DIR=$(FETCH_DIR)/vidalia-$(VIDALIA_VER) -VIDALIA_OPTS=-DCMAKE_EXE_LINKER_FLAGS="-static-libstdc++" -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_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) build-vidalia: -mkdir $(VIDALIA_DIR)/build cd $(VIDALIA_DIR)/build && cmake -G "MSYS Makefiles" $(VIDALIA_OPTS) ..

1 0

r25137: {website} put up my partial "why aurora" faq answer (website/trunk/docs/en)
by Roger Dingledine 28 Sep '11

28 Sep '11

Author: arma Date: 2011-09-28 23:38:14 +0000 (Wed, 28 Sep 2011) New Revision: 25137 Modified: website/trunk/docs/en/faq.wml Log: put up my partial "why aurora" faq answer Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2011-09-28 23:37:38 UTC (rev 25136) +++ website/trunk/docs/en/faq.wml 2011-09-28 23:38:14 UTC (rev 25137) @@ -747,6 +747,27 @@ <hr> +<a id="TBBBrowserName"></a> +<h3><a class="anchor" href="#TBBBrowserName">Why does TBB's browser window +say Aurora?</a></h3> + +<p> +We build Firefox from source in order to include our <a +href="https://gitweb.torproject.org/torbrowser.git/tree/maint-2.2:/src/current-pa…">Firefox +privacy fixes</>. The default Firefox build process calls the resulting +browser "Aurora". +</p> + +<p> +Don't be confused into thinking the browser you +see is the same as the Firefox pre-releases that +were also named Aurora. A future TBB release will <a +href="https://trac.torproject.org/projects/tor/ticket/2176">probably</a> +have a more recognizable name like "Tor Browser". +</p> + +<hr> + <a id="TBBSocksPort"></a> <h3><a class="anchor" href="#TBBSocksPort">I'm on OSX or Linux and I want to run another application through the Tor launched by Tor

1 0

r25136: {website} 0.2.3.5-alpha tarballs are up (in website/trunk: . include)
by Roger Dingledine 28 Sep '11

28 Sep '11

Author: arma Date: 2011-09-28 23:37:38 +0000 (Wed, 28 Sep 2011) New Revision: 25136 Modified: website/trunk/Makefile website/trunk/include/versions.wmi Log: 0.2.3.5-alpha tarballs are up Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-09-28 21:23:37 UTC (rev 25135) +++ website/trunk/Makefile 2011-09-28 23:37:38 UTC (rev 25136) @@ -12,7 +12,7 @@ export TORGIT=/home/runa/tordev/tor/.git export STABLETAG=tor-0.2.2.33 -export DEVTAG=tor-0.2.3.4-alpha +export DEVTAG=tor-0.2.3.5-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-09-28 21:23:37 UTC (rev 25135) +++ website/trunk/include/versions.wmi 2011-09-28 23:37:38 UTC (rev 25136) @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.2.33</define-tag> -<define-tag version-alpha whitespace=delete>0.2.3.4-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.2.3.5-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.2.33</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.3.4-alpha</define-tag>

1 0

[torbrowser/maint-2.2] bump firefox to 7.0, tor to 0.2.2.33, and downgrade https-everywhere to 1.0.3
by erinn＠torproject.org 28 Sep '11

28 Sep '11

commit 07c4e10d6a6240aa79a9c70767839a98caea8498 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Sep 29 00:07:49 2011 +0100 bump firefox to 7.0, tor to 0.2.2.33, and downgrade https-everywhere to 1.0.3 --- build-scripts/versions.mk | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 1e36e0f..c44c3b5 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -2,17 +2,16 @@ RELEASE_VER=2.2.32 -HTTPSEVERY_VER=1.0.0development.5 -FIREFOX_VER=6.0.2 +HTTPSEVERY_VER=1.0.3 +FIREFOX_VER=7.0 LIBEVENT_VER=2.0.14-stable LIBPNG_VER=1.4.8 NOSCRIPT_VER=2.1.2.7 OPENSSL_VER=1.0.0d OTR_VER=3.2.0 PIDGIN_VER=2.6.4 -POLIPO_VER=1.0.4.1 QT_VER=4.6.2 -TOR_VER=0.2.2.32 +TOR_VER=0.2.2.33 TORBUTTON_VER=1.4.3 VIDALIA_VER=0.2.14 ZLIB_VER=1.4.0

1 0

[torflow/master] 4101 - 'address_to_context' is not defined
by mikeperry＠torproject.org 28 Sep '11

28 Sep '11

commit 81b6ef6be8a6e685770b2d0e5daf8b64f7e690e5 Author: aagbsn <aagbsn(a)extc.org> Date: Tue Sep 27 00:51:38 2011 -0700 4101 - 'address_to_context' is not defined missing 'self' --- NetworkScanners/ExitAuthority/soat.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NetworkScanners/ExitAuthority/soat.py b/NetworkScanners/ExitAuthority/soat.py index be0dde0..19a820e 100755 --- a/NetworkScanners/ExitAuthority/soat.py +++ b/NetworkScanners/ExitAuthority/soat.py @@ -1322,7 +1322,7 @@ class BaseHTTPTest(Test): result = HttpTestResult(self.node_map[exit_node[1:]], address, TEST_FAILURE, FAILURE_EXITONLY, sha1sum_new.hexdigest(), psha1sum.hexdigest(), - address_to_context(address)+".content") + self.address_to_context(address)+".content") retval = self.register_exit_failure(result) else: @@ -1334,7 +1334,7 @@ class BaseHTTPTest(Test): result = HttpTestResult(self.node_map[exit_node[1:]], address, TEST_INCONCLUSIVE, INCONCLUSIVE_DYNAMIC, sha1sum_new.hexdigest(), psha1sum.hexdigest(), - address_to_context(address)+".content") + self.address_to_context(address)+".content") retval = self.register_inconclusive(result) elif result == COMPARE_EQUAL:

1 0

[torflow/master] 4080 sha1sum not defined
by mikeperry＠torproject.org 28 Sep '11

28 Sep '11

commit de846d719a69756c8993be7f1c279dde6a81776a Author: aagbsn <aagbsn(a)extc.org> Date: Thu Sep 22 02:23:13 2011 -0700 4080 sha1sum not defined This fix corrects 2 references to an undefined variable sha1sum: fix for missing sha1sum #1 just uses the sha() of the content from the new request because compare() already declares the content equal: if req.content == new_req.content: assert(sha(req.content) == sha(new_req.content)) fix for missing sha1sum #2 is to load the original content (from disk) and compute sha(). I added a helper function load_original_sha1sum() for clarity. --- NetworkScanners/ExitAuthority/soat.py | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/NetworkScanners/ExitAuthority/soat.py b/NetworkScanners/ExitAuthority/soat.py index 7688be1..be0dde0 100755 --- a/NetworkScanners/ExitAuthority/soat.py +++ b/NetworkScanners/ExitAuthority/soat.py @@ -1303,6 +1303,7 @@ class BaseHTTPTest(Test): if result == COMPARE_NOEQUAL: # Reload direct content and try again new_req = http_request(address, my_cookie_jar, self.headers) + sha1sum_new = sha(new_req.content) # If a new direct load somehow fails, then we're out of luck if not (200 <= new_req.code < 300): @@ -1320,7 +1321,7 @@ class BaseHTTPTest(Test): # The content has not actually changed, so our exit node is screwing with us. result = HttpTestResult(self.node_map[exit_node[1:]], address, TEST_FAILURE, FAILURE_EXITONLY, - sha1sum.hexdigest(), psha1sum.hexdigest(), + sha1sum_new.hexdigest(), psha1sum.hexdigest(), address_to_context(address)+".content") retval = self.register_exit_failure(result) @@ -1342,6 +1343,7 @@ class BaseHTTPTest(Test): retval = self.register_success(result) elif result == COMPARE_TRUNCATION: + sha1sum = self.load_original_sha1sum(address) result = HttpTestResult(self.node_map[exit_node[1:]], address, TEST_FAILURE, FAILURE_EXITTRUNCATION, sha1sum.hexdigest(), psha1sum.hexdigest(), @@ -1453,6 +1455,13 @@ class BaseHTTPTest(Test): else: return COMPARE_NOEQUAL + def load_original_sha1sum(self, address): + context = self.address_to_context(address) + f = open(context + '.content') + old_content = f.read() + f.close() + return sha(old_content) + # TODO move these somewhere sensible def mime_to_filetype(mime_type): return mimetypes.guess_extension(mime_type)[1:]

1 0

[torflow/master] 4102 - address_to_failed_prefix is not defined
by mikeperry＠torproject.org 28 Sep '11

28 Sep '11

commit 46956cc9778b33c69b8ea4f427f27307fd8e742b Author: aagbsn <aagbsn(a)extc.org> Date: Tue Sep 27 10:53:05 2011 -0700 4102 - address_to_failed_prefix is not defined fixed missing 'self'; also corrected a reference-before-assignment --- NetworkScanners/ExitAuthority/soat.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NetworkScanners/ExitAuthority/soat.py b/NetworkScanners/ExitAuthority/soat.py index 19a820e..8e7b8a7 100755 --- a/NetworkScanners/ExitAuthority/soat.py +++ b/NetworkScanners/ExitAuthority/soat.py @@ -1348,12 +1348,12 @@ class BaseHTTPTest(Test): address, TEST_FAILURE, FAILURE_EXITTRUNCATION, sha1sum.hexdigest(), psha1sum.hexdigest(), content_prefix+".content", - exit_content_file) + self.address_to_failed_prefix(address)+'.'+exit_node[1:]+'.content') retval = self.register_exit_failure(result) # If we failed, then store what the exit node handed us if retval == TEST_FAILURE: - exit_content_file = open(address_to_failed_prefix(address)+'.'+exit_node[1:]+'.content', 'w') + exit_content_file = open(self.address_to_failed_prefix(address)+'.'+exit_node[1:]+'.content', 'w') exit_content_file.write(preq.contet) exit_content_file.close()

1 0