tor-commits August 2012

tor-commits@lists.torproject.org

19 participants
901 discussions

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 29 Aug '12

29 Aug '12

commit 2ab906020f01f71957184784f87d720418352661 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 29 12:45:20 2012 +0000 Update translations for vidalia_help --- cs/server.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cs/server.po b/cs/server.po index 464031d..ebe2c33 100644 --- a/cs/server.po +++ b/cs/server.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-08-28 13:57+0000\n" +"PO-Revision-Date: 2012-08-29 12:43+0000\n" "Last-Translator: digitaldreamer <digitaldreamer(a)email.cz>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -352,7 +352,7 @@ msgid "" "connections to your computer from other computers on the Internet. If you " "want to run a Tor relay, however, other Tor clients and relays must be able " "to connect to your relay through your home router or firewall." -msgstr "" +msgstr "Mnozí uživatelé se z domova připojují k internetu skrze <i>router</i>, který umožňuje, aby více uživatelů na místní síti sdílelo stejné internetové přopjení. Někteří uživatelé mohou také být za <i>firewallem</i> který blkuje příchozí připojení k vašemu počítači od jiných počítačů na internetu. Pokud však chcete provozovat Tor relay, jiní klienti Toru musí mít možnost připojit se k vašemu relayi i skrze váš domácí router nebo firewall." #. type: Content of: <html><body><p> #: en/server.html:200 @@ -362,7 +362,7 @@ msgid "" "known as <i>port forwarding</i>. Port forwarding configures your router or " "firewall to \"forward\" all connections to certain ports on your router or " "firewall to local ports on your computer." -msgstr "" +msgstr "Aby byl váš relay veřejně dotupný, musí váš router nebo firewall vědět, které porty přeposlat vašm počítači, tím že na něm nastavíte tzv. <i>port forwarding</i>. Port forwarding nakonfigujruje váš router nebo firewall aby \"přeposílal\" všechna připojení k zadaným portům na vašem routeru nebo firewallu vašemu počítači." #. type: Content of: <html><body><p> #: en/server.html:208

1 0

[compass/master] Display total count in fingerprint column
by karsten＠torproject.org 29 Aug '12

29 Aug '12

