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

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 20 Nov '13

20 Nov '13

commit ed6dea933accc39e16284d530233aa01b087d54f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 20 16:15:52 2013 +0000 Update translations for torcheck_completed --- gl/torcheck.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gl/torcheck.po b/gl/torcheck.po index 22dbed6..e81689d 100644 --- a/gl/torcheck.po +++ b/gl/torcheck.po @@ -2,13 +2,14 @@ # Copyright (C) 2008-2012 The Tor Project, Inc # # Translators: +# manuel meixide <m.meixide(a)gmail.com>, 2013 # mbouzada <mbouzada(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-11-06 09:10+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-11-20 16:10+0000\n" +"Last-Translator: manuel meixide <m.meixide(a)gmail.com>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/torproject/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,21 +19,21 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Congratulations. Your browser is configured to use Tor." -msgstr "Parabéns. O seu navegador está configurado para empregar Tor." +msgstr "Parabéns. O navegador está configurado para empregar Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Vaia ao <a href=\"https://www.torproject.org/\">sitio de Tor</a> para obter máis información sobre o uso seguro de Tor. Agora é libre para navegar por Internet de forma anónima." +msgstr "Visite o <a href=\"https://www.torproject.org/\">sitio de Tor</a> para obter máis información sobre o uso seguro de Tor. Agora é libre para navegar por Internet de forma anónima." msgid "There is a security update available for the Tor Browser Bundle." -msgstr "Hai unha actualización de seguranza dispoñíbel para Tor Browser Bundle." +msgstr "Hai unha actualización de seguranza dispoñíbel para o Tor Browser Bundle." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Premac aquí para ir á páxina de descargas</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Prema aquí para ir á páxina de descargas</a>" msgid "Sorry. You are not using Tor." msgstr "Sentímolo. Non está usando o Tor" @@ -45,7 +46,7 @@ msgid "" msgstr "Se tenta empregar un cliente Tor, vaia ao <a href=\"https://www.torproject.org/\">sitio de Tor</a> e máis especificamente as <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instruccións para configurar o cliente de Tor</a>." msgid "Sorry, your query failed or an unexpected response was received." -msgstr "Sentímolo, non foi posíbel facer a súa consulta ou recibiuse unha resposta non agardada." +msgstr "Sentímolo, fallou a súa consulta ou recibiuse unha resposta non agardada." msgid "" "A temporary service outage prevents us from determining if your source IP " @@ -53,4 +54,4 @@ msgid "" msgstr "Unha interrupción temporal do servizo impídenos determinar se o seu enderezo IP de orixe é un nodo <a href=\"https://www.torproject.org/\">Tor</a>." msgid "Your IP address appears to be: " -msgstr "O seu enderezo IP semella estar:" +msgstr "O seu enderezo IP semella ser:"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 20 Nov '13

20 Nov '13

