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

[compass/master] Added a function to emulate the command line functionality of the old code
by karsten＠torproject.org 07 Jan '13

07 Jan '13

commit 96d2ab282deaf7e8493c70c7375ee6a978275894 Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Fri Dec 21 11:31:05 2012 -0500 Added a function to emulate the command line functionality of the old code --- compass.py | 95 ++++++++++++++++++++++++++++++++++++++++++++++++----------- util.py | 10 ++++++ 2 files changed, 87 insertions(+), 18 deletions(-) diff --git a/compass.py b/compass.py index 40b564a..60d66fd 100755 --- a/compass.py +++ b/compass.py @@ -253,11 +253,49 @@ class RelayStats(object): WEIGHTS = ['consensus_weight_fraction', 'advertised_bandwidth_fraction', 'guard_probability', 'middle_probability', 'exit_probability'] + def print_selection(self,selection,options): + """ + Print the selection returned by sort_and_reduce relays into a + string for the command line version. + """ + column_widths = [9,10,10,10,10,21,80 if options.links else 42,7,7,4,11] + headings = ["CW","adv_bw","P_guard","P_middle", "P_exit", "Nickname", + "Link" if options.links else "Fingerprint", + "Exit","Guard","CC", "Autonomous System"] + + #Print the header + print("".join(word.ljust(column_widths[i]) for i,word in enumerate(headings))) + + for relay in selection['results']: + print("".join(field.ljust(column_widths[i]) + for i,field in + enumerate(relay.printable_fields()))) + + #Print the 'excluded' set if we have it + if selection['excluded']: + print("".join(field.ljust(column_widths[i]) + for i,field in + enumerate(selection['excluded'].printable_fields()))) + + #Print the 'total' set if we have it + if selection['total']: + print("".join(field.ljust(column_widths[i]) + for i,field in + enumerate(selection['total'].printable_fields()))) + def sort_and_reduce(self, relay_set, options): """ - Take a set of relays (has already been grouped and - filtered), sort it and return the ones requested + Take a set of relays (has already been grouped and + filtered), sort it and return the ones requested in the 'top' option. Add index numbers to them as well. + + Returns a hash with three values: + *results*: A list of Result objects representing the selected + relays + *excluded*: A Result object representing the stats for the + filtered out relays. May be None + *total*: A Result object representing the stats for all of the + relays in this filterset. """ output_relays = list() excluded_relays = None @@ -277,7 +315,7 @@ class RelayStats(object): selected_relay.index = i + 1 output_relays.append(selected_relay) - # Figure out what the 'remainder' numbers are + # Figure out what the 'remainder' numbers are if len(relay_set) > options.top: if options.by_country and options.by_as: filtered = "countries and ASes" @@ -309,12 +347,12 @@ class RelayStats(object): filtered) total_relays.fp = "(total in selection)" - # Only include the last line if + # Only include the last line if if total_relays.cw > 99.9: total_relays = None return { - 'results': output_relays, + 'results': output_relays, 'excluded': excluded_relays, 'total': total_relays } @@ -520,6 +558,15 @@ def create_option_parser(): group.add_option("-C", "--by-country", action="store_true", default=False, help="group relays by country") parser.add_option_group(group) + group = OptionGroup(parser, "Sorting options") + group.add_option("--sort", type="choice", + choices=["cw","adv_bw","p_guard","p_exit","p_middle", + "nick","fp"], + default="cw", + help="sort by this field") + group.add_option("--sort_reverse", action="store_true", default=True, + help="invert the sorting order") + parser.add_option_group(group) group = OptionGroup(parser, "Display options") group.add_option("-l", "--links", action="store_true", help="display links to the Atlas service instead of fingerprints") @@ -582,17 +629,29 @@ if '__main__' == __name__: exit() if not os.path.exists(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'details.json')): parser.error("Did not find details.json. Re-run with --download.") + stats = RelayStats(options) - sorted_groups = stats.format_and_sort_groups(stats.relays, - country=options.country, - ases=options.ases, - by_country=options.by_country, - by_as_number=options.by_as, - links=options.links) - - output_string = stats.print_groups(sorted_groups, options.top, - by_country=options.by_country, - by_as_number=options.by_as, - short=70 if options.short else None, - links=options.links) - print '\n'.join(output_string) + results = stats.select_relays(stats.relays, + by_country=options.by_country, + by_as_number=options.by_as, + country=options.country, + ases=options.ases, + links=options.links) + + sorted_results = stats.sort_and_reduce(results,options) + + stats.print_selection(sorted_results,options) + + #sorted_groups = stats.format_and_sort_groups(stats.relays, + #country=options.country, + #ases=options.ases, + #by_country=options.by_country, + #by_as_number=options.by_as, + #links=options.links) + + #output_string = stats.print_groups(sorted_groups, options.top, + #by_country=options.by_country, + #by_as_number=options.by_as, + #short=70 if options.short else None, + #links=options.links) + #print '\n'.join(output_string) diff --git a/util.py b/util.py index 082a991..f6d3d51 100644 --- a/util.py +++ b/util.py @@ -58,6 +58,16 @@ class Result(): def jsonify(self): return self.__dict__ + def printable_fields(self): + """ + Return this Result object as a list with the fields in the order + expected for printing. + """ + format_str = "%.4f%%|%.4f%%|%.4f%%|%.4f%%|%.4f%%|%s|%s|%s|%s|%s|%s" + formatted = format_str % ( self.cw, self.adv_bw, self.p_guard, self.p_middle, self.p_exit, + self.nick, self.fp, self.exit, self.guard, self.cc, self.as_info ) + return formatted.split("|") + class ResultEncoder(json.JSONEncoder): def default(self,obj): if isinstance(obj,Result):

