- tor-commits - lists.torproject.org

[stem/master] Targeting reader test at /usr rather than root dir
by atagar＠torproject.org 06 Jun '12

06 Jun '12

commit ee6e475a347277ff6a387107219fa5ba79a7ae99 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 6 09:53:03 2012 -0700 Targeting reader test at /usr rather than root dir I've been running the reader's test_stop() integ test by running over the root direcctory because I simply needed something 'big' to keep the test occupied for a second or two. This turned out to inadvertantly fuzz the reader which is sorta a good thing since it discovered that block devices and encrypted partitions can be slow to read, causing stop() to block for a bit. However, we don't want to run over people's private stuff, and slow reads on encrypted partitions probably isn't a problem that we want to solve anyway, so running over '/usr' instead. --- test/integ/descriptor/reader.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/integ/descriptor/reader.py b/test/integ/descriptor/reader.py index 0ae882e..0e6c867 100644 --- a/test/integ/descriptor/reader.py +++ b/test/integ/descriptor/reader.py @@ -281,7 +281,7 @@ class TestDescriptorReader(unittest.TestCase): """ is_test_running = True - reader = stem.descriptor.reader.DescriptorReader("/") + reader = stem.descriptor.reader.DescriptorReader("/usr") # Fails the test after a couple seconds if we don't finish successfully. # Depending on what we're blocked on this might not work when the test

1 0

[stem/master] Descriptor typo corrections
by atagar＠torproject.org 06 Jun '12

06 Jun '12

commit 63c2ddb95e4c96e509e030240df12266012ce844 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 6 10:09:21 2012 -0700 Descriptor typo corrections Fixes by Karsten --- stem/descriptor/extrainfo_descriptor.py | 6 ++++-- stem/descriptor/reader.py | 2 +- stem/descriptor/server_descriptor.py | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index ff37064..0a4e893 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -37,7 +37,7 @@ Extra-info descriptors are available from a few sources... |- MIN - smallest rate at which a descriptor was downloaded in B/s |- MAX - largest rate at which a descriptor was downloaded in B/s |- D1-4 and D6-9 - rate of the slowest x/10 download rates in B/s - |- Q1 and Q3 - rate of the slowest and fastest querter download rates in B/s + |- Q1 and Q3 - rate of the slowest and fastest quarter download rates in B/s +- MD - median download rate in B/s parse_file - Iterates over the extra-info descriptors in a file. @@ -179,6 +179,8 @@ class ExtraInfoDescriptor(stem.descriptor.Descriptor): :var str geoip_db_digest: sha1 of geoIP database file :var str signature: **\*** signature for this extrainfo descriptor + **Bi-directional connection usage:** + :var datetime conn_bi_direct_end: end of the sampling interval :var int conn_bi_direct_interval: seconds per interval :var int conn_bi_direct_below: connections that read/wrote less than 20 KiB @@ -203,7 +205,7 @@ class ExtraInfoDescriptor(stem.descriptor.Descriptor): :var list cell_processed_cells: measurement of processed cells per circuit :var list cell_queued_cells: measurement of queued cells per circuit :var list cell_time_in_queue: mean enqueued time in milliseconds for cells - :var int cell_circuits_per_decile: mean number of circuits in a deciles + :var int cell_circuits_per_decile: mean number of circuits in a decile **Directory Mirror Attributes:** diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index 51eb46c..499ded1 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -103,7 +103,7 @@ class ParsingFailure(FileSkipped): class UnrecognizedType(FileSkipped): """ File doesn't contain descriptor data. This could either be due to its file - type or because it doens't conform to a recognizable descriptor type. + type or because it doesn't conform to a recognizable descriptor type. """ def __init__(self, mime_type): diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index e19a3bd..bbce9d1 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -152,7 +152,7 @@ class ServerDescriptor(stem.descriptor.Descriptor): :var stem.exit_policy.ExitPolicy exit_policy: **\*** stated exit policy :var list family: **\*** nicknames or fingerprints of declared family - :var int average_bandwidth: **\*** averate rate it's willing to relay in bytes/s + :var int average_bandwidth: **\*** average rate it's willing to relay in bytes/s :var int burst_bandwidth: **\*** burst rate it's willing to relay in bytes/s :var int observed_bandwidth: **\*** estimated capacity based on usage in bytes/s @@ -271,7 +271,7 @@ class ServerDescriptor(stem.descriptor.Descriptor): def get_annotations(self): """ - Provides content that appeard prior to the descriptor. If this comes from + Provides content that appeared prior to the descriptor. If this comes from the cached-descriptors file then this commonly contains content like... ::