commit 44b0378b5347b5a60f868c457861e2a600d97ec3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 20 16:15:49 2013 +0000 Update translations for torcheck --- gl/torcheck.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gl/torcheck.po b/gl/torcheck.po index 22dbed6..e81689d 100644 --- a/gl/torcheck.po +++ b/gl/torcheck.po @@ -2,13 +2,14 @@ # Copyright (C) 2008-2012 The Tor Project, Inc # # Translators: +# manuel meixide <m.meixide(a)gmail.com>, 2013 # mbouzada <mbouzada(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-11-06 09:10+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-11-20 16:10+0000\n" +"Last-Translator: manuel meixide <m.meixide(a)gmail.com>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/torproject/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,21 +19,21 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "Congratulations. Your browser is configured to use Tor." -msgstr "Parabéns. O seu navegador está configurado para empregar Tor." +msgstr "Parabéns. O navegador está configurado para empregar Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Vaia ao <a href=\"https://www.torproject.org/\">sitio de Tor</a> para obter máis información sobre o uso seguro de Tor. Agora é libre para navegar por Internet de forma anónima." +msgstr "Visite o <a href=\"https://www.torproject.org/\">sitio de Tor</a> para obter máis información sobre o uso seguro de Tor. Agora é libre para navegar por Internet de forma anónima." msgid "There is a security update available for the Tor Browser Bundle." -msgstr "Hai unha actualización de seguranza dispoñíbel para Tor Browser Bundle." +msgstr "Hai unha actualización de seguranza dispoñíbel para o Tor Browser Bundle." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Premac aquí para ir á páxina de descargas</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Prema aquí para ir á páxina de descargas</a>" msgid "Sorry. You are not using Tor." msgstr "Sentímolo. Non está usando o Tor" @@ -45,7 +46,7 @@ msgid "" msgstr "Se tenta empregar un cliente Tor, vaia ao <a href=\"https://www.torproject.org/\">sitio de Tor</a> e máis especificamente as <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instruccións para configurar o cliente de Tor</a>." msgid "Sorry, your query failed or an unexpected response was received." -msgstr "Sentímolo, non foi posíbel facer a súa consulta ou recibiuse unha resposta non agardada." +msgstr "Sentímolo, fallou a súa consulta ou recibiuse unha resposta non agardada." msgid "" "A temporary service outage prevents us from determining if your source IP " @@ -53,4 +54,4 @@ msgid "" msgstr "Unha interrupción temporal do servizo impídenos determinar se o seu enderezo IP de orixe é un nodo <a href=\"https://www.torproject.org/\">Tor</a>." msgid "Your IP address appears to be: " -msgstr "O seu enderezo IP semella estar:" +msgstr "O seu enderezo IP semella ser:"

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 20 Nov '13

20 Nov '13

commit 5ce06b53128809acf277bb5fd151cf83586f3b78 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 20 16:15:08 2013 +0000 Update translations for tsum --- gl/short-user-manual_gl_noimg.xhtml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gl/short-user-manual_gl_noimg.xhtml b/gl/short-user-manual_gl_noimg.xhtml index e5f30ce..708c52c 100644 --- a/gl/short-user-manual_gl_noimg.xhtml +++ b/gl/short-user-manual_gl_noimg.xhtml @@ -4,9 +4,9 @@ <title/> </head> <body> - <h1 id="the-short-user-manual">The Short User Manual</h1> - <p>Este manual para persoas usuarias contén información sobre como descargar Tor, sobre como usalo e sobre que facer se non é posíbel conectar Tor á rede. Se non atopas a resposta á túa pregunta neste documento, envía unha mensaxe de correo electrónico a help(a)rt.torproject.org.</p> - <p>Please note that we are providing support on a voluntary basis, and we get a lot of emails every single day. There is no need to worry if we don't get back to you straight away.</p> + <h1 id="the-short-user-manual">Breve Manual de Usuario</h1> + <p>Este manual contén información sobre como descargar Tor, como usalo e que facer se Tor non se pode conectar á rede. Se non atopa a resposta á súa pregunta neste documento, envíe un correo electrónico a help(a)rt.torproject.org.</p> + <p>Teña en conta que estamos ofrecendo apoio nunha base voluntaria, e temos unha gran cantidade de correos electrónicos todos os días. Non hai necesidade de se preocupar se non lle respondemos de inmediato.</p> <h2 id="how-tor-works">Como funciona Tor</h2> <p>Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet.</p> <p>The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay.</p>

1 0

[tor/master] Whitespace cleanup
by nickm＠torproject.org 20 Nov '13

20 Nov '13

commit 027f4c82ebcbe4555e66948f3ee14950661bc11a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 20 11:05:00 2013 -0500 Whitespace cleanup --- src/test/test_data.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_data.c b/src/test/test_data.c index e1f6f6c..0c51c98 100644 --- a/src/test/test_data.c +++ b/src/test/test_data.c @@ -197,3 +197,4 @@ const char AUTHORITY_SIGNKEY_C[] = "z2gmDjia+QqsU4FmuikCQDDOs85uwNSKJFax9XMzd1qd1QwX20F8lvnOsWErXiDw\n" "Fy2+rmIRHoSxn4D+rE5ivqkO99E9jAlz+uuQz/6WqwE=\n" "-----END RSA PRIVATE KEY-----\n"; +

