tor-commits October 2013

tor-commits@lists.torproject.org

17 participants
1284 discussions

[tor-browser-bundle/master] Bump versions and URLs for TBB 3.0beta1.
by mikeperry＠torproject.org 14 Oct '13

14 Oct '13

commit 019c4c308d612f680fe98ba11ec452b788dd5e10 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 11 17:28:11 2013 -0700 Bump versions and URLs for TBB 3.0beta1. --- gitian/fetch-inputs.sh | 4 ++-- gitian/versions | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index cce3331..2d345ce 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -156,8 +156,8 @@ do done cd .. -# Noscript and PDF.JS are magikal and special: -wget -N https://addons.mozilla.org/firefox/downloads/file/224880/${NOSCRIPT_PACKAGE} +# NoScript and PDF.JS are magikal and special: +wget -N ${NOSCRIPT_URL} wget -N https://addons.mozilla.org/firefox/downloads/file/201180/${PDFJS_PACKAGE} # So is mingw: diff --git a/gitian/versions b/gitian/versions index 8f3585e..731fb7c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,13 +1,13 @@ -TORBROWSER_VERSION=3.0-alpha-4 +TORBROWSER_VERSION=3.0-beta-1 BUNDLE_LOCALES="de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-17.0.9esr-3.0alpha4-build2 +TORBROWSER_TAG=tor-browser-17.0.9esr-3.0beta1-build1 TOR_TAG=tor-0.2.4.17-rc TORLAUNCHER_TAG=0.2.3-alpha -TORBUTTON_TAG=1.6.2.1 -HTTPSE_TAG=3.3.1 +TORBUTTON_TAG=1.6.3 +HTTPSE_TAG=3.4.2 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -22,7 +22,7 @@ GCC_VER=4.6.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.7.1-sm+fn+fx.xpk +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.2-fx+fn+sm.xpi PDFJS_PACKAGE=pdf_viewer-0.8.1-sm+fx+an.xpi TOOLCHAIN4_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -31,17 +31,19 @@ MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 -# Hashes for things with weak sigs or no sigs +# Hashes for packages with weak sigs or no sigs OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=e9ee8f45b0b025236c5e04e270edeb05de6ed8a73822c74d7122a2ade3d25f33 +NOSCRIPT_HASH=52b309f2e5ca1bee4d0f97cbb342fdac3be6a447c35f744a90348df55eea635f PDFJS_HASH=2e3e6811f5294b24aafeba44e8206ddc81fb15e5934e5166a2c7df3a4405020b MINGW_HASH=457f11d29f6e95425d190711a73955fa54a98a2113ce2c2bfd76291be71e3e2b MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 +## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} TOOLCHAIN4_URL=https://mingw-and-ndk.googlecode.com/files/${TOOLCHAIN4_PACK… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} +NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NOSCRIPT_PACKAGE}

1 0

[tor-browser-bundle/master] For some reason, Firefox wants an empty Caches directory alongside the profile dir.
by mikeperry＠torproject.org 14 Oct '13

14 Oct '13

commit 956bd6d3bb7f2e80a681e0c42f0a71865d427b1b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Oct 11 17:27:33 2013 -0700 For some reason, Firefox wants an empty Caches directory alongside the profile dir. --- gitian/descriptors/linux/gitian-bundle.yml | 1 + gitian/descriptors/mac/gitian-bundle.yml | 1 + gitian/descriptors/windows/gitian-bundle.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 115eb6f..1728358 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -49,6 +49,7 @@ script: | umask 0022 # mkdir -p $OUTDIR/ + mkdir -p tor-browser/Data/Browser/Caches mkdir -p tor-browser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org mkdir -p tor-browser/Docs/sources/ # diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index a4d5835..85df0e7 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -45,6 +45,7 @@ script: | # mkdir -p $OUTDIR/ mkdir -p TorBrowserBundle.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org + mkdir -p TorBrowserBundle.app/Data/Browser/Caches mkdir -p TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ mkdir -p TorBrowserBundle.app/Docs/sources # diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 0af203f..abe4549 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -47,6 +47,7 @@ script: | # mkdir -p $OUTDIR/ mkdir -p tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org + mkdir -p tbb-windows-installer/"Tor Browser"/Data/Browser/Caches mkdir -p tbb-windows-installer/"Tor Browser"/Docs/sources # cd tor-launcher

