September 2012 - tor-commits - lists.torproject.org

[tor/master] specify a version for the bug6884 changes file
by nickm＠torproject.org 18 Sep '12

18 Sep '12

commit f675e0a33efa5f32377e784b2612c2b6a5c9180b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 18 15:54:36 2012 -0400 specify a version for the bug6884 changes file --- changes/6884 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/changes/6884 b/changes/6884 index 90585dc..66801db 100644 --- a/changes/6884 +++ b/changes/6884 @@ -1,4 +1,4 @@ o Minor bugfixes (client): - Correct log printout about which address family is preferred when connecting to a bridge with both an IPv4 and IPv6 OR port. - Fixes bug 6884. + Fixes bug 6884; bugfix on 0.2.4.1-alpha.

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 18 Sep '12

18 Sep '12

commit 27ed2da09879e71fe24115cdef1e29db7143bbab Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 18 18:15:05 2012 +0000 Update translations for orbot --- values-he/strings.xml | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/values-he/strings.xml b/values-he/strings.xml new file mode 100644 index 0000000..92f76f8 --- /dev/null +++ b/values-he/strings.xml @@ -0,0 +1,51 @@ +<?xml version='1.0' encoding='UTF-8'?> +<resources> + <string name="app_name">Orbot</string> + <string name="internal_web_url">http://orbot/</string> + <string name="default_web_url">http://check.torproject.org</string> + <string name="secure_default_web_url">https://check.torproject.org</string> + <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> + <string name="control_permission_label">התחל ועצור את Tor</string> + <string name="tor_proxy_service_process">שירות הפרוקסי של Tor</string> + <string name="status_starting_up">Orbot מתחיל</string> + <string name="status_activated">מחובר לרשת Tor</string> + <string name="status_disabled">Orbot כבוי</string> + <string name="status_shutting_down">Orbot בתהליך כיבוי</string> + <string name="menu_home">בית</string> + <string name="menu_settings">הגדרות</string> + <string name="menu_info">עזרה</string> + <string name="menu_apps">יישומים</string> + <string name="menu_start">התחל</string> + <string name="menu_stop">עצור</string> + <string name="menu_about">אודות</string> + <string name="menu_wizard">אשף</string> + <string name="button_help">עזרה</string> + <string name="button_close">סגור</string> + <string name="button_about">אודות</string> + <string name="menu_verify">בדיקה</string> + <string name="menu_exit">צא</string> + <string name="press_to_start">-נגיעה ארוכה להתחלה-</string> + <string name="pref_transparent_port_title">רשימת פורטים</string> + <string name="pref_has_root">דרוש רוט</string> + <string name="title_error">שגיאת יישום</string> + <string name="wizard_title">Orbot</string> + <string name="wizard_btn_tell_me_more">אודות Orbot</string> + <string name="btn_next">הבא</string> + <string name="btn_back">הקודם</string> + <string name="btn_finish">סיים</string> +  +  +  +  +  +  +  +  +  +  + <string name="default_bridges"/> +</resources>

1 0

[compass/master] Initialise tooltips
by karsten＠torproject.org 18 Sep '12

18 Sep '12

commit 5ef93402b2195339904517fbd331ff57df08dd1b Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Sep 16 10:50:17 2012 +0530 Initialise tooltips --- static/js/custom.js | 1 + templates/index.html | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/static/js/custom.js b/static/js/custom.js index d56f90c..290c1e0 100644 --- a/static/js/custom.js +++ b/static/js/custom.js @@ -27,6 +27,7 @@ function doAjax(){ $('html, body').animate({ scrollTop: $('#result').offset().top }, 1000); + $('span[rel=tooltip]').tooltip(); }); } } diff --git a/templates/index.html b/templates/index.html index f0ab694..4535a68 100644 --- a/templates/index.html +++ b/templates/index.html @@ -164,6 +164,7 @@ --> <script src="{{ url_for('static', filename='js/jquery-1.8.0.min.js') }}"></script> <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script> + <script src="{{ url_for('static', filename='js/bootstrap-tooltip.js') }}"></script> <script src="{{ url_for('static', filename='js/custom.js') }}"></script> <script> doAjax();

1 0

[compass/master] Add a 'total' line at the bottom of the table
by karsten＠torproject.org 18 Sep '12

18 Sep '12