1 0

[tor/master] A Bridge Authority should compute flag thresholds
by nickm＠torproject.org 20 Nov '13

20 Nov '13

commit b36f93a6711aa3c763d1ea0765862cd2f6939756 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Oct 2 02:46:24 2013 +0000 A Bridge Authority should compute flag thresholds As a bridge authority, before we create our networkstatus document, we should compute the thresholds needed for the various status flags assigned to each bridge based on the status of all other bridges. We then add these thresholds to the networkstatus document for easy access. Fixes for #1117 and #9859. --- changes/bug9859 | 6 ++++++ src/or/dirserv.c | 19 +++++++++++++++++++ src/or/dirserv.h | 1 + src/or/networkstatus.c | 10 +++++++++- 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/changes/bug9859 b/changes/bug9859 new file mode 100644 index 0000000..54ca30e --- /dev/null +++ b/changes/bug9859 @@ -0,0 +1,6 @@ + o Minor Feature + + - Assign status flags to bridges based on thresholds calculated + over all bridges. Fixes bug 9859. + - Add threshold cutoffs to the networkstatus document created by + the Bridge Authority. Fixes bug 1117. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index d30a474..8d2da5b 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1957,6 +1957,10 @@ dirserv_compute_performance_thresholds(routerlist_t *rl, /* Now, fill in the arrays. */ SMARTLIST_FOREACH_BEGIN(nodelist_get_list(), node_t *, node) { + if (options->BridgeAuthoritativeDir && + node->ri && + node->ri->purpose != ROUTER_PURPOSE_BRIDGE) + continue; if (router_counts_toward_thresholds(node, now, omit_as_sybil, require_mbw)) { routerinfo_t *ri = node->ri; @@ -2071,6 +2075,21 @@ dirserv_compute_performance_thresholds(routerlist_t *rl, tor_free(wfus); } +/* Use dirserv_compute_performance_thresholds() to compute the thresholds + * for the status flags, specifically for bridges. + * + * This is only called by a Bridge Authority from + * networkstatus_getinfo_by_purpose(). + */ +void +dirserv_compute_bridge_flag_thresholds(routerlist_t *rl) +{ + + digestmap_t *omit_as_sybil = digestmap_new(); + dirserv_compute_performance_thresholds(rl, omit_as_sybil); + digestmap_free(omit_as_sybil, NULL); +} + /** Measured bandwidth cache entry */ typedef struct mbw_cache_entry_s { long mbw_kb; diff --git a/src/or/dirserv.h b/src/or/dirserv.h index 7221fc9..c2d6131 100644 --- a/src/or/dirserv.h +++ b/src/or/dirserv.h @@ -51,6 +51,7 @@ int list_server_status_v1(smartlist_t *routers, char **router_status_out, int dirserv_dump_directory_to_string(char **dir_out, crypto_pk_t *private_key); char *dirserv_get_flag_thresholds_line(void); +void dirserv_compute_bridge_flag_thresholds(routerlist_t *rl); int directory_fetches_from_authorities(const or_options_t *options); int directory_fetches_dir_info_early(const or_options_t *options); diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index c950731..a935a46 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2171,9 +2171,17 @@ networkstatus_dump_bridge_status_to_file(time_t now) char *status = networkstatus_getinfo_by_purpose("bridge", now); const or_options_t *options = get_options(); char *fname = NULL; + char *thresholds = NULL, *thresholds_and_status = NULL; + routerlist_t *rl = router_get_routerlist(); + dirserv_compute_bridge_flag_thresholds(rl); + thresholds = dirserv_get_flag_thresholds_line(); + tor_asprintf(&thresholds_and_status, "flag-thresholds %s\n%s", + thresholds, status); tor_asprintf(&fname, "%s"PATH_SEPARATOR"networkstatus-bridges", options->DataDirectory); - write_str_to_file(fname,status,0); + write_str_to_file(fname,thresholds_and_status,0); + tor_free(thresholds); + tor_free(thresholds_and_status); tor_free(fname); tor_free(status); }

