June 2017 - tor-commits - lists.torproject.org

[metrics-lib/master] Escalate NoSuchAlgorithmExceptions.
by karsten＠torproject.org 16 Jun '17

16 Jun '17

commit 1ac254697b21ac297a2e3ef151fcf0bc22c53354 Author: iwakeh <iwakeh(a)torproject.org> Date: Thu Jun 8 08:54:06 2017 +0000 Escalate NoSuchAlgorithmExceptions. --- .../torproject/descriptor/impl/DescriptorImpl.java | 30 ++++++++++------------ 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java index 79905c0..52ff6d4 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java @@ -364,14 +364,8 @@ public abstract class DescriptorImpl implements Descriptor { end = ascii.indexOf(endToken) + endToken.length(); } if (start >= 0 && end >= 0 && end > start) { - try { - MessageDigest md = MessageDigest.getInstance("SHA-1"); - md.update(this.rawDescriptorBytes, this.offset + start, end - start); - this.digestSha1Hex = DatatypeConverter.printHexBinary(md.digest()) - .toLowerCase(); - } catch (NoSuchAlgorithmException e) { - /* Handle below. */ - } + this.digestSha1Hex = DatatypeConverter.printHexBinary( + messageDigest("SHA-1", start, end)).toLowerCase(); } } if (null == this.digestSha1Hex) { @@ -380,6 +374,16 @@ public abstract class DescriptorImpl implements Descriptor { } } + private byte[] messageDigest(String alg, int start, int end) { + try { + MessageDigest md = MessageDigest.getInstance(alg); + md.update(this.rawDescriptorBytes, this.offset + start, end - start); + return md.digest(); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException(e); + } + } + public String getDigestSha1Hex() { return this.digestSha1Hex; } @@ -403,14 +407,8 @@ public abstract class DescriptorImpl implements Descriptor { end = ascii.indexOf(endToken) + endToken.length(); } if (start >= 0 && end >= 0 && end > start) { - try { - MessageDigest md = MessageDigest.getInstance("SHA-256"); - md.update(this.rawDescriptorBytes, this.offset + start, end - start); - this.digestSha256Base64 = DatatypeConverter.printBase64Binary( - md.digest()).replaceAll("=", ""); - } catch (NoSuchAlgorithmException e) { - /* Handle below. */ - } + this.digestSha256Base64 = DatatypeConverter.printBase64Binary( + messageDigest("SHA-256", start, end)).replaceAll("=", ""); } } if (null == this.digestSha256Base64) {

1 0

[webwml/staging] Move scripts to their own js file
by hiro＠torproject.org 16 Jun '17

16 Jun '17

commit 17643b01962fabf590b6b76959b9fb3efb511c85 Author: hiromipaw <hiro(a)torproject.org> Date: Fri Jun 16 11:16:38 2017 +0200 Move scripts to their own js file --- docs/torbutton/en/index.wml | 82 ++++----------------------------------------- en/index.wml | 5 +-- include/thankyou-head.wmi | 27 +++++++-------- js/animate.js | 8 +++++ js/functions.js | 65 +++++++++++++++++++++++++++++++++++ rule-41/banner.html | 19 +++-------- 6 files changed, 98 insertions(+), 108 deletions(-) diff --git a/docs/torbutton/en/index.wml b/docs/torbutton/en/index.wml index 1070239..f947b96 100644 --- a/docs/torbutton/en/index.wml +++ b/docs/torbutton/en/index.wml @@ -8,81 +8,14 @@ <a href="<page index>">Home » </a> <a href="<page docs/torbutton/index>">Torbutton</a> </div> - <div id="maincol"> + <div id="maincol">  - + <link rel="search" type="application/opensearchdescription+xml" title="Google Canada" href="search/google-ca.xml"/> <link rel="search" type="application/opensearchdescription+xml" title="Google UK" href="search/google-uk.xml"/> <link rel="search" type="application/opensearchdescription+xml" title="Google USA" href="search/google-us.xml"/> - <script type="text/javascript"> - - function addSearchProvider(prov) { - - try { - window.external.AddSearchProvider(prov); - } - - catch (e) { - alert("Search plugins require Firefox 2"); - return; - } - } - - function addEngine(name,ext,cat,pid) - { - if ((typeof window.sidebar == "object") && (typeof window.sidebar.addSearchEngine == "function")) { - window.sidebar.addSearchEngine( - "http://mycroft.mozdev.org/install.php/" + pid + "/" + name + ".src", - "http://mycroft.mozdev.org/install.php/" + pid + "/" + name + "."+ ext, name, cat ); - } else { - alert("You will need a browser which supports Sherlock to install this plugin."); - } - } - - function addOpenSearch(name,ext,cat,pid,meth) - { - if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) { - if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") { - alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch."); - } else { - window.external.AddSearchProvider( - "http://mycroft.mozdev.org/installos.php/" + pid + "/" + name + ".xml"); - } - } else { - alert("You will need a browser which supports OpenSearch to install this plugin."); - } - } - - function addOpenSearch2(name,ext,cat,pid,meth) - { - if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) { - if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") { - alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch."); - } else { - window.external.AddSearchProvider( - "http://torbutton.torproject.org/dev/search/" + name + ".xml"); - } - } else { - alert("You will need a browser which supports OpenSearch to install this plugin."); - } - } - - function install (aEvent) - { - var params = { - "Torbutton": { URL: aEvent.target.href, - Hash: aEvent.target.getAttribute("hash"), - toString: function () { return this.URL; } - } - }; - InstallTrigger.install(params); - - return false; - } - - - </script> - + <script type="text/javascript" src="$(DOCROOT)/js/functions.js" charset="utf-8"></script> + <h2>Torbutton</h2> <hr> @@ -110,12 +43,12 @@ repository</a> or simply unzip the xpi. <br/> <strong>Bug Reports:</strong> <a href="https://trac.torproject.org/projects/tor/report/14">Torproject Bug Tracker</a><br/> - <strong>Documents:</strong> - <b>[</b> + <strong>Documents:</strong> + <b>[</b> <a href="https://gitweb.torproject.org/torbutton.git/tree/src/CHANGELOG">changelog</a> <b>|</b> <a href="https://gitweb.torproject.org/torbutton.git/tree/src/LICENSE">license</a> <b>|</b> <a href="https://gitweb.torproject.org/torbutton.git/tree/src/CREDITS">credits</a> <b>]</b> - + </div>  <div id = "sidecol"> @@ -126,4 +59,3 @@ </div>  #include <foot.wmi> - diff --git a/en/index.wml b/en/index.wml index 836d3b0..a228691 100644 --- a/en/index.wml +++ b/en/index.wml @@ -65,10 +65,7 @@ browse the Internet.</p> </div> </td> - <td> - <div class="project"> - <a href="https://guardianproject.info/apps/orbot/"><img - src="$(IMGROOT)/icon-Orbot.jpg" alt="Orbot Icon"></a> + <td><meta name="description" content="The Tor Project's free software protects your privacy online. Site blocked? Email [mailto:gettor@torproject.org] for help downloading Tor Browser."> <h3><a href="https://guardianproject.info/apps/orbot/">Orbot</a></h3> <p>Tor for Google Android devices.</p> </div> diff --git a/include/thankyou-head.wmi b/include/thankyou-head.wmi index 388944e..661dde0 100644 --- a/include/thankyou-head.wmi +++ b/include/thankyou-head.wmi @@ -14,7 +14,7 @@ <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">"> <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">"> - # begin WML to generate css/js paths + # begin WML to generate css/js paths <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)">"> <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.css">"> @@ -29,17 +29,14 @@ <link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/ie6.css"> <![endif]--> # <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script> - # end WML to generate css/js paths + # end WML to generate css/js paths <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="author" content="The Tor Project, Inc."> <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research"> <script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js" charset="utf-8"></script> <script type="text/javascript" src="$(DOCROOT)/js/jquery.infieldlabel.min.js" charset="utf-8"></script> -<script type="text/javascript" charset="utf-8"> -/* email placeholder function */ - $(function(){ $("label").replaceWith('<label class="active" for="email">Enter your email address</label>'); $("label").inFieldLabels(); }); -</script> +<script type="text/javascript" src="$(DOCROOT)/js/functions.js" charset="utf-8"></script> </head> <body> <div id="wrap"> @@ -63,9 +60,9 @@ my $lang = "$(LANG)"; for my $key (@keys) { - my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; - # in directory of active link, set class active + # in directory of active link, set class active my $class; if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { $class = 'class="active"'; @@ -74,12 +71,12 @@ } $dir = '.' unless defined $dir; - + # translated version if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key}; - } + } # english version elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", @@ -108,14 +105,14 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), my $val = shift @calltoaction; push @keys, $key; $calltoaction{$key} = $val; - } + } my $page = $WML_SRC_BASENAME; my $lang = "$(LANG)"; for my $key (@keys) { - my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; - # in directory, set active + # in directory, set active my $class; if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { #if ($WML_SRC_BASENAME eq $base) { @@ -129,7 +126,7 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key}; - } + } # default to english version elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", @@ -137,7 +134,7 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), } else { warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; } - } + } }:> </ul> </div> diff --git a/js/animate.js b/js/animate.js new file mode 100644 index 0000000..a789365 --- /dev/null +++ b/js/animate.js @@ -0,0 +1,8 @@ +document.addEventListener("DOMContentLoaded", function(event) { + var animate = document.getElementById("animate"); + animate.classList.add("not-loaded"); + window.setTimeout(function () { + animate.classList.remove("not-loaded"); + animate.classList.add("loaded"); + }, 0); +}); diff --git a/js/functions.js b/js/functions.js new file mode 100644 index 0000000..661ad81 --- /dev/null +++ b/js/functions.js @@ -0,0 +1,65 @@ +$(function(){ $("label").replaceWith('<label class="active" for="email">Enter your email address</label>'); $("label").inFieldLabels(); }); + +function addSearchProvider(prov) { + +try { +window.external.AddSearchProvider(prov); +} + +catch (e) { +alert("Search plugins require Firefox 2"); +return; +} +} + +function addEngine(name,ext,cat,pid) +{ + if ((typeof window.sidebar == "object") && (typeof window.sidebar.addSearchEngine == "function")) { + window.sidebar.addSearchEngine( + "http://mycroft.mozdev.org/install.php/" + pid + "/" + name + ".src", + "http://mycroft.mozdev.org/install.php/" + pid + "/" + name + "."+ ext, name, cat ); + } else { + alert("You will need a browser which supports Sherlock to install this plugin."); + } +} + +function addOpenSearch(name,ext,cat,pid,meth) +{ + if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) { + if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") { + alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch."); + } else { + window.external.AddSearchProvider( + "http://mycroft.mozdev.org/installos.php/" + pid + "/" + name + ".xml"); + } + } else { + alert("You will need a browser which supports OpenSearch to install this plugin."); + } +} + +function addOpenSearch2(name,ext,cat,pid,meth) +{ + if ((typeof window.external == "object") && ((typeof window.external.AddSearchProvider == "unknown") || (typeof window.external.AddSearchProvider == "function"))) { + if ((typeof window.external.AddSearchProvider == "unknown") && meth == "p") { + alert("This plugin uses POST which is not currently supported by Internet Explorer's implementation of OpenSearch."); + } else { + window.external.AddSearchProvider( + "http://torbutton.torproject.org/dev/search/" + name + ".xml"); + } + } else { + alert("You will need a browser which supports OpenSearch to install this plugin."); + } +} + +function install (aEvent) +{ + var params = { + "Torbutton": { URL: aEvent.target.href, + Hash: aEvent.target.getAttribute("hash"), + toString: function () { return this.URL; } + } + }; + InstallTrigger.install(params); + + return false; +} diff --git a/rule-41/banner.html b/rule-41/banner.html index 1c8372a..e356f3d 100644 --- a/rule-41/banner.html +++ b/rule-41/banner.html @@ -12,18 +12,9 @@ <script type="text/javascript" src="js/jquery-1.11.0.min.js"></script> <script type="text/javascript" src="js/easyXDM.min.js"></script> <script type='text/javascript' src="js/modernizr.min.js"></script> - <script type='text/javascript' src="js/css3-mediaqueries.js"></script> - <script type="text/javascript"> + <script type='text/javascript' src="js/css3-mediaqueries.js"></script> + <script type="text/javascript" src="js/animate.js"></script> - document.addEventListener("DOMContentLoaded", function(event) { - var animate = document.getElementById("animate"); - animate.classList.add("not-loaded"); - window.setTimeout(function () { - animate.classList.remove("not-loaded"); - animate.classList.add("loaded"); - }, 0); - }); - </script>  <!--[if lt IE 9]> <script type='text/javascript' src="js/html5.js"></script> @@ -71,8 +62,8 @@ <div class="mobile-banner visible-xs abs-centered"> <a href="https://NoGlobalWarrants.org" target="_blank"><img src="imgs/mobile_txt.png" class="img-responsive abs-centered" /></a> </div> - - <script type='text/javascript' src="js/main.js"></script> + + <script type='text/javascript' src="js/main.js"></script> </body> -</html> \ No newline at end of file +</html>

1 0

[torbirdy/master] Disable Microsoft Family Safety
by sukhbir＠torproject.org 16 Jun '17

16 Jun '17

commit c1d5099bb496d8687e9aece60ed1eb71eb46c518 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Jun 15 19:38:36 2017 -0400 Disable Microsoft Family Safety From TorBirdy bug #22318 and Tor Browser bug #21686. --- components/torbirdy.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/torbirdy.js b/components/torbirdy.js index 1dd7cd1..e6177ba 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -320,6 +320,9 @@ var TorBirdyPrefs = { "browser.safebrowsing.enabled": false, "browser.safebrowsing.malware.enabled": false, + // Disable Microsoft Family Safety (From TBB: #21686). + "security.family_safety.mode": 0, + // RSS. "rss.display.prefer_plaintext": true, // These are similar to the mailnews.* settings.

1 0

[torbirdy/master] Disable Google Safe Browsing (#22567)
by sukhbir＠torproject.org 16 Jun '17

16 Jun '17

commit 7b58fc6e1819d53a5a04299f7a6b58810db85b08 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Jun 15 18:58:09 2017 -0400 Disable Google Safe Browsing (#22567) --- components/torbirdy.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/torbirdy.js b/components/torbirdy.js index 1271ed9..1dd7cd1 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -316,6 +316,10 @@ var TorBirdyPrefs = { Other Settings */ + // Disable Google Safe Browsing (#22567). + "browser.safebrowsing.enabled": false, + "browser.safebrowsing.malware.enabled": false, + // RSS. "rss.display.prefer_plaintext": true, // These are similar to the mailnews.* settings.

1 0

[tor/master] Remove old callgraph scripts; recommend calltool instead.
by nickm＠torproject.org 14 Jun '17

14 Jun '17

commit 80ad374b8457e4c92f88f8a89376a8ca87231c9c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 14 17:44:15 2017 -0400 Remove old callgraph scripts; recommend calltool instead. --- doc/HACKING/HelpfulTools.md | 13 +- scripts/maint/analyze_callgraph.py | 259 ------------------------------------ scripts/maint/display_callgraph.py | 41 ------ scripts/maint/generate_callgraph.sh | 14 -- 4 files changed, 3 insertions(+), 324 deletions(-) diff --git a/doc/HACKING/HelpfulTools.md b/doc/HACKING/HelpfulTools.md index 67481ac..b8ba2aa 100644 --- a/doc/HACKING/HelpfulTools.md +++ b/doc/HACKING/HelpfulTools.md @@ -226,17 +226,10 @@ performance! See the gperftools manual for more info, but basically: Generating and analyzing a callgraph ------------------------------------ -1. Run `./scripts/maint/generate_callgraph.sh`. This will generate a - bunch of files in a new ./callgraph directory. +0. Build Tor on linux or mac, ideally with -O0 or -fno-inline. -2. Run `./scripts/maint/analyze_callgraph.py callgraph/src/*/*`. This - will do a lot of graph operations and then dump out a new - `callgraph.pkl` file, containing data in Python's 'pickle' format. - -3. Run `./scripts/maint/display_callgraph.py`. It will display: - - the number of functions reachable from each function. - - all strongly-connnected components in the Tor callgraph - - the largest bottlenecks in the largest SCC in the Tor callgraph. +1. Clone 'https://gitweb.torproject.org/user/nickm/calltool.git/' . + Follow the README in that repository. Note that currently the callgraph generator can't detect calls that pass through function pointers. diff --git a/scripts/maint/analyze_callgraph.py b/scripts/maint/analyze_callgraph.py deleted file mode 100755 index 8ce5827..0000000 --- a/scripts/maint/analyze_callgraph.py +++ /dev/null @@ -1,259 +0,0 @@ -#!/usr/bin/python - -import re -import sys -import copy -import cPickle -import os - -class Parser: - def __init__(self): - self.calls = {} - self.definedIn = {} - - def enter_func(self, name): - if self.infunc and not self.extern and self.calledfns: - if self.infunc in self.definedIn: - #print "{}: {} or {}?".format( - # self.infunc, self.definedIn[self.infunc], self.module) - self.definedIn[self.infunc] = 'nil' - else: - self.definedIn[self.infunc] = self.module - self.calls.setdefault(self.infunc, set()).update( self.calledfns ) - - self.calledfns = set() - self.infunc = name - self.extern = False - - def parse_callgraph_file(self, inp, module): - self.infunc = None - self.extern = False - self.calledfns = set() - self.module = module - - for line in inp: - m = re.match(r"Call graph node for function: '([^']+)'", line) - if m: - self.enter_func(m.group(1)) - continue - m = re.match(r" CS<[^>]+> calls external node", line) - if m: - self.extern = True - m = re.match(r" CS<[^>]+> calls function '([^']+)'", line) - if m: - self.calledfns.add(m.group(1)) - self.enter_func(None) - - def extract_callgraph(self): - c = self.calls - self.calls = {} - return c - - -def transitive_closure(g): - passno = 0 - changed = True - g = copy.deepcopy(g) - import random - while changed: - passno += 1 - changed = False - keys = g.keys() - idx = 0 - for k in keys: - idx += 1 - print "Pass %d/?: %d/%d\r" %(passno, idx, len(keys)), - sys.stdout.flush() - newset = g[k].copy() - for fn in g[k]: - newset.update(g.get(fn, set())) - if len(newset) != len(g[k]): - g[k].update( newset ) - changed = True - - print - - return g - -def strongly_connected_components(g): - # From https://en.wikipedia.org/wiki/Tarjan%27s_strongly_connected_components_algo…, done stupidly. - index_of = {} - index = [ 0 ] - lowlink = {} - S = [] - onStack = set() - - all_sccs = [] - - def strongconnect(fn): - index_of[fn] = index[0] - lowlink[fn] = index[0] - index[0] += 1 - S.append(fn) - onStack.add(fn) - - for w in g.get(fn, []): - if w not in index_of: - strongconnect(w) - lowlink[fn] = min(lowlink[fn], lowlink[w]) - elif w in onStack: - lowlink[fn] = min(lowlink[fn], index_of[w]) - - if lowlink[fn] == index_of[fn]: - this_scc = [] - all_sccs.append(this_scc) - while True: - w = S.pop() - onStack.remove(w) - this_scc.append(w) - if w == fn: - break - - for v in g.keys(): - if v not in index_of: - strongconnect(v) - - return all_sccs - -def biggest_component(sccs): - return max(len(c) for c in sccs) - -def connection_bottlenecks(callgraph): - - callers = {} - for fn in callgraph: - for fn2 in callgraph[fn]: - callers.setdefault(fn2, set()).add(fn) - - components = strongly_connected_components(callgraph) - components.sort(key=len) - big_component_fns = components[-1] - size = len(big_component_fns) - - function_bottlenecks = fn_results = [] - - total = len(big_component_fns) - idx = 0 - for fn in big_component_fns: - idx += 1 - print "Pass 1/3: %d/%d\r"%(idx, total), - sys.stdout.flush() - cg2 = copy.deepcopy(callgraph) - del cg2[fn] - - fn_results.append( (size - biggest_component(strongly_connected_components(cg2)), fn) ) - - print - bcf_set = set(big_component_fns) - - call_bottlenecks = fn_results = [] - result_set = set() - total = len(big_component_fns) - idx = 0 - for fn in big_component_fns: - fn_callers = callers[fn].intersection(bcf_set) - idx += 1 - if len(fn_callers) != 1: - continue - - print "Pass 2/3: %d/%d\r"%(idx, total), - sys.stdout.flush() - - caller = fn_callers.pop() - assert len(fn_callers) == 0 - cg2 = copy.deepcopy(callgraph) - cg2[caller].remove(fn) - - fn_results.append( (size - biggest_component(strongly_connected_components(cg2)), fn, "called by", caller) ) - result_set.add( (caller, fn) ) - - print - - total = len(big_component_fns) - idx = 0 - for fn in big_component_fns: - fn_calls = callgraph[fn].intersection(bcf_set) - idx += 1 - if len(fn_calls) != 1: - continue - - print "Pass 3/3: %d/%d\r"%(idx, total), - sys.stdout.flush() - - callee = fn_calls.pop() - if (fn, callee) in result_set: - continue - - assert len(fn_calls) == 0 - cg2 = copy.deepcopy(callgraph) - cg2[fn].remove(callee) - - fn_results.append( (size - biggest_component(strongly_connected_components(cg2)), callee, "called by", fn) ) - - print - - - return (function_bottlenecks, call_bottlenecks) - -if __name__ == '__main__': - p = Parser() - for fname in sys.argv[1:]: - modname = re.sub(r'.*/', '', fname).replace('.callgraph', '.c') - with open(fname, 'r') as f: - p.parse_callgraph_file(f, modname) - - sys.stdout.flush() - - print "Building callgraph" - callgraph = p.extract_callgraph() - inModule = p.definedIn - - print "Deriving module callgraph" - modCallgraph = {} - for fn in callgraph: - fnMod = inModule[fn] - for called in callgraph[fn]: - try: - calledMod = inModule[called] - except KeyError: - continue - modCallgraph.setdefault(fnMod, set()).add(calledMod) - del modCallgraph['nil'] - - print "Finding strongly connected components" - sccs = strongly_connected_components(callgraph) - - print "Finding the transitive closure of the callgraph.." - closure = transitive_closure(callgraph) - - print "Finding bottlenecks..." - bottlenecks = connection_bottlenecks(callgraph) - - print "Finding module SCCs" - modSCCS = strongly_connected_components(modCallgraph) - - print "Finding module TC" - modTC = transitive_closure(modCallgraph) - - print "Finding module bottlenecks" - modB = connection_bottlenecks(modCallgraph) - - data = { - 'callgraph' : callgraph, - 'sccs' : sccs, - 'closure' : closure, - 'bottlenecks' : bottlenecks, - 'modules' : p.definedIn, - 'modItems' : { - 'callgraph' : modCallgraph, - 'sccs' : modSCCS, - 'closure' : modTC, - 'bottlenecks' : modB, - } - } - - with open('callgraph.pkl', 'w') as f: - cPickle.dump(data, f) - - - diff --git a/scripts/maint/display_callgraph.py b/scripts/maint/display_callgraph.py deleted file mode 100755 index c9001c6..0000000 --- a/scripts/maint/display_callgraph.py +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/python - -import cPickle - -data = cPickle.load(open("callgraph.pkl")) - -# data = data['modItems'] - -callgraph = data['callgraph'] -closure = data['closure'] -sccs = data['sccs'] -fn_bottle, call_bottle = data['bottlenecks'] - -for n_reachable, fn in sorted(list((len(r), fn) for fn, r in closure.iteritems())): - print "%s can reach %s other functions." %(fn, n_reachable) - - -c = [ (len(component), component) for component in sccs ] -c.sort() - -print "\n================================" - -for n, component in c: - if n < 2: - continue - print "Strongly connected component of size %d:"%n - print component - - -print "\n================================" - -print "====== Number of functions pulled into blob, by function in blob." -fn_bottle.sort() -for n, fn in fn_bottle[-30:]: - print "%3d: %s"%(n, fn) - -print "====== Number of functions pulled into blob, by call in blob." -call_bottle.sort() -for n, fn1, _, fn2 in call_bottle[-30:]: - print "%3d: %s -> %s "%(n, fn2, fn1) - diff --git a/scripts/maint/generate_callgraph.sh b/scripts/maint/generate_callgraph.sh deleted file mode 100755 index c6b33c0..0000000 --- a/scripts/maint/generate_callgraph.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -C_FILES=`echo src/common/*.c src/or/*.c src/tools/*.c` -CFLAGS="-Isrc/ext/trunnel -Isrc/trunnel -I. -Isrc/ext -Isrc/common -DLOCALSTATEDIR=\"\" -DSHARE_DATADIR=\"\" -Dinline=" - -mkdir -p callgraph/src/common -mkdir -p callgraph/src/or -mkdir -p callgraph/src/tools - -for fn in $C_FILES; do - echo $fn - clang $CFLAGS -S -emit-llvm -fno-inline -o - $fn | \ - opt -analyze -print-callgraph >/dev/null 2> "callgraph/${fn}allgraph" -done

1 0

[webwml/master] Change keywords and description meta tags
by hiro＠torproject.org 14 Jun '17

14 Jun '17

commit bfd7aef36e72ca21c44c444d252cfc225efa2a64 Author: hiromipaw <hiro(a)torproject.org> Date: Wed Jun 14 23:05:50 2017 +0200 Change keywords and description meta tags --- include/head.wmi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/head.wmi b/include/head.wmi index 1fb416b..ca85552 100644 --- a/include/head.wmi +++ b/include/head.wmi @@ -14,8 +14,8 @@ <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="author" content="The Tor Project, Inc."> - <meta name="description" content="Tor is a free software that prevents people from learning your location or browsing habits by letting you communicate anonymously on the Internet. It also helps you bypass censorship online. If you can't open the website, email gettor(a)torproject.org for instruction on how to get Tor Browser."> - <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research"> + <meta name="description" content="The Tor Project's free software protects your privacy online. Site blocked? Email [mailto:gettor@torproject.org] for help downloading Tor Browser."> + <meta name="keywords" content="tor, tor project, tor browser, avoid censorship, traffic analysis, anonymous communications, privacy, avoid surveillance, online security, anonymous online, private browsing, anonymity online, online privacy, protect privacy, private mac browser, private windows browser, private android browser, linux browser, anonymity network, tor network, onion router, onion browser"> <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg"> {#meta#}

1 0

[webwml/staging] Add new Tor Browser version: 7.5a1
by hiro＠torproject.org 14 Jun '17

14 Jun '17

commit 12320aab061fb307d07951541ddeffa3a66a0b41 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jun 14 01:28:52 2017 +0200 Add new Tor Browser version: 7.5a1 --- include/versions.wmi | 20 ++++++++++---------- projects/torbrowser/RecommendedTBBVersions | 6 +++++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index fb9cc5c..7b8598a 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -5,29 +5,29 @@ <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.0</define-tag> <define-tag version-torbrowserbundledir whitespace=delete>7.0.1</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>7.0a4</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>7.5a1</define-tag> <define-tag version-torbrowserbundle whitespace=delete>7.0.1</define-tag> <define-tag releasedate-torbrowserbundle whitespace=delete>2017-06-13</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>7.0a4</define-tag> -<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2017-05-16</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>7.5a1</define-tag> +<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2017-06-14</define-tag> <define-tag version-torbrowserbundlelinux32 whitespace=delete>7.0.1</define-tag> <define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2017-06-13</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>7.0.1</define-tag> <define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2017-06-13</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>7.0a4</define-tag> -<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2017-05-16</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>7.0a4</define-tag> -<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2017-05-16</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>7.5a1</define-tag> +<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2017-06-14</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>7.5a1</define-tag> +<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2017-06-14</define-tag> <define-tag version-torbrowserbundleosx32 whitespace=delete>7.0.1</define-tag> <define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2017-06-13</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>7.0.1</define-tag> <define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2017-06-13</define-tag> -<define-tag version-torbrowserbundleosx64beta whitespace=delete>7.0a4</define-tag> -<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2017-05-16</define-tag> -<define-tag version-torbrowsersandboxlinux whitespace=delete>0.0.6</define-tag> +<define-tag version-torbrowserbundleosx64beta whitespace=delete>7.5a1</define-tag> +<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2017-06-14</define-tag> +<define-tag version-torbrowsersandboxlinux whitespace=delete>0.0.7</define-tag> <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundledir>/tor-win32-<version-win32-stable>.zip</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 71de866..1a9b9ce 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -14,5 +14,9 @@ "7.0a4", "7.0a4-Linux", "7.0a4-MacOS", -"7.0a4-Windows" +"7.0a4-Windows", +"7.5a1", +"7.5a1-Linux", +"7.5a1-MacOS", +"7.5a1-Windows" ]

1 0

[webwml/staging] Add new Tor Browser version: 7.0.1
by hiro＠torproject.org 14 Jun '17

14 Jun '17

commit 7a95a8a346d9b851a6da6d89ec5d500b9ef6ba58 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jun 13 21:30:00 2017 +0200 Add new Tor Browser version: 7.0.1 --- include/versions.wmi | 24 ++++++++++++------------ projects/torbrowser/RecommendedTBBVersions | 4 ++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index f56c0e6..fb9cc5c 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,30 +1,30 @@ <define-tag version-stable whitespace=delete>0.3.0.8</define-tag> <define-tag version-alpha whitespace=delete>0.3.1.3-alpha</define-tag> -<define-tag version-win32-stable whitespace=delete>0.3.0.7</define-tag> +<define-tag version-win32-stable whitespace=delete>0.3.0.8</define-tag> <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.0</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>7.0</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>7.0.1</define-tag> <define-tag version-torbrowserbundlebetadir whitespace=delete>7.0a4</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>7.0</define-tag> -<define-tag releasedate-torbrowserbundle whitespace=delete>2017-06-07</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>7.0.1</define-tag> +<define-tag releasedate-torbrowserbundle whitespace=delete>2017-06-13</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>7.0a4</define-tag> <define-tag releasedate-torbrowserbundlebeta whitespace=delete>2017-05-16</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>7.0</define-tag> -<define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2017-06-07</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>7.0</define-tag> -<define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2017-06-07</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>7.0.1</define-tag> +<define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2017-06-13</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>7.0.1</define-tag> +<define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2017-06-13</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>7.0a4</define-tag> <define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2017-05-16</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>7.0a4</define-tag> <define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2017-05-16</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>7.0</define-tag> -<define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2017-06-07</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>7.0</define-tag> -<define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2017-06-07</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>7.0.1</define-tag> +<define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2017-06-13</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>7.0.1</define-tag> +<define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2017-06-13</define-tag> <define-tag version-torbrowserbundleosx64beta whitespace=delete>7.0a4</define-tag> <define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2017-05-16</define-tag> <define-tag version-torbrowsersandboxlinux whitespace=delete>0.0.6</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index ca853dd..71de866 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -7,6 +7,10 @@ "7.0-Linux", "7.0-MacOS", "7.0-Windows", +"7.0.1", +"7.0.1-Linux", +"7.0.1-MacOS", +"7.0.1-Windows", "7.0a4", "7.0a4-Linux", "7.0a4-MacOS",

1 0

[webwml/staging] Change keywords and description meta tags
by hiro＠torproject.org 14 Jun '17

14 Jun '17

commit bfd7aef36e72ca21c44c444d252cfc225efa2a64 Author: hiromipaw <hiro(a)torproject.org> Date: Wed Jun 14 23:05:50 2017 +0200 Change keywords and description meta tags --- include/head.wmi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/head.wmi b/include/head.wmi index 1fb416b..ca85552 100644 --- a/include/head.wmi +++ b/include/head.wmi @@ -14,8 +14,8 @@ <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="author" content="The Tor Project, Inc."> - <meta name="description" content="Tor is a free software that prevents people from learning your location or browsing habits by letting you communicate anonymously on the Internet. It also helps you bypass censorship online. If you can't open the website, email gettor(a)torproject.org for instruction on how to get Tor Browser."> - <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research"> + <meta name="description" content="The Tor Project's free software protects your privacy online. Site blocked? Email [mailto:gettor@torproject.org] for help downloading Tor Browser."> + <meta name="keywords" content="tor, tor project, tor browser, avoid censorship, traffic analysis, anonymous communications, privacy, avoid surveillance, online security, anonymous online, private browsing, anonymity online, online privacy, protect privacy, private mac browser, private windows browser, private android browser, linux browser, anonymity network, tor network, onion router, onion browser"> <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg"> {#meta#}

1 0

[stem/master] Normalized stem.util.term.format to return unicode
by atagar＠torproject.org 14 Jun '17

14 Jun '17

commit a4a59d0b309ebb07123c633aeae8cb3907ce1eb2 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 14 09:38:30 2017 -0700 Normalized stem.util.term.format to return unicode An anonymous user reports that the following line in the 'to russia with love' tutorial fails for python3... print(term.format(query("https://www.atagar.com/echo.php"), term.Color.BLUE)) On relection I want stem.util.term.format() to accept both bytes and unicode, so normalizing the input once we get it. --- docs/change_log.rst | 1 + stem/util/term.py | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 84f7493..50158ca 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -70,6 +70,7 @@ The following are only available within Stem's `git repository * Added cwd argument to :func:`~stem.util.system.call` * Added :class:`~stem.util.test_tools.TimedTestRunner` and :func:`~stem.util.test_tools.test_runtimes` * Supporing pid arguments in :func:`~stem.util.system.is_running` + * Normalized :func:`~stem.util.term.format` to return unicode * **Interpreter** diff --git a/stem/util/term.py b/stem/util/term.py index 895c4e9..68fa817 100644 --- a/stem/util/term.py +++ b/stem/util/term.py @@ -115,15 +115,21 @@ def format(msg, *attr): * `termcolor <https://pypi.python.org/pypi/termcolor>`_ * `colorama <https://pypi.python.org/pypi/colorama>`_ + .. versionchanged:: 1.6.0 + Normalized return value to be unicode to better support python 2/3 + compatibility. + :param str msg: string to be formatted :param str attr: text attributes, this can be :data:`~stem.util.term.Color`, :data:`~stem.util.term.BgColor`, or :data:`~stem.util.term.Attr` enums and are case insensitive (so strings like 'red' are fine) - :returns: **str** wrapped with ANSI escape encodings, starting with the given + :returns: **unicode** wrapped with ANSI escape encodings, starting with the given attributes and ending with a reset """ + msg = stem.util.str_tools._to_unicode(msg) + if DISABLE_COLOR_SUPPORT: return msg

1 0