1 0

[tor/master] Merge remote-tracking branch 'asn/bug9651'
by nickm＠torproject.org 14 Oct '13

14 Oct '13

commit 7f2415683a86dcd72270b75c467a6ddc5649a7a8 Merge: a26a579 43b9b51 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 14 11:43:33 2013 -0400 Merge remote-tracking branch 'asn/bug9651' src/or/config.c | 11 +++++++++++ 1 file changed, 11 insertions(+)

1 0

[tor/master] changes file for bug9651
by nickm＠torproject.org 14 Oct '13

14 Oct '13

commit 1129362bd7208413d93f7f8e1b4317883a5c7910 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 14 11:44:20 2013 -0400 changes file for bug9651 --- changes/bug9651 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug9651 b/changes/bug9651 new file mode 100644 index 0000000..453fe9a --- /dev/null +++ b/changes/bug9651 @@ -0,0 +1,3 @@ + o Minor features: + - Warn when the Extended ORPort should be set, but it isn't. Resolves + ticket 9651.

1 0

[tor/master] Warn when the Extended ORPort should be on but it's not.
by nickm＠torproject.org 14 Oct '13

14 Oct '13

commit 43b9b5138999f0b8619cc7f90c1b09c1b9aac42c Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Sep 24 12:30:25 2013 +0100 Warn when the Extended ORPort should be on but it's not. --- src/or/config.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/or/config.c b/src/or/config.c index 37b42e8..8f5e544 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3176,6 +3176,17 @@ options_validate(or_options_t *old_options, or_options_t *options, smartlist_free(options_sl); } + /* If we are a bridge with a pluggable transport proxy but no + Extended ORPort, inform the user that she is missing out. */ + if (server_mode(options) && options->ServerTransportPlugin && + !options->ExtORPort_lines) { + log_notice(LD_CONFIG, "We are a bridge with a pluggable transport " + "proxy but the Extended ORPort is disabled. The " + "Extended ORPort helps Tor communicate with the pluggable " + "transport proxy. Please enable it using the ExtORPort " + "torrc option."); + } + if (options->ConstrainedSockets) { /* If the user wants to constrain socket buffer use, make sure the desired * limit is between MIN|MAX_TCPSOCK_BUFFER in k increments. */

1 0

[doctor/master] Dropping Tonga from checks
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit 30a40e7014aea5c32658bc2f31bf1f53721c9af1 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 14 08:34:55 2013 -0700 Dropping Tonga from checks We were downloading Tonga's consensus but not its vote so it would be included in checks for the former but not later. Up side is that this checked that Tonga was up and healthy (still important since it's an authority, even it it doesn't vote). But this is already covered by 'descriptor_checker.py'. This is in response to... https://lists.torproject.org/pipermail/tor-dev/2013-October/005618.html --- consensus_health_checker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index 02149da..8a3a9c9 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -575,7 +575,7 @@ def _get_documents(label, resource): queries, documents, issues = {}, {}, [] for authority in DIRECTORY_AUTHORITIES.values(): - if label == 'vote' and authority.v3ident is None: + if authority.v3ident is None: continue # not a voting authority queries[authority.nickname] = downloader.query(

1 0

[doctor/master] Skipping initial vote download for non-voting authorities
by atagar＠torproject.org 14 Oct '13

14 Oct '13

