- tor-commits - lists.torproject.org

[compass/master] Add a loading gif while Ajax-ing
by karsten＠torproject.org 17 Sep '12

17 Sep '12

commit aefd024644942ff222897e44768341ca8f8a9ea6 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Sep 16 11:47:35 2012 +0530 Add a loading gif while Ajax-ing --- static/css/style.css | 7 +++++++ static/img/loader.gif | Bin 0 -> 1928 bytes static/js/custom.js | 5 +++++ templates/index.html | 5 +++-- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/static/css/style.css b/static/css/style.css new file mode 100644 index 0000000..66e0ef6 --- /dev/null +++ b/static/css/style.css @@ -0,0 +1,7 @@ +.loading { + width: 24px; + margin: 0 auto; + padding-top: 50px; + padding-bottom: 100px; + display: none; +} \ No newline at end of file diff --git a/static/img/loader.gif b/static/img/loader.gif new file mode 100644 index 0000000..521a291 Binary files /dev/null and b/static/img/loader.gif differ diff --git a/static/js/custom.js b/static/js/custom.js index 2144e89..d56f90c 100644 --- a/static/js/custom.js +++ b/static/js/custom.js @@ -14,10 +14,15 @@ function addListener(){ function doAjax(){ var path = window.location.search; if(path) { + $('.loading').show(); + $('html, body').animate({ + scrollTop: $('.loading').offset().top + }, 1000); $.ajax({ url: "result"+path, type: "GET", }).done(function(data) { + $('.loading').hide(); $('#result').append(data); $('html, body').animate({ scrollTop: $('#result').offset().top diff --git a/templates/index.html b/templates/index.html index 9ffe0d2..f0ab694 100644 --- a/templates/index.html +++ b/templates/index.html @@ -9,6 +9,7 @@  <link href="{{ url_for('static', filename='css/bootstrap.css') }}" rel="stylesheet"> + <link href="{{ url_for('static', filename='css/style.css') }}" rel="stylesheet"> <style type="text/css"> body { padding-top: 60px; @@ -143,9 +144,9 @@ </fieldset> </form> </div> - - <hr> + <div class="loading"><img src="{{ url_for('static', filename='img/loader.gif') }}" /></div> + <hr> <div id="result"></div> <footer>

1 0

[pyonionoo/master] Add missing fields in /summary?type=foo
by karsten＠torproject.org 17 Sep '12

17 Sep '12

commit 22b61026361f1c859a54fe9cbac51f994ac452cc Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Sep 16 19:44:55 2012 +0530 Add missing fields in /summary?type=foo --- pyonionoo/handlers/summary.py | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pyonionoo/handlers/summary.py b/pyonionoo/handlers/summary.py index 5502e9d..7260c77 100644 --- a/pyonionoo/handlers/summary.py +++ b/pyonionoo/handlers/summary.py @@ -14,7 +14,6 @@ from pyonionoo.parser import Router ARGUMENTS = ['type', 'running', 'search', 'lookup', 'country', 'order', 'offset', 'limit'] class SummaryHandler(cyclone.web.RequestHandler): - @defer.inlineCallbacks def get(self): """ @@ -29,7 +28,6 @@ class SummaryHandler(cyclone.web.RequestHandler): self.write(response) def _get_results(self): - user_arguments = self.request.arguments routers = database.get_summary_routers(**arguments.parse(user_arguments)) @@ -46,12 +44,12 @@ class SummaryHandler(cyclone.web.RequestHandler): 'r' : bool(router['running']) }) - if relays: - response['relays'] = relays - response['relays_published'] = relay_timestamp.strftime("%Y-%m-%d %H:%M:%S") - if bridges: - response['bridges'] = bridges - response['bridges_published'] = bridge_timestamp.strftime("%Y-%m-%d %H:%M:%S") + # response is a dict, so the order is not maintained. should the + # values in the response be in a specific order? + response['relays'] = relays + response['relays_published'] = relay_timestamp.strftime("%Y-%m-%d %H:%M:%S") + response['bridges'] = bridges + response['bridges_published'] = bridge_timestamp.strftime("%Y-%m-%d %H:%M:%S") return response

1 0

[pyonionoo/master] Merge remote-tracking branch 'gsathya/bug_6707'
by karsten＠torproject.org 17 Sep '12

17 Sep '12

commit 34e6b71e88c8c931e5310739ab494eed86a6494c Merge: fdcf519 22b6102 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Sep 17 21:56:45 2012 -0400 Merge remote-tracking branch 'gsathya/bug_6707' pyonionoo/handlers/summary.py | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-)

1 0

[pyonionoo/master] Remove cookie_secret.py and related code
by karsten＠torproject.org 17 Sep '12

17 Sep '12

commit fdcf519240ebf7962653b666b3b5f53b510a566a Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Sep 16 12:04:21 2012 +0530 Remove cookie_secret.py and related code --- pyonionoo.conf | 4 +--- pyonionoo/config.py | 3 --- scripts/cookie_secret.py | 22 ---------------------- 3 files changed, 1 insertions(+), 28 deletions(-) diff --git a/pyonionoo.conf b/pyonionoo.conf index e3b4b90..6e93de1 100644 --- a/pyonionoo.conf +++ b/pyonionoo.conf @@ -1,8 +1,6 @@ [server] debug = true xheaders = false -xsrf_cookies = false -cookie_secret = dHDj2e0pSEetYyY6Uk9q2XniVQlCEEemlbO8m4kn9sw= [frontend] locale_path = frontend/locale @@ -31,5 +29,5 @@ poolsize = 10 debug = no [metrics] -out_dir = /tmp/ndanner/out +out_dir = /tmp diff --git a/pyonionoo/config.py b/pyonionoo/config.py index 5e0cdca..1de03b0 100644 --- a/pyonionoo/config.py +++ b/pyonionoo/config.py @@ -21,9 +21,6 @@ def parse_config(filename): # web server settings settings["debug"] = xget(cfg.getboolean, "server", "debug", False) settings["xheaders"] = xget(cfg.getboolean, "server", "xheaders", False) - settings["cookie_secret"] = cfg.get("server", "cookie_secret") - settings["xsrf_cookies"] = xget(cfg.getboolean, "server", "xsrf_cookies", - False) # get project's absolute path root = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) diff --git a/scripts/cookie_secret.py b/scripts/cookie_secret.py deleted file mode 100644 index 7ccddba..0000000 --- a/scripts/cookie_secret.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env python -# coding: utf-8 -# -# Copyright 2012 Alexandre Fiori -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import base64 -import uuid - -if __name__ == "__main__": - print(base64.b64encode(uuid.uuid4().bytes + uuid.uuid4().bytes))

1 0

[torspec/master] Adding 'bwweightscale' parameter
by nickm＠torproject.org 17 Sep '12

17 Sep '12

commit bc51eaaac113b60710e16b987a3cb60332a1a881 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 16 18:16:56 2012 -0700 Adding 'bwweightscale' parameter The network status document's "bandwidths-weights" line mentions an undocumented parameter. Adding it to the params section. This addresses... https://trac.torproject.org/6872 --- dir-spec.txt | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index c18efcf..249c950 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1266,6 +1266,10 @@ proxies. See trac entry 1751 for details. Min: 0, Max: 1 + "bwweightscale" -- Value that bandwidth-weights are divided by. If not + present then this defaults to 10000. + Min: 1 + "cbtdisabled", "cbtnummodes", "cbtrecentcount", "cbtmaxtimeouts", "cbtmincircs", "cbtquantile", "cbtclosequantile", "cbttestfreq", "cbtmintimeout", and "cbtinitialtimeout" -- see "2.4.5. Consensus @@ -1461,9 +1465,8 @@ "Wmb=" INT SP "Wmd=" INT SP "Wme=" INT SP "Wmg=" INT SP "Wmm=" INT NL These values represent the weights to apply to router bandwidths - during path selection. They are sorted in lexical order (as ASCII byte - strings). The integer values are divided by BW_WEIGHT_SCALE=10000 or - the consensus param "bwweightscale". They are: + during path selection. Values are divided by the consensus' + "bwweightscale" param. Definition of our entries are... Wgg - Weight for Guard-flagged nodes in the guard position Wgm - Weight for non-flagged nodes in the guard Position

1 0

[torspec/master] Merge remote-tracking branch 'atagar/6872'
by nickm＠torproject.org 17 Sep '12

17 Sep '12

commit eacdd6ec6c8ba1c29a4b2d6d1d095b73887a6b89 Merge: b829224 bc51eaa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 17 17:23:06 2012 -0400 Merge remote-tracking branch 'atagar/6872' dir-spec.txt | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/master] Don't do reachability testing over IPv6 unless AuthDirPublishIPv6 is set.
by nickm＠torproject.org 17 Sep '12

17 Sep '12

commit bee1e46bd179b4085f47f3f3fc34db94e67e1c72 Author: Linus Nordberg <linus(a)torproject.org> Date: Mon Sep 17 20:21:22 2012 +0200 Don't do reachability testing over IPv6 unless AuthDirPublishIPv6 is set. This affects both directory authorities and bridge authoritites. --- changes/bug6880 | 3 +++ src/or/dirserv.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/bug6880 b/changes/bug6880 new file mode 100644 index 0000000..c08a2d4 --- /dev/null +++ b/changes/bug6880 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Don't do reachability testing over IPv6 unless + AuthDirPublishIPv6 is set. Fix for bug 6880. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index a8f2fb9..d355690 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -3415,7 +3415,8 @@ dirserv_single_reachability_test(time_t now, routerinfo_t *router) router->cache_info.identity_digest); /* Possible IPv6. */ - if (!tor_addr_is_null(&router->ipv6_addr)) { + if (get_options()->AuthDirHasIPv6Connectivity == 1 && + !tor_addr_is_null(&router->ipv6_addr)) { char addrstr[TOR_ADDR_BUF_LEN]; log_debug(LD_OR, "Testing reachability of %s at %s:%u.", router->nickname,

1 0

[tor/master] Merge remote-tracking branch 'linus/bug6880'
by nickm＠torproject.org 17 Sep '12

17 Sep '12

commit 5dfec9f8335d0fa954ff5423a41e3e249547fd8d Merge: 1e5cd1c bee1e46 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 17 16:05:09 2012 -0400 Merge remote-tracking branch 'linus/bug6880' changes/bug6880 | 3 +++ src/or/dirserv.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletions(-)

1 0

[tor/master] Fix comment typo in tor_memeq
by nickm＠torproject.org 17 Sep '12

17 Sep '12

commit 1e5cd1c7d6f45456c5e7c1b288e5e02e7c02b377 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Sep 17 11:13:09 2012 -0400 Fix comment typo in tor_memeq --- src/common/di_ops.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/di_ops.c b/src/common/di_ops.c index 7683c59..418d6e3 100644 --- a/src/common/di_ops.c +++ b/src/common/di_ops.c @@ -123,7 +123,7 @@ tor_memeq(const void *a, const void *b, size_t sz) * * If any_difference != 0: * 0 < any_difference < 256, so - * 0 < any_difference - 1 < 255 + * 0 <= any_difference - 1 < 255 * (any_difference - 1) >> 8 == 0 * 1 & ((any_difference - 1) >> 8) == 0 */

1 0

[tor/master] Make crypto_pk_cmp_keys do something sane for NULL keys
by nickm＠torproject.org 17 Sep '12

17 Sep '12

commit f3916a685594a6e0e4f4a215a57f5aea34c8570c Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sat Sep 15 02:47:14 2012 -0700 Make crypto_pk_cmp_keys do something sane for NULL keys Fixes bug 4283; bugfix on r76 (Git commit 01aadefbfc7dbd99ddaff922b897996b768cf2f9). --- src/common/crypto.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 7768cc3..5b5fb75 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -748,19 +748,23 @@ crypto_pk_public_exponent_ok(crypto_pk_t *env) return BN_is_word(env->key->e, 65537); } -/** Compare the public-key components of a and b. Return -1 if a\<b, 0 - * if a==b, and 1 if a\>b. +/** Compare the public-key components of a and b. Return -1 if a\<b, + * 0 if a==b, and 1 if a\>b. A NULL key is considered to be less than + * all non-NULL keys, and equal to itself. + * + * Note that this may leak information about the keys through timing. */ int crypto_pk_cmp_keys(crypto_pk_t *a, crypto_pk_t *b) { int result; + char a_is_non_null = (a != NULL) && (a->key != NULL); + char b_is_non_null = (b != NULL) && (b->key != NULL); + char an_argument_is_null = !a_is_non_null | !b_is_non_null; - if (!a || !b) - return -1; - - if (!a->key || !b->key) - return -1; + result = tor_memcmp(&a_is_non_null, &b_is_non_null, sizeof(a_is_non_null)); + if (an_argument_is_null) + return result; tor_assert(PUBLIC_KEY_OK(a)); tor_assert(PUBLIC_KEY_OK(b));

1 0