1 0

[tor/master] Merge remote-tracking branch 'sysrqb/bug9859_5'
by nickm＠torproject.org 20 Nov '13

20 Nov '13

commit 03da9be2f13c0cca9bb35e2aba9bf0876f40db33 Merge: e716565 b36f93a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 20 11:03:37 2013 -0500 Merge remote-tracking branch 'sysrqb/bug9859_5' changes/bug9859 | 6 ++++++ src/or/dirserv.c | 19 +++++++++++++++++++ src/or/dirserv.h | 1 + src/or/networkstatus.c | 10 +++++++++- 4 files changed, 35 insertions(+), 1 deletion(-)

1 0

[flashproxy/master] add M2Crypto as a dependency of flashproxy-common
by infinity0＠torproject.org 20 Nov '13

20 Nov '13

commit 6de80151eb2df2068e33fad6ace9fff991cb2b78 Author: Ximin Luo <infinity0(a)gmx.com> Date: Wed Nov 20 15:35:04 2013 +0000 add M2Crypto as a dependency of flashproxy-common --- setup-common.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup-common.py b/setup-common.py index 440085f..bcfdb71 100755 --- a/setup-common.py +++ b/setup-common.py @@ -42,5 +42,6 @@ setup( install_requires = [ 'setuptools', + 'M2Crypto', ], )

1 0

[torspec/master] Add 223-ace-handshake.txt
by nickm＠torproject.org 20 Nov '13

20 Nov '13

