- tor-commits - lists.torproject.org

[obfsproxy/master] Implemented nickm's comments.
by nickm＠torproject.org 28 May '11

28 May '11

commit bb3b4f219f0685da10e0b95b36c181135c17f469 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sat May 28 05:34:46 2011 +0200 Implemented nickm's comments. * Used WSA error codes for Windows compatibility. * Used enum to turn socks5_handle_request returns into meaningful words. * 's/EVUTIL_SOCKET_ERROR()/evutil_socket_geterror()/g' --- src/network.c | 13 ++++++----- src/socks.c | 43 +++++++++++++++++++++-------------- src/socks.h | 12 ++++++++- src/test/test_socks_unsupported.py | 2 + src/test/unittest_socks.c | 16 ++++++------ 5 files changed, 53 insertions(+), 33 deletions(-) diff --git a/src/network.c b/src/network.c index 1f68804..f1c4584 100644 --- a/src/network.c +++ b/src/network.c @@ -10,6 +10,7 @@ #include "util.h" #include "socks.h" #include "protocol.h" +#include "socks.h" #include <assert.h> #include <stdlib.h> @@ -229,7 +230,7 @@ socks_read_cb(struct bufferevent *bev, void *arg) { conn_t *conn = arg; //struct bufferevent *other; - int r; + enum req_status r; assert(bev == conn->input); /* socks must be on the initial bufferevent */ //dbg(("Got data on the socks side (%d) \n", conn->socks_state->state)); @@ -262,13 +263,13 @@ socks_read_cb(struct bufferevent *bev, void *arg) r = handle_socks(bufferevent_get_input(bev), bufferevent_get_output(bev), conn->socks_state); - } while (r == 1); + } while (r == SOCKS_GOOD); - if (r == 0) + if (r == SOCKS_INCOMPLETE) return; /* need to read more data. */ - else if (r == -1) + else if (r == SOCKS_BROKEN) conn_free(conn); /* XXXX maybe send socks reply */ - else if (r == -2) { + else if (r == SOCKS_CMD_NOT_CONNECT) { bufferevent_enable(bev, EV_WRITE); bufferevent_disable(bev, EV_READ); socks5_send_reply(bufferevent_get_output(bev), conn->socks_state, @@ -367,7 +368,7 @@ output_event_cb(struct bufferevent *bev, short what, void *arg) bufferevent_enable(conn->input, EV_WRITE); bufferevent_disable(conn->input, EV_READ); socks_send_reply(conn->socks_state, bufferevent_get_output(conn->input), - EVUTIL_SOCKET_ERROR()); + evutil_socket_geterror()); bufferevent_setcb(conn->input, NULL, close_conn_on_flush, output_event_cb, conn); return; diff --git a/src/socks.c b/src/socks.c index 7ee44ee..8782a63 100644 --- a/src/socks.c +++ b/src/socks.c @@ -38,6 +38,7 @@ "Server reply" is done by: socks5_send_reply() */ + static int socks5_do_negotiation(struct evbuffer *dest, unsigned int neg_was_success); @@ -61,6 +62,12 @@ socks_state_free(socks_state_t *s) free(s); } +#ifdef _WIN32 +#define ERR(e) WSA##e +#else +#define ERR(e) e +#endif + /** This function receives an errno(3) 'error' and returns the reply code that should be sent to the SOCKS client. @@ -80,11 +87,11 @@ socks_errno_to_reply(socks_state_t *state, int error) return SOCKS5_SUCCESS; else { switch (error) { - case ENETUNREACH: + case ERR(ENETUNREACH): return SOCKS5_FAILED_NETUNREACH; - case EHOSTUNREACH: + case ERR(EHOSTUNREACH): return SOCKS5_FAILED_HOSTUNREACH; - case ECONNREFUSED: + case ERR(ECONNREFUSED): return SOCKS5_FAILED_REFUSED; default: return SOCKS5_FAILED_GENERAL; @@ -94,6 +101,8 @@ socks_errno_to_reply(socks_state_t *state, int error) return -1; } +#undef ERR + /** Takes a command request from 'source', it evaluates it and if it's legit it parses it into 'parsereq'. @@ -109,7 +118,7 @@ socks_errno_to_reply(socks_state_t *state, int error) Client Request (Client -> Server) */ -int +enum req_status socks5_handle_request(struct evbuffer *source, struct parsereq *parsereq) { /** XXX: max FQDN size is 255. */ @@ -121,7 +130,7 @@ socks5_handle_request(struct evbuffer *source, struct parsereq *parsereq) if (buflength < SIZEOF_SOCKS5_STATIC_REQ+1) { printf("socks: request packet is too small (1).\n"); - return 0; + return SOCKS_INCOMPLETE; } /* We only need the socks5_req and an extra byte to get @@ -140,7 +149,7 @@ socks5_handle_request(struct evbuffer *source, struct parsereq *parsereq) } if (p[1] != SOCKS5_CMD_CONNECT) - return -2; /* We must send reply to the client. */ + return SOCKS_CMD_NOT_CONNECT; /* We must send reply to the client. */ unsigned int addrlen,af,extralen=0; /* p[3] is Address type field */ @@ -169,7 +178,7 @@ socks5_handle_request(struct evbuffer *source, struct parsereq *parsereq) int minsize = SIZEOF_SOCKS5_STATIC_REQ + addrlen + extralen + 2; if (buflength < minsize) { printf("socks: request packet too small %d:%d (2)\n", buflength, minsize); - return 0; + return SOCKS_INCOMPLETE; } /* Drain data from the buffer to get to the good part, the actual @@ -203,10 +212,10 @@ socks5_handle_request(struct evbuffer *source, struct parsereq *parsereq) parsereq->port = ntohs(destport); parsereq->af = af; - return 1; + return SOCKS_GOOD; err: - return -1; + return SOCKS_BROKEN; } /** @@ -446,7 +455,7 @@ int handle_socks(struct evbuffer *source, struct evbuffer *dest, socks_state_t *socks_state) { - int r; + enum req_status r; if (socks_state->broken) return -1; @@ -496,15 +505,15 @@ handle_socks(struct evbuffer *source, struct evbuffer *dest, if (socks_state->state == ST_NEGOTIATION_DONE) { /* We know this connection. Let's see what it wants. */ r = socks5_handle_request(source,&socks_state->parsereq); - if (r == -2) { /* Request CMD != CONNECT. */ + if (r == SOCKS_GOOD) + socks_state->state = ST_HAVE_ADDR; + else if (r == SOCKS_INCOMPLETE) + return SOCKS_INCOMPLETE; + else if (r == SOCKS_CMD_NOT_CONNECT) { socks_state->broken = 1; - return -2; - } else if (r == -1) /* Broken request. */ + return SOCKS_CMD_NOT_CONNECT; + } else if (r == SOCKS_BROKEN) goto broken; - else if (r == 0) /* Incomplete. */ - return 0; - else if (r == 1) /* Neat request. */ - socks_state->state = ST_HAVE_ADDR; return r; } break; diff --git a/src/socks.h b/src/socks.h index d360982..7b35cb5 100644 --- a/src/socks.h +++ b/src/socks.h @@ -16,6 +16,14 @@ enum socks_status_t { /* Have sent reply */ ST_SENT_REPLY }; + +enum req_status { + SOCKS_GOOD=0, + SOCKS_INCOMPLETE, + SOCKS_CMD_NOT_CONNECT, + SOCKS_BROKEN +}; + int handle_socks(struct evbuffer *source, struct evbuffer *dest, socks_state_t *socks_state); socks_state_t *socks_state_new(void); @@ -90,10 +98,10 @@ struct socks_state_t { int socks5_handle_negotiation(struct evbuffer *source, struct evbuffer *dest, socks_state_t *state); -int socks5_handle_request(struct evbuffer *source, - struct parsereq *parsereq); int socks5_send_reply(struct evbuffer *reply_dest, socks_state_t *state, int status); +enum req_status socks5_handle_request(struct evbuffer *source, struct parsereq *parsereq); + int socks4_read_request(struct evbuffer *source, socks_state_t *state); int socks4_send_reply(struct evbuffer *dest, diff --git a/src/test/test_socks_unsupported.py b/src/test/test_socks_unsupported.py index c0d625c..d1afd02 100644 --- a/src/test/test_socks_unsupported.py +++ b/src/test/test_socks_unsupported.py @@ -13,4 +13,6 @@ s.send(request) data = s.recv(1024) if (struct.unpack('BBBBih', data)[1] == 7): print "Works." +else: + print "Fail!" diff --git a/src/test/unittest_socks.c b/src/test/unittest_socks.c index 5ec28cc..d7706ee 100644 --- a/src/test/unittest_socks.c +++ b/src/test/unittest_socks.c @@ -158,7 +158,7 @@ test_socks_socks5_request(void *data) evbuffer_add(source, "\x05", 1); evbuffer_add(source, req1, 7); - tt_int_op(0, ==, socks5_handle_request(source,&pr1)); /* 0: want more data*/ + tt_int_op(SOCKS_INCOMPLETE, ==, socks5_handle_request(source,&pr1)); /* 0: want more data*/ /* emptying source buffer before next test */ size_t buffer_len = evbuffer_get_length(source); @@ -175,7 +175,7 @@ test_socks_socks5_request(void *data) evbuffer_add(source, "\x05", 1); evbuffer_add(source, req2, 7); - tt_int_op(0, ==, socks5_handle_request(source,&pr1)); /* 0: want more data*/ + tt_int_op(SOCKS_INCOMPLETE, ==, socks5_handle_request(source,&pr1)); /* 0: want more data*/ /* emptying source buffer before next test */ buffer_len = evbuffer_get_length(source); @@ -192,7 +192,7 @@ test_socks_socks5_request(void *data) evbuffer_add(source, "\x05", 1); evbuffer_add(source, req3, 9); - tt_int_op(1, ==, socks5_handle_request(source,&pr1)); + tt_int_op(SOCKS_GOOD, ==, socks5_handle_request(source,&pr1)); tt_str_op(pr1.addr, ==, "127.0.0.1"); tt_int_op(pr1.port, ==, 80); @@ -211,7 +211,7 @@ test_socks_socks5_request(void *data) memcpy(req4+20,&port,2); evbuffer_add(source,req4,22); - tt_int_op(1, ==, socks5_handle_request(source,&pr1)); + tt_int_op(SOCKS_GOOD, ==, socks5_handle_request(source,&pr1)); tt_str_op(pr1.addr, ==, "d:1:5:e:a:5:e:0"); tt_int_op(pr1.port, ==, 80); @@ -232,7 +232,7 @@ test_socks_socks5_request(void *data) memcpy(req5+5+strlen(fqdn),&port,2); evbuffer_add(source, req5, 24); - tt_int_op(1, ==, socks5_handle_request(source,&pr1)); + tt_int_op(SOCKS_GOOD, ==, socks5_handle_request(source,&pr1)); tt_str_op(pr1.addr, ==, "www.test.example"); tt_int_op(pr1.port, ==, 80); @@ -244,7 +244,7 @@ test_socks_socks5_request(void *data) req6[2] = 0; evbuffer_add(source,req6,3); - tt_int_op(0, ==, socks5_handle_request(source,&pr1)); + tt_int_op(SOCKS_INCOMPLETE, ==, socks5_handle_request(source,&pr1)); /* emptying source buffer before next test */ buffer_len = evbuffer_get_length(source); @@ -260,7 +260,7 @@ test_socks_socks5_request(void *data) req7[4] = 42; evbuffer_add(source,req7,5); - tt_int_op(-1, ==, socks5_handle_request(source,&pr1)); + tt_int_op(SOCKS_BROKEN, ==, socks5_handle_request(source,&pr1)); /* emptying source buffer before next test */ buffer_len = evbuffer_get_length(source); @@ -278,7 +278,7 @@ test_socks_socks5_request(void *data) evbuffer_add(source, "\x05", 1); evbuffer_add(source, req8, 9); /* '-2' means that we don't support the requested command. */ - tt_int_op(-2, ==, socks5_handle_request(source,&pr1)); + tt_int_op(SOCKS_CMD_NOT_CONNECT, ==, socks5_handle_request(source,&pr1)); end:

1 0

[obfsproxy/master] evutil_socket_geterror() takes an argument
by nickm＠torproject.org 28 May '11

28 May '11

commit 3d988b65198163de6b0c9e4de2bfc964dcfe3e82 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat May 28 00:34:02 2011 -0400 evutil_socket_geterror() takes an argument --- src/network.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/network.c b/src/network.c index f1c4584..0f26648 100644 --- a/src/network.c +++ b/src/network.c @@ -368,7 +368,7 @@ output_event_cb(struct bufferevent *bev, short what, void *arg) bufferevent_enable(conn->input, EV_WRITE); bufferevent_disable(conn->input, EV_READ); socks_send_reply(conn->socks_state, bufferevent_get_output(conn->input), - evutil_socket_geterror()); + evutil_socket_geterror(bufferevent_getfd(bev))); bufferevent_setcb(conn->input, NULL, close_conn_on_flush, output_event_cb, conn); return;

1 0

r24790: {website} fix the warning image and link to the donation page through (in website/trunk: css donate/en)
by Andrew Lewman 27 May '11

27 May '11

Author: phobos Date: 2011-05-27 02:15:22 +0000 (Fri, 27 May 2011) New Revision: 24790 Modified: website/trunk/css/layout.css website/trunk/donate/en/become-sponsor.wml website/trunk/donate/en/donate-hardware.wml website/trunk/donate/en/donate-service.wml website/trunk/donate/en/matching-program.wml Log: fix the warning image and link to the donation page through the new sidenav. Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2011-05-27 01:25:07 UTC (rev 24789) +++ website/trunk/css/layout.css 2011-05-27 02:15:22 UTC (rev 24790) @@ -431,7 +431,7 @@ } .warning h2 { - background: url("../images/warning.jpg") no-repeat scroll left top transparent; + background: url("../images/warning2.jpg") no-repeat scroll left top transparent; padding-left: 40px; } Modified: website/trunk/donate/en/become-sponsor.wml =================================================================== --- website/trunk/donate/en/become-sponsor.wml 2011-05-27 01:25:07 UTC (rev 24789) +++ website/trunk/donate/en/become-sponsor.wml 2011-05-27 02:15:22 UTC (rev 24790) @@ -39,7 +39,7 @@ </div>  <div id = "sidecol"> -#include "side.wmi" +#include "side-donate.wmi" #include "info.wmi" </div>  Modified: website/trunk/donate/en/donate-hardware.wml =================================================================== --- website/trunk/donate/en/donate-hardware.wml 2011-05-27 01:25:07 UTC (rev 24789) +++ website/trunk/donate/en/donate-hardware.wml 2011-05-27 02:15:22 UTC (rev 24790) @@ -27,7 +27,7 @@ </div>  <div id = "sidecol"> -#include "side.wmi" +#include "side-donate.wmi" #include "info.wmi" </div>  Modified: website/trunk/donate/en/donate-service.wml =================================================================== --- website/trunk/donate/en/donate-service.wml 2011-05-27 01:25:07 UTC (rev 24789) +++ website/trunk/donate/en/donate-service.wml 2011-05-27 02:15:22 UTC (rev 24790) @@ -36,7 +36,7 @@ </div>  <div id = "sidecol"> -#include "side.wmi" +#include "side-donate.wmi" #include "info.wmi" </div>  Modified: website/trunk/donate/en/matching-program.wml =================================================================== --- website/trunk/donate/en/matching-program.wml 2011-05-27 01:25:07 UTC (rev 24789) +++ website/trunk/donate/en/matching-program.wml 2011-05-27 02:15:22 UTC (rev 24790) @@ -16,7 +16,7 @@ </div>  <div id = "sidecol"> -#include "side.wmi" +#include "side-donate.wmi" #include "info.wmi" </div>