1 0

[compass/master] Fixed bugs around link printing
by karsten＠torproject.org 07 Jan '13

07 Jan '13

commit af78f0fcbefab8e63014b23589efe0c489925e2b Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Fri Dec 21 13:51:09 2012 -0500 Fixed bugs around link printing --- compass.py | 2 +- util.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/compass.py b/compass.py index a25f72f..1eadaf3 100755 --- a/compass.py +++ b/compass.py @@ -269,7 +269,7 @@ class RelayStats(object): for relay in selection['results']: print("".join(field.ljust(column_widths[i]) for i,field in - enumerate(relay.printable_fields()))) + enumerate(relay.printable_fields(options.links)))) #Print the 'excluded' set if we have it if selection['excluded']: diff --git a/util.py b/util.py index aa30c27..893abcc 100644 --- a/util.py +++ b/util.py @@ -58,14 +58,16 @@ class Result(): def jsonify(self): return self.__dict__ - def printable_fields(self): + def printable_fields(self,links=False): """ Return this Result object as a list with the fields in the order expected for printing. """ format_str = "%.4f%%|%.4f%%|%.4f%%|%.4f%%|%.4f%%|%s|%s|%s|%s|%s|%s" formatted = format_str % ( self.cw, self.adv_bw, self.p_guard, self.p_middle, self.p_exit, - self.nick, self.fp, self.exit, self.guard, self.cc, self.as_info ) + self.nick, + "https://atlas.torproject.org/#details/" + self.fp if links else self.fp, + self.exit, self.guard, self.cc, self.as_info ) return formatted.split("|") class ResultEncoder(json.JSONEncoder):

1 0

[compass/master] Transformed results page to use Angular
by karsten＠torproject.org 07 Jan '13

07 Jan '13