commit ebc735e69071bc5cf7d71ce47a1d269fa280077b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 20 10:59:33 2013 -0500 Add 223-ace-handshake.txt --- proposals/000-index.txt | 2 + proposals/223-ace-handshake.txt | 115 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 75ea52b..99845a4 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -143,6 +143,7 @@ Proposals by number: 220 Migrate server identity keys to Ed25519 [DRAFT] 221 Stop using CREATE_FAST [CLOSED] 222 Stop sending client timestamps [CLOSED] +223 Ace: Improved circuit-creation key exchange [OPEN] Proposals by status: @@ -188,6 +189,7 @@ Proposals by status: 211 Internal Mapaddress for Tor Configuration Testing [for 0.2.4.x+] 212 Increase Acceptable Consensus Age [for 0.2.4.x+] 215 Let the minimum consensus method change with time + 223 Ace: Improved circuit-creation key exchange ACCEPTED: 140 Provide diffs between consensuses 147 Eliminate the need for v2 directories in generating v3 directories [for 0.2.4.x] diff --git a/proposals/223-ace-handshake.txt b/proposals/223-ace-handshake.txt new file mode 100644 index 0000000..78592a3 --- /dev/null +++ b/proposals/223-ace-handshake.txt @@ -0,0 +1,115 @@ +Filename: 223-ace-handshake.txt +Title: Ace: Improved circuit-creation key exchange +Author: Esfandiar Mohammadi +Created: 22-July-2013 +Status: Open + +History: + + 22-July-2013 -- Submitted + 20-Nov-2013 -- Reformatted slightly, wrapped lines, added + references, adjusted the KDF [nickm] + +Summary: + +This is an attempt to translate the proposed circuit handshake from +"Ace: An Efficient Key-Exchange Protocol for Onion Routing" by +Backes, Kate, and Mohammadi into a Tor proposal format. + +The specification assumes an implementation of scalar multiplication +and addition of two curve elements, as in Robert Ransom's celator +library. + +Notation: + + Let a|b be the concatenation of a with b. + + Let H(x,t) be a tweakable hash function of output width H_LENGTH + bytes. + + Let t_mac, t_key, and t_verify be a set of arbitrarily-chosen + tweaks for the hash function. + + Let EXP(a,b) be a^b in some appropriate group G where the + appropriate DH parameters hold. Let's say elements of this group, + when represented as byte strings, are all G_LENGTH bytes long. + Let's say we are using a generator g for this group. + + Let MUTLIEXPONEN (a,b,c,d) be (a^b)*(c^d) in some appropriate + group G where the appropriate DH parameters hold. Let's say + elements of this group, when represented as byte strings, are all + G_LENGTH bytes long. Let's say we are using a generator g for + this group. + + Let PROTOID be a string designating this variant of the protocol. + + Let KEYID be a collision-resistant (but not necessarily preimage-resistant) + hash function on members of G, of output length H_LENGTH bytes. + +Instantiation: + + Let's call this PROTOID "ace-curve25519-ed-uncompressed-sha256-1" + + Set H(x,t) == HMAC_SHA256 with message x and key t. So H_LENGTH == 32. + Set t_mac == PROTOID | ":mac" + t_key == PROTOID | ":key" + t_verify == PROTOID | ":verify" + Set EXP(a,b) == scalar_mult_curve25519(a,b), + MUTLIEXPONEN(a,b) == dblscalarmult_curve25519(a,b,c,d), and g == 9 . + + Set KEYID(B) == B. (We don't need to use a hash function here, since our + keys are already very short. It is trivially collision-resistant, since + KEYID(A)==KEYID(B) iff A==B.) + +Protocol: + + Take a router with identity key digest ID. + + As setup, the router generates a secret key b, and a public onion key + B = EXP(g,b). The router publishes B in its server descriptor. + + To send a create cell, the client generates two keypairs of x_1, + X_1=EXP(g,x_1) and x_2, X_2=EXP(g,x_2) and sends a CREATE cell + with contents: + + NODEID: ID -- H_LENGTH bytes + KEYID: KEYID(B) -- H_LENGTH bytes + CLIENT_PK: X_1, X_2 -- 2 x G_LENGTH bytes + + The server checks X_1, X_2, generates a keypair of y, Y=EXP(g,y) + and computes + + point = MUTLIEXPONEN(X_1,y,X_2,b) + secret_input = point | ID | B | X_1 | X_2 | Y | PROTOID + KEY_SEED = H(secret_input | "Key Seed", t_key) + KEY_VERIFY = H(secret_input | "HMac Seed", t_verify) + auth_input = ID | Y | X_1 | X_2 | PROTOID | "Server" + + The server sends a CREATED cell containing: + + SERVER_PK: Y -- G_LENGTH bytes + AUTH: H(auth_input, KEY_VERIFY) -- H_LENGTH bytes + + The client then checks Y, and computes + + point = MUTLIEXPONEN(Y,x_1,B,x_2) + secret_input = | ID | B | X_1 | X_2 | Y | PROTOID + KEY_SEED = H(secret_input | "Key Seed", t_key) + KEY_VERIFY = H(secret_input | "HMac Seed", t_verify) + auth_input = ID | B | Y | X_1 | X_2 | PROTOID | "Server" + + The client verifies that AUTH == H(auth_input, KEY_VERIFY). + + Both parties now have a shared value for KEY_SEED. They expand + this into the keys needed for the Tor relay protocol. + +Key expansion: + + When using this handshake, clients and servers should expand keys + using HKDF as with the ntor handshake today. + +See also: + + http://www.infsec.cs.uni-saarland.de/~mohammadi/ace/ace.html + for implementations, academic paper, and benchmarking code. +

1 0

[flashproxy/master] merge proxy/modules README so that there are less files to read/install
by infinity0＠torproject.org 20 Nov '13

20 Nov '13

commit 8f7d0b74e7b3a5bedc5af79cfa0c429ea3e4b027 Author: Ximin Luo <infinity0(a)gmx.com> Date: Wed Nov 20 14:00:56 2013 +0000 merge proxy/modules README so that there are less files to read/install --- proxy/README | 11 ++++++++++- proxy/modules/README | 8 -------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/proxy/README b/proxy/README index 8cb31b4..18de1c8 100644 --- a/proxy/README +++ b/proxy/README @@ -1,4 +1,13 @@ -This directory contains the flash proxy JavaScript proxy program and +The proxy directory contains the flash proxy JavaScript proxy program and associated HTML and media files. End users don't have to do anything with these files. They are meant to be installed on a centralized web server and then accessed through a browser. + +The modules subdirectory 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/README b/proxy/modules/README deleted file mode 100644 index 520a47b..0000000 --- a/proxy/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/.

1 0

[flashproxy/master] nodejs proxy: restructure install docs and mention a pure-apt install
by infinity0＠torproject.org 20 Nov '13

20 Nov '13

commit 44aa48cf7416ef94752276a753049919f94cc8a7 Author: Ximin Luo <infinity0(a)gmx.com> Date: Wed Nov 20 13:59:39 2013 +0000 nodejs proxy: restructure install docs and mention a pure-apt install --- .gitignore | 4 ---- proxy/modules/nodejs/.gitignore | 3 +++ proxy/modules/nodejs/INSTALL | 35 +++++++++++++++++++++++++++++++++++ proxy/modules/nodejs/Makefile | 7 +------ proxy/modules/nodejs/README | 23 ----------------------- 5 files changed, 39 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index 439f73d..5672537 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,3 @@ /dist /*.egg-info /py2exe-tmp - -/proxy/modules/nodejs/node_modules -/proxy/modules/nodejs/flashproxy.js - diff --git a/proxy/modules/nodejs/.gitignore b/proxy/modules/nodejs/.gitignore new file mode 100644 index 0000000..72f73ff --- /dev/null +++ b/proxy/modules/nodejs/.gitignore @@ -0,0 +1,3 @@ +/flashproxy.js +/node_modules +/npm-debug.log diff --git a/proxy/modules/nodejs/INSTALL b/proxy/modules/nodejs/INSTALL new file mode 100644 index 0000000..9f6f677 --- /dev/null +++ b/proxy/modules/nodejs/INSTALL @@ -0,0 +1,35 @@ +First, install nodejs: + + # apt-get install nodejs + +Make sure flashproxy.js exists in the current directory, either a symlink or +a plain copy. + +== Install from source + +If your distribution contains both the following packages (newer suites of +Debian and Ubuntu), you can run main.js directly: + + # apt-get install node-xmlhttprequest node-ws + $ nodejs main.js + +Otherwise, you can use npm to install it as a package, along with all its +dependencies: + + # apt-get install npm + # npm install -g + $ flashproxy + +== Install from npm registry + +This package is also being published on the npm registry. To install from there +rather than your local copy, 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/Makefile b/proxy/modules/nodejs/Makefile index 8809eb0..9b1f8ce 100644 --- a/proxy/modules/nodejs/Makefile +++ b/proxy/modules/nodejs/Makefile @@ -1,9 +1,4 @@ -.PHONY: prepublish apt-get-build-dep - -apt-get-build-dep: - apt-get install nodejs node-xmlhttprequest - apt-get install npm && npm install ws - @echo "warning: Debian has node.js as /usr/bin/nodejs; install nodejs-legacy if you need it in /usr/bin/node" +.PHONY: prepublish prepublish: flashproxy.js flashproxy.js: ../../flashproxy.js diff --git a/proxy/modules/nodejs/README b/proxy/modules/nodejs/README index 57d0ddf..2f14bcd 100644 --- a/proxy/modules/nodejs/README +++ b/proxy/modules/nodejs/README @@ -3,26 +3,3 @@ 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

1 0