commit 100d6441449208988869be94d810ed590d479b15 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Tue Aug 28 19:14:05 2012 +0530 Display total count in fingerprint column When grouping by country/AS, the total number of relays are displayed in the nickname column. This is wrong, we calculate the number of unique fingerprints and not nicknames. Move the relay count to fingerprint column. --- app.py | 6 +++--- compass.py | 4 ++-- templates/result.html | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app.py b/app.py index d84cbdc..40de2fa 100644 --- a/app.py +++ b/app.py @@ -58,10 +58,10 @@ def parse(output_string, grouping=False, sort_key=None): the elements and delete the last element in the list. """ if grouping: - values[5] = "%s %s" % (values[5], values[6]) - for id in xrange(7, len(values)): + values[6] = "%s %s" % (values[6], values[7]) + for id in xrange(8, len(values)): values[id-1] = values[id] - del values[id] + del values[-1] # TODO: change inaccurate value of 10 if len(values) > 10: diff --git a/compass.py b/compass.py index a62fb3c..e478e8f 100755 --- a/compass.py +++ b/compass.py @@ -253,8 +253,8 @@ class RelayStats(object): as_name = relay.get('as_name', '??') relays_in_group += 1 if by_country or by_as_number: - nickname = "(%d relays)" % relays_in_group - fingerprint = "*" + nickname = "*" + fingerprint = "(%d relays)" % relays_in_group exit = "*" guard = "*" if not by_as_number and not ases: diff --git a/templates/result.html b/templates/result.html index 8dc3b6e..a572933 100644 --- a/templates/result.html +++ b/templates/result.html @@ -78,7 +78,7 @@ <td>{{ result.p_exit }}</td> <td>{{ result.nick }}</td>  - {% if result.fp == '*' %} + {% if "relays" in result.fp %} <td>{{ result.fp }}</td> {% else %} <td><a href="https://atlas.torproject.org/#details/{{

1 0

[compass/master] Merge AS_Number and AS_Name
by karsten＠torproject.org 29 Aug '12

29 Aug '12

commit 3042bb95f008b3fb0345076c95039261f041a3ed Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Tue Aug 28 19:28:51 2012 +0530 Merge AS_Number and AS_Name Those two columns took up quite a bit of space, merging them together should hopefully free up more space to display more important information. --- app.py | 2 ++ compass.py | 11 ++++++----- templates/result.html | 6 ++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app.py b/app.py index 40de2fa..a0d2b05 100644 --- a/app.py +++ b/app.py @@ -39,6 +39,7 @@ class Result(): self.cc = None self.as_no = None self.as_name = None + self.as_info = None def parse(output_string, grouping=False, sort_key=None): results = [] @@ -78,6 +79,7 @@ def parse(output_string, grouping=False, sort_key=None): result.as_no = values[10] result.as_name = ' '.join(values[11:]) result.as_name = re.sub(r'$[^)]*$', '', result.as_name) + result.as_info = "%s %s" % (result.as_no, result.as_name) if sort_key: key = float(getattr(result, sort_key)[:-1]) diff --git a/compass.py b/compass.py index e478e8f..015e71a 100755 --- a/compass.py +++ b/compass.py @@ -251,6 +251,7 @@ class RelayStats(object): country = relay.get('country', '??') as_number = relay.get('as_number', '??') as_name = relay.get('as_name', '??') + as_info = "%s %s" %(as_number, as_name) relays_in_group += 1 if by_country or by_as_number: nickname = "*" @@ -263,9 +264,9 @@ class RelayStats(object): if not by_country and not country: country = "*" if links: - format_string = "%8.4f%% %8.4f%% %8.4f%% %8.4f%% %8.4f%% %-19s %-78s %-4s %-5s %-2s %-9s %s" + format_string = "%8.4f%% %8.4f%% %8.4f%% %8.4f%% %8.4f%% %-19s %-78s %-4s %-5s %-2s %-9s" else: - format_string = "%8.4f%% %8.4f%% %8.4f%% %8.4f%% %8.4f%% %-19s %-40s %-4s %-5s %-2s %-9s %s" + format_string = "%8.4f%% %8.4f%% %8.4f%% %8.4f%% %8.4f%% %-19s %-40s %-4s %-5s %-2s %-9s" formatted_group = format_string % ( group_weights[0] * 100.0, group_weights[1] * 100.0, @@ -273,7 +274,7 @@ class RelayStats(object): group_weights[3] * 100.0, group_weights[4] * 100.0, nickname, fingerprint, - exit, guard, country, as_number, as_name) + exit, guard, country, as_info) formatted_groups[formatted_group] = group_weights sorted_groups = sorted(formatted_groups.iteritems(), key=operator.itemgetter(1)) sorted_groups.reverse() @@ -282,9 +283,9 @@ class RelayStats(object): 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 AS_num AS_name"[:short]) + 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 AS_num AS_name"[:short]) + 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]) diff --git a/templates/result.html b/templates/result.html index a572933..28d4f21 100644 --- a/templates/result.html +++ b/templates/result.html @@ -63,8 +63,7 @@ <th>Exit</th> <th>Guard</th> <th>Country</th> - <th>Autonomous System Number</th> - <th>Autonomous System Name</th> + <th>Autonomous System</th> </tr> </thead> <tbody> @@ -87,8 +86,7 @@ <td>{{ result.exit }}</td> <td>{{ result.guard }}</td> <td>{{ result.cc }}</td> - <td>{{ result.as_no }}</td> - <td>{{ result.as_name }}</td> + <td>{{ result.as_info }}</td> </tr> {% endfor %} </tbody>

1 0

[compass/master] Display more info while grouping
by karsten＠torproject.org 29 Aug '12

29 Aug '12

commit eb91901e64ec6aecf6cb69f51bbdd326747e6090 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Tue Aug 28 19:59:24 2012 +0530 Display more info while grouping '*' is not very informative while grouping. Instead provide more information such as - - How many relays with the exit flag are in a given group? - How many relays with the guard flag are in a given group? - How many distinct AS numbers are in a given group? --- compass.py | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-) diff --git a/compass.py b/compass.py index 015e71a..9f2b340 100755 --- a/compass.py +++ b/compass.py @@ -236,7 +236,8 @@ class RelayStats(object): formatted_groups = {} for group in grouped_relays.values(): group_weights = (0, 0, 0, 0, 0) - relays_in_group = 0 + relays_in_group, exits_in_group, guards_in_group = 0, 0, 0 + ases_in_group = set() for relay in group: weights = (relay.get('consensus_weight_fraction', 0), relay.get('advertised_bandwidth_fraction', 0), @@ -246,27 +247,35 @@ class RelayStats(object): group_weights = tuple(sum(x) for x in zip(group_weights, weights)) nickname = relay['nickname'] fingerprint = relay['fingerprint'] if not links else "https://atlas.torproject.org/#details/%s" % relay['fingerprint'] - exit = 'Exit' if 'Exit' in set(relay['flags']) else '-' - guard = 'Guard' if 'Guard' in set(relay['flags']) else '-' + if 'Exit' 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 = "*" - guard = "*" + exit = "(%d)" % exits_in_group + guard = "(%d)" % guards_in_group if not by_as_number and not ases: - as_number = "*" - as_name = "*" + 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 %-4s %-5s %-2s %-9s" + 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 %-4s %-5s %-2s %-9s" + format_string = "%8.4f%% %8.4f%% %8.4f%% %8.4f%% %8.4f%% %-19s %-40s %-5s %-5s %-2s %-9s" formatted_group = format_string % ( group_weights[0] * 100.0, group_weights[1] * 100.0, @@ -283,9 +292,9 @@ class RelayStats(object): 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]) + 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]) + 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])

1 0

[metrics-web/master] Stop wasting graph space for cut out days.
by karsten＠torproject.org 29 Aug '12

29 Aug '12

commit 3d5bc767edcae80fd5759c5a349c16d207d68e7a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Aug 29 12:30:59 2012 +0200 Stop wasting graph space for cut out days. --- rserve/graphs.R | 78 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 40 insertions(+), 38 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index 4799726..83d380d 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -278,16 +278,16 @@ date_breaks <- function(days) { } plot_networksize <- function(start, end, path, dpi) { + end <- min(end, as.character(Sys.Date() - 2)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, avg_running AS relays FROM network_size ", - "WHERE date >= '", start, "' AND date <= '", end, - "' AND date < current_date - 1", sep = "") + "WHERE date >= '", start, "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) relays <- fetch(rs, n = -1) q <- paste("SELECT date, avg_running AS bridges ", "FROM bridge_network_size WHERE date >= '", start, - "' AND date <= '", end, "' AND date < current_date - 1", sep = "") + "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) bridges <- fetch(rs, n = -1) dbDisconnect(con) @@ -325,11 +325,12 @@ plot_networksize <- function(start, end, path, dpi) { } plot_cloudbridges <- function(start, end, path, dpi) { + end <- min(end, as.character(Sys.Date() - 2)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, avg_running_ec2 ", "FROM bridge_network_size WHERE date >= '", start, - "' AND date <= '", end, "' AND date < current_date - 1", sep = "") + "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) bridges <- fetch(rs, n = -1) dbDisconnect(con) @@ -358,17 +359,16 @@ plot_cloudbridges <- function(start, end, path, dpi) { } plot_relaycountries <- function(start, end, country, path, dpi) { + end <- min(end, as.character(Sys.Date() - 2)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) if (country == "all") { q <- paste("SELECT date, avg_running AS relays FROM network_size ", - "WHERE date >= '", start, "' AND date <= '", end, - "' AND date < current_date - 1", sep = "") + "WHERE date >= '", start, "' AND date <= '", end, "'", sep = "") } else { q <- paste("SELECT date, relays FROM relay_countries ", "WHERE date >= '", start, "' AND date <= '", end, - "' AND date < current_date - 1 ", - "AND country = '", country, "'", sep = "") + "' AND country = '", country, "'", sep = "") } rs <- dbSendQuery(con, q) u <- fetch(rs, n = -1) @@ -403,11 +403,11 @@ plot_relaycountries <- function(start, end, country, path, dpi) { } plot_versions <- function(start, end, path, dpi) { + end <- min(end, as.character(Sys.Date() - 2)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, version, relays FROM relay_versions ", - "WHERE date >= '", start, "' AND date <= '", end, - "' AND date < current_date - 1", sep = "") + "WHERE date >= '", start, "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) versions <- fetch(rs, n = -1) dbDisconnect(con) @@ -439,11 +439,12 @@ plot_versions <- function(start, end, path, dpi) { } plot_platforms <- function(start, end, path, dpi) { + end <- min(end, as.character(Sys.Date() - 2)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user=dbuser, password=dbpassword, dbname=db) q <- paste("SELECT date, avg_linux, avg_darwin, avg_bsd, avg_windows, ", "avg_other FROM relay_platforms WHERE date >= '", start, - "' AND date <= '", end, "' AND date < current_date - 1", sep = "") + "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) platforms <- fetch(rs, n = -1) dbDisconnect(con) @@ -471,16 +472,15 @@ plot_platforms <- function(start, end, path, dpi) { } plot_bandwidth <- function(start, end, path, dpi) { + end <- min(end, as.character(Sys.Date() - 4)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, bwadvertised FROM total_bandwidth ", - "WHERE date >= '", start, "' AND date <= '", end, "' ", - "AND date < current_date - 3", sep = "") + "WHERE date >= '", start, "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) bw_desc <- fetch(rs, n = -1) q <- paste("SELECT date, read, written FROM total_bwhist ", - "WHERE date >= '", start, "' AND date <= '", end, "' ", - "AND date < current_date - 3", sep = "") + "WHERE date >= '", start, "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) bw_hist <- fetch(rs, n = -1) dbDisconnect(con) @@ -509,11 +509,12 @@ plot_bandwidth <- function(start, end, path, dpi) { } plot_bwhist_flags <- function(start, end, path, dpi) { + end <- min(end, as.character(Sys.Date() - 4)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, isexit, isguard, read, written ", "FROM bwhist_flags WHERE date >= '", start, "' AND date <= '", end, - "' AND date < current_date - 3", sep = "") + "'", sep = "") rs <- dbSendQuery(con, q) bw <- fetch(rs, n = -1) dbDisconnect(con) @@ -555,12 +556,12 @@ plot_bwhist_flags <- function(start, end, path, dpi) { } plot_dirbytes <- function(start, end, path, dpi) { + end <- min(end, as.character(Sys.Date() - 4)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, dr, dw, brp, bwp, brd, bwd FROM user_stats ", "WHERE country = 'zy' AND bwp / bwd <= 3 AND date >= '", start, - "' AND date <= '", end, "' AND date < current_date - 3 ", - "ORDER BY date", sep = "") + "' AND date <= '", end, "' ORDER BY date", sep = "") rs <- dbSendQuery(con, q) dir <- fetch(rs, n = -1) dbDisconnect(con) @@ -591,23 +592,23 @@ plot_dirbytes <- function(start, end, path, dpi) { } plot_relayflags <- function(start, end, flags, granularity, path, dpi) { + end <- min(end, as.character(Sys.Date() - 2)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) if (granularity == 'day') { columns <- paste("avg_", tolower(flags), sep = "", collapse = ", ") q <- paste("SELECT date, ", columns, " FROM network_size ", - "WHERE date >= '", start, "' AND date <= '", end, - "' AND date < current_date - 1", sep = "") + "WHERE date >= '", start, "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) networksize <- fetch(rs, n = -1) dbDisconnect(con) dbUnloadDriver(drv) networksize <- melt(networksize, id = "date") networksize <- rbind(data.frame( - date = as.Date(rep(end, 5)), + date = as.Date(end) + 1, variable = paste("avg_", c("running", "exit", "guard", "fast", "stable"), sep = ""), - value = rep(NA, 5)), networksize) + value = NA), networksize) dates <- seq(from = as.Date(start, "%Y-%m-%d"), to = as.Date(end, "%Y-%m-%d"), by="1 day") missing <- setdiff(dates, networksize$date) @@ -637,15 +638,14 @@ plot_relayflags <- function(start, end, flags, granularity, path, dpi) { columns <- paste("avg_", tolower(flags), sep = "", collapse = ", ") q <- paste("SELECT validafter, ", columns, " FROM network_size_hour ", "WHERE DATE(validafter) >= '", start, - "' AND DATE(validafter) <= '", end, "' ", - "AND DATE(validafter) < current_date - 1", sep = "") + "' AND DATE(validafter) <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) networksize <- fetch(rs, n = -1) dbDisconnect(con) dbUnloadDriver(drv) networksize <- melt(networksize, id = "validafter") networksize <- rbind(data.frame( - validafter = as.POSIXct(rep(paste(end, "00:00:00"), 5)), + validafter = as.POSIXct(rep(paste(end, "23:59:00"), 5)), variable = paste("avg_", c("running", "exit", "guard", "fast", "stable"), sep = ""), value = rep(NA, 5)), networksize) @@ -666,13 +666,14 @@ plot_relayflags <- function(start, end, flags, granularity, path, dpi) { plot_direct_users <- function(start, end, country, events, path, nocutoff, dpi) { + if (nocutoff != "off") { + end <- min(end, as.character(Sys.Date() - 4)) + } drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, r, bwp, brn, bwn, brp, bwr, brr, country ", "FROM user_stats WHERE date >= '", start, "' AND date <= '", end, - "' ", ifelse(nocutoff == "off", - " AND date < current_date - 3 ", ""), - " AND (country = 'zy'", ifelse(country == "all", "", + "' AND (country = 'zy'", ifelse(country == "all", "", paste(" OR country = '", country, "'", sep = "")), ")", sep = "") rs <- dbSendQuery(con, q) u <- fetch(rs, n = -1) @@ -743,12 +744,12 @@ plot_direct_users <- function(start, end, country, events, path, nocutoff, } plot_bridge_users <- function(start, end, country, path, dpi) { + end <- min(end, as.character(Sys.Date() - 4)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, users FROM bridge_stats ", "WHERE date >= '", start, "' AND date <= '", end, "' ", - "AND date < current_date - 3", - " AND country = '", ifelse(country == "all", "zy", country), "'", + "AND country = '", ifelse(country == "all", "zy", country), "'", sep = "") rs <- dbSendQuery(con, q) bridgeusers <- fetch(rs, n = -1) @@ -782,12 +783,12 @@ plot_bridge_users <- function(start, end, country, path, dpi) { } plot_torperf <- function(start, end, source, filesize, path, dpi) { + end <- min(end, as.character(Sys.Date() - 2)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, q1, md, q3 FROM torperf_stats ", "WHERE source = '", paste(source, filesize, sep = "-"), - "' AND date >= '", start, "' AND date <= '", end, - "' AND date < current_date - 1", sep = "") + "' AND date >= '", start, "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) torperf <- fetch(rs, n = -1) dbDisconnect(con) @@ -832,13 +833,13 @@ plot_torperf <- function(start, end, source, filesize, path, dpi) { plot_torperf_failures <- function(start, end, source, filesize, path, dpi) { + end <- min(end, as.character(Sys.Date() - 2)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, timeouts, failures, requests ", "FROM torperf_stats WHERE source = '", paste(source, filesize, sep = "-"), - "' AND date >= '", start, "' AND date <= '", end, - "' AND date < current_date - 1", sep = "") + "' AND date >= '", start, "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) torperf <- fetch(rs, n = -1) dbDisconnect(con) @@ -886,12 +887,12 @@ plot_torperf_failures <- function(start, end, source, filesize, path, } plot_connbidirect <- function(start, end, path, dpi) { + end <- min(end, as.character(Sys.Date() - 2)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT DATE(statsend) AS date, readnum, writenum, bothnum ", "FROM connbidirect WHERE DATE(statsend) >= '", start, - "' AND DATE(statsend) <= '", end, "' AND DATE(statsend) < ", - "current_date - 1", sep = "") + "' AND DATE(statsend) <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) c <- fetch(rs, n = -1) dbDisconnect(con) @@ -987,17 +988,18 @@ plot_almost_fast_exits <- function(start, end, path, dpi) { } plot_bandwidth_flags <- function(start, end, path, dpi) { + end <- min(end, as.character(Sys.Date() - 4)) drv <- dbDriver("PostgreSQL") con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) q <- paste("SELECT date, isexit, isguard, bwadvertised AS value ", "FROM bandwidth_flags WHERE date >= '", start, "' AND date <= '", - end, "' AND date < current_date - 3", sep = "") + end, "'", sep = "") rs <- dbSendQuery(con, q) bw_desc <- fetch(rs, n = -1) q <- paste("SELECT date, isexit, isguard, ", "(read + written) / (2 * 86400) ", "AS value FROM bwhist_flags WHERE date >= '", start, - "' AND date <= '", end, "' AND date < current_date - 3", sep = "") + "' AND date <= '", end, "'", sep = "") rs <- dbSendQuery(con, q) bw_hist <- fetch(rs, n = -1) dbDisconnect(con)

1 0

[torbrowser/master] bump Firefox to 15.0, update libevent, https-everywhere, and noscript as well
by erinn＠torproject.org 29 Aug '12

29 Aug '12

commit 2c46dfe143f6bc0cf22aaea424c1d25b30fa398f Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 29 05:18:02 2012 +0100 bump Firefox to 15.0, update libevent, https-everywhere, and noscript as well --- build-scripts/versions-alpha.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 4efc8db..6fc7cd5 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -7,15 +7,15 @@ OPENSSL_VER=1.0.1c LIBPNG_VER=1.5.12 QT_VER=4.8.1 VIDALIA_VER=0.2.20 -LIBEVENT_VER=2.0.19-stable +LIBEVENT_VER=2.0.20-stable TOR_VER=0.2.3.20-rc PIDGIN_VER=2.6.4 -FIREFOX_VER=14.0.1 +FIREFOX_VER=15.0 MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6 -NOSCRIPT_VER=2.4.9 -HTTPSEVERYWHERE_VER=3.0development.5 +NOSCRIPT_VER=2.5.2 +HTTPSEVERYWHERE_VER=3.0development.6 OBFSPROXY_VER=0.1.4 OTR_VER=3.2.0

1 0

[torbrowser/maint-2.3] bump Firefox to 15.0, update libevent, https-everywhere, and noscript as well
by erinn＠torproject.org 29 Aug '12

29 Aug '12

1 0

[torbrowser/master] Merge branch 'maint-2.3'
by erinn＠torproject.org 29 Aug '12

29 Aug '12

commit 87a3b8262c2de9b494a9475347d8bbe8090e47a7 Merge: 3356ab5 2c46dfe Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 29 05:18:25 2012 +0100 Merge branch 'maint-2.3' build-scripts/versions-alpha.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)

1 0

[stem/master] Implement Controller.repurpose_circuit
by atagar＠torproject.org 28 Aug '12

28 Aug '12

commit d27fbbb06a247d3fb12684f76f2a7f5a51a36b04 Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Mon Aug 27 11:02:48 2012 -0700 Implement Controller.repurpose_circuit --- stem/control.py | 22 ++++++++++++++++++++++ test/integ/control/controller.py | 19 +++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/stem/control.py b/stem/control.py index ece7f03..a9df1ba 100644 --- a/stem/control.py +++ b/stem/control.py @@ -29,6 +29,7 @@ interacting at a higher level. |- signal - sends a signal to the tor client |- new_circuit - create new circuits |- extend_circuit - create new circuits and extend existing ones + |- repurpose_circuit - change a circuit's purpose |- get_version - convenience method to get tor version |- authenticate - convenience method to authenticate the controller +- protocolinfo - convenience method to get the protocol info @@ -1055,6 +1056,27 @@ class Controller(BaseController): raise stem.socket.ProtocolError("SIGNAL response contained unrecognized status code: %s" % response.code) + def repurpose_circuit(self, circuit_id, purpose): + """ + Changes a circuit's purpose. Currently, two purposes are recognized... + * general + * controller + + :param int circuit_id: id of the circuit whose purpose is to be changed + :param str purpose: purpose (either "general" or "controller") + + :raises: :class:`stem.socket.InvalidArguments` if the circuit doesn't exist or if the purpose was invalid + """ + + response = self.msg("SETCIRCUITPURPOSE %s purpose=%s" % (str(circuit_id), purpose)) + stem.response.convert("SINGLELINE", response) + + if not response.is_ok(): + if response.code == "552": + raise stem.socket.InvalidRequest(response.code, response.message) + else: + raise stem.socket.ProtocolError("SETCIRCUITPURPOSE returned unexpected response code: %s" % response.code) + def new_circuit(self, path = None, purpose = "general"): """ Requests a new circuit. If the path isn't provided, one is automatically diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index e1e24d8..5a078c0 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -376,4 +376,23 @@ class TestController(unittest.TestCase): self.assertRaises(stem.socket.InvalidRequest, controller.extend_circuit, "foo") self.assertRaises(stem.socket.InvalidRequest, controller.extend_circuit, 0, "thisroutershouldntexistbecausestemexists!@##$%#") self.assertRaises(stem.socket.InvalidRequest, controller.extend_circuit, 0, "thisroutershouldntexistbecausestemexists!@##$%#", "foo") + + def test_repurpose_circuit(self): + if test.runner.require_control(self): return + + runner = test.runner.get_runner() + + with runner.get_tor_controller() as controller: + first_circ = controller.get_info('circuit-status').splitlines()[0].split() + circ_id = int(first_circ[0]) + purpose = "CONTROLLER" + if "PURPOSE=CONTROLLER" in first_circ: + purpose = "GENERAL" + controller.repurpose_circuit(circ_id, purpose) + purpose_arg = "PURPOSE=%s" % purpose + circ = filter(lambda line: int(line.split()[0]) == circ_id, controller.get_info('circuit-status').splitlines())[0] + self.assertTrue(purpose_arg in circ) + + self.assertRaises(stem.socket.InvalidRequest, controller.repurpose_circuit, 'f934h9f3h4', "fooo") + self.assertRaises(stem.socket.InvalidRequest, controller.repurpose_circuit, '4', "fooo")