1 0

[stem/master] Correcting incorrect variable in logging
by atagar＠torproject.org 06 Jun '12

06 Jun '12

commit da1e0a75082efef9e24f86fbba68e6c47116619c Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 6 09:23:11 2012 -0700 Correcting incorrect variable in logging Issue caught by Karsten. --- test/integ/process.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/integ/process.py b/test/integ/process.py index 470faa7..61440fd 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -51,5 +51,5 @@ class TestProcess(unittest.TestCase): runtime = time.time() - start_time if not (runtime > 2 and runtime < 3): - self.fail("Test should have taken 2-3 seconds, took %i instead" % timeout) + self.fail("Test should have taken 2-3 seconds, took %i instead" % runtime)

1 0

[stem/master] Skipping non-regular files when the reader crawls
by atagar＠torproject.org 06 Jun '12

06 Jun '12

commit ebed653be563f2e16c384d9d3b235ad2ecb11566 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 6 08:47:54 2012 -0700 Skipping non-regular files when the reader crawls When the reader encounters block devices it can get stuck, causing the integ test for stop() to fail. Caught by nickm. --- stem/descriptor/reader.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index acc9f8f..51eb46c 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -386,6 +386,11 @@ class DescriptorReader: self._notify_skip_listeners(target, AlreadyRead(last_modified, last_used)) return + # Block devices and such are never descriptors, and can cause us to block + # for quite a while so skipping anything that isn't a regular file. + + if not os.path.isfile(target): return + # The mimetypes module only checks the file extension. To actually # check the content (like the 'file' command) we'd need something like # pymagic (https://github.com/cloudburst/pymagic)

1 0

[metrics-tasks/master] yatei customizations
by karsten＠torproject.org 06 Jun '12

06 Jun '12

commit 1cb095be419cde92e433e07ac4c3bb1190c2f2b2 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jun 5 14:53:04 2012 +0300 yatei customizations --- task-2718/detector.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/task-2718/detector.py b/task-2718/detector.py index 716bbdf..a3d073c 100644 --- a/task-2718/detector.py +++ b/task-2718/detector.py @@ -297,7 +297,6 @@ def write_all(tss, minc, maxc, INTERVAL=7): for c in tss.country_codes: if c in exclude: continue - print ".", series = tss.get_country_series(c) for i, v in enumerate(series): if i > 0 and i - INTERVAL >= 0 and series[i] != None and series[i-INTERVAL] != None and series[i-INTERVAL] != 0 and minc[i]!= None and maxc[i]!= None: @@ -319,7 +318,7 @@ def main(): tss = torstatstore(CSV_FILE) l = tss.get_largest_locations(50) minx, maxx = make_tendencies_minmax(l, INTERV) - plot_all(tss, minx, maxx, INTERV, DAYS, rdir=GRAPH_DIR) + #plot_all(tss, minx, maxx, INTERV, DAYS, rdir=GRAPH_DIR) write_all(tss, minx, maxx, INTERV) if __name__ == "__main__":

1 0

[metrics-tasks/master] Add support for daily censorship reports.
by karsten＠torproject.org 06 Jun '12

06 Jun '12