commit 322c34cc9529b3795ade04f0a16a8f3302b87d69 Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Thu Dec 20 16:46:31 2012 -0500 Transformed results page to use Angular --- templates/index.html | 116 +++++++++++++++++++++++++++++++------------------ 1 files changed, 73 insertions(+), 43 deletions(-) diff --git a/templates/index.html b/templates/index.html index 613e28b..7626773 100644 --- a/templates/index.html +++ b/templates/index.html @@ -151,50 +151,80 @@ </form> </div> - <div class="loading"><img src="{{ url_for('static', filename='img/loader.gif') }}" /></div> - <hr> - <div id="result" ></div> + <div class="hero-unit" ng-show="state == 'result_empty'"> + <p>No results found</p> + </div> + <div class="hero-unit" ng-show="state == 'loaded' || state == 'sorting'"> <table class="table table-striped"> - <thead> - <tr> - <th>#</th> - <th><span rel="tooltip" title="Relative bandwidth weight assigned to this relay by the directory authorities">Consensus Weights</span></th> - <th><span rel="tooltip" title="Relative advertised bandwidth of this relay compared to the total advertised bandwidth in the network">Advertised Bandwidth</span></th> - <th><span rel="tooltip" title=" Probability of this relay to be selected for the guard position">Guard Probability</span></th> - <th><span rel="tooltip" title="Probability of this relay to be selected for the middle position">Middle Probability</span></th> - <th><span rel="tooltip" title="Probability of this relay to be selected for the exit position">Exit Probability</span></th> - <th>Nickname</th> - <th>Fingerprint</th> - <th>Exit</th> - <th>Guard</th> - <th>Country</th> - <th>Autonomous System</th> - </tr> - </thead> - <tbody> - <tr ng-repeat="relay in relayResults.results"> - <td> [[ relay.index ]] </td> - <td> [[ relay.cw ]] </td> - <td> [[ relay.adv_bw]] </td> - <td>[[ relay.p_guard ]]</td> - <td>[[ relay.p_middle ]]</td> - <td>[[ relay.p_exit ]]</td> - <td>[[ relay.nick ]]</td> -  - {% if relay.fp|length != 40 %} - <td>[[ relay.fp ]]</td> - {% else %} - <td><a href="https://atlas.torproject.org/#details/[[ relay.fp ]]">[[ relay.fp[:8] ]]</a></td> - {% endif %} - <td>[[ relay.exit ]]</td> - <td>[[ relay.guard ]]</td> - <td>[[ relay.cc ]]</td> - <td>[[ relay.as_info ]]</td> - <tr> - </tbody> - </table> - - + <thead> + <tr> + <th ng-click="setsort('index',false)">#</th> + <th ng-click="setsort('cw', true)"> + <span rel="tooltip" title="Relative bandwidth weight assigned to this relay by the directory authorities">Consensus Weights</span> + </th> + <th ng-click="setsort('adv_bw',true)"><span rel="tooltip" title="Relative advertised bandwidth of this relay compared to the total advertised bandwidth in the network">Advertised Bandwidth</span></th> + <th ng-click="setsort('p_guard',true)"><span rel="tooltip" title=" Probability of this relay to be selected for the guard position">Guard Probability</span></th> + <th ng-click="setsort('p_middle',true)"><span rel="tooltip" title="Probability of this relay to be selected for the middle position">Middle Probability</span></th> + <th ng-click="setsort('p_exit',true)"><span rel="tooltip" title="Probability of this relay to be selected for the exit position">Exit Probability</span></th> + <th ng-click="setsort('nick',false)">Nickname</th> + <th ng-click="setsort('fp',false)">Fingerprint</th> + <th ng-click="setsort('exit',false)">Exit</th> + <th ng-click="setsort('guard',false)">Guard</th> + <th ng-click="setsort('cc',false)">Country</th> + <th ng-click="setsort('as_info',false)">Autonomous System</th> + </tr> + </thead> + <tfoot> + <tr ng-show="data.excluded"> + <td> {{ data.excluded.index }} </td> + <td> {{ data.excluded.cw | number:4 }}%</td> + <td> {{ data.excluded.adv_bw | number:4}}%</td> + <td>{{ data.excluded.p_guard | number:4 }}%</td> + <td>{{ data.excluded.p_middle | number:4 }}%</td> + <td>{{ data.excluded.p_exit | number:4 }}%</td> + <td>{{ data.excluded.nick }}</td> + <td> {{data.excluded.fp }} </td> + <td>{{ data.excluded.exit }}</td> + <td>{{ data.excluded.guard }}</td> + <td>{{ data.excluded.cc }}</td> + <td>{{ data.excluded.as_info }}</td> + </tr> + <tr ng-show="data.total"> + <td> {{ data.total.index }} </td> + <td> {{ data.total.cw | number:4 }}%</td> + <td> {{ data.total.adv_bw | number:4}}%</td> + <td>{{ data.total.p_guard | number:4 }}%</td> + <td>{{ data.total.p_middle | number:4 }}%</td> + <td>{{ data.total.p_exit | number:4 }}%</td> + <td>{{ data.total.nick }}</td> + <td> {{data.total.fp }} </td> + <td>{{ data.total.exit }}</td> + <td>{{ data.total.guard }}</td> + <td>{{ data.total.cc }}</td> + <td>{{ data.total.as_info }}</td> + </tr> + </tfoot> + <tbody> + <tr ng-repeat="relay in data.results | orderBy:table.sort:table.reverse"> + <td> {{ relay.index }} </td> + <td> {{ relay.cw | number:4 }}%</td> + <td> {{ relay.adv_bw | number:4}}%</td> + <td>{{ relay.p_guard | number:4 }}%</td> + <td>{{ relay.p_middle | number:4 }}%</td> + <td>{{ relay.p_exit | number:4 }}%</td> + <td>{{ relay.nick }}</td> + <td> + <a href="https://atlas.torproject.org/#details/{{relay.fp}}" >{{relay.fp.substring(0,8)}}</a> + </td> + <td>{{ relay.exit }}</td> + <td>{{ relay.guard }}</td> + <td>{{ relay.cc }}</td> + <td>{{ relay.as_info }}</td> + <tr> + </tbody> + </table> + </div> + </div> <footer> The Tor Project - 2012<br>

1 0

[compass/master] Fixed a couple of bugs found in testing.
by karsten＠torproject.org 07 Jan '13