1 0

r24789: {website} rransom is correct, it's page donate/donate. (website/trunk/download/en)
by Andrew Lewman 27 May '11

27 May '11

Author: phobos Date: 2011-05-27 01:25:07 +0000 (Fri, 27 May 2011) New Revision: 24789 Modified: website/trunk/download/en/download-easy.wml website/trunk/download/en/download.wml Log: rransom is correct, it's page donate/donate. Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2011-05-27 01:20:37 UTC (rev 24788) +++ website/trunk/download/en/download-easy.wml 2011-05-27 01:25:07 UTC (rev 24789) @@ -96,7 +96,7 @@ <input class="donate-btn" type="submit" name="donate" value="Donate"> </p> <p> - <a href="../donate/donate" >Other donation options...</a> + <a href="<page donate/donate>">Other donation options...</a> </p> </form> </td> Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-05-27 01:20:37 UTC (rev 24788) +++ website/trunk/download/en/download.wml 2011-05-27 01:25:07 UTC (rev 24789) @@ -92,7 +92,7 @@ <p> <input class="donate-btn" type="submit" name="donate" value="Donate"> </p> - <p><a href="../donate/donate" >Other donation options...</a></p> + <p><a href="<page donate/donate>">Other donation options...</a></p> </form>

1 0

r24788: {website} remove the hard links to english pages. (in website/trunk: donate/en download/en)
by Andrew Lewman 27 May '11

27 May '11