commit 94f955ec4266ac21c782a495bb1bd60f0c48be7e Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jun 5 19:37:28 2012 +0300 Add support for daily censorship reports. --- task-2718/detector.py | 54 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 51 insertions(+), 3 deletions(-) diff --git a/task-2718/detector.py b/task-2718/detector.py index 1d6b4c2..5a55b39 100644 --- a/task-2718/detector.py +++ b/task-2718/detector.py @@ -267,15 +267,22 @@ def absolute_plot(series, minc, maxc, labels,INTERVAL, xtitle): If 'scoring_interval' is specifed we only consider upscore/downscore that happened in the latest 'scoring_interval' days. """ -def censor_score(series, minc, maxc, INTERVAL): +def censor_score(series, minc, maxc, INTERVAL, scoring_interval=None): upscore = 0 downscore = 0 + + if scoring_interval is None: + scoring_interval = len(series) + assert(len(series) >= scoring_interval) + for i, v in enumerate(series): if i > 0 and i - INTERVAL >= 0 and series[i] != None and series[i-INTERVAL] != None and series[i-INTERVAL] != 0 and minc[i]!= None and maxc[i]!= None: in_minc = minc[i] * poisson.ppf(1-0.9999, series[i-INTERVAL]) in_maxc = maxc[i] * poisson.ppf(0.9999, series[i-INTERVAL]) - downscore += 1 if minc[i] != None and v < in_minc else 0 - upscore += 1 if maxc[i] != None and v > in_maxc else 0 + if (i >= (len(series) - scoring_interval)): + downscore += 1 if minc[i] != None and v < in_minc else 0 + upscore += 1 if maxc[i] != None and v > in_maxc else 0 + return downscore, upscore def plot_target(tss, TARGET, xtitle, minx, maxx, DAYS=365, INTERV = 7): @@ -338,6 +345,44 @@ def write_all(tss, minc, maxc, INTERVAL=7): ranges_file.write("%s,%s,%s,%s\n" % (tss.all_dates[i], c, minv, maxv)) ranges_file.close() +"""Write a file containing a short censorship report over the last +'notification_period' days. +""" +def write_ml_report(tss, minx, maxx, INTERV, DAYS, notification_period=None): + if notification_period is None: + notification_period = DAYS + + report_file = open('short_censorship_report.txt', 'w') + file_prologue_written = False + + s = tss.get_largest(None) # no restrictions, get 'em all. + scores = [] + for num, li in s: + ds,us = censor_score(tss.get_country_series(li)[-DAYS:], minx[-DAYS:], maxx[-DAYS:], INTERV, notification_period) + scores += [(ds,num, us, li)] + scores.sort() + scores.reverse() + + for downscores,users_n,upscores,country_name in scores: + if (downscores > 0) or (upscores > 0): + if not file_prologue_written: + prologue = "=======================\n" + prologue += "Automatic Censorship Report for %s to %s\n" % (tss.all_dates[-notification_period], tss.all_dates[-1]) + prologue += "=======================\n\n" + report_file.write(prologue) + file_prologue_written = True + + if ((upscores > 0) and (downscores == 0)): + s = "We detected an unusual spike of Tor users in %s (%d upscores, %d users).\n" % \ + (country_name, upscores, users_n) + else: + s = "We detected %d potential censorship events in %s (users: %d, upscores: %d).\n" % \ + (downscores, country_name, users_n, upscores) + + report_file.write(s + "\n") + + report_file.close() + def main(): # Change these to customize script CSV_FILE = "direct-users.csv" @@ -353,5 +398,8 @@ def main(): #plot_all(tss, minx, maxx, INTERV, DAYS, rdir=GRAPH_DIR) write_all(tss, minx, maxx, INTERV) + # Make our short report; only consider events of the last day + write_ml_report(tss, minx, maxx, INTERV, DAYS, 1) + if __name__ == "__main__": main()

1 0

[metrics-tasks/master] Add documentation.
by karsten＠torproject.org 06 Jun '12

06 Jun '12

commit ad7d50bd436e2994c34fd454e969704b4902e418 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jun 5 18:09:16 2012 +0300 Add documentation. --- task-2718/detector.py | 76 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 54 insertions(+), 22 deletions(-) diff --git a/task-2718/detector.py b/task-2718/detector.py index a3d073c..1d6b4c2 100644 --- a/task-2718/detector.py +++ b/task-2718/detector.py @@ -38,14 +38,14 @@ ## anomalies that might be indicative of censorship. # Dep: matplotlib -from pylab import * +from pylab import * import matplotlib # Dep: numpy -import numpy +import numpy # Dep: scipy -import scipy.stats +import scipy.stats from scipy.stats.distributions import norm from scipy.stats.distributions import poisson @@ -56,7 +56,18 @@ import os.path days = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"] -# read the .csv file +""" +Represents a .csv file containing information on the number of +connecting Tor users per country. + +'store': Dictionary with (<country code>, <counter>) as key, and the number of users as value. + <country code> can also be "date"... +'all_dates': List of the data intervals (with default timedelta: 1 day). +'country_codes': List of all relevant country codes. +'MAX_INDEX': Length of store, number of country codes etc. +'date_min': The oldest date found in the .csv. +'date_min': The latest date found in the .csv. +""" class torstatstore: def __init__(self, file_name): f = file(file_name) @@ -72,13 +83,13 @@ class torstatstore: processed_val = None if ccode == "date": try: - year, month, day = int(val[:4]), int(val[5:7]), int(val[8:10]) + year, month, day = int(val[:4]), int(val[5:7]), int(val[8:10]) processed_val = date(year, month, day) except Exception, e: print "Parsing error (ignoring line %s):" % j print "%s" % val,e - break - + break + elif val != "NA": processed_val = int(val) store[(ccode, i)] = processed_val @@ -91,7 +102,7 @@ class torstatstore: d = date_min dt = timedelta(days=1) while d <= date_max: - all_dates += [d] + all_dates += [d] d = d + dt # Save for later @@ -102,6 +113,9 @@ class torstatstore: self.date_min = date_min self.date_max = date_max + """Return a list representing a time series of 'ccode' with respect + to the number of connected users. + """ def get_country_series(self, ccode): assert ccode in self.country_codes series = {} @@ -114,6 +128,10 @@ class torstatstore: sx += [series[d]] return sx + """Return an ordered list containing tuples of the form (<number of + users>, <country code>). The list is ordered with respect to the + number of users for each country. + """ def get_largest(self, number): exclude = set(["all", "??", "date"]) l = [(self.store[(c, self.MAX_INDEX-1)], c) for c in self.country_codes if c not in exclude] @@ -121,6 +139,9 @@ class torstatstore: l.reverse() return l[:number] + """Return a dictionary, with <country code> as key, and the time + series of the country code as the value. + """ def get_largest_locations(self, number): l = self.get_largest(number) res = {} @@ -128,14 +149,16 @@ class torstatstore: res[ccode] = self.get_country_series(ccode) return res -# Computes the difference between today and a number of days in the past +"""Return a list containing lists (?) where each such list contains +the difference in users for a time delta of 'days' +""" def n_day_rel(series, days): rel = [] for i, v in enumerate(series): if series[i] is None: rel += [None] continue - + if i - days < 0 or series[i-days] is None or series[i-days] == 0: rel += [None] else: @@ -175,7 +198,7 @@ def make_tendencies_minmax(l, INTERVAL = 1): return minx, maxx # Makes pretty plots -def raw_plot(series, minc, maxc, labels, xtitle): +def raw_plot(series, minc, maxc, labels, xtitle): assert len(xtitle) == 3 fname, stitle, slegend = xtitle @@ -185,19 +208,19 @@ def raw_plot(series, minc, maxc, labels, xtitle): matplotlib.rc('font', **font) ylim( (-max(series)*0.1, max(series)*1.1) ) - plot(labels, series, linewidth=1.0, label="Users") + plot(labels, series, linewidth=1.0, label="Users") wherefill = [] for mm,mx in zip(minc, maxc): - wherefill += [not (mm == None and mx == None)] + wherefill += [not (mm == None and mx == None)] assert mm < mx or (mm == None and mx == None) - + fill_between(labels, minc, maxc, where=wherefill, color="gray", label="Prediction") vdown = [] vup = [] for i,v in enumerate(series): - if minc[i] != None and v < minc[i]: + if minc[i] != None and v < minc[i]: vdown += [v] vup += [None] elif maxc[i] != None and v > maxc[i]: @@ -206,7 +229,7 @@ def raw_plot(series, minc, maxc, labels, xtitle): else: vup += [None] vdown += [None] - + plot(labels, vdown, 'o', ms=10, lw=2, alpha=0.5, mfc='orange', label="Downturns") plot(labels, vup, 'o', ms=10, lw=2, alpha=0.5, mfc='green', label="Upturns") @@ -235,9 +258,15 @@ def absolute_plot(series, minc, maxc, labels,INTERVAL, xtitle): else: in_minc += [None] in_maxc += [None] - raw_plot(series, in_minc, in_maxc, labels, xtitle) + raw_plot(series, in_minc, in_maxc, labels, xtitle) -# Censorship score by jurisdiction +"""Return the number of downscores and upscores of a time series +'series', given tendencies 'minc' and 'maxc' for the time interval +'INTERVAL'. + +If 'scoring_interval' is specifed we only consider upscore/downscore +that happened in the latest 'scoring_interval' days. +""" def censor_score(series, minc, maxc, INTERVAL): upscore = 0 downscore = 0 @@ -263,17 +292,17 @@ def plot_all(tss, minx, maxx, INTERV, DAYS=None, rdir="img"): return summary_file = file(os.path.join(rdir, "summary.txt"), "w") - + if DAYS == None: DAYS = 6*31 - + s = tss.get_largest(200) scores = [] for num, li in s: print ".", ds,us = censor_score(tss.get_country_series(li)[-DAYS:], minx[-DAYS:], maxx[-DAYS:], INTERV) # print ds, us - scores += [(ds,num, us, li)] + scores += [(ds,num, us, li)] scores.sort() scores.reverse() s = "\n=======================\n" @@ -290,6 +319,7 @@ def plot_all(tss, minx, maxx, INTERV, DAYS=None, rdir="img"): plot_target(tss, c,xtitle, minx, maxx, DAYS, INTERV) summary_file.close() +"""Write a CSV report on the minimum/maximum users of each country per date.""" def write_all(tss, minc, maxc, INTERVAL=7): ranges_file = file("direct-users-ranges.csv", "w") ranges_file.write("date,country,minusers,maxusers\n") @@ -312,9 +342,11 @@ def main(): # Change these to customize script CSV_FILE = "direct-users.csv" GRAPH_DIR = "img" + # Time interval to model connection rates. INTERV = 7 + # Consider maximum DAYS days back. DAYS= 6 * 31 - + tss = torstatstore(CSV_FILE) l = tss.get_largest_locations(50) minx, maxx = make_tendencies_minmax(l, INTERV)

1 0

[metrics-web/master] Use a temp file for writing raw bridge usage data.
by karsten＠torproject.org 06 Jun '12

06 Jun '12

commit 7ce5984810a05bdd59790b8010da0d1f47e8910a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jun 6 10:00:49 2012 +0200 Use a temp file for writing raw bridge usage data. Fixes more of #6064. --- .../ernie/cron/BridgeStatsFileHandler.java | 24 ++++++++++++++++--- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/ernie/cron/BridgeStatsFileHandler.java b/src/org/torproject/ernie/cron/BridgeStatsFileHandler.java index aba7804..70a6a6f 100644 --- a/src/org/torproject/ernie/cron/BridgeStatsFileHandler.java +++ b/src/org/torproject/ernie/cron/BridgeStatsFileHandler.java @@ -50,6 +50,11 @@ public class BridgeStatsFileHandler { private File bridgeStatsRawFile; /** + * Temp file for writing intermediate results. + */ + private File bridgeStatsRawTempFile; + + /** * Bridge user numbers by country as seen by single bridges on a given * day. Map keys are bridge and date written as "bridge,date", map * values are lines as read from <code>stats/bridge-stats-raw</code>. @@ -118,6 +123,7 @@ public class BridgeStatsFileHandler { /* Initialize file names for intermediate and final results. */ this.bridgeStatsRawFile = new File("stats/bridge-stats-raw"); + this.bridgeStatsRawTempFile = new File("stats/bridge-stats-raw.tmp"); this.bridgeStatsFile = new File("stats/bridge-stats"); this.hashedRelayIdentitiesFile = new File( "stats/hashed-relay-identities"); @@ -368,10 +374,12 @@ public class BridgeStatsFileHandler { /* Write observations made by single bridges to disk. */ try { this.logger.fine("Writing file " - + this.bridgeStatsRawFile.getAbsolutePath() + "..."); - this.bridgeStatsRawFile.getParentFile().mkdirs(); + + this.bridgeStatsRawFile.getAbsolutePath() + " (using " + + this.bridgeStatsRawTempFile.getAbsolutePath() + " as temp " + + "file)..."); + this.bridgeStatsRawTempFile.getParentFile().mkdirs(); BufferedWriter bw = new BufferedWriter(new FileWriter( - this.bridgeStatsRawFile)); + this.bridgeStatsRawTempFile)); bw.append("bridge,date,time"); for (String c : this.countries) { if (c.equals("zy")) { @@ -399,11 +407,19 @@ public class BridgeStatsFileHandler { } } bw.close(); + if (!this.bridgeStatsRawTempFile.renameTo( + this.bridgeStatsRawFile)) { + this.logger.fine("Failed to rename " + + this.bridgeStatsRawTempFile.getAbsolutePath() + " to " + + this.bridgeStatsRawFile.getAbsolutePath() + "."); + } this.logger.fine("Finished writing file " + this.bridgeStatsRawFile.getAbsolutePath() + "."); } catch (IOException e) { this.logger.log(Level.WARNING, "Failed to write " - + this.bridgeStatsRawFile.getAbsolutePath() + "!", e); + + this.bridgeStatsRawFile.getAbsolutePath() + " (using " + + this.bridgeStatsRawTempFile.getAbsolutePath() + " as temp " + + "file)!", e); } /* Aggregate per-day statistics. */

1 0

[flashproxy/master] Use plain http (not https) in embed links.
by dcf＠torproject.org 06 Jun '12

06 Jun '12

commit 1caa8dad46cd4a803036ebc0b76f4f9e6784e196 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jun 5 22:10:18 2012 -0700 Use plain http (not https) in embed links. Using https would be preferable, which is why I changed this to explicit https in 836b7a27. But I learned that Firefox doesn't allow making a plaintext (ws) WebSocket connection in an https page; you have to use wss instead, for the same reason you get mixed-content warnings. https://bugzilla.mozilla.org/show_bug.cgi?id=662692 https://developer.mozilla.org/en/Firefox_8_for_developers#WebSockets https://developer.mozilla.org/en/WebSockets/Writing_WebSocket_client_applic… I think that we can't use wss sockets because they would require each client to have a CA cert. In the iframe link, I've left the protocol implicit, so it will use https if the page itself is https and http otherwise. This is to avoid using mixed content, but the badge won't work if the browser disallows the plaintext WebSocket. The about:config setting that controls this is network.websocket.allowInsecureFromHTTPS. --- README | 8 ++++---- doc/websocket-transport.txt | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README b/README index c00804b..71fbffe 100644 --- a/README +++ b/README @@ -26,7 +26,7 @@ changing pool of addresses. This page has a description of the project; viewing it also turns your computer into a flash proxy as long as the page is open. -https://crypto.stanford.edu/flashproxy/ +http://crypto.stanford.edu/flashproxy/ == Quick start for users @@ -46,7 +46,7 @@ if you are able to configure port forwarding or receive direct connections from the Internet. If you don't get a connection within 30 seconds or so, make sure someone -with Flash Player is viewing https://crypto.stanford.edu/flashproxy/. +with Flash Player is viewing http://crypto.stanford.edu/flashproxy/. There aren't yet enough operational proxies that one is available all the time. @@ -87,7 +87,7 @@ without having to do port forwarding. === Troubleshooting -Make sure someone is viewing https://crypto.stanford.edu/flashproxy/, or +Make sure someone is viewing http://crypto.stanford.edu/flashproxy/, or another web page with a flash proxy badge on it. Sometimes Tor can think that the bridge you reach through a proxy is @@ -131,7 +131,7 @@ Add this line to torrc to make the relay use the external proxy: Paste in this HTML where you want the badge to appear: -<iframe src="https://crypto.stanford.edu/flashproxy/embed.html" width="70px" height="23px" frameBorder="0" scrolling="no"></iframe> +<iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="70px" height="23px" frameBorder="0" scrolling="no"></iframe> == For developers diff --git a/doc/websocket-transport.txt b/doc/websocket-transport.txt index ad1eef5..cf46301 100644 --- a/doc/websocket-transport.txt +++ b/doc/websocket-transport.txt @@ -103,7 +103,7 @@ Examples > GET / HTTP/1.1\r\n > Host: 192.0.2.1:80\r\n -> Origin: https://example.com\r\n +> Origin: http://example.com\r\n > Sec-WebSocket-Version: 13\r\n > Sec-WebSocket-Key: mzo2xSF9N8VUxuefqO0RSw==\r\n > Connection: Upgrade\r\n @@ -121,7 +121,7 @@ Examples > GET / HTTP/1.1\r\n > Host: 192.0.2.1:80\r\n -> Origin: https://example.com\r\n +> Origin: http://example.com\r\n > Sec-WebSocket-Version: 13\r\n > Sec-WebSocket-Protocol: base64\r\n > Sec-WebSocket-Key: k5Ybhw0XBDeBfmda1J9ooQ==\r\n

1 0

[flashproxy/master] Catch exceptions that happen during ProxyPair connections.
by dcf＠torproject.org 06 Jun '12

06 Jun '12

commit 07dc549ef49061f153adcbc16f3e4e31643c5607 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jun 5 22:29:43 2012 -0700 Catch exceptions that happen during ProxyPair connections. --- flashproxy.js | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/flashproxy.js b/flashproxy.js index 55aedc5..28beb29 100644 --- a/flashproxy.js +++ b/flashproxy.js @@ -437,7 +437,13 @@ function FlashProxy() { this.proxy_pairs.splice(this.proxy_pairs.indexOf(proxy_pair), 1); this.badge.proxy_end(); }.bind(this); - proxy_pair.connect(); + try { + proxy_pair.connect(); + } catch (err) { + puts("ProxyPair: exception while connecting: " + repr(err.message) + "."); + this.die(); + return; + } this.badge.proxy_begin(); };

1 0