07 Jan '13

commit 82ed817929b7d9457650581945f0b8a424b5496a Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Fri Dec 21 12:35:13 2012 -0500 Fixed a couple of bugs found in testing. --- compass.py | 87 +++++++++++++++++++++++++++--------------------------------- util.py | 18 ++++++------ 2 files changed, 48 insertions(+), 57 deletions(-) diff --git a/compass.py b/compass.py index 60d66fd..a25f72f 100755 --- a/compass.py +++ b/compass.py @@ -310,46 +310,49 @@ class RelayStats(object): if options.top < 0: options.top = len(relay_set) - # Add selected relays to the result set - for i,selected_relay in enumerate(relay_set[:options.top]): - selected_relay.index = i + 1 - output_relays.append(selected_relay) + # Set up to handle the special lines at the bottom + excluded_relays = util.Result(zero_probs=True) + total_relays = util.Result(zero_probs=True) + if options.by_country and options.by_as: + filtered = "countries and ASes" + elif options.by_country: + filtered = "countries" + elif options.by_as: + filtered = "ASes" + else: + filtered = "relays" - # Figure out what the 'remainder' numbers are - if len(relay_set) > options.top: - if options.by_country and options.by_as: - filtered = "countries and ASes" - elif options.by_country: - filtered = "countries" - elif options.by_as: - filtered = "ASes" - else: - filtered = "relays" - - # Sum up all the rates - excluded_relays = util.Result(zero_probs=True) - total_relays = util.Result(zero_probs=True) - for i,relay in enumerate(relay_set): - if i < options.top: - excluded_relays.p_guard += relay.p_guard - excluded_relays.p_exit += relay.p_exit - excluded_relays.p_middle += relay.p_middle - excluded_relays.adv_bw += relay.adv_bw - excluded_relays.cw += relay.cw - total_relays.p_guard += relay.p_guard - total_relays.p_exit += relay.p_exit - total_relays.p_middle += relay.p_middle - total_relays.adv_bw += relay.adv_bw - total_relays.cw += relay.cw + # Add selected relays to the result set + for i,relay in enumerate(relay_set): + if i < options.top: + relay.index = i + 1 + output_relays.append(relay) + + if i >= options.top: + excluded_relays.p_guard += relay.p_guard + excluded_relays.p_exit += relay.p_exit + excluded_relays.p_middle += relay.p_middle + excluded_relays.adv_bw += relay.adv_bw + excluded_relays.cw += relay.cw + + total_relays.p_guard += relay.p_guard + total_relays.p_exit += relay.p_exit + total_relays.p_middle += relay.p_middle + total_relays.adv_bw += relay.adv_bw + total_relays.cw += relay.cw excluded_relays.fp = "(%d other %s)" % ( len(relay_set) - options.top, filtered) total_relays.fp = "(total in selection)" - # Only include the last line if - if total_relays.cw > 99.9: - total_relays = None + # Only include the excluded line if + if len(relay_set) <= options.top: + excluded_relays = None + + # Only include the last line if + if total_relays.cw > 99.9: + total_relays = None return { 'results': output_relays, @@ -534,7 +537,8 @@ def create_option_parser(): help="select only relays suitable for guard position") group.add_option("--exit-filter",type="choice", dest="exit_filter", choices=["fast_exits_only","almost_fast_exits_only", - "all_relays","fast_exits_only_any_network"]) + "all_relays","fast_exits_only_any_network"], + default='all_relays') group.add_option("--fast-exits-only", action="store_true", help="select only fast exits (%d+ Mbit/s, %d+ KB/s, %s, %d- per /24)" % (FAST_EXIT_BANDWIDTH_RATE / (125 * 1024), @@ -619,7 +623,7 @@ if '__main__' == __name__: parser.error("Not a valid fingerprint or nickname: %s" % options.family) try: - fix_exit_filter_options(options) + options = fix_exit_filter_options(options) except: parser.error("Can only filter by one fast-exit option.") @@ -642,16 +646,3 @@ if '__main__' == __name__: stats.print_selection(sorted_results,options) - #sorted_groups = stats.format_and_sort_groups(stats.relays, - #country=options.country, - #ases=options.ases, - #by_country=options.by_country, - #by_as_number=options.by_as, - #links=options.links) - - #output_string = stats.print_groups(sorted_groups, options.top, - #by_country=options.by_country, - #by_as_number=options.by_as, - #short=70 if options.short else None, - #links=options.links) - #print '\n'.join(output_string) diff --git a/util.py b/util.py index f6d3d51..aa30c27 100644 --- a/util.py +++ b/util.py @@ -39,15 +39,15 @@ class Result(): self.p_guard = 0.0 if zero_probs else None self.p_exit = 0.0 if zero_probs else None self.p_middle = 0.0 if zero_probs else None - self.nick = None - self.fp = None - self.link = None - self.exit = None - self.guard = None - self.cc = None - self.as_no = None - self.as_name = None - self.as_info = None + self.nick = "" + self.fp = "" + self.link = "" + self.exit = "" + self.guard = "" + self.cc = "" + self.as_no = "" + self.as_name = "" + self.as_info = "" def __getitem__(self,prop): getattr(self,prop)