commit 1bfbc46b72848adf1bc8c11822bf2a047d9f3f90 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Oct 14 08:21:45 2013 -0700 Skipping initial vote download for non-voting authorities Huh. Code around this was a little odd, we were trying to download votes from non-voting authorities once then short circuiting on the retry. Perfectly fine, just a little odd. --- consensus_health_checker.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index 734c5ea..02149da 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -575,6 +575,9 @@ def _get_documents(label, resource): queries, documents, issues = {}, {}, [] for authority in DIRECTORY_AUTHORITIES.values(): + if label == 'vote' and authority.v3ident is None: + continue # not a voting authority + queries[authority.nickname] = downloader.query( resource, endpoints = [(authority.address, authority.dir_port)], @@ -585,14 +588,11 @@ def _get_documents(label, resource): try: documents[authority] = query.run()[0] except Exception, exc: - if label == 'vote' and authority in DIRECTORY_AUTHORITIES: + if label == 'vote': # try to download the vote via the other authorities v3ident = DIRECTORY_AUTHORITIES[authority].v3ident - if v3ident is None: - continue # not a voting authority - query = downloader.query( '/tor/status-vote/current/%s' % v3ident, default_params = False,

1 0

[onionoo/master] Fix index.html display bug in Opera.
by karsten＠torproject.org 14 Oct '13

14 Oct '13

