February 2016 - tor-commits - lists.torproject.org

[torbutton/maint-1.9.4] Bug 18144: about:tor update arrow position is wrong (Retina and zoom)
by gk＠torproject.org 08 Feb '16

08 Feb '16

commit 3ccbfe38c767fb5d85ea37168ae08c297997b5ac Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Feb 1 14:48:22 2016 -0500 Bug 18144: about:tor update arrow position is wrong (Retina and zoom) For the about:tor content window, use nsIDOMWindowUtils.screenPixelsPerCSSPixel instead of window.devicePixelRatio to compensate for a retina display and for content zoom (devicePixelRatio always returns 1.0 for content windows due to the fix for bug 13875). --- src/chrome/content/aboutTor/aboutTor.xhtml | 7 +------ src/chrome/content/torbutton.js | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 6fdbe50..dbb8a89 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>  @@ -59,11 +59,6 @@ function adjustToolbarIconArrow() return; } - // Account for content zoom and retina displays by converting to device - // independent units. - if ("devicePixelRatio" in window) // FF18+ - tbXpos /= window.devicePixelRatio; - const kArrowMargin = 6; // Horizontal margin between line and text. const kArrowHeadExtraWidth = 9; // Horizontal margin to the line. const kArrowLineThickness = 11; diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 0d1cfe8..25b61fb 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1023,7 +1023,8 @@ function torbutton_adjust_abouttor_fontsizes(aDoc, aContainerName) } // Determine X position of torbutton toolbar item and pass it through -// to the xhtml document. +// to the xhtml document by setting a torbutton-xpos attribute on the body. +// The value that is set takes retina displays and content zoom into account. function torbutton_update_abouttor_arrow(aDoc) { try { let tbXpos = -1; @@ -1033,15 +1034,22 @@ function torbutton_update_abouttor_arrow(aDoc) { let contentElem = document.getElementById("content"); let contentRect = contentElem.getBoundingClientRect(); if (tbItemRect.top < contentRect.top) { - tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - - contentElem.getBoundingClientRect().left; + tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - contentRect.left; } } - if (tbXpos >= 0) { - if ("devicePixelRatio" in window) // FF18+ - tbXpos *= window.devicePixelRatio; // Convert to device pixels. - tbXpos = Math.round(tbXpos); + if (tbXpos >= 0) { + // Convert to device-independent units, compensating for retina display + // and content zoom that may be in effect on the about:tor page. + // Because window.devicePixelRatio always returns 1.0 for non-Chrome + // windows (see bug 13875), we use screenPixelsPerCSSPixel for the + // content window. + tbXpos *= window.devicePixelRatio; + let pixRatio = gBrowser.contentWindow + .QueryInterface(Ci.nsIInterfaceRequestor) + .getInterface(Ci.nsIDOMWindowUtils) + .screenPixelsPerCSSPixel; + tbXpos = Math.round(tbXpos / pixRatio); aDoc.body.setAttribute("torbutton-xpos", tbXpos); } else { aDoc.body.removeAttribute("torbutton-xpos");

1 0

[torbutton/master] Bug 18144: about:tor update arrow position is wrong (Retina and zoom)
by gk＠torproject.org 08 Feb '16

08 Feb '16

commit b195514c21e5809f9afc8ec606e716d0e67865cc Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Feb 1 14:48:22 2016 -0500 Bug 18144: about:tor update arrow position is wrong (Retina and zoom) For the about:tor content window, use nsIDOMWindowUtils.screenPixelsPerCSSPixel instead of window.devicePixelRatio to compensate for a retina display and for content zoom (devicePixelRatio always returns 1.0 for content windows due to the fix for bug 13875). --- src/chrome/content/aboutTor/aboutTor.xhtml | 7 +------ src/chrome/content/torbutton.js | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 6fdbe50..dbb8a89 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>  @@ -59,11 +59,6 @@ function adjustToolbarIconArrow() return; } - // Account for content zoom and retina displays by converting to device - // independent units. - if ("devicePixelRatio" in window) // FF18+ - tbXpos /= window.devicePixelRatio; - const kArrowMargin = 6; // Horizontal margin between line and text. const kArrowHeadExtraWidth = 9; // Horizontal margin to the line. const kArrowLineThickness = 11; diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 0d1cfe8..25b61fb 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1023,7 +1023,8 @@ function torbutton_adjust_abouttor_fontsizes(aDoc, aContainerName) } // Determine X position of torbutton toolbar item and pass it through -// to the xhtml document. +// to the xhtml document by setting a torbutton-xpos attribute on the body. +// The value that is set takes retina displays and content zoom into account. function torbutton_update_abouttor_arrow(aDoc) { try { let tbXpos = -1; @@ -1033,15 +1034,22 @@ function torbutton_update_abouttor_arrow(aDoc) { let contentElem = document.getElementById("content"); let contentRect = contentElem.getBoundingClientRect(); if (tbItemRect.top < contentRect.top) { - tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - - contentElem.getBoundingClientRect().left; + tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - contentRect.left; } } - if (tbXpos >= 0) { - if ("devicePixelRatio" in window) // FF18+ - tbXpos *= window.devicePixelRatio; // Convert to device pixels. - tbXpos = Math.round(tbXpos); + if (tbXpos >= 0) { + // Convert to device-independent units, compensating for retina display + // and content zoom that may be in effect on the about:tor page. + // Because window.devicePixelRatio always returns 1.0 for non-Chrome + // windows (see bug 13875), we use screenPixelsPerCSSPixel for the + // content window. + tbXpos *= window.devicePixelRatio; + let pixRatio = gBrowser.contentWindow + .QueryInterface(Ci.nsIInterfaceRequestor) + .getInterface(Ci.nsIDOMWindowUtils) + .screenPixelsPerCSSPixel; + tbXpos = Math.round(tbXpos / pixRatio); aDoc.body.setAttribute("torbutton-xpos", tbXpos); } else { aDoc.body.removeAttribute("torbutton-xpos");