1 0

[compass/master] Added support for 'short' option.
by karsten＠torproject.org 07 Jan '13

07 Jan '13

commit e423c98fb65ad8d6cbaa2788547b950dd8612062 Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Fri Dec 21 14:09:35 2012 -0500 Added support for 'short' option. Of note, I don't understand why the short option exists. --- compass.py | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/compass.py b/compass.py index 1eadaf3..370a912 100755 --- a/compass.py +++ b/compass.py @@ -255,7 +255,7 @@ class RelayStats(object): def print_selection(self,selection,options): """ - Print the selection returned by sort_and_reduce relays into a + Print the selection returned by sort_and_reduce relays into a string for the command line version. """ column_widths = [9,10,10,10,10,21,80 if options.links else 42,7,7,4,11] @@ -264,24 +264,28 @@ class RelayStats(object): "Exit","Guard","CC", "Autonomous System"] #Print the header - print("".join(word.ljust(column_widths[i]) for i,word in enumerate(headings))) + header = "".join(word.ljust(column_widths[i]) for i,word in enumerate(headings)) + print(header[:options.short]) for relay in selection['results']: - print("".join(field.ljust(column_widths[i]) + line = "".join(field.ljust(column_widths[i]) for i,field in - enumerate(relay.printable_fields(options.links)))) + enumerate(relay.printable_fields(options.links))) + print(line[:options.short]) #Print the 'excluded' set if we have it if selection['excluded']: - print("".join(field.ljust(column_widths[i]) + line = "".join(field.ljust(column_widths[i]) for i,field in - enumerate(selection['excluded'].printable_fields()))) + enumerate(selection['excluded'].printable_fields())) + print(line[:options.short]) #Print the 'total' set if we have it if selection['total']: - print("".join(field.ljust(column_widths[i]) + line = "".join(field.ljust(column_widths[i]) for i,field in - enumerate(selection['total'].printable_fields()))) + enumerate(selection['total'].printable_fields())) + print(line[:options.short]) def sort_and_reduce(self, relay_set, options): """ @@ -289,10 +293,10 @@ class RelayStats(object): filtered), sort it and return the ones requested in the 'top' option. Add index numbers to them as well. - Returns a hash with three values: + Returns a hash with three values: *results*: A list of Result objects representing the selected relays - *excluded*: A Result object representing the stats for the + *excluded*: A Result object representing the stats for the filtered out relays. May be None *total*: A Result object representing the stats for all of the relays in this filterset. @@ -304,7 +308,7 @@ class RelayStats(object): # We need a simple sorting key function def sort_fn(r): return getattr(r,options.sort) - + relay_set.sort(key=sort_fn,reverse=options.sort_reverse) if options.top < 0: @@ -568,7 +572,7 @@ def create_option_parser(): "nick","fp"], default="cw", help="sort by this field") - group.add_option("--sort_reverse", action="store_true", default=True, + group.add_option("--sort_reverse", action="store_true", default=True, help="invert the sorting order") parser.add_option_group(group) group = OptionGroup(parser, "Display options")

1 0

[compass/master] Fixed 'short' option
by karsten＠torproject.org 07 Jan '13

07 Jan '13