Author: phobos Date: 2011-05-27 01:20:37 +0000 (Fri, 27 May 2011) New Revision: 24788 Modified: website/trunk/donate/en/donate.wml website/trunk/download/en/download-easy.wml website/trunk/download/en/download.wml Log: remove the hard links to english pages. Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2011-05-27 01:04:25 UTC (rev 24787) +++ website/trunk/donate/en/donate.wml 2011-05-27 01:20:37 UTC (rev 24788) @@ -142,10 +142,10 @@ <input type="hidden" name="isDonationWidget" value="1"> <input type="hidden" name="description" value="Supporting Online Anonymity & Privacy"> <input type="hidden" name="amazonPaymentsAccountId" value="XGSROLNTXRNC3N1P4TXKMNK14LN1D6SZUD8SN1"> - <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate/donate.html.en"> + <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate/donate"> <input type="hidden" name="processImmediate" value="1"> <input type="hidden" name="cobrandingStyle" value="logo"> - <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate/donate.html.en"> + <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate/donate"> </div> </form> <small>Requires an Amazon Account</small> Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2011-05-27 01:04:25 UTC (rev 24787) +++ website/trunk/download/en/download-easy.wml 2011-05-27 01:20:37 UTC (rev 24788) @@ -96,7 +96,7 @@ <input class="donate-btn" type="submit" name="donate" value="Donate"> </p> <p> - <a href="../donate/donate.html.en" >Other donation options...</a> + <a href="../donate/donate" >Other donation options...</a> </p> </form> </td> @@ -152,7 +152,7 @@ </tbody> </table>  +<p>Interested in <a href="../about/overview">learning more about Tor in general</a>?</p> --> </div>  <div id="sidecol-right"> Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-05-27 01:04:25 UTC (rev 24787) +++ website/trunk/download/en/download.wml 2011-05-27 01:20:37 UTC (rev 24788) @@ -92,7 +92,7 @@ <p> <input class="donate-btn" type="submit" name="donate" value="Donate"> </p> - <p><a href="../donate/donate.html.en" >Other donation options...</a></p> + <p><a href="../donate/donate" >Other donation options...</a></p> </form>

1 0

r24787: {website} roll out new pages for donations, downloads, download-easy, (in website/trunk: . css donate/en download/en images)
by Andrew Lewman 27 May '11

27 May '11