1 0

[tor/master] changes file for bug18051
by nickm＠torproject.org 08 Feb '16

08 Feb '16

commit 0c4fa4a9234e8aae56a2a10c45ad0ff3c2bf91cf Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 8 08:35:43 2016 -0500 changes file for bug18051 --- changes/bug18051 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug18051 b/changes/bug18051 new file mode 100644 index 0000000..1b11867 --- /dev/null +++ b/changes/bug18051 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When generating a URL for a directory server on an IPv6 address, + wrap the IPv6 address in square brackets. Fixes bug 18051; + bugfix on ?. Patch from Malek.

1 0

[tor/master] Add missing consts; my fault.
by nickm＠torproject.org 08 Feb '16

08 Feb '16

commit 92048a1b43024d338e0b3fd1fd36d5255b98358e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 8 08:34:18 2016 -0500 Add missing consts; my fault. --- src/or/router.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index ff21f41..6d3582f 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1739,7 +1739,7 @@ router_upload_dir_desc_to_dirservers(int force) int router_compare_to_my_exit_policy(const tor_addr_t *addr, uint16_t port) { - routerinfo_t *me = router_get_my_routerinfo(); + const routerinfo_t *me = router_get_my_routerinfo(); if (!me) /* make sure routerinfo exists */ return -1; @@ -1836,7 +1836,7 @@ const char * router_get_my_descriptor(void) { const char *body; - routerinfo_t *me = router_get_my_routerinfo(); + const routerinfo_t *me = router_get_my_routerinfo(); if (! me) return NULL; tor_assert(me->cache_info.saved_location == SAVED_NOWHERE);

1 0

[tor/master] decorated ipv6 address for directory send command
by nickm＠torproject.org 08 Feb '16

08 Feb '16

commit 061586e36cb8d34e0db761e77fa8407b993632ce Author: Malek <malek(a)mit.edu> Date: Sat Feb 6 16:30:49 2016 -0500 decorated ipv6 address for directory send command --- src/or/directory.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index c1fa37f..13392d6 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1159,6 +1159,23 @@ directory_get_consensus_url(const char *resource) return url; } +/** + * Copies the ipv6 from source to destination, subject to buffer size limit + * size. If decorate is true, makes sure the copied address is decorated. + */ +static void +copy_ipv6_address(char* destination, const char* source, size_t len, + int decorate) { + tor_assert(destination); + tor_assert(source); + + if (decorate && source[0] != '[') { + tor_snprintf(destination, len, "[%s]", source); + } else { + strlcpy(destination, source, len); + } +} + /** Queue an appropriate HTTP command on conn-\>outbuf. The other args * are as in directory_initiate_command(). */ @@ -1170,6 +1187,9 @@ directory_send_command(dir_connection_t *conn, { char proxystring[256]; char hoststring[128]; + /* NEEDS to be the same size hoststring. + Will be decorated with brackets around it if it is ipv6. */ + char decorated_address[128]; smartlist_t *headers = smartlist_new(); char *url; char request[8192]; @@ -1182,12 +1202,20 @@ directory_send_command(dir_connection_t *conn, if (resource) conn->requested_resource = tor_strdup(resource); + /* decorate the ip address if it is ipv6 */ + if(strchr(conn->base_.address, ':')) { + copy_ipv6_address(decorated_address, conn->base_.address, + sizeof(decorated_address), 1); + } else { + strlcpy(decorated_address, conn->base_.address, sizeof(decorated_address)); + } + /* come up with a string for which Host: we want */ if (conn->base_.port == 80) { - strlcpy(hoststring, conn->base_.address, sizeof(hoststring)); + strlcpy(hoststring, decorated_address, sizeof(hoststring)); } else { - tor_snprintf(hoststring, sizeof(hoststring),"%s:%d", - conn->base_.address, conn->base_.port); + tor_snprintf(hoststring, sizeof(hoststring), "%s:%d", + decorated_address, conn->base_.port); } /* Format if-modified-since */ @@ -4157,4 +4185,3 @@ dir_split_resource_into_fingerprints(const char *resource, smartlist_free(fp_tmp); return 0; } -

1 0

[tor/master] Merge branch 'decorated_ipv6_directory_send_command_squashed'
by nickm＠torproject.org 08 Feb '16

08 Feb '16

commit 9f6589d65a26388ac4a8e73a9b6e00a0472bac0b Merge: d004f06 061586e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 8 08:33:28 2016 -0500 Merge branch 'decorated_ipv6_directory_send_command_squashed' src/or/directory.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-)

1 0

[tor/master] fix wide lines, use more locals.
by nickm＠torproject.org 08 Feb '16

08 Feb '16

commit d004f06830cc6499489c525c73c2e33832b498e4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 8 08:31:31 2016 -0500 fix wide lines, use more locals. --- src/or/dirserv.c | 2 +- src/or/router.c | 27 +++++++++++++++------------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index bafea5e..3771818 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3103,7 +3103,7 @@ dirserv_get_routerdescs(smartlist_t *descs_out, const char *key, DSR_HEX|DSR_SORT_UNIQ); SMARTLIST_FOREACH_BEGIN(digests, const char *, d) { if (router_digest_is_me(d)) { - /* calling router_get_my_routerinfo() to make sure desc_routerinfo exists */ + /* calling router_get_my_routerinfo() to make sure it exists */ const routerinfo_t *ri = router_get_my_routerinfo(); if (ri) smartlist_add(descs_out, (void*) &(ri->cache_info)); diff --git a/src/or/router.c b/src/or/router.c index f09f375..ff21f41 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1739,7 +1739,8 @@ router_upload_dir_desc_to_dirservers(int force) int router_compare_to_my_exit_policy(const tor_addr_t *addr, uint16_t port) { - if (!router_get_my_routerinfo()) /* make sure desc_routerinfo exists */ + routerinfo_t *me = router_get_my_routerinfo(); + if (!me) /* make sure routerinfo exists */ return -1; /* make sure it's resolved to something. this way we can't get a @@ -1747,20 +1748,21 @@ router_compare_to_my_exit_policy(const tor_addr_t *addr, uint16_t port) if (tor_addr_is_null(addr)) return -1; - /* look at router_get_my_routerinfo()->exit_policy for both the v4 and the v6 - * policies. The exit_policy field in router_get_my_routerinfo() is a bit unusual, - * in that it contains IPv6 and IPv6 entries. We don't want to look - * at router_get_my_routerinfo()->ipv6_exit_policy, since that's a port summary. */ + /* look at router_get_my_routerinfo()->exit_policy for both the v4 and the + * v6 policies. The exit_policy field in router_get_my_routerinfo() is a + * bit unusual, in that it contains IPv6 and IPv6 entries. We don't want to + * look at router_get_my_routerinfo()->ipv6_exit_policy, since that's a port + * summary. */ if ((tor_addr_family(addr) == AF_INET || tor_addr_family(addr) == AF_INET6)) { return compare_tor_addr_to_addr_policy(addr, port, - router_get_my_routerinfo()->exit_policy) != ADDR_POLICY_ACCEPTED; + me->exit_policy) != ADDR_POLICY_ACCEPTED; #if 0 } else if (tor_addr_family(addr) == AF_INET6) { return get_options()->IPv6Exit && desc_routerinfo->ipv6_exit_policy && compare_tor_addr_to_short_policy(addr, port, - desc_routerinfo->ipv6_exit_policy) != ADDR_POLICY_ACCEPTED; + me->ipv6_exit_policy) != ADDR_POLICY_ACCEPTED; #endif } else { return -1; @@ -1772,7 +1774,7 @@ router_compare_to_my_exit_policy(const tor_addr_t *addr, uint16_t port) MOCK_IMPL(int, router_my_exit_policy_is_reject_star,(void)) { - if (!router_get_my_routerinfo()) /* make sure desc_routerinfo exists */ + if (!router_get_my_routerinfo()) /* make sure routerinfo exists */ return -1; return router_get_my_routerinfo()->policy_is_reject_star; @@ -1834,12 +1836,13 @@ const char * router_get_my_descriptor(void) { const char *body; - if (!router_get_my_routerinfo()) + routerinfo_t *me = router_get_my_routerinfo(); + if (! me) return NULL; - tor_assert(router_get_my_routerinfo()->cache_info.saved_location == SAVED_NOWHERE); - body = signed_descriptor_get_body(&router_get_my_routerinfo()->cache_info); + tor_assert(me->cache_info.saved_location == SAVED_NOWHERE); + body = signed_descriptor_get_body(&me->cache_info); /* Make sure this is nul-terminated. */ - tor_assert(!body[router_get_my_routerinfo()->cache_info.signed_descriptor_len]); + tor_assert(!body[me->cache_info.signed_descriptor_len]); log_debug(LD_GENERAL,"my desc is '%s'", body); return body; }

1 0

[tor/master] Using router_get_my_routerinfo()
by nickm＠torproject.org 08 Feb '16

08 Feb '16

commit c30be5a82d47328c311ed4bff925e37b6b40411c Author: Harini Kannan <hkannan(a)mit.edu> Date: Sun Feb 7 16:07:35 2016 -0500 Using router_get_my_routerinfo() --- src/or/connection.c | 1 - src/or/dirserv.c | 2 +- src/or/router.c | 24 ++++++++++++------------ 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 123c33a..6c2160c 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1111,7 +1111,6 @@ connection_listener_new(const struct sockaddr *listensockaddr, start_reading = 1; tor_addr_from_sockaddr(&addr, listensockaddr, &usePort); - log_notice(LD_NET, "Opening %s on %s", conn_type_to_string(type), fmt_addrport(&addr, usePort)); diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 491557e..bafea5e 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3103,7 +3103,7 @@ dirserv_get_routerdescs(smartlist_t *descs_out, const char *key, DSR_HEX|DSR_SORT_UNIQ); SMARTLIST_FOREACH_BEGIN(digests, const char *, d) { if (router_digest_is_me(d)) { - /* make sure desc_routerinfo exists */ + /* calling router_get_my_routerinfo() to make sure desc_routerinfo exists */ const routerinfo_t *ri = router_get_my_routerinfo(); if (ri) smartlist_add(descs_out, (void*) &(ri->cache_info)); diff --git a/src/or/router.c b/src/or/router.c index 741e1ed..f09f375 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1747,14 +1747,14 @@ router_compare_to_my_exit_policy(const tor_addr_t *addr, uint16_t port) if (tor_addr_is_null(addr)) return -1; - /* look at desc_routerinfo->exit_policy for both the v4 and the v6 - * policies. The exit_policy field in desc_routerinfo is a bit unusual, + /* look at router_get_my_routerinfo()->exit_policy for both the v4 and the v6 + * policies. The exit_policy field in router_get_my_routerinfo() is a bit unusual, * in that it contains IPv6 and IPv6 entries. We don't want to look - * at desc_routerinfio->ipv6_exit_policy, since that's a port summary. */ + * at router_get_my_routerinfo()->ipv6_exit_policy, since that's a port summary. */ if ((tor_addr_family(addr) == AF_INET || tor_addr_family(addr) == AF_INET6)) { return compare_tor_addr_to_addr_policy(addr, port, - desc_routerinfo->exit_policy) != ADDR_POLICY_ACCEPTED; + router_get_my_routerinfo()->exit_policy) != ADDR_POLICY_ACCEPTED; #if 0 } else if (tor_addr_family(addr) == AF_INET6) { return get_options()->IPv6Exit && @@ -1775,7 +1775,7 @@ router_my_exit_policy_is_reject_star,(void)) if (!router_get_my_routerinfo()) /* make sure desc_routerinfo exists */ return -1; - return desc_routerinfo->policy_is_reject_star; + return router_get_my_routerinfo()->policy_is_reject_star; } /** Return true iff I'm a server and <b>digest</b> is equal to @@ -1836,10 +1836,10 @@ router_get_my_descriptor(void) const char *body; if (!router_get_my_routerinfo()) return NULL; - tor_assert(desc_routerinfo->cache_info.saved_location == SAVED_NOWHERE); - body = signed_descriptor_get_body(&desc_routerinfo->cache_info); + tor_assert(router_get_my_routerinfo()->cache_info.saved_location == SAVED_NOWHERE); + body = signed_descriptor_get_body(&router_get_my_routerinfo()->cache_info); /* Make sure this is nul-terminated. */ - tor_assert(!body[desc_routerinfo->cache_info.signed_descriptor_len]); + tor_assert(!body[router_get_my_routerinfo()->cache_info.signed_descriptor_len]); log_debug(LD_GENERAL,"my desc is '%s'", body); return body; } @@ -2242,10 +2242,10 @@ check_descriptor_bandwidth_changed(time_t now) { static time_t last_changed = 0; uint64_t prev, cur; - if (!desc_routerinfo) + if (!router_get_my_routerinfo()) return; - prev = desc_routerinfo->bandwidthcapacity; + prev = router_get_my_routerinfo()->bandwidthcapacity; cur = we_are_hibernating() ? 0 : rep_hist_bandwidth_assess(); if ((prev != cur && (!prev || !cur)) || cur > prev*2 || @@ -2299,11 +2299,11 @@ check_descriptor_ipaddress_changed(time_t now) (void) now; - if (!desc_routerinfo) + if (router_get_my_routerinfo() == NULL) return; /* XXXX ipv6 */ - prev = desc_routerinfo->addr; + prev = router_get_my_routerinfo()->addr; if (resolve_my_address(LOG_INFO, options, &cur, &method, &hostname) < 0) { log_info(LD_CONFIG,"options->Address didn't resolve into an IP."); return;

1 0

[snowflake/master] more jasmine specs for proxypair, ui, and snowflake coffee files
by serene＠torproject.org 08 Feb '16

08 Feb '16

commit 547cb9690a5dfb0059d07e6d71a198d24189dd96 Author: Serene Han <keroserene+git(a)gmail.com> Date: Sun Feb 7 08:32:41 2016 -0800 more jasmine specs for proxypair, ui, and snowflake coffee files --- proxy/Cakefile | 2 ++ proxy/broker.coffee | 1 - proxy/proxypair.coffee | 9 +++-- proxy/snowflake.coffee | 32 +++++++---------- proxy/spec/proxypair.spec.coffee | 16 +-------- proxy/spec/snowflake.spec.coffee | 60 ++++++++++++++++++++++++++++++++ proxy/spec/ui.spec.coffee | 75 ++++++++++++++++++++++++++++++++++++++++ proxy/spec/util.spec.coffee | 12 +------ proxy/ui.coffee | 8 ++--- 9 files changed, 159 insertions(+), 56 deletions(-) diff --git a/proxy/Cakefile b/proxy/Cakefile index 97d7978..88d142b 100644 --- a/proxy/Cakefile +++ b/proxy/Cakefile @@ -13,7 +13,9 @@ FILES = [ ] FILES_SPEC = [ 'spec/util.spec.coffee' + 'spec/ui.spec.coffee' 'spec/proxypair.spec.coffee' + 'spec/snowflake.spec.coffee' ] FILES_ALL = FILES.concat FILES_SPEC OUTFILE = 'build/snowflake.coffee' diff --git a/proxy/broker.coffee b/proxy/broker.coffee index 2cc39f7..acd5a5f 100644 --- a/proxy/broker.coffee +++ b/proxy/broker.coffee @@ -24,7 +24,6 @@ class Broker constructor: (@url) -> @clients = 0 @id = genSnowflakeID() - dbg 'Contacting Broker at ' + @url + '\nSnowflake ID: ' + @id # Ensure url has the right protocol + trailing slash. @url = 'https://' + @url if 0 != @url.indexOf('https://', 0) @url += '/' if '/' != @url.substr -1 diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee index 83dc353..e7adfb9 100644 --- a/proxy/proxypair.coffee +++ b/proxy/proxypair.coffee @@ -5,7 +5,6 @@ Represents a single: ### - class ProxyPair MAX_BUFFER: 10 * 1024 * 1024 @@ -58,15 +57,15 @@ class ProxyPair channel.onopen = => log 'WebRTC DataChannel opened!' snowflake.state = MODE.WEBRTC_READY - ui.setActive true + snowflake.ui.setActive true # This is the point when the WebRTC datachannel is done, so the next step # is to establish websocket to the server. @connectRelay() channel.onclose = -> log 'WebRTC DataChannel closed.' - ui.setStatus 'disconnected.' + snowflake.ui.setStatus 'disconnected.' + snowflake.ui.setActive false snowflake.state = MODE.INIT - ui.setActive false # Change this for multiplexing. snowflake.reset() channel.onerror = -> log 'Data channel error!' @@ -79,7 +78,7 @@ class ProxyPair @relay.label = 'websocket-relay' @relay.onopen = => log @relay.label + ' connected!' - ui.setStatus 'connected' + snowflake.ui.setStatus 'connected' @relay.onclose = @onClose @relay.onerror = @onError @relay.onmessage = @onRelayToClientMessage diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index e49b375..0df1904 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -21,8 +21,6 @@ if 'undefined' != typeof window && window.location COPY_PASTE_ENABLED = Params.getBool(query, 'manual', false) else window = {} -# HEADLESS is true if we are running not in a browser with a DOM. -HEADLESS = 'undefined' == typeof(document) # Bytes per second. Set to undefined to disable limit. DEFAULT_RATE_LIMIT = DEFAULT_RATE_LIMIT || undefined @@ -59,7 +57,7 @@ class Snowflake state: MODE.INIT retries: 0 - constructor: (@broker) -> + constructor: (@broker, @ui) -> rateLimitBytes = undefined if 'off' != query['ratelimit'] rateLimitBytes = Params.getByteCount(query, 'ratelimit', @@ -89,8 +87,8 @@ class Snowflake return if COPY_PASTE_ENABLED timer = null # Temporary countdown. - countdown = (msg, sec) -> - ui.setStatus msg + ' (Retrying in ' + sec + ' seconds...)' + countdown = (msg, sec) => + @ui.setStatus msg + ' (Retrying in ' + sec + ' seconds...)' sec-- if sec >= 0 setTimeout((-> countdown(msg, sec)), 1000) @@ -101,8 +99,8 @@ class Snowflake clearTimeout timer msg = 'polling for client... ' msg += '[retries: ' + @retries + ']' if @retries > 0 - ui.setStatus msg - recv = broker.getClientOffer() + @ui.setStatus msg + recv = @broker.getClientOffer() @retries++ recv.then (desc) => offer = JSON.parse desc @@ -132,14 +130,12 @@ class Snowflake pair.onCleanup = (event) => # Delete from the list of active proxy pairs. @proxyPairs.splice(@proxyPairs.indexOf(pair), 1) - # @badge.endProxy() if @badge try pair.begin() catch err log 'ERROR: ProxyPair exception while connecting.' log err return - # @badge.beginProxy if @badge cease: -> while @proxyPairs.length > 0 @@ -148,12 +144,10 @@ class Snowflake disable: -> log 'Disabling Snowflake.' @cease() - # @badge.disable() if @badge die: -> log 'Snowflake died.' @cease() - # @badge.die() if @badge # Close all existing ProxyPairs and begin finding new clients from scratch. reset: -> @@ -163,8 +157,6 @@ class Snowflake @beginWebRTC() snowflake = null -broker = null -ui = null # Signalling channel - just tells user to copy paste to the peer. # Eventually this should go over the broker. @@ -190,19 +182,19 @@ Signalling = # Log to both console and UI if applicable. log = (msg) -> console.log 'Snowflake: ' + msg - ui.log msg + snowflake.ui.log msg -dbg = (msg) -> log msg if true == ui.debug +dbg = (msg) -> log msg if true == snowflake.ui.debug init = -> ui = new UI() - log '== snowflake proxy ==' - log 'Copy-Paste mode detected.' if COPY_PASTE_ENABLED brokerUrl = Params.getString(query, 'broker', DEFAULT_BROKER) broker = new Broker brokerUrl - snowflake = new Snowflake(broker) - # window.snowflake = snowflake - # window.ui = ui + snowflake = new Snowflake broker, ui + + dbg 'Contacting Broker at ' + broker.url + '\nSnowflake ID: ' + broker.id + log '== snowflake proxy ==' + log 'Copy-Paste mode detected.' if COPY_PASTE_ENABLED relayAddr = Params.getAddress(query, 'relay', DEFAULT_RELAY) snowflake.setRelayAddr relayAddr diff --git a/proxy/spec/proxypair.spec.coffee b/proxy/spec/proxypair.spec.coffee index 261d38d..162c0b4 100644 --- a/proxy/spec/proxypair.spec.coffee +++ b/proxy/spec/proxypair.spec.coffee @@ -1,27 +1,13 @@ ### -jasmine tests for Snowflake +jasmine tests for Snowflake proxypair ### -# Stubs to fake browser functionality. -class PeerConnection -class WebSocket - OPEN: 1 - CLOSED: 0 -ui = - log: -> - setActive: -> -log = -> describe 'ProxyPair', -> fakeRelay = Parse.address '0.0.0.0:12345' rateLimit = new DummyRateLimit() destination = [] fakeClient = send: (d) -> destination.push d - # Fake snowflake to interact with - snowflake = { - broker: - sendAnswer: -> - } pp = new ProxyPair(fakeClient, fakeRelay, rateLimit) it 'begins webrtc connection', -> diff --git a/proxy/spec/snowflake.spec.coffee b/proxy/spec/snowflake.spec.coffee new file mode 100644 index 0000000..be1601b --- /dev/null +++ b/proxy/spec/snowflake.spec.coffee @@ -0,0 +1,60 @@ +### +jasmine tests for Snowflake +### + +query = {} +# Fake browser functionality: +class PeerConnection +class RTCSessionDescription + type: 'offer' +class WebSocket + OPEN: 1 + CLOSED: 0 +log = -> +class FakeUI + log: -> + setActive: -> + setStatus: -> +fakeUI = new FakeUI() +class FakeBroker + getClientOffer: -> new Promise((F,R) -> {}) +# Fake snowflake to interact with +snowflake = + ui: fakeUI + broker: + sendAnswer: -> + +describe 'Snowflake', -> + + it 'constructs correctly', -> + s = new Snowflake({ fake: 'broker' }, fakeUI) + query['ratelimit'] = 'off' + expect(s.rateLimit).not.toBeNull() + expect(s.broker).toEqual { fake: 'broker' } + expect(s.ui).not.toBeNull() + expect(s.retries).toBe 0 + + it 'sets relay address correctly', -> + s = new Snowflake(null, fakeUI) + s.setRelayAddr 'foo' + expect(s.relayAddr).toEqual 'foo' + + it 'initalizes WebRTC connection', -> + s = new Snowflake(new FakeBroker(), fakeUI) + spyOn(s.broker, 'getClientOffer').and.callThrough() + s.beginWebRTC() + expect(s.retries).toBe 1 + expect(s.broker.getClientOffer).toHaveBeenCalled() + + it 'receives SDP offer', -> + s = new Snowflake(new FakeBroker(), fakeUI) + s.proxyPair = { receiveWebRTCOffer: -> } + spyOn(s.proxyPair, 'receiveWebRTCOffer').and.returnValue true + spyOn(s, 'sendAnswer') + s.receiveOffer 'foo' + expect(s.sendAnswer).toHaveBeenCalled() + + it 'can make a proxypair', -> + s = new Snowflake(new FakeBroker(), fakeUI) + s.makeProxyPair() + expect(s.proxyPairs.length).toBe 2 diff --git a/proxy/spec/ui.spec.coffee b/proxy/spec/ui.spec.coffee new file mode 100644 index 0000000..1628d83 --- /dev/null +++ b/proxy/spec/ui.spec.coffee @@ -0,0 +1,75 @@ +### +jasmine tests for Snowflake UI +### + +document = + getElementById: (id) -> + +describe 'UI', -> + + it 'activates debug mode when badge does not exist', -> + spyOn(document, 'getElementById').and.callFake (id) -> + return null if 'badge' == id + return { + focus: -> + } + u = new UI() + expect(u.debug).toBe true + expect(document.getElementById.calls.count()).toEqual 5 + expect(u.$status).not.toBeNull() + expect(u.$msglog).not.toBeNull() + expect(u.$send).not.toBeNull() + expect(u.$input).not.toBeNull() + + it 'is not debug mode when badge exists', -> + spyOn(document, 'getElementById').and.callFake (id) -> + return {} if 'badge' == id + return null + u = new UI() + expect(u.debug).toBe false + expect(document.getElementById).toHaveBeenCalled() + expect(document.getElementById.calls.count()).toEqual 1 + expect(u.$status).toBeNull() + expect(u.$msglog).toBeNull() + expect(u.$send).toBeNull() + expect(u.$input).toBeNull() + + it 'sets status message only when in debug mode', -> + u = new UI() + u.$status = { innerHTML: '' } + u.debug = false + u.setStatus('test') + expect(u.$status.innerHTML).toEqual '' + u.debug = true + u.setStatus('test') + expect(u.$status.innerHTML).toEqual 'Status: test' + + it 'sets message log css correctly for debug mode', -> + u = new UI() + u.debug = true + u.$msglog = {} + u.setActive true + expect(u.$msglog.className).toEqual 'active' + u.setActive false + expect(u.$msglog.className).toEqual '' + + it 'sets badge css correctly for non-debug mode', -> + u = new UI() + u.debug = false + u.$badge = {} + u.setActive true + expect(u.$badge.className).toEqual 'active' + u.setActive false + expect(u.$badge.className).toEqual '' + + it 'logs to the textarea correctly, only when debug mode', -> + u = new UI() + u.$msglog = { value: '', scrollTop: 0, scrollHeight: 1337 } + u.debug = false + u.log 'test' + expect(u.$msglog.value).toEqual '' + expect(u.$msglog.scrollTop).toEqual 0 + u.debug = true + u.log 'test' + expect(u.$msglog.value).toEqual 'test\n' + expect(u.$msglog.scrollTop).toEqual 1337 diff --git a/proxy/spec/util.spec.coffee b/proxy/spec/util.spec.coffee index a4281e9..07b712b 100644 --- a/proxy/spec/util.spec.coffee +++ b/proxy/spec/util.spec.coffee @@ -1,17 +1,7 @@ ### -jasmine tests for Snowflake +jasmine tests for Snowflake utils ### -# Stubs to fake browser functionality. -class PeerConnection -class WebSocket - OPEN: 1 - CLOSED: 0 -ui = - log: -> - setActive: -> -log = -> - describe 'BuildUrl', -> it 'should parse just protocol and host', -> expect(buildUrl('http', 'example.com')).toBe 'http://example.com' diff --git a/proxy/ui.coffee b/proxy/ui.coffee index f951f67..cb25216 100644 --- a/proxy/ui.coffee +++ b/proxy/ui.coffee @@ -6,10 +6,10 @@ class UI debug = false # True when there's no badge # DOM elements references. - $msglog = null - $send = null - $input = null - $status = null + $msglog: null + $send: null + $input: null + $status: null constructor: -> @$badge = document.getElementById('badge')

1 0

[webwml/master] Remove unused N900 images
by sebastian＠torproject.org 07 Feb '16

07 Feb '16

commit a8574518c141a738ea2b29ed096cb3f824f8268c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Feb 7 18:17:51 2016 +0100 Remove unused N900 images --- images/N900/10_success-small.png | Bin 226409 -> 0 bytes images/N900/10_success.png | Bin 174213 -> 0 bytes images/N900/11_after_rebooting-small.png | Bin 52131 -> 0 bytes images/N900/11_after_rebooting.png | Bin 43976 -> 0 bytes images/N900/12_status_menu-small.png | Bin 122210 -> 0 bytes images/N900/12_status_menu.png | Bin 99049 -> 0 bytes images/N900/13_enable_tor-small.png | Bin 92249 -> 0 bytes images/N900/13_enable_tor.png | Bin 70965 -> 0 bytes images/N900/14_check_tor-small.png | Bin 76880 -> 0 bytes images/N900/14_check_tor.png | Bin 49637 -> 0 bytes images/N900/1_app_menu-small.png | Bin 262268 -> 0 bytes images/N900/1_app_menu.png | Bin 297204 -> 0 bytes images/N900/2_app_manager-small.png | Bin 187985 -> 0 bytes images/N900/2_app_manager.png | Bin 242688 -> 0 bytes images/N900/3_app_managermenu-small.png | Bin 144670 -> 0 bytes images/N900/3_app_managermenu.png | Bin 108576 -> 0 bytes images/N900/4_catalog_list-small.png | Bin 67683 -> 0 bytes images/N900/4_catalog_list.png | Bin 55933 -> 0 bytes images/N900/5_new_catalog-small.png | Bin 104907 -> 0 bytes images/N900/5_new_catalog.png | Bin 75177 -> 0 bytes images/N900/6_app_manager-small.png | Bin 187392 -> 0 bytes images/N900/6_app_manager.png | Bin 241880 -> 0 bytes images/N900/7_app_categories-small.png | Bin 137320 -> 0 bytes images/N900/7_app_categories.png | Bin 116193 -> 0 bytes images/N900/8_app_list-small.png | Bin 98294 -> 0 bytes images/N900/8_app_list.png | Bin 72474 -> 0 bytes images/N900/9_disclaimer-small.png | Bin 139479 -> 0 bytes images/N900/9_disclaimer.png | Bin 84438 -> 0 bytes 28 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/N900/10_success-small.png b/images/N900/10_success-small.png deleted file mode 100644 index 2841a68..0000000 Binary files a/images/N900/10_success-small.png and /dev/null differ diff --git a/images/N900/10_success.png b/images/N900/10_success.png deleted file mode 100644 index e7d5662..0000000 Binary files a/images/N900/10_success.png and /dev/null differ diff --git a/images/N900/11_after_rebooting-small.png b/images/N900/11_after_rebooting-small.png deleted file mode 100644 index 1990169..0000000 Binary files a/images/N900/11_after_rebooting-small.png and /dev/null differ diff --git a/images/N900/11_after_rebooting.png b/images/N900/11_after_rebooting.png deleted file mode 100644 index f86965a..0000000 Binary files a/images/N900/11_after_rebooting.png and /dev/null differ diff --git a/images/N900/12_status_menu-small.png b/images/N900/12_status_menu-small.png deleted file mode 100644 index 27c0307..0000000 Binary files a/images/N900/12_status_menu-small.png and /dev/null differ diff --git a/images/N900/12_status_menu.png b/images/N900/12_status_menu.png deleted file mode 100644 index 1ee95b3..0000000 Binary files a/images/N900/12_status_menu.png and /dev/null differ diff --git a/images/N900/13_enable_tor-small.png b/images/N900/13_enable_tor-small.png deleted file mode 100644 index e116e58..0000000 Binary files a/images/N900/13_enable_tor-small.png and /dev/null differ diff --git a/images/N900/13_enable_tor.png b/images/N900/13_enable_tor.png deleted file mode 100644 index d45b10f..0000000 Binary files a/images/N900/13_enable_tor.png and /dev/null differ diff --git a/images/N900/14_check_tor-small.png b/images/N900/14_check_tor-small.png deleted file mode 100644 index 59e57fd..0000000 Binary files a/images/N900/14_check_tor-small.png and /dev/null differ diff --git a/images/N900/14_check_tor.png b/images/N900/14_check_tor.png deleted file mode 100644 index f1b8838..0000000 Binary files a/images/N900/14_check_tor.png and /dev/null differ diff --git a/images/N900/1_app_menu-small.png b/images/N900/1_app_menu-small.png deleted file mode 100644 index 4bcd48e..0000000 Binary files a/images/N900/1_app_menu-small.png and /dev/null differ diff --git a/images/N900/1_app_menu.png b/images/N900/1_app_menu.png deleted file mode 100644 index 4df6677..0000000 Binary files a/images/N900/1_app_menu.png and /dev/null differ diff --git a/images/N900/2_app_manager-small.png b/images/N900/2_app_manager-small.png deleted file mode 100644 index 3a6b8a2..0000000 Binary files a/images/N900/2_app_manager-small.png and /dev/null differ diff --git a/images/N900/2_app_manager.png b/images/N900/2_app_manager.png deleted file mode 100644 index 2914138..0000000 Binary files a/images/N900/2_app_manager.png and /dev/null differ diff --git a/images/N900/3_app_managermenu-small.png b/images/N900/3_app_managermenu-small.png deleted file mode 100644 index 2c673b2..0000000 Binary files a/images/N900/3_app_managermenu-small.png and /dev/null differ diff --git a/images/N900/3_app_managermenu.png b/images/N900/3_app_managermenu.png deleted file mode 100644 index 59156d4..0000000 Binary files a/images/N900/3_app_managermenu.png and /dev/null differ diff --git a/images/N900/4_catalog_list-small.png b/images/N900/4_catalog_list-small.png deleted file mode 100644 index d8c2082..0000000 Binary files a/images/N900/4_catalog_list-small.png and /dev/null differ diff --git a/images/N900/4_catalog_list.png b/images/N900/4_catalog_list.png deleted file mode 100644 index fc8f86a..0000000 Binary files a/images/N900/4_catalog_list.png and /dev/null differ diff --git a/images/N900/5_new_catalog-small.png b/images/N900/5_new_catalog-small.png deleted file mode 100644 index 7f1f18e..0000000 Binary files a/images/N900/5_new_catalog-small.png and /dev/null differ diff --git a/images/N900/5_new_catalog.png b/images/N900/5_new_catalog.png deleted file mode 100644 index 0aafaa2..0000000 Binary files a/images/N900/5_new_catalog.png and /dev/null differ diff --git a/images/N900/6_app_manager-small.png b/images/N900/6_app_manager-small.png deleted file mode 100644 index b287f51..0000000 Binary files a/images/N900/6_app_manager-small.png and /dev/null differ diff --git a/images/N900/6_app_manager.png b/images/N900/6_app_manager.png deleted file mode 100644 index 203b033..0000000 Binary files a/images/N900/6_app_manager.png and /dev/null differ diff --git a/images/N900/7_app_categories-small.png b/images/N900/7_app_categories-small.png deleted file mode 100644 index 4f82e44..0000000 Binary files a/images/N900/7_app_categories-small.png and /dev/null differ diff --git a/images/N900/7_app_categories.png b/images/N900/7_app_categories.png deleted file mode 100644 index f07c2c1..0000000 Binary files a/images/N900/7_app_categories.png and /dev/null differ diff --git a/images/N900/8_app_list-small.png b/images/N900/8_app_list-small.png deleted file mode 100644 index dd69363..0000000 Binary files a/images/N900/8_app_list-small.png and /dev/null differ diff --git a/images/N900/8_app_list.png b/images/N900/8_app_list.png deleted file mode 100644 index e8db31e..0000000 Binary files a/images/N900/8_app_list.png and /dev/null differ diff --git a/images/N900/9_disclaimer-small.png b/images/N900/9_disclaimer-small.png deleted file mode 100644 index af9d8e4..0000000 Binary files a/images/N900/9_disclaimer-small.png and /dev/null differ diff --git a/images/N900/9_disclaimer.png b/images/N900/9_disclaimer.png deleted file mode 100644 index 1241f0b..0000000 Binary files a/images/N900/9_disclaimer.png and /dev/null differ

1 0