commit 841ef798f6129548337bf336f224df589be6de85 Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Fri Dec 21 15:09:34 2012 -0500 Fixed 'short' option --- compass.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/compass.py b/compass.py index 370a912..1ce991b 100755 --- a/compass.py +++ b/compass.py @@ -345,10 +345,10 @@ class RelayStats(object): total_relays.adv_bw += relay.adv_bw total_relays.cw += relay.cw - excluded_relays.fp = "(%d other %s)" % ( + excluded_relays.nick = "(%d other %s)" % ( len(relay_set) - options.top, filtered) - total_relays.fp = "(total in selection)" + total_relays.nick = "(total in selection)" # Only include the excluded line if if len(relay_set) <= options.top: @@ -580,7 +580,8 @@ def create_option_parser(): help="display links to the Atlas service instead of fingerprints") group.add_option("-t", "--top", type="int", default=10, metavar="NUM", help="display only the top results (default: %default; -1 for all)") - group.add_option("-s", "--short", action="store_true", + + group.add_option("-s", "--short", action="store_const",dest='short',const=70, help="cut the length of the line output at 70 chars") parser.add_option_group(group) return parser

1 0

[compass/master] Cleaned up the select_relays function
by karsten＠torproject.org 07 Jan '13

07 Jan '13

commit 13ed67e31420d647a9b5a9e85447bc718bd28eaf Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Fri Dec 21 15:27:28 2012 -0500 Cleaned up the select_relays function --- compass.py | 115 ++++-------------------------------------------------------- 1 files changed, 7 insertions(+), 108 deletions(-) diff --git a/compass.py b/compass.py index 1ce991b..8e6c203 100755 --- a/compass.py +++ b/compass.py @@ -365,7 +365,7 @@ class RelayStats(object): } - def select_relays(self, grouped_relays, country=None, ases=None, by_country=False, by_as_number=False, links=False): + def select_relays(self, grouped_relays, options): """ Return a Pythonic representation of the relays result set. Return it as a set of Result objects. """ @@ -381,7 +381,7 @@ class RelayStats(object): group_weights[weight] += relay.get(weight, 0) result.nick = relay['nickname'] - result.link = links + result.link = options.links result.fp = relay['fingerprint'] if 'Exit' in set(relay['flags']) and not 'BadExit' in set(relay['flags']): @@ -403,15 +403,15 @@ class RelayStats(object): # If we want to group by things, we need to handle some fields # specially - if by_country or by_as_number: + if options.by_country or options.by_as: result.nick = "*" result.fp = "(%d relays)" % relays_in_group result.exit = "(%d)" % exits_in_group result.guard = "(%d)" % guards_in_group - if not by_as_number and not ases: + if not options.by_as and not options.ases: result.as_info = "(%s)" % len(ases_in_group) - if not by_country and not country: - country = "*" + if not options.by_country and not options.country: + options.country = "*" #Include our weight values for weight in group_weights.iterkeys(): @@ -425,102 +425,6 @@ class RelayStats(object): return results - def format_and_sort_groups(self, grouped_relays, country=None, ases=None, by_country=False, by_as_number=False, links=False): - - formatted_groups = {} - for group in grouped_relays.values(): - group_weights = dict.fromkeys(RelayStats.WEIGHTS, 0) - relays_in_group, exits_in_group, guards_in_group = 0, 0, 0 - ases_in_group = set() - for relay in group: - for weight in RelayStats.WEIGHTS: - group_weights[weight] += relay.get(weight, 0) - nickname = relay['nickname'] - fingerprint = relay['fingerprint'] if not links else "https://atlas.torproject.org/#details/%s" % relay['fingerprint'] - if 'Exit' in set(relay['flags']) and not 'BadExit' in set(relay['flags']): - exit = 'Exit' - exits_in_group += 1 - else: - exit = '-' - if 'Guard' in set(relay['flags']): - guard = 'Guard' - guards_in_group += 1 - else: - guard = '-' - country = relay.get('country', '??') - as_number = relay.get('as_number', '??') - as_name = relay.get('as_name', '??') - as_info = "%s %s" %(as_number, as_name) - ases_in_group.add(as_info) - relays_in_group += 1 - if by_country or by_as_number: - nickname = "*" - fingerprint = "(%d relays)" % relays_in_group - exit = "(%d)" % exits_in_group - guard = "(%d)" % guards_in_group - if not by_as_number and not ases: - as_info = "(%s)" % len(ases_in_group) - if not by_country and not country: - country = "*" - if links: - format_string = "%8.4f%% %8.4f%% %8.4f%% %8.4f%% %8.4f%% %-19s %-78s %-5s %-5s %-2s %-9s" - else: - format_string = "%8.4f%% %8.4f%% %8.4f%% %8.4f%% %8.4f%% %-19s %-40s %-5s %-5s %-2s %-9s" - formatted_group = format_string % ( - group_weights['consensus_weight_fraction'] * 100.0, - group_weights['advertised_bandwidth_fraction'] * 100.0, - group_weights['guard_probability'] * 100.0, - group_weights['middle_probability'] * 100.0, - group_weights['exit_probability'] * 100.0, - nickname, fingerprint, - exit, guard, country, as_info) - formatted_groups[formatted_group] = group_weights - sorted_groups = sorted(formatted_groups.iteritems(), key=lambda gs: gs[1]['consensus_weight_fraction']) - sorted_groups.reverse() - return sorted_groups - - def print_groups(self, sorted_groups, count=10, by_country=False, by_as_number=False, short=False, links=False): - output_string = [] - if links: - output_string.append(" CW adv_bw P_guard P_middle P_exit Nickname Link Exit Guard CC Autonomous System"[:short]) - else: - output_string.append(" CW adv_bw P_guard P_middle P_exit Nickname Fingerprint Exit Guard CC Autonomous System"[:short]) - if count < 0: count = len(sorted_groups) - for formatted_group, weight in sorted_groups[:count]: - output_string.append(formatted_group[:short]) - if len(sorted_groups) > count: - if by_country and by_as_number: - type = "countries and ASes" - elif by_country: - type = "countries" - elif by_as_number: - type = "ASes" - else: - type = "relays" - other_weights = dict.fromkeys(RelayStats.WEIGHTS, 0) - for _, weights in sorted_groups[count:]: - for weight in RelayStats.WEIGHTS: - other_weights[weight] += weights[weight] - output_string.append("%8.4f%% %8.4f%% %8.4f%% %8.4f%% %8.4f%% (%d other %s)" % ( - other_weights['consensus_weight_fraction'] * 100.0, - other_weights['advertised_bandwidth_fraction'] * 100.0, - other_weights['guard_probability'] * 100.0, - other_weights['middle_probability'] * 100.0, - other_weights['exit_probability'] * 100.0, - len(sorted_groups) - count, type)) - selection_weights = dict.fromkeys(RelayStats.WEIGHTS, 0) - for _, weights in sorted_groups: - for weight in RelayStats.WEIGHTS: - selection_weights[weight] += weights[weight] - if len(sorted_groups) > 1 and selection_weights['consensus_weight_fraction'] < 0.999: - output_string.append("%8.4f%% %8.4f%% %8.4f%% %8.4f%% %8.4f%% (total in selection)" % ( - selection_weights['consensus_weight_fraction'] * 100.0, - selection_weights['advertised_bandwidth_fraction'] * 100.0, - selection_weights['guard_probability'] * 100.0, - selection_weights['middle_probability'] * 100.0, - selection_weights['exit_probability'] * 100.0)) - return output_string - def create_option_parser(): parser = OptionParser() parser.add_option("-d", "--download", action="store_true", @@ -640,12 +544,7 @@ if '__main__' == __name__: parser.error("Did not find details.json. Re-run with --download.") stats = RelayStats(options) - results = stats.select_relays(stats.relays, - by_country=options.by_country, - by_as_number=options.by_as, - country=options.country, - ases=options.ases, - links=options.links) + results = stats.select_relays(stats.relays,options) sorted_results = stats.sort_and_reduce(results,options)