Author: phobos Date: 2011-05-27 01:04:25 +0000 (Fri, 27 May 2011) New Revision: 24787 Added: website/trunk/donate/en/side-donate.wmi website/trunk/images/warning2.jpg website/trunk/jquery-1.6.1.min.js Modified: website/trunk/css/ie7-and-down.css website/trunk/css/layout.css website/trunk/donate/en/donate.wml website/trunk/download/en/download-easy.wml website/trunk/download/en/download.wml Log: roll out new pages for donations, downloads, download-easy, and css fixes to accomodate them all. All, jquery makes all of this happen, with sane fallback for those without javascript. Modified: website/trunk/css/ie7-and-down.css =================================================================== --- website/trunk/css/ie7-and-down.css 2011-05-25 15:51:16 UTC (rev 24786) +++ website/trunk/css/ie7-and-down.css 2011-05-27 01:04:25 UTC (rev 24787) @@ -27,14 +27,67 @@ width: 100%; border-bottom: 1px solid #ddd; } + +.hlist { + text-align: center; + display: block; + width: 100%; + padding: 0px 0px; + list-style: none; + margin: 0px 0px 18px 0px; + } + + .hlist li { + width: auto; + display: inline; + float: left; + border-right: 1px solid #444444; + margin-left: -4px; + } -.donate-btn { - width: 102px; + .hlist li.last { + border-right: 0px solid #444444; + } + + .hlist a { + display: block; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + text-decoration: none; + font-weight: bold; + padding: 0px 8px; + } + +.dbox.donate ul.amounts li { + list-style-type: none; + display: inline; + float: left; + margin-left: 20px; + } + + .donate-btn { + width: 122px; font-size: 0; - color: #fff; - text-align: right; -} + color: transparent; + } + +.dbox.dl { + margin: 0px 0px 20px 20px; + } +.dbox.dsmall { + display: inline; + float: left; + } + + .dbox.dsmall small { + position: static; + display: inline; + float: none; + } + .focus .continue { padding-bottom: 20px; } table h2 { margin-bottom: -4px; padding-bottom: 0;} Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2011-05-25 15:51:16 UTC (rev 24786) +++ website/trunk/css/layout.css 2011-05-27 01:04:25 UTC (rev 24787) @@ -389,7 +389,9 @@ .windows, .mac, .linux, -.android { padding: 5px 0 5px 20px; } +.android { + padding: 5px 0 5px 30px; + } .windows { background: url(../images/icon-windows.gif) left center no-repeat; } .mac { background: url(../images/icon-mac.gif) left center no-repeat; } @@ -422,12 +424,21 @@ .paypal span { padding-right: 20px; } .warning { - background: #ebd4a9 url(../images/warning.jpg) left center no-repeat;; - border: 1px solid #deba78; - padding: 10px 15px; -} - .warning p { padding-left: 40px; } + background: #F4F2C7; + border: 2px dashed #bfbd8c; + padding: 25px 25px; + margin-top: 4px; + } + + .warning h2 { + background: url("../images/warning.jpg") no-repeat scroll left top transparent; + padding-left: 40px; + } + .warning p { + padding-left: 20px; + } + .focus { background: #f4f2c7; border: 1px solid #ebd4a9; @@ -555,7 +566,276 @@ #footer .first { margin-left: 30px; } #footer .wider { width: 201px; } + + +/* DONATION ADDITIONS ----------- */ + +small { + margin: 0px auto 0px auto; + text-align: center; + font-size: 10px; + font-style: italic; + } + +.hlist { + text-align: center; + display: block; + width: 100%; + padding: 0px 0px; + list-style: none; + margin: 0px 0px 18px 0px; + } + + .hlist li { + display: inline-block; + border-right: 1px solid #444444; + margin-left: -4px; + } + .hlist li.last { + border-right: 0px solid #444444; + } + + .hlist a { + display: block; + top: 0px; + right: 0px; + bottom: 0px; + left: 0px; + text-decoration: none; + font-weight: bold; + padding: 0px 8px; + } + +.dbox { + float: none; + text-align: center; + color: #222222; + border: 2px solid #cbcbaf; + background-color: #ffffed; + padding: 20px 20px; + width: 163px; + margin: 0px 0px 0px 10px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + } + + .dbox p { + display: block; + padding: 0px 0px 0px 0px; + margin: 0px 0px 0px 0px; + } + + .dbox h2 { + background: url() top left transparent; + color: #23300E; + padding:0px 0px 15px 0px; + } + + .dbox input , + .dbox select { + background-color: #fefff7; + color: #23300E; + border:2px solid #CCCFB8; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + padding: 0px 0px 0px 5px; + margin: 0px 0px 10px 0px; + } + + .dbox input:focus , + .dbox select:focus { + -moz-box-shadow: 0px 0px 4px #cbcbaf; + -webkit-box-shadow: 0px 0px 4px #cbcbaf; + box-shadow: 0px 0px 4px #cbcbaf; + border:2px solid #cbcbaf; + background-color: #FFFFFF; + } + + .dbox select.cur { + margin-right: 5px; + text-align: left; + } + + .dbox input.amount { + width: 100px; + margin-right: 0px; + text-align: left; + } + + .dbox select#t3 { + width: 100%; + margin-bottom: 20px; + padding: 0px 0px; + } + + .dbox input.donate-btn { + background: url(../images/btn_donateCC_LG.gif) left top no-repeat transparent; + height: 26px; + width: 122px; + margin-top: 0px; + display: block; + background-color: transparent; + color: transparent; + border:0px solid transparent; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + margin: 10px auto 10px auto; + padding: 0px 0px 0px 0px; + } + + .dbox span { + float: left; + padding-right: 0px; + } + + .dbox div label { + padding: 0px 10px 0px 0px; + } + + .dbox h6#ppinfo{ + width: 100%; + text-align: center; + margin: -15px auto 0px auto; + } + + .dbox small, + .dbox.donate #ppinfo { + margin: 0px auto 0px auto; + text-align: center; + font-size: 10px; + font-style: italic; + } + +.dbox.dl { + margin: -50px 0px 20px 20px; + float: right; + } + +.dbox.donate { + float: none; + padding: 30px 30px; + width: 626px; + min-height: 0px; + max-width: none; + text-align: left; + } + + .dbox.donate input , + .dbox.donate select { + padding-bottom: 0px; + margin-bottom: 0px; + } + + .dbox.donate .drow { + margin: 0px 0px 0px 20px; + } + + .dbox.donate .drow div { + padding: 0px 0 0 0px; + width: auto; + display: block; + } + + .dbox.donate h3 { + padding-left: 0px; + color: #23300E; + margin: 0 0 10px 0; + } + + .dbox.donate h4 { + padding-left: 20px; + } + + .dbox.donate p { + padding: 5px 20px 15px 40px; + } + + .dbox.donate span { + float: left; + padding-right: 0px; + } + + .dbox.donate div label { + padding: 0px 10px 0px 0px; + } + + .dbox.donate .type { + padding-left: 20px; + } + + .dbox.donate select#t3 { + width: auto; + margin-bottom: 0px; + } + + .dbox.donate ul.amounts { + width: auto; + } + + .dbox.donate ul.amounts li { + display: inline-block; + margin-left: 20px; + } + + .dbox.donate ul.amounts li label { + padding: 0px 0px 0px 5px; + } + + .dbox.donate input.donate-btn { + background: url(../images/btn_donateCC_LG.gif) left top no-repeat transparent; + height: 26px; + width: 115px; + margin-top: -3px; + display: inline-block; + background-color: transparent; + color: transparent; + border:0px solid transparent; + } + +.dbox.dsmall { + position: relative; + display: inline-block; + width: 170px; + height: 140px; + text-align: center; + margin: 0px 10px; + vertical-align: top; + } + + .dbox.dsmall input.donate-btn { + background: url() left top no-repeat transparent; + width: auto; + height: auto; + margin-top: 0px; + display: block; + background-color: transparent; + color: transparent; + border:0px solid transparent; + } + + .dbox.dsmall div label { + padding: 0px 0px 0px 0px; + } + + .dbox.dsmall small { + display: block; + position: absolute; + width: 172px; + float: none; + bottom: 20px; + margin: 0px auto; + } + + .givv p { + text-align: justify; + margin-top: 10px; + font-size: 11px; + line-height: 13px; + } /* ** Markup free clearing ** Details: http://www.positioniseverything.net/easyclearing.html Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2011-05-25 15:51:16 UTC (rev 24786) +++ website/trunk/donate/en/donate.wml 2011-05-27 01:04:25 UTC (rev 24787) @@ -8,162 +8,154 @@ <a href="<page index>">Home » </a> <a href="<page donate/donate>">Donate</a> </div> - <div id="maincol"> - <h1>Monetary Donations</h1> +<div id="maincol"> + <h1>Make A Donation</h1> <p><strong>Your support is critical to our success.</strong> The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy. Donations to The Tor Project may be tax deductible to persons who are in the US; or who pay taxes in countries with reciprocity with the US on charitable donations. Our tax ID - number is 20-8096820. We are listed on <a + number is 20-8096820. We are listed on <a href="http://www2.guidestar.org/organizations/20-8096820/tor-project.aspx">GuideStar</a>. - We're happy to accept donations via: - <ul> + We're happy to accept donations via:</p> + <ul class="hlist"> <li><a href="#paypal">Paypal</a></li> <li><a href="#amazon">Amazon Payments</a></li> <li><a href="#google">Google Checkout</a></li> <li><a href="#givv">Givv.org</a></li> - <li><a href="#cash">checks, money orders, bank transfers, stock grants or + <li class="last"><a href="#cash">checks, money orders, bank transfers, stock grants or other more sophisticated transactions.</a></li> - </ul></p> - <p>If you want to make an anonymous donation, please do so in an anonymous way. Contact us at donations(a)torproject.org for more details.</p> -  - <div class="title toptwenty">Tor Project Subscription via PayPal</div> - <div class="left hundred"> - <div class="paypal focus"> - <a id="paypal"></a> - <a class="anchor" href="#paypal"></a> - <h4>Monthly Subscription to The Tor Project</h4> - <table> - <form id="subscribe" action="https://www.paypal.com/cgi-bin/webscr" method="post"> - <div class="toppad"> - <tr> - <td>Choose your currency:</td> - <td> - <select name="currency_code"> - <option value="USD" selected="selected">$</option> - <option value="EUR">€</option> - <option value="GBP">£</option> - <option value="YEN">¥</option> - </select> - </td> - </tr> - <tr> - <input type="hidden" name="p3" value="1"> - <input type="hidden" name="t3" value="M"> + </ul> + <p>If you want to make an anonymous donation, please do so in an anonymous way. Contact us at donations(a)torproject.org for more details.</p> + +<script type="text/javascript" src="../jquery-1.6.1.min.js"></script> +<script type="text/javascript"> +function displayVals() { + var t3 = jQuery('#t3').val(); + var amount = jQuery('#amount').val(); + var radioVal = jQuery('input[@name="amount"]:checked').val(); + if(t3 != 0){ + if( !amount ) { + jQuery('#a3').val(radioVal); + }else{ + jQuery('#a3').val(amount); + } + jQuery('#p3').val(1); + jQuery('#cmd').val('_xclick-subscriptions'); + jQuery('#item_name').val('Tor Project Membership'); + jQuery('#ppinfo').replaceWith('<small id="ppinfo">Requires a PayPal Account</small>'); + }else{ + jQuery('#a3').val(0); + jQuery('#p3').val(0); + jQuery('#cmd').val('_donations'); + jQuery('#item_name').val('Donation to the Tor Project'); + jQuery('#ppinfo').replaceWith('<small id="ppinfo">Does Not Require a PayPal Account</small>'); + } + if( !t3 ) { + jQuery('#cmd').val('_donations'); + jQuery('#item_name').val('Donation to the Tor Project'); + jQuery('#ppinfo').replaceWith('<small id="ppinfo">Does Not Require a PayPal Account</small>'); + } +} + +jQuery(function(){ + jQuery("input[@name='amount']:checked").change(displayVals); + jQuery("#amount").change(displayVals); + jQuery("#t3").change(displayVals); + displayVals(); + +}); +</script> + + <div class="hundred toptwenty"> + <div class="dbox donate"> + <a name="paypal"></a> + <h3>Donate via PayPal</h3> + <form id="donate" action="https://www.paypal.com/cgi-bin/webscr" method="post"> + <p class="type"> + <label for="type">Donation Type:</label> + <select id="t3" name="t3"> + <option value="0">One-time Donation</option> + <option value="M">Monthly Subscription</option> + </select> + <small id="ppinfo">Does Not Require a PayPal Account</small> + </p> + <div class="drow"> + <div> + <span> + <select name="currency_code" class="cur"> + <option value="USD" selected="selected">$</option> + <option value="EUR">€</option> + <option value="GBP">£</option> + <option value="YEN">¥</option> + </select> + </span> + <ul class="amounts"> + <li><input type="radio" name="amount" value="2000.00"><label for="2000">2000</label></li> + <li><input type="radio" name="amount" value="1000.00"><label for="1000">1000</label></li> + <li><input type="radio" name="amount" value="500.00"><label for="500">500</label></li> + <li><input type="radio" name="amount" value="250.00"><label for="250">250</label></li> + <li><input type="radio" name="amount" value="100.00"><label for="100">100</label></li> + <li><input type="radio" name="amount" value="50.00"><label for="50">50</label></li> + <li><input type="radio" name="amount" value="20.00" checked="checked"><label for="20">20</label></li> + <li><input type="radio" name="amount" value="10.00"><label for="10">10</label></li> + <li><input type="radio" name="amount" value="5.00"><label for="5">5</label></li> + </ul> + </div> + <div> + <label for="custom">or enter a donation amount:</label><input type="text" id="amount" class="amount" name="amount"> + <input type="hidden" id="a3" name="a3" value="0"> + <input class="donate-btn" type="submit" name="donate" value="Donate" alt="Subscribe to Tor with PayPal - it's fast, free and secure!"> +  + </div> + <input type="hidden" id="p3" name="p3" value="1"> <input type="hidden" name="sra" value="1"> <input type="hidden" name="src" value="1"> <input type="hidden" name="no_shipping" value="1"> <input type="hidden" name="no_note" value="1"> - <input type="image" src="$(IMGROOT)/btn_donateCC_LG.gif" name="submit" alt="Subscribe to Tor with PayPal - it's fast, free and secure!"/> - <input type="hidden" name="cmd" value="_xclick-subscriptions"> + <input type="hidden" id="cmd" name="cmd" value="_donations"> <input type="hidden" name="business" value="donations(a)torproject.org"> - <input type="hidden" name="item_name" value="Tor Project Membership"> - <input type="hidden" name="return" value="https://www.torproject.org/donate"/> - <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate"/> - <input class="donate-btn" type="submit" name="donate" value="Donate"> - </tr> - <tr> - <td><input type="radio" name="amount" value="5.00">5/mo</td> - <td><input type="radio" name="amount" value="10.00">10/mo</td> - <td><input type="radio" name="amount" value="20.00" checked="checked">20/mo</td> - </tr> - <tr> - <td><input type="radio" name="amount" value="50.00">50/mo</td> - <td><input type="radio" name="amount" value="100.00">100/mo</td> - <td><input type="radio" name="amount" value="250.00">250/mo</td> - </tr> + <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> + <input type="hidden" name="return" value="https://www.torproject.org/donate"> + <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate"> </div> + </form> + </div> + </div> + + <div class="hundred toptwenty"> + + <a name="amazon"></a> + <div class="dbox dsmall"> + <h3>Donate via Amazon Payments</h3> + <form action="https://authorize.payments.amazon.com/pba/paypipeline" method="post"> + <div class="drow toppad"> + <div> + <label for="amazon">$</label> + <input type="text" name="amount" size="6" value="20"> + <input class="donate-btn" type="image" src="http://g-ecx.images-amazon.com/images/G/01/asp/golden_small_donate_withmsg_…"> + </div> + <input type="hidden" name="immediateReturn" value="1"> + <input type="hidden" name="collectShippingAddress" value="0"> + <input type="hidden" name="minimumDonationAmount" value="USD 5"> + <input type="hidden" name="isDonationWidget" value="1"> + <input type="hidden" name="description" value="Supporting Online Anonymity & Privacy"> + <input type="hidden" name="amazonPaymentsAccountId" value="XGSROLNTXRNC3N1P4TXKMNK14LN1D6SZUD8SN1"> + <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate/donate.html.en"> + <input type="hidden" name="processImmediate" value="1"> + <input type="hidden" name="cobrandingStyle" value="logo"> + <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate/donate.html.en"> + </div> </form> - </table> - </div> - </div> -  -  - <div class="title toptwenty">Single Donation via PayPal</div> - <div class="left hundred"> - <div class="paypal focus"> - <h4>Make a one-time donation</h4> - <form id="donate" action="https://www.paypal.com/cgi-bin/webscr" method="post"> - <table> - <tr colspan="2"> - <td>Choose your currency:</td> - <td> - <select name="currency_code"> - <option value="USD" selected="selected">$</option> - <option value="EUR">€</option> - <option value="GBP">£</option> - <option value="YEN">¥</option> - </select> - </td> - </tr> - <tr colspan="2"> - <input type="hidden" name="no_shipping" value="1"> - <input type="image" src="$(IMGROOT)/btn_donateCC_LG.gif" name="submit" alt="Make a single donation with PayPal - it's fast, free and secure!"/> - <input type="hidden" name="cmd" value="_xclick"> - <input type="hidden" name="business" value="donations(a)torproject.org"> - <input type="hidden" name="item_name" value="Donation to the Tor Project"> - <input type="hidden" name="return" value="https://www.torproject.org/donate/donate.html.en"/> - <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate/donate.html.en"/> - </tr> - <tr> - <td><input type="radio" name="amount" value="10.00"> 10</td> - <td><input type="radio" name="amount" value="20.00" checked="checked"> 20</td> - <td><input type="radio" name="amount" value="50.00"> 50</td> - <td><input type="radio" name="amount" value="100.00"> 100</td> - </tr> - <tr> - <td><input type="radio" name="amount" value="250.00"> 250</td> - <td><input type="radio" name="amount" value="500.00"> 500</td> - <td><input type="radio" name="amount" value="1000.00"> 1,000</td> - <td><input type="radio" name="amount" value="5000.00"> 5,000</td> - </tr> - </table> - </form> - </div> - </div> -  -  - <div class="title topforty">Single Donation via Amazon Payments</div> - <div class="hundred left"> - <div class="paypal focus"> - <a id="amazon"></a> - <a class="anchor" href="#amazon"></a> - <h4>Make a single donation.</h4> - <form action="https://authorize.payments.amazon.com/pba/paypipeline" method="post"> - <table> - <tr> - <input type="hidden" name="immediateReturn" value="1"> - <input type="hidden" name="collectShippingAddress" value="0"> - <input type="hidden" name="minimumDonationAmount" value="USD 10"> - <input type="hidden" name="isDonationWidget" value="1"> - <input type="hidden" name="description" value="Supporting Online Anonymity & Privacy"> - <input type="hidden" name="amazonPaymentsAccountId" value="XGSROLNTXRNC3N1P4TXKMNK14LN1D6SZUD8SN1"> - <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate/donate.html.en"> - <input type="hidden" name="processImmediate" value="1"> - <input type="hidden" name="cobrandingStyle" value="logo"> - <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate/donate.html.en"> - </tr> - <td> </td> - <td>$<input type="text" name="amount" size="8" value="10"></td> - <td> </td> - <tr> - <td colspan="3"><input type="image" src="http://g-ecx.images-amazon.com/images/G/01/asp/golden_small_donate_withmsg_…"></td> - </tr> - </table> - </form> - </div> - </div> -  -  - <div class="title topforty">Single Donation via Google Checkout</div> - <div class="hundred left"> - <div class="paypal focus"> + <small>Requires an Amazon Account</small> + </div> + + <a id="google"></a> - <a class="anchor" href="#google"></a> - <h4>Make a single donation.</h4> - + <div class="dbox dsmall"> + <h3>Donate via Google Checkout</h3> + <script type="text/javascript"> function validateAmount(amount){ if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){ @@ -175,64 +167,55 @@ } } </script> -<form action="https://checkout.google.com/cws/v2/Donations/250937139555708/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top"> -<table> -<tr> - <input name="item_name_1" type="hidden" value="Donate to the Tor -Project"/> - <input name="item_description_1" type="hidden" value="Tor is written -for and supported by people like you"/> - <input name="item_quantity_1" type="hidden" value="1"/> - <input name="item_currency_1" type="hidden" value="USD"/> - <input name="item_is_modifiable_1" type="hidden" value="true"/> - <input name="item_min_price_1" type="hidden" value="0.01"/> - <input name="item_max_price_1" type="hidden" value="25000.0"/> - <input name="_charset_" type="hidden" value="utf-8"/> -</tr> -<tr> -<td> - $ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="6" type="text" value="25.00"/> - <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=2509371395557…" type="image"/> -</td> -</tr> -</table> -</form> -</div> -</div> -  -  - <div class="title topforty">Donate via Givv.org</div> - <div class="hundred left"> + + <form action="https://checkout.google.com/cws/v2/Donations/250937139555708/checkoutForm" id="BB_BuyButtonForm" method="post" name="BB_BuyButtonForm" onSubmit="return validateAmount(this.item_price_1)" target="_top"> + <div class="drow toppad"> + <div> + <label for="google">$</label> + <input id="item_price_1" name="item_price_1" size="6" type="text" value="20"> + <input class="donate-btn" alt="Donate" src="https://checkout.google.com/buttons/checkout.gif?merchant_id=&w=168&h=44&st…" type="image"> + </div> + <input name="item_name_1" type="hidden" value="Donate to the Tor Project"> + <input name="item_description_1" type="hidden" value="Tor is written for and supported by people like you"> + <input name="item_quantity_1" type="hidden" value="1"> + <input name="item_currency_1" type="hidden" value="USD"> + <input name="item_is_modifiable_1" type="hidden" value="true"> + <input name="item_min_price_1" type="hidden" value="0.01"> + <input name="item_max_price_1" type="hidden" value="25000.0"> + <input name="_charset_" type="hidden" value="utf-8"> + </div> + </form> + <small>Requires a Google Account</small> + </div> + + <a id="givv"></a> - <a class="anchor" href="#givv"></a> - <p>Givv.org is a new way to think about making your impact. Make one monthly donation. To as many nonprofits as you like. - Automatic, one-click giving. You stay anonymous and stay in control! - <strong><a href="http://givv.org/recipients/the-tor-project">Continue to Givv.org »</a></strong></p> - </div> -  -  - <div class="title toptwenty">Donate via Check, Cash, or Money Order</div> - <div class="left hundred"> - <a id="cash"></a> - <a class="anchor" href="#cash"></a> - <p>You can send checks or money orders to:</p> + <div class="dbox dsmall givv"> + <h3>Donate via Givv.org</h3> + <p>Givv.org is a new way to think about making your impact. Make one monthly donation. To as many nonprofits as you like. Automatic, one-click giving. <strong>You stay anonymous and stay in control!</strong></p> + <p style="text-align:center;"><strong><a href="http://givv.org/recipients/the-tor-project">Continue to Givv.org »</a></strong></p> + </div> + + </div> + + <a id="cash"></a> + <div class="hundred toptwenty"> + <div class="dbox donate"> + <h3>Donate via Check, Cash, Money Order, Bank Transfer, Stock Grant, or Another More Sophisticated Transaction</h3> + <h4>You can send checks or money orders to:</h4> <p>The Tor Project, Inc<br> 969 Main Street, Suite 206<br> Walpole, MA 02081-2972 USA</p> - </div> -  - <div class="title toptwenty"> - Donate via Wire or Bank Transfer - </div> - <div class="left hundred"> - <h3>US Transfers</h3> + + <h3 style="margin-top:20px;">Donate via Wire or Bank Transfer</h3> + <h4>US Transfers</h4> <p>For US donations via wire or ACH transfer, please contact us for the relevant information.</p> - <h3>European Transfers</h3> + <h4>European Transfers</h4> <p>Wau Holland Stiftung<br> IBAN DE03 5204 0021 0277 281202<br> SWIFT BIC COBADEFF520</p> - <p><strong>Classic style German account information is:</strong><br> - Konto: 2772812-02<br> + <h4>Classic style German account information is:</h4> + <p>Konto: 2772812-02<br> Inhaber: Wau Holland Stiftung<br> Bank: Commerzbank Kassel<br> BLZ: 52040021</p> @@ -254,12 +237,13 @@ a donation receipt upon request (if provided with address information).</li> </ul> - </div> -  -  + </div> + </div> + + </div> <div id = "sidecol"> -#include "side.wmi" +#include "side-donate.wmi" #include "info.wmi" </div>  Added: website/trunk/donate/en/side-donate.wmi =================================================================== --- website/trunk/donate/en/side-donate.wmi (rev 0) +++ website/trunk/donate/en/side-donate.wmi 2011-05-27 01:04:25 UTC (rev 24787) @@ -0,0 +1,92 @@ +#! /usr/bin/wml +<: use strict; :> +<: use warnings; :> +#use "perl-globals.wmi" +#use "links.wmi" +#use "versions.wmi" +#use "sidenav.wmi" +<div class="img-shadow"> + <div id="sidenav"> + <h2>Help another way:</h2> + <: + # recursively search menu structure to see if it contains a given page + sub containsSub($$); + sub containsSub($$) { + my ($elements, $page) = @_; + for my $ele (@{$elements}) { + if (containsSub($ele->{'subelements'},$page)){ + return 1; + } elsif ($page eq $ele->{'url'}) { + return 1; + } + + } + return 0; + } + + # generate navigation menu + sub printNavMenu($$$); + sub printNavMenu($$$) { + my ($navmenu, $page, $lang) = @_; + print '<ul>'."\n"; + for my $navmenu (@{$navmenu}) { + # this menu entry is the current (active) page + if ($navmenu->{'url'} eq $page) { + + # the current page has nested menu elements + if ($navmenu->{'subelements'}) { # menu has dropdown + printf '<li class="dropdown active"><a class="active" href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + + print '<li>'."\n"; + printNavMenu($navmenu->{'subelements'},$page,$lang); + print '</li>'."\n"; + + # the current (active) page does not have sub elements + } else { + printf '<li class="active"><a class="active" href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + } + + # a subelement of this menu item is the current (active) page + } elsif (containsSub($navmenu->{'subelements'}, $page)) { + printf '<li class="dropdown"><a class="active" href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + + print '<li>'."\n"; #encapsulate subelements + # recurse to generate the expanded menu + printNavMenu($navmenu->{'subelements'},$page,$lang); + print '</li>'."\n"; #encapsulate subelements + + # the menu entry is not active and does not enclose the active page + } else { + + # if there are subelements, set collapsed style + if ($navmenu->{'subelements'}) { + printf '<li class="dropdown"><a href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + # regular menu entry + } else { + printf '<li><a href="%s">%s</a></li>'."\n", + pageToURL($navmenu->{'url'}, $lang), $navmenu->{'txt'}; + } + } + } + print '</ul>'."\n"; + } + + my $lang = "$(LANG)"; + + use Cwd; + use Cwd 'abs_path'; + use File::Spec; + + # get document path from site root + my $path = File::Spec->abs2rel(getcwd(),abs_path("$(DOCROOT)")); + my $page = $WML_SRC_BASENAME; + printNavMenu($sidenav, $path.'/'.$page, $lang); + :> + </div> +  +</div> + Modified: website/trunk/download/en/download-easy.wml =================================================================== --- website/trunk/download/en/download-easy.wml 2011-05-25 15:51:16 UTC (rev 24786) +++ website/trunk/download/en/download-easy.wml 2011-05-27 01:04:25 UTC (rev 24787) @@ -7,19 +7,108 @@ <div id="content" class="clearfix"> <div id="breadcrumbs"><a href="<page index>">Home » </a><a href="<page download/download-easy>">Easy Download Selector</a></div> <div id="maincol-left"> + +<div class="warning"> +<h2>Want Tor to really work?</h2> +<p>...then please don't just install it and go on. You need to change some of +your habits, and reconfigure your software! Tor by itself is <em>NOT</em> all +you need to maintain your anonymity. Read the <a +href="<page download/download>#warning">full list of warnings</a>. +</p> +</div> + +<br> -<table class="topforty"> -<tr> -<td class="nopad"><div class="title"> -Tor Browser Bundle -</div> +<table class="toppad" summary=""> +<tbody> +<tr style="vertical-align:top;"> +<td class="nopad" height="1" style="vertical-align:top;"> +<h2>Tor Browser Bundle</h2> + </td> + +  +<script type="text/javascript" src="../jquery-1.6.1.min.js"></script> +<script type="text/javascript"> +function displayVals() { + var t3 = jQuery("#t3").val(); + var amount = jQuery("#amount").val(); + if(t3 != 0){ + jQuery('#a3').val(amount); + jQuery('#p3').val(1); + jQuery('#cmd').val('_xclick-subscriptions'); + jQuery('#item_name').val('Tor Project Membership'); + jQuery('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>'); + }else{ + jQuery('#a3').val(0); + jQuery('#p3').val(0); + jQuery('#cmd').val('_donations'); + jQuery('#item_name').val('Donation to the Tor Project'); + jQuery('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); + } + if( !t3 ) { + jQuery('#cmd').val('_donations'); + jQuery('#item_name').val('Donation to the Tor Project'); + jQuery('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); + } +} + +jQuery(function(){ + jQuery("#amount").change(displayVals); + jQuery("#t3").change(displayVals); + displayVals(); +}); + +</script> +<td class="nopad" rowspan="8" style="width:220px;vertical-align:top;"> + <form class="dbox" action="https://www.paypal.com/cgi-bin/webscr" method="post"> + <h2>Donate to Tor</h2> + <p> + <select name="currency_code" class="cur"> + <option value="USD" selected="selected">$</option> + <option value="EUR">€</option> + <option value="GBP">£</option> + <option value="YEN">¥</option> + </select> + <input type="text" id="amount" class="amount" name="amount" value="5" size="10"> + </p> + <p> + <input type="hidden" id="a3" name="a3" value="0"> + <select id="t3" name="t3"> + <option value="0">One-time Donation</option> + <option value="M">Monthly Subscription</option> + </select> + </p> + <p> + <input type="hidden" id="p3" name="p3" value="1"> + <input type="hidden" name="sra" value="1"> + <input type="hidden" name="src" value="1"> + <input type="hidden" name="no_shipping" value="1"> + <input type="hidden" name="no_note" value="1"> + <input type="hidden" id="cmd" name="cmd" value="_donations"> + <input type="hidden" name="business" value="donations(a)torproject.org"> + <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> + <input type="hidden" name="return" value="https://www.torproject.org/donate"> + <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate"> + </p> + <h6 id="ppinfo" style="height:0px;"></h6> + <p> + <input class="donate-btn" type="submit" name="donate" value="Donate"> + </p> + <p> + <a href="../donate/donate.html.en" >Other donation options...</a> + </p> + </form> +</td> +  + </tr> <tr> <td>The <strong>Tor Browser Bundle</strong> contains everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more & other languages »</a></td> + </tr> <tr class="gray"> <td><span class="windows"> @@ -45,31 +134,25 @@ </span> </td> </tr> -</table> -<br> - -<div class="warning"> -<h2>Want Tor to really work?</h2> -<p>...then please don't just install it and go on. You need to change some of -your habits, and reconfigure your software! Tor by itself is <em>NOT</em> all -you need to maintain your anonymity. Read the <a -href="<page download/download>#warning">full list of warnings</a>. -</p> -</div> - -<br> -<p>Need more download options? <a href="<page download/download>">See advanced choices</a>.</p> -<br> -<p>Interested in <a href="<page about/overview>">learning more about Tor in general</a>?</p> -<br> +<tr> +<td> +<p>Looking for something else? <a href="<page download/download>">View All Downloads</a>.</p> +</td> +</tr> +<tr class="gray"> +<td colspan="2"> <p>To keep informed of security advisories and new stable releases, subscribe to the <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-announce">tor-announce mailing list</a>. You can also <a href="http://rss.gmane.org/gmane.network.onion-routing.announce">watch the list's RSS feed</a>.</p> -<p>All trademarks are the property of their respective owners.</p> - +</td> +</tr> +</tbody> +</table> + </div>  <div id="sidecol-right"> @@ -109,6 +192,9 @@  </div> </div> +<div class=""> +<p><small>All trademarks are the property of their respective owners.</small></p> +</div> #include <foot.wmi> Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-05-25 15:51:16 UTC (rev 24786) +++ website/trunk/download/en/download.wml 2011-05-27 01:04:25 UTC (rev 24787) @@ -20,7 +20,84 @@ <td class="nopad"><div class="title"><a name="Windows">Microsoft Windows</a></div></td> </tr> <tr> -<td>The Tor Software for Windows comes bundled in four different ways: +<td> +  +<script type="text/javascript" src="../jquery-1.6.1.min.js"></script> +<script type="text/javascript"> +function displayVals() { + var t3 = jQuery("#t3").val(); + var amount = jQuery("#amount").val(); + if(t3 != 0){ + jQuery('#a3').val(amount); + jQuery('#p3').val(1); + jQuery('#cmd').val('_xclick-subscriptions'); + jQuery('#item_name').val('Tor Project Membership'); + jQuery('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>'); + }else{ + jQuery('#a3').val(0); + jQuery('#p3').val(0); + jQuery('#cmd').val('_donations'); + jQuery('#item_name').val('Donation to the Tor Project'); + jQuery('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); + } + if( !t3 ) { + jQuery('#cmd').val('_donations'); + jQuery('#item_name').val('Donation to the Tor Project'); + jQuery('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); + } +} + +jQuery(function(){ + jQuery("#amount").change(displayVals); + jQuery("#t3").change(displayVals); + displayVals(); +}); + +</script> + <form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post"> + <h2>Donate to Tor</h2> + <p> + <select name="currency_code" class="cur"> + <option value="USD" selected="selected">$</option> + <option value="EUR">€</option> + <option value="GBP">£</option> + <option value="YEN">¥</option> + </select> + <input type="text" id="amount" class="amount" name="amount" value="5" size="10"> + </p> + <p> + <input type="hidden" id="a3" name="a3" value="0"> + <select id="t3" name="t3"> + <option value="0">One-time Donation</option> + <option value="M">Monthly Subscription</option> + </select> + </p> + + <p> + + <input type="hidden" id="p3" name="p3" value="1"> + + <input type="hidden" name="sra" value="1"> + <input type="hidden" name="src" value="1"> + <input type="hidden" name="no_shipping" value="1"> + <input type="hidden" name="no_note" value="1"> + + <input type="hidden" id="cmd" name="cmd" value="_donations"> + <input type="hidden" name="business" value="donations(a)torproject.org"> + <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> + <input type="hidden" name="return" value="https://www.torproject.org/donate"> + <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate"> + </p> + <h6 id="ppinfo" style="height:0px;"></h6> + <p> + <input class="donate-btn" type="submit" name="donate" value="Donate"> + </p> + <p><a href="../donate/donate.html.en" >Other donation options...</a></p> + </form> + +  + +The Tor Software for Windows comes bundled in four different ways: <ul> <li>The <strong>Tor Browser Bundle</strong> contains everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more »</a></li> <li>The <strong>Vidalia Bundle</strong> contains Tor, <a href="<page projects/vidalia>">Vidalia</a>, Polipo, and Torbutton for installation on your system. You need your own Firefox, and you'll need to configure other applications if you want them to use Tor.</li> Added: website/trunk/images/warning2.jpg =================================================================== (Binary files differ) Property changes on: website/trunk/images/warning2.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: website/trunk/jquery-1.6.1.min.js =================================================================== (Binary files differ) Property changes on: website/trunk/jquery-1.6.1.min.js ___________________________________________________________________ Added: svn:mime-type + application/javascript