commit b894185a7c7770df218436c9d99b6cba1795a134 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Sep 9 20:46:10 2012 +0530 Add a 'total' line at the bottom of the table --- app.py | 22 ++++++++++++++++++++-- templates/result.html | 6 +++--- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/app.py b/app.py index a0d2b05..3a66a79 100644 --- a/app.py +++ b/app.py @@ -26,6 +26,7 @@ class Opt(object): class Result(): def __init__(self): + self.index = None self.cw = None self.adv_bw = None self.p_guard = None @@ -66,6 +67,7 @@ def parse(output_string, grouping=False, sort_key=None): # TODO: change inaccurate value of 10 if len(values) > 10: + result.index = id result.cw = values[0] result.adv_bw = values[1] result.p_guard = values[2] @@ -89,6 +91,23 @@ def parse(output_string, grouping=False, sort_key=None): sorted_results[key] = [result] else: results.append(result) + else: + result.index = "" + result.cw = values[0] + result.adv_bw = values[1] + result.p_guard = values[2] + result.p_middle = values[3] + result.p_exit = values[4] + result.nick = "" + result.fp = ' '.join(values[5:]) + result.exit = "" + result.guard = "" + result.cc = "" + result.as_no = "" + result.as_name = "" + result.as_info = "" + results.append(result) + return results if results else sorted_results @app.route('/') @@ -130,7 +149,6 @@ def result(): short=None, links=None) results = parse(output_string, options.by_country or options.by_as, sort_key) - if sort_key: for key in sorted(results.iterkeys(), reverse=True): for value in results[key]: @@ -138,7 +156,7 @@ def result(): else: relays = results - return render_template('result.html', results=relays) + return render_template('result.html', results=relays, grouping=options.by_as or options.by_country) if __name__ == '__main__': # Bind to PORT if defined, otherwise default to 5000. diff --git a/templates/result.html b/templates/result.html index 190e8fc..5fad51c 100644 --- a/templates/result.html +++ b/templates/result.html @@ -19,15 +19,15 @@ <tbody> {% for result in results %} <tr> - <td>{{ loop.index }}</td> + <td>{{ result.index }}</td> <td>{{ result.cw }}</td> <td>{{ result.adv_bw }}</td> <td>{{ result.p_guard }}</td> <td>{{ result.p_middle }}</td> <td>{{ result.p_exit }}</td> <td>{{ result.nick }}</td> -  - {% if "relays" in result.fp %} +  + {% if result.fp|length != 40 %} <td>{{ result.fp }}</td> {% else %} <td><a href="https://atlas.torproject.org/#details/{{ result.fp }}">{{ result.fp[:8] }}</a></td>

1 0

[compass/master] Merge remote-tracking branch 'gsathya/bug_6677'
by karsten＠torproject.org 18 Sep '12

18 Sep '12

commit 7c231ae1029d04e8d3a19e8106539a55e6c5b265 Merge: aefd024 b894185 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 18 11:52:22 2012 -0400 Merge remote-tracking branch 'gsathya/bug_6677' app.py | 22 ++++++++++++++++++++-- templates/result.html | 6 +++--- 2 files changed, 23 insertions(+), 5 deletions(-)

1 0

r25796: {website} Adding GSoC 2012 contributors GSoC contributors for 2012 (mi (website/trunk/about/en)
by Damian Johnson 18 Sep '12

18 Sep '12

Author: atagar Date: 2012-09-18 14:20:57 +0000 (Tue, 18 Sep 2012) New Revision: 25796 Modified: website/trunk/about/en/volunteers.wml Log: Adding GSoC 2012 contributors GSoC contributors for 2012 (minus Julien since he dropped out early). I don't recall Michele or vmon giving permission to use their application nor a link for their project so no links for them. Addition suggested by gsathya. Modified: website/trunk/about/en/volunteers.wml =================================================================== --- website/trunk/about/en/volunteers.wml 2012-09-15 02:46:34 UTC (rev 25795) +++ website/trunk/about/en/volunteers.wml 2012-09-18 14:20:57 UTC (rev 25796) @@ -12,6 +12,13 @@ <div id="maincol"> <h1>Volunteers</h1> <dl> +<dt>Google Summer of Code, 2012</dt><dd> +Brandon Wiley - <a href="http://stepthreeprivacy.org/">Python Pluggable Transports</a><br /> +Feroze Naina - <a href="http://feroze.in/gsoc12.html">Hidden Service Configuration</a><br /> +Michele Orrù - APAF<br /> +Ravi Padmala - <a href="../about/gsocProposal/gsoc12-proposal-stemImprovements.html">Stem Improvements and Arm port</a><br /> +vmon - Stegotorus</dd> + <dt>Google Summer of Code, 2011</dt><dd> Brandon Wiley - <a href="http://stepthreeprivacy.org/">Blocking-resistant Transport Evaluation Framework</a><br /> George Kadianakis - <a href="https://gitorious.org/obfsproxy/pages/Home">Pluggable transports</a><br /> @@ -19,6 +26,7 @@ Kamran Khan - <a href="http://code.inspirated.com/">GTK+ Frontend and Client Mode Improvements for arm</a><br /> Max - <a href="https://tails.boum.org/todo/TailsGreeter/blog/">Custom GDM3 startup menu, aka. tails-greeter</a><br /> Sathyanarayanan Gunasekaran - <a href="http://gsathya.in/blog/">GSoC : Orbot + ORLib</a></dd> + <dt>Anonym, bertagaz, and intrigeri</dt><dd>Maintainers of <a href="https://tails.boum.org/">The Amnesic Incognito Live System</a>.</dd> <dt>Marco Bonetti</dt><dd>Focusing on MobileTor for the iPhone.</dd>

1 0

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

18 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 18 Sep '12

18 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 18 Sep '12

18 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 18 Sep '12

18 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