1 0

[compass/master] Added better help messages to command line options
by karsten＠torproject.org 07 Jan '13

07 Jan '13

commit d501a15cd159b00c6373dceee116e80920f15bd6 Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Fri Dec 21 15:55:58 2012 -0500 Added better help messages to command line options --- compass.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/compass.py b/compass.py index 8e6c203..b83ee5f 100755 --- a/compass.py +++ b/compass.py @@ -446,6 +446,7 @@ def create_option_parser(): group.add_option("--exit-filter",type="choice", dest="exit_filter", choices=["fast_exits_only","almost_fast_exits_only", "all_relays","fast_exits_only_any_network"], + metavar="{fast_exits_only|almost_fast_exits_only|all_relays|fast_exits_only_any_network}", default='all_relays') group.add_option("--fast-exits-only", action="store_true", help="select only fast exits (%d+ Mbit/s, %d+ KB/s, %s, %d- per /24)" % @@ -474,6 +475,7 @@ def create_option_parser(): group.add_option("--sort", type="choice", choices=["cw","adv_bw","p_guard","p_exit","p_middle", "nick","fp"], + metavar="{cw|adv_bw|p_guard|p_exit|p_middle|nick|fp}", default="cw", help="sort by this field") group.add_option("--sort_reverse", action="store_true", default=True,

1 0

[compass/master] Added some testing scripts
by karsten＠torproject.org 07 Jan '13

07 Jan '13

commit 70e369c263be79d87f6d752fc1b46ae5f70393c5 Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Fri Dec 21 15:58:38 2012 -0500 Added some testing scripts --- testing/README | 13 +++++++++ testing/check.py | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ testing/test.sh | 41 ++++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+), 0 deletions(-) diff --git a/testing/README b/testing/README new file mode 100644 index 0000000..9457b1e --- /dev/null +++ b/testing/README @@ -0,0 +1,13 @@ + +These are a set of scripts designed to makes sure that any +changes I have made don't change the behavior of the original +compass.py. test.sh will run a series of command line switches +at compass.py, and save the output in a series of named test +files. +check.py will take two test names and compare the output +from those tests to see if they match. + + +Note: Sometimes a test will fail even though the output is correct +because the sorting works differently in my revised version and +elements with the same value don't always occur in the same order. diff --git a/testing/check.py b/testing/check.py new file mode 100755 index 0000000..c15583c --- /dev/null +++ b/testing/check.py @@ -0,0 +1,73 @@ +#!/usr/bin/python + +import os +import sys + +def colored(s,col): + if col == "red": + return "\033[31m" + s + "\033[0m" + elif col == "green": + return "\033[36m" + s + "\033[0m" + else: + return s + +def usage(): + sys.stderr.write("Check and see if output matches between two sets of test files\n") + sys.stderr.write("Usage: check.py <testfile_dir> <test_label_1> <test_label_2> \n") + sys.exit(-1) + + +def run(): + + if len(sys.argv) < 3: + usage() + + filedir = sys.argv[1] + a = sys.argv[2] + b = sys.argv[3] + a_files = {} + b_files = {} + max_test = 0 + + + files = os.listdir(filedir) + + for f in files: + if f.split(".")[0] == a: + a_files[int( f.split(".")[1] )] = f + if f.split(".")[0] == b: + b_files[int(f.split(".")[1])] = f + + + if int(f.split(".")[1]) > max_test: + max_test = int(f.split('.')[1]) + + for i in xrange(1,max_test): + sys.stdout.write("Testing '{0}.{2}' against '{1}.{2}': ".format(a,b,i)) + + try: + a_in = open("{0}/{1}".format(filedir,a_files[i])).readlines() + b_in = open("{0}/{1}".format(filedir,b_files[i])).readlines() + except IOError,e: + sys.stdout.write("{0} [{1}]\n".format(colored("Fail","red"),e)) + else: + i = 0 + fail = False + + for comp_a,comp_b in zip(a_in,b_in): + i += 1 + for field_a, field_b in zip(comp_a.split(),comp_b.split()): + if field_a.lower() != field_b.lower(): + sys.stdout.write("{0} [{1}]\n".format(colored("Fail","red"),"Line {0} doesn't match.".format(i))) + fail = True + break + + if fail: + break + + if not fail: + sys.stdout.write("{0}\n".format(colored("Pass","green"))) + + +if __name__ == "__main__": + run() diff --git a/testing/test.sh b/testing/test.sh new file mode 100755 index 0000000..5aa9284 --- /dev/null +++ b/testing/test.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +# This is intended to run a bunch of options against compass.py and dump +# the output to a file. + +if [[ $# -lt 3 ]]; then + echo "Usage: test.sh <compass_py_loc> <scratch_dir> <test_name>" + exit 1 +fi + +scratch="$2" +[[ -d $scratch ]] || echo "'$scratch' is not a directory" || exit 1 +[[ -f $1 ]] || echo "'$1' is not a file" || exit 1 + +name="$3" + +i=1 + +bin="python $1" +declare -a testcases=( + '' + '-i' + '-e' + '-a 3320' + '-a 3320 -i -e -l' + '-c US' + '-c US -g' + '-c US -A' + '-g -e' + '--almost-fast-exits-only' + '--fast-exits-only' + '-l' + '--almost-fast-exits-only -c DE' + '-t 100 -s' + ) + +for i in $(seq 0 "${#testcases[@]}"); do + $bin ${testcases[$i]} > "$scratch/$name.$i" +done + +

1 0

[compass/master] Moved the loading icon to the right place.
by karsten＠torproject.org 07 Jan '13

07 Jan '13

commit cd8eba8388d42c0c09d29e2b1a983debc16ed6e1 Author: Chris Wacek <cwacek(a)cs.georgetown.edu> Date: Sun Dec 23 00:30:40 2012 -0500 Moved the loading icon to the right place. --- templates/index.html | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/templates/index.html b/templates/index.html index 741a176..87c0d4b 100644 --- a/templates/index.html +++ b/templates/index.html @@ -152,14 +152,17 @@ </div> </div> <div class="form-actions"> - <button class="btn btn-primary" ng-click="request(query)">Submit</button> + <button class="btn btn-primary" ng-click="request()">Submit</button> <button class="btn" ng-click="reset()">Reset</button> - <div ng-show="state == loading" class="loading"><img src="/static/img/loader.gif" /></div> + <span>{{state}}</span> </div> </fieldset> </form> </div> + <div class="hero-unit" ng-show="state == 'loading'" > + <div class='loading'><img src="/static/img/loader.gif" /></div> + </div> <div class="hero-unit" ng-show="state == 'result_empty'"> <p>No results found</p> </div>

1 0