1 0

[stem/master] Skipping repurpose_circuit() test if offline
by atagar＠torproject.org 28 Aug '12

28 Aug '12

commit d97a0c30002062ac0fbc45b32c2be6061cc35594 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 27 11:08:10 2012 -0700 Skipping repurpose_circuit() test if offline The repurpose_circuit() test uses 'GETINFO circuit-status' results which are empty when offline, causing an error... ====================================================================== ERROR: test_repurpose_circuit ---------------------------------------------------------------------- Traceback: File "/home/atagar/Desktop/stem/test/integ/control/controller.py", line 386, in test_repurpose_circuit first_circ = controller.get_info('circuit-status').splitlines()[0].split() IndexError: list index out of range ---------------------------------------------------------------------- Ran 14 tests in 1.390s --- test/integ/control/controller.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 5a078c0..5f5113c 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -383,7 +383,13 @@ class TestController(unittest.TestCase): runner = test.runner.get_runner() with runner.get_tor_controller() as controller: - first_circ = controller.get_info('circuit-status').splitlines()[0].split() + circuit_output = controller.get_info('circuit-status') + + # the circuit-status results will be empty if we don't have a connection + if circuit_output == '': + if test.runner.require_online(self): return + + first_circ = circuit_output.splitlines()[0].split() circ_id = int(first_circ[0]) purpose = "CONTROLLER" if "PURPOSE=CONTROLLER" in first_circ:

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2012