commit 7eadc13776c9f6b9ae563796b3d0fa8b7fce6e80 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Oct 14 11:34:02 2013 +0200 Fix index.html display bug in Opera. rndm says: "There was a bug in the opera browser that misplaced the "returns a x" on each request method. I changed the css from "float:right" to a "position: absolute; right: 0" that does the same. It now looks the same on firefox, chromium and opera." Thanks, rndm! --- web/index.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/index.html b/web/index.html index 6899c53..d70a112 100644 --- a/web/index.html +++ b/web/index.html @@ -7,7 +7,7 @@ body { font-family: "Open Sans","lucida grande","Segoe UI",arial,verdana, "lucida sans unicode",tahoma,sans-serif; background: #fafafa; font-size: 13px; line-height: 22px; color: #222; } h1 { font-size: 20px; font-weight: normal; text-align: center; } -h3 { color: #7D4698; } +h3 { color: #7D4698; position: relative } a { color: #7D4698; text-decoration: none; font-weight: bold; } ul { list-style: none; padding: 0; margin: 0; } p { margin: 0; padding: 0; } @@ -17,12 +17,13 @@ a[name] { padding: 0; margin: 0; } .box > * { margin-left: 30px; margin-right: 30px; } .box h3 a { visibility: hidden; } .box:hover h3 a { visibility: visible; } -.api-request { border-bottom: 1px solid #eee; } +.api-request { border-bottom: 1px solid #eee; position: relative } .request-url, .request-type, .request-response { padding: 8px 10px; vertical-align: middle } .request-type { color: #57145F; display: inline-block; } .request-url { color: #333; font-size: 18px; } -.request-response { float: right; color: #666; } +.request-response { position: absolute; color: #666; right: 0; } +h3 .request-response { padding: 0 !important; } .api-urls>li:last-child { border-bottom: 0; } .required-true, .required-false, .typeof { display: inline-block; vertical-align: middle; padding: 5px 10px; }

1 0

[flashproxy/master] Move the modules directory into the proxy directory.
by dcf＠torproject.org 14 Oct '13

14 Oct '13

commit 3f85bb0ed83ec34505be1b0fca5b3f8307d9dec4 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 13 19:02:44 2013 -0700 Move the modules directory into the proxy directory. Taken from https://github.com/infinity0/flashproxy/commit/4819df2aa1f45eec0fd5e676abcb…, except moved to proxy/modules rather than proxy-modules, as was originally suggested at https://trac.torproject.org/projects/tor/ticket/9668. --- .gitignore | 4 ++-- modules/README | 8 -------- modules/drupal/flashproxy-start.js | 1 - modules/drupal/flashproxy.info | 5 ----- modules/drupal/flashproxy.js | 1 - modules/drupal/flashproxy.module | 2 -- modules/facebook/facebook.html | 17 ----------------- modules/mediawiki/custom.js | 9 --------- modules/nodejs/Makefile | 4 ---- modules/nodejs/README | 28 ---------------------------- modules/nodejs/main.js | 30 ------------------------------ modules/nodejs/package.json | 30 ------------------------------ proxy/modules/README | 8 ++++++++ proxy/modules/drupal/flashproxy-start.js | 1 + proxy/modules/drupal/flashproxy.info | 5 +++++ proxy/modules/drupal/flashproxy.js | 1 + proxy/modules/drupal/flashproxy.module | 2 ++ proxy/modules/facebook/facebook.html | 17 +++++++++++++++++ proxy/modules/mediawiki/custom.js | 9 +++++++++ proxy/modules/nodejs/Makefile | 4 ++++ proxy/modules/nodejs/README | 28 ++++++++++++++++++++++++++++ proxy/modules/nodejs/main.js | 30 ++++++++++++++++++++++++++++++ proxy/modules/nodejs/package.json | 30 ++++++++++++++++++++++++++++++ 23 files changed, 137 insertions(+), 137 deletions(-) diff --git a/.gitignore b/.gitignore index c3e5b7f..0e9120d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ *.pyc /dist /py2exe-tmp -/modules/nodejs/node_modules -/modules/nodejs/flashproxy.js +/proxy/modules/nodejs/node_modules +/proxy/modules/nodejs/flashproxy.js diff --git a/modules/README b/modules/README deleted file mode 100644 index 520a47b..0000000 --- a/modules/README +++ /dev/null @@ -1,8 +0,0 @@ -This directory contains modules and plugins for making flash proxies -work with other systems such as web publishing platforms. - -See a collection of modules for other platforms at -https://github.com/glamrock/cupcake. - -For a plugin for Mozilla Firefox, see -https://addons.mozilla.org/en-us/firefox/addon/tor-flashproxy-badge/. diff --git a/modules/drupal/flashproxy-start.js b/modules/drupal/flashproxy-start.js deleted file mode 100644 index fe7d10b..0000000 --- a/modules/drupal/flashproxy-start.js +++ /dev/null @@ -1 +0,0 @@ -flashproxy_badge_insert().start(); diff --git a/modules/drupal/flashproxy.info b/modules/drupal/flashproxy.info deleted file mode 100644 index 2f9b174..0000000 --- a/modules/drupal/flashproxy.info +++ /dev/null @@ -1,5 +0,0 @@ -name = Flashproxy Module -description = Insert Flashproxy js into some or all pages on your site. -core = 7.x -scripts[] = flashproxy.js -scripts[] = flashproxy-start.js diff --git a/modules/drupal/flashproxy.js b/modules/drupal/flashproxy.js deleted file mode 120000 index 710e470..0000000 --- a/modules/drupal/flashproxy.js +++ /dev/null @@ -1 +0,0 @@ -../../proxy/flashproxy.js \ No newline at end of file diff --git a/modules/drupal/flashproxy.module b/modules/drupal/flashproxy.module deleted file mode 100644 index a4abe2d..0000000 --- a/modules/drupal/flashproxy.module +++ /dev/null @@ -1,2 +0,0 @@ -<?php - diff --git a/modules/facebook/facebook.html b/modules/facebook/facebook.html deleted file mode 100644 index 8321dbc..0000000 --- a/modules/facebook/facebook.html +++ /dev/null @@ -1,17 +0,0 @@ -<!DOCTYPE html> -<html> -<head> -<meta charset="utf-8"> -<title>flash proxy facebook app demo</title> -<style type="text/css"> -iframe { - display: block; - padding: 5%; - border: none; -} -</style> -</head> -<body> -<iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="80" height="15" frameborder="0" scrolling="no"></iframe> -</body> -</html> diff --git a/modules/mediawiki/custom.js b/modules/mediawiki/custom.js deleted file mode 100644 index 4b882c6..0000000 --- a/modules/mediawiki/custom.js +++ /dev/null @@ -1,9 +0,0 @@ -/* Flash proxy badge for MediaWiki. By Sathyanarayanan Gunasekaran. - Requires $wgAllowUserJs to be true in the MediaWiki configuration. - https://www.mediawiki.org/wiki/Manual:Interface/JavaScript - This affects only your own user. Works on Wikipedia. - - Go to Preferences → Appearance → Custom JavaScript. - You will end up editing common.js; paste in this code and save it. */ - -$('#p-personal ul').append('<li><iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="80" height="15" frameborder="0" scrolling="no"></iframe></li>'); diff --git a/modules/nodejs/Makefile b/modules/nodejs/Makefile deleted file mode 100644 index e4a11d4..0000000 --- a/modules/nodejs/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -.PHONY: prepublish -prepublish: flashproxy.js -flashproxy.js: ../../proxy/flashproxy.js - cp -f $< $@ diff --git a/modules/nodejs/README b/modules/nodejs/README deleted file mode 100644 index 57d0ddf..0000000 --- a/modules/nodejs/README +++ /dev/null @@ -1,28 +0,0 @@ -== Headless flash proxies with node.js - -Traditionally, flash proxies have run in the browser. However, it may be -desirable to run them as background daemons. This directory contains a main.js -file which wraps the regular flashproxy.js and runs headlessly from node.js. - -To install the requirements (in Ubuntu universe), - - > apt-get install git nodejs npm - -Then, if you've checked out the flashproxy source from git, - - > git clone https://git.torproject.org/flashproxy.git - > cd flashproxy/modules/nodejs - > npm install - > npm start # or, node main.js - -This package is also being published on the npm registry. To add a `flashproxy` -bin to your path without checking out from git, at any time run, - - > npm install -g flashproxy - > flashproxy - -Rather than install globally, you can also, - - > cd ~/ # or, to the dir of your choice - > npm install flashproxy - > npm start flashproxy # or, node node_modules/flashproxy diff --git a/modules/nodejs/main.js b/modules/nodejs/main.js deleted file mode 100755 index 64e50b9..0000000 --- a/modules/nodejs/main.js +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env node - -var path = require("path"); -var fs = require("fs"); - -// Get a querystring from the command line -var location_search = "debug=1&initial_facilitator_poll_interval=10"; -if (process.argv[2] != null) - location_search = process.argv[2]; - -// Setup environment variables for node.js -var XMLHttpRequest = require("xmlhttprequest").XMLHttpRequest; -var window = { - location: { search: "?" + location_search }, - navigator: { userAgent: "Chrome/16" }, - WebSocket: require("ws") -}; - -// Include flashproxy.js using eval to avoid modifying it. -var file = path.join(__dirname, "flashproxy.js"); -try { - var data = fs.readFileSync(file, "utf8"); -} catch (e) { - console.log("Can't locate the flashproxy.js file. You probably need to run \"npm install\"."); - process.exit(1); -} -eval(data); - -// Start 'er up -flashproxy_badge_new().start(); diff --git a/modules/nodejs/package.json b/modules/nodejs/package.json deleted file mode 100644 index 1de1157..0000000 --- a/modules/nodejs/package.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "flashproxy", - "version": "0.1.0", - "description": "Standalone flash proxy. A flash proxy is a lightweight proxy providing access to the Tor network.", - "main": "main.js", - "scripts": { - "prepublish": "make prepublish", - "start": "node main.js" - }, - "bin": { - "flashproxy": "main.js" - }, - "dependencies": { - "xmlhttprequest": "1.5.0", - "ws": "0.4.27" - }, - "repository": { - "type": "git", - "url": "https://git.torproject.org/flashproxy.git" - }, - "keywords": [ - "flashproxy", - "tor", - "bridge", - "relay", - "websocket", - "pluggable transport" - ], - "license": "MIT" -} diff --git a/proxy/modules/README b/proxy/modules/README new file mode 100644 index 0000000..520a47b --- /dev/null +++ b/proxy/modules/README @@ -0,0 +1,8 @@ +This directory contains modules and plugins for making flash proxies +work with other systems such as web publishing platforms. + +See a collection of modules for other platforms at +https://github.com/glamrock/cupcake. + +For a plugin for Mozilla Firefox, see +https://addons.mozilla.org/en-us/firefox/addon/tor-flashproxy-badge/. diff --git a/proxy/modules/drupal/flashproxy-start.js b/proxy/modules/drupal/flashproxy-start.js new file mode 100644 index 0000000..fe7d10b --- /dev/null +++ b/proxy/modules/drupal/flashproxy-start.js @@ -0,0 +1 @@ +flashproxy_badge_insert().start(); diff --git a/proxy/modules/drupal/flashproxy.info b/proxy/modules/drupal/flashproxy.info new file mode 100644 index 0000000..2f9b174 --- /dev/null +++ b/proxy/modules/drupal/flashproxy.info @@ -0,0 +1,5 @@ +name = Flashproxy Module +description = Insert Flashproxy js into some or all pages on your site. +core = 7.x +scripts[] = flashproxy.js +scripts[] = flashproxy-start.js diff --git a/proxy/modules/drupal/flashproxy.js b/proxy/modules/drupal/flashproxy.js new file mode 120000 index 0000000..710e470 --- /dev/null +++ b/proxy/modules/drupal/flashproxy.js @@ -0,0 +1 @@ +../../proxy/flashproxy.js \ No newline at end of file diff --git a/proxy/modules/drupal/flashproxy.module b/proxy/modules/drupal/flashproxy.module new file mode 100644 index 0000000..a4abe2d --- /dev/null +++ b/proxy/modules/drupal/flashproxy.module @@ -0,0 +1,2 @@ +<?php + diff --git a/proxy/modules/facebook/facebook.html b/proxy/modules/facebook/facebook.html new file mode 100644 index 0000000..8321dbc --- /dev/null +++ b/proxy/modules/facebook/facebook.html @@ -0,0 +1,17 @@ +<!DOCTYPE html> +<html> +<head> +<meta charset="utf-8"> +<title>flash proxy facebook app demo</title> +<style type="text/css"> +iframe { + display: block; + padding: 5%; + border: none; +} +</style> +</head> +<body> +<iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="80" height="15" frameborder="0" scrolling="no"></iframe> +</body> +</html> diff --git a/proxy/modules/mediawiki/custom.js b/proxy/modules/mediawiki/custom.js new file mode 100644 index 0000000..4b882c6 --- /dev/null +++ b/proxy/modules/mediawiki/custom.js @@ -0,0 +1,9 @@ +/* Flash proxy badge for MediaWiki. By Sathyanarayanan Gunasekaran. + Requires $wgAllowUserJs to be true in the MediaWiki configuration. + https://www.mediawiki.org/wiki/Manual:Interface/JavaScript + This affects only your own user. Works on Wikipedia. + + Go to Preferences → Appearance → Custom JavaScript. + You will end up editing common.js; paste in this code and save it. */ + +$('#p-personal ul').append('<li><iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="80" height="15" frameborder="0" scrolling="no"></iframe></li>'); diff --git a/proxy/modules/nodejs/Makefile b/proxy/modules/nodejs/Makefile new file mode 100644 index 0000000..e4a11d4 --- /dev/null +++ b/proxy/modules/nodejs/Makefile @@ -0,0 +1,4 @@ +.PHONY: prepublish +prepublish: flashproxy.js +flashproxy.js: ../../proxy/flashproxy.js + cp -f $< $@ diff --git a/proxy/modules/nodejs/README b/proxy/modules/nodejs/README new file mode 100644 index 0000000..57d0ddf --- /dev/null +++ b/proxy/modules/nodejs/README @@ -0,0 +1,28 @@ +== Headless flash proxies with node.js + +Traditionally, flash proxies have run in the browser. However, it may be +desirable to run them as background daemons. This directory contains a main.js +file which wraps the regular flashproxy.js and runs headlessly from node.js. + +To install the requirements (in Ubuntu universe), + + > apt-get install git nodejs npm + +Then, if you've checked out the flashproxy source from git, + + > git clone https://git.torproject.org/flashproxy.git + > cd flashproxy/modules/nodejs + > npm install + > npm start # or, node main.js + +This package is also being published on the npm registry. To add a `flashproxy` +bin to your path without checking out from git, at any time run, + + > npm install -g flashproxy + > flashproxy + +Rather than install globally, you can also, + + > cd ~/ # or, to the dir of your choice + > npm install flashproxy + > npm start flashproxy # or, node node_modules/flashproxy diff --git a/proxy/modules/nodejs/main.js b/proxy/modules/nodejs/main.js new file mode 100755 index 0000000..64e50b9 --- /dev/null +++ b/proxy/modules/nodejs/main.js @@ -0,0 +1,30 @@ +#!/usr/bin/env node + +var path = require("path"); +var fs = require("fs"); + +// Get a querystring from the command line +var location_search = "debug=1&initial_facilitator_poll_interval=10"; +if (process.argv[2] != null) + location_search = process.argv[2]; + +// Setup environment variables for node.js +var XMLHttpRequest = require("xmlhttprequest").XMLHttpRequest; +var window = { + location: { search: "?" + location_search }, + navigator: { userAgent: "Chrome/16" }, + WebSocket: require("ws") +}; + +// Include flashproxy.js using eval to avoid modifying it. +var file = path.join(__dirname, "flashproxy.js"); +try { + var data = fs.readFileSync(file, "utf8"); +} catch (e) { + console.log("Can't locate the flashproxy.js file. You probably need to run \"npm install\"."); + process.exit(1); +} +eval(data); + +// Start 'er up +flashproxy_badge_new().start(); diff --git a/proxy/modules/nodejs/package.json b/proxy/modules/nodejs/package.json new file mode 100644 index 0000000..1de1157 --- /dev/null +++ b/proxy/modules/nodejs/package.json @@ -0,0 +1,30 @@ +{ + "name": "flashproxy", + "version": "0.1.0", + "description": "Standalone flash proxy. A flash proxy is a lightweight proxy providing access to the Tor network.", + "main": "main.js", + "scripts": { + "prepublish": "make prepublish", + "start": "node main.js" + }, + "bin": { + "flashproxy": "main.js" + }, + "dependencies": { + "xmlhttprequest": "1.5.0", + "ws": "0.4.27" + }, + "repository": { + "type": "git", + "url": "https://git.torproject.org/flashproxy.git" + }, + "keywords": [ + "flashproxy", + "tor", + "bridge", + "relay", + "websocket", + "pluggable transport" + ], + "license": "MIT" +}

1 0

[flashproxy/master] ChangeLog for source code rearrangement.
by dcf＠torproject.org 14 Oct '13

14 Oct '13

commit fafc26a63f419326e09aca4d4f4804e7bc75c18d Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 13 19:13:51 2013 -0700 ChangeLog for source code rearrangement. --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8707b89..1b41ad9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,11 @@ particular protocol flash proxies should use to connect to you, and is distinct from the transport method name used by Tor. + o Rearranged some files in the source tree. Facilitator documentation + is now under facilitator/doc. The App Engine source code is under + facilitator/appengine. The directory containing other ways to use + the proxy moved from modules to proxy/modules. Patch by Ximin Luo. + Changes in version 1.3 o Added a new observed Google public key pin.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2013