1 0

[arm/master] fix: --debug flag broke if config-text unavailable
by atagar＠torproject.org 26 May '11

26 May '11

commit d6df7862474e728c31fea1edd9613a3e64dc73f8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 21 13:59:20 2011 -0700 fix: --debug flag broke if config-text unavailable When in debug mode arm attempted to log the results of 'GETINFO config-text' without taking into account that this call may fail (this is a new config option so this happens quite a bit). Caught by trogdor --- src/starter.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/starter.py b/src/starter.py index 9268351..0454f9e 100644 --- a/src/starter.py +++ b/src/starter.py @@ -193,8 +193,9 @@ def _dumpConfig(): # dumps tor's version and configuration torConfigEntry = "Tor (%s) Configuration:\n" % conn.getInfo("version") - for line in conn.getInfo("config-text").split("\n"): - if " " in line: key, value = line.split(" ", 1) + for line in conn.getInfo("config-text", "").split("\n"): + if not line: continue + elif " " in line: key, value = line.split(" ", 1) else: key, value = line, "" if key in PRIVATE_TORRC_ENTRIES:

1 0

[arm/master] fix: Man page had author's hard coded home
by atagar＠torproject.org 26 May '11

26 May '11

commit 13ba8d61c35bb7ceff0514a68cd6ee99b55059c4 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 25 08:17:58 2011 -0700 fix: Man page had author's hard coded home The debug flag referenced /home/atagar rather than ~ (caught by kuhkatz) --- arm.1 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arm.1 b/arm.1 index 32a03cc..6a1fa19 100644 --- a/arm.1 +++ b/arm.1 @@ -31,7 +31,7 @@ user provided configuration file (default is \fB~/.armrc\fR) .TP \fB\-d\fR, \fB\-\-debug\fR -writes all arm logs to /home/atagar/.arm/log +writes all arm logs to ~/.arm/log .TP \fB\-b\fR, \fB\-\-blind\fR

1 0

[arm/master] Adding an option for reconnecting to Tor
by atagar＠torproject.org 26 May '11

26 May '11

commit 3941336e68bb6fd16b2fe4c6c8dd955262a90286 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 25 09:39:59 2011 -0700 Adding an option for reconnecting to Tor If Tor is shut down then restarted this provides an option so the user can press 'r' to reconnect to the new instance. Use cases are... Success -> log and display message indicating success Password Required -> prompt for password Failure -> display message with a description of the problem --- src/cli/controller.py | 16 +++++++++++----- src/cli/headerPanel.py | 34 +++++++++++++++++++++++++++++++--- src/starter.py | 10 +++------- src/util/connections.py | 18 ++++++++++++++++++ src/util/torTools.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 108 insertions(+), 15 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index d9895e6..e94f7f6 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -18,7 +18,7 @@ import cli.graphing.connStats import cli.graphing.resourceStats import cli.connections.connPanel -from util import connections, conf, enum, log, panel, sysTools, torConfig, torTools, uiTools +from util import connections, conf, enum, log, panel, sysTools, torConfig, torTools ARM_CONTROLLER = None @@ -346,7 +346,7 @@ def heartbeatCheck(isUnresponsive): conn = torTools.getConn() lastHeartbeat = conn.getHeartbeat() - if conn.isAlive() and "BW" in conn.getControllerEvents() and lastHeartbeat != 0: + if conn.isAlive() and "BW" in conn.getControllerEvents(): if not isUnresponsive and (time.time() - lastHeartbeat) >= 10: isUnresponsive = True log.log(log.NOTICE, "Relay unresponsive (last heartbeat: %s)" % time.ctime(lastHeartbeat)) @@ -357,15 +357,21 @@ def heartbeatCheck(isUnresponsive): return isUnresponsive -def connResetListener(_, eventType): +def connResetListener(conn, eventType): """ - Pauses connection resolution when tor's shut down, and resumes if started - again. + Pauses connection resolution when tor's shut down, and resumes with the new + pid if started again. """ if connections.isResolverAlive("tor"): resolver = connections.getResolver("tor") resolver.setPaused(eventType == torTools.State.CLOSED) + + if eventType == torTools.State.INIT: + torPid = conn.getMyPid() + + if torPid and torPid != resolver.getPid(): + resolver.setPid(torPid) def startTorMonitor(startTime): """ diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index 102ef64..decf975 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -19,6 +19,8 @@ import time import curses import threading +import cli.popups + from util import log, panel, sysTools, torTools, uiTools # minimum width for which panel attempts to double up contents (two columns to @@ -33,7 +35,9 @@ FLAG_COLORS = {"Authority": "white", "BadExit": "red", "BadDirectory": "red VERSION_STATUS_COLORS = {"new": "blue", "new in series": "blue", "obsolete": "red", "recommended": "green", "old": "red", "unrecommended": "red", "unknown": "cyan"} -DEFAULT_CONFIG = {"features.showFdUsage": False, +DEFAULT_CONFIG = {"startup.interface.ipAddress": "127.0.0.1", + "startup.interface.port": 9051, + "features.showFdUsage": False, "log.fdUsageSixtyPercent": log.NOTICE, "log.fdUsageNinetyPercent": log.WARN} @@ -107,6 +111,29 @@ class HeaderPanel(panel.Panel, threading.Thread): if self.vals["tor/orPort"]: return 4 if isWide else 6 else: return 3 if isWide else 4 + def handleKey(self, key): + isKeystrokeConsumed = True + + if key in (ord('r'), ord('R')) and not self._isTorConnected: + try: + ctlAddr, ctlPort = self._config["startup.interface.ipAddress"], self._config["startup.interface.port"] + tmpConn, authType, authValue = torTools.getConnectionComponents(ctlAddr, ctlPort) + + if authType == torTools.AUTH_TYPE.PASSWORD: + authValue = cli.popups.inputPrompt("Controller Password: ") + if not authValue: raise IOError() # cancel reconnection + + tmpConn.authenticate(authValue) + torTools.getConn().init(tmpConn) + log.log(log.NOTICE, "Reconnected to Tor's control port") + cli.popups.showMsg("Tor reconnected", 1) + except Exception, exc: + # displays notice for failed connection attempt + if exc.args: cli.popups.showMsg("Unable to reconnect (%s)" % exc, 3) + else: isKeystrokeConsumed = False + + return isKeystrokeConsumed + def draw(self, width, height): self.valsLock.acquire() isWide = width + 1 >= MIN_DUAL_COL_WIDTH @@ -233,7 +260,8 @@ class HeaderPanel(panel.Panel, threading.Thread): else: statusTime = torTools.getConn().getStatus()[1] statusTimeLabel = time.strftime("%H:%M %m/%d/%Y", time.localtime(statusTime)) - self.addfstr(2 if isWide else 4, 0, "<b><red>Tor Disconnected</red></b> (%s)" % statusTimeLabel) + msg = "<b><red>Tor Disconnected</red></b> (%s) - press r to reconnect" % statusTimeLabel + self.addfstr(2 if isWide else 4, 0, msg) # Undisplayed / Line 3 Right (exit policy) if isWide: @@ -313,7 +341,7 @@ class HeaderPanel(panel.Panel, threading.Thread): self._cond.notifyAll() self._cond.release() - def resetListener(self, conn, eventType): + def resetListener(self, _, eventType): """ Updates static parameters on tor reload (sighup) events. diff --git a/src/starter.py b/src/starter.py index 0454f9e..b41b18b 100644 --- a/src/starter.py +++ b/src/starter.py @@ -11,7 +11,6 @@ import sys import time import getopt import locale -import socket import platform import version @@ -327,7 +326,7 @@ if __name__ == '__main__': # sets up TorCtl connection, prompting for the passphrase if necessary and # sending problems to stdout if they arise - TorCtl.INCORRECT_PASSWORD_MSG = "Controller password found in '%s' was incorrect" % configPath + TorCtl.TorCtl.INCORRECT_PASSWORD_MSG = "Controller password found in '%s' was incorrect" % configPath authPassword = config.get("startup.controlPassword", CONFIG["startup.controlPassword"]) conn = TorCtl.TorCtl.connect(controlAddr, controlPort, authPassword) if conn == None: @@ -344,12 +343,9 @@ if __name__ == '__main__': # making this a much bigger hack). try: - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.connect((controlAddr, controlPort)) - tmpConn = TorCtl.TorCtl.Connection(s) + tmpConn, authType, cookiePath = util.torTools.getConnectionComponents(controlAddr, controlPort) - if tmpConn.get_auth_type() == TorCtl.TorCtl.AUTH_TYPE.COOKIE: - cookiePath = tmpConn.get_auth_cookie_path() + if authType == util.torTools.AUTH_TYPE.COOKIE: torPid = util.torTools.getPid(controlPort) if torPid and cookiePath[0] != "/": diff --git a/src/util/connections.py b/src/util/connections.py index c090893..47aa8af 100644 --- a/src/util/connections.py +++ b/src/util/connections.py @@ -538,6 +538,24 @@ class ConnectionResolver(threading.Thread): return self._resolutionCounter + def getPid(self): + """ + Provides the pid used to narrow down connection resolution. This is an + empty string if undefined. + """ + + return self.processPid + + def setPid(self, processPid): + """ + Sets the pid used to narrow down connection resultions. + + Arguments: + processPid - pid for the process we're fetching connections for + """ + + self.processPid = processPid + def setPaused(self, isPause): """ Allows or prevents further connection resolutions (this still makes use of diff --git a/src/util/torTools.py b/src/util/torTools.py index 12af772..d7ffa4d 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -25,6 +25,9 @@ from util import enum, log, procTools, sysTools, uiTools # CLOSED - control port closed State = enum.Enum("INIT", "CLOSED") +# enums for authentication on the tor control port +AUTH_TYPE = enum.Enum("NONE", "COOKIE", "PASSWORD") + # Addresses of the default directory authorities for tor version 0.2.3.0-alpha # (this comes from the dirservers array in src/or/config.c). DIR_SERVERS = [("86.59.21.38", "80"), # tor26 @@ -301,6 +304,45 @@ def parseVersion(versionStr): return result +def getConnectionComponents(controlAddr="127.0.0.1", controlPort=9051): + """ + Provides an uninitiated torctl connection for the control port. This returns + a tuple with the... + (torctl connection, authType, authValue) + + The authValue corresponds to the cookie path if using an authentication + cookie. Otherwise this is the empty string. This raises an IOError if unable + to connect. + + Arguments: + controlAddr - ip address belonging to the controller + controlPort - port belonging to the controller + """ + + try: + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + s.connect((controlAddr, controlPort)) + conn = TorCtl.Connection(s) + authType, authValue = conn.get_auth_type(), "" + + if authType == TorCtl.AUTH_TYPE.COOKIE: + authValue = conn.get_auth_cookie_path() + + # converts to our enum type + if authType == TorCtl.AUTH_TYPE.NONE: + authType = AUTH_TYPE.NONE + elif authType == TorCtl.AUTH_TYPE.COOKIE: + authType = AUTH_TYPE.COOKIE + elif authType == TorCtl.AUTH_TYPE.PASSWORD: + authType = AUTH_TYPE.PASSWORD + + return (conn, authType, authValue) + except socket.error, exc: + if "Connection refused" in exc.args: + raise IOError("Connection refused. Is the ControlPort enabled?") + else: raise IOError("Failed to establish socket: %s" % exc) + except Exception, exc: raise IOError(exc) + def getConn(): """ Singleton constructor for a Controller. Be aware that this starts as being @@ -385,6 +427,9 @@ class Controller(TorCtl.PostEventListener): self.conn.add_event_listener(self) for listener in self.eventListeners: self.conn.add_event_listener(listener) + # registers this as our first heartbeat + self._updateHeartbeat() + # reset caches for ip -> fingerprint lookups self._fingerprintMappings = None self._fingerprintLookupCache = {}

1 0

[arm/master] fix: Unicode init needs to be before curses
by atagar＠torproject.org 26 May '11

26 May '11

commit d8ebaa88886c0aeb421623416990bd3058b175f9 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat May 21 13:36:19 2011 -0700 fix: Unicode init needs to be before curses The locale needs to be set before initializing curses for unicode characters to be rendered. --- src/cli/controller.py | 6 ------ src/starter.py | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 8222da8..d9895e6 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -4,7 +4,6 @@ user input to the proper panels. """ import time -import locale import curses import threading @@ -460,11 +459,6 @@ def drawTorMonitor(stdscr, startTime): try: curses.curs_set(0) except curses.error: pass - # If using our LANG variable for rendering multi-byte characters lets us - # get unicode support then then use it. - if uiTools.isUnicodeAvailable(): - locale.setlocale(locale.LC_ALL, "") - # logs the initialization time msg = "arm started (initialization took %0.3f seconds)" % (time.time() - startTime) log.log(CONFIG["log.startTime"], msg) diff --git a/src/starter.py b/src/starter.py index 84abbca..9268351 100644 --- a/src/starter.py +++ b/src/starter.py @@ -10,6 +10,7 @@ import os import sys import time import getopt +import locale import socket import platform @@ -397,5 +398,11 @@ if __name__ == '__main__': procName.renameProcess("arm\0%s" % "\0".join(sys.argv[1:])) except: pass + # If using our LANG variable for rendering multi-byte characters lets us + # get unicode support then then use it. This needs to be done before + # initializing curses. + if util.uiTools.isUnicodeAvailable(): + locale.setlocale(locale.LC_ALL, "") + cli.controller.startTorMonitor(time.time() - initTime)

1 0