February 2018 - tor-commits - lists.torproject.org

[metrics-web/master] Move copyright notice from x axis label to caption.
by karsten＠torproject.org 13 Feb '18

13 Feb '18

commit bb596534c18d38b8054101b99066365e3d28e53c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Feb 13 14:53:54 2018 +0100 Move copyright notice from x axis label to caption. --- src/main/R/rserver/graphs.R | 107 ++++++++++++++++++++++++++------------------ 1 file changed, 64 insertions(+), 43 deletions(-) diff --git a/src/main/R/rserver/graphs.R b/src/main/R/rserver/graphs.R index fffe7c4..04f1b10 100644 --- a/src/main/R/rserver/graphs.R +++ b/src/main/R/rserver/graphs.R @@ -316,11 +316,7 @@ theme_update( plot.title = element_text(hjust = 0.5, margin = margin(b = 11)), # Leave a little more room to the right for long x axis labels. - plot.margin = margin(5.5, 11, 5.5, 5.5), - - # Leave some room between plot and x axis label, which we use for the - # copyright notice. - axis.title.x = element_text(margin = margin(t = 11)) + plot.margin = margin(5.5, 11, 5.5, 5.5) ) # Set the default line size of geom_line() to 1. @@ -350,12 +346,13 @@ plot_networksize <- function(start, end, path) { networksize <- melt(s, id = "date") ggplot(networksize, aes(x = as.Date(date, "%Y-%m-%d"), y = value, colour = variable)) + geom_line() + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", limits = c(0, NA)) + scale_colour_hue("", breaks = c("relays", "bridges"), labels = c("Relays", "Bridges")) + - ggtitle("Number of relays") + ggtitle("Number of relays") + + labs(caption = copyright_notice) ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -380,13 +377,14 @@ plot_versions <- function(start, end, path) { ggplot(versions, aes(x = as.Date(date, "%Y-%m-%d"), y = relays, colour = version)) + geom_line() + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", limits = c(0, NA)) + scale_colour_manual(name = "Tor version", values = colours[colours$breaks %in% visible_versions, 2], breaks = visible_versions) + - ggtitle("Relay versions") + ggtitle("Relay versions") + + labs(caption = copyright_notice) ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -401,14 +399,15 @@ plot_platforms <- function(start, end, path) { ggplot(platforms, aes(x = as.Date(date, "%Y-%m-%d"), y = value, colour = variable)) + geom_line() + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", limits = c(0, NA)) + scale_colour_manual(name = "Platform", breaks = c("Linux", "Darwin", "BSD", "Windows", "Other"), labels = c("Linux", "macOS", "BSD", "Windows", "Other"), values = c("#E69F00", "#56B4E9", "#009E73", "#0072B2", "#333333")) + - ggtitle("Relay platforms") + ggtitle("Relay platforms") + + labs(caption = copyright_notice) ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -424,7 +423,7 @@ plot_bandwidth <- function(start, end, path) { ggplot(bandwidth, aes(x = as.Date(date, "%Y-%m-%d"), y = value * 8 / 1e9, colour = variable)) + geom_line() + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", labels = unit_format(unit = "Gbit/s"), limits = c(0, NA)) + @@ -432,6 +431,7 @@ plot_bandwidth <- function(start, end, path) { breaks = c("bwadv", "bwhist"), labels = c("Advertised bandwidth", "Bandwidth history")) + ggtitle("Total relay bandwidth") + + labs(caption = copyright_notice) + theme(legend.position = "top") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -464,13 +464,14 @@ plot_bwhist_flags <- function(start, end, path) { ggplot(bw, aes(x = as.Date(date, "%Y-%m-%d"), y = value * 8 / 1e9, colour = variable)) + geom_line() + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", labels = unit_format(unit = "Gbit/s"), limits = c(0, NA)) + scale_colour_manual(name = "", values = c("#E69F00", "#56B4E9", "#009E73", "#0072B2")) + ggtitle("Bandwidth history by relay flags") + + labs(caption = copyright_notice) + theme(legend.position = "top") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -486,7 +487,7 @@ plot_dirbytes <- function(start, end, path) { ggplot(dir, aes(x = as.Date(date, "%Y-%m-%d"), y = value * 8 / 1e9, colour = variable)) + geom_line() + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", labels = unit_format(unit = "Gbit/s"), limits = c(0, NA)) + @@ -494,6 +495,7 @@ plot_dirbytes <- function(start, end, path) { breaks = c("dirwrite", "dirread"), labels = c("Written dir bytes", "Read dir bytes")) + ggtitle("Number of bytes spent on answering directory requests") + + labs(caption = copyright_notice) + theme(legend.position = "top") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -521,13 +523,14 @@ plot_relayflags <- function(start, end, flags, path) { value = rep(NA, length(missing) * 6)), networksize) ggplot(networksize, aes(x = as.Date(date, "%Y-%m-%d"), y = value, colour = as.factor(variable))) + geom_line() + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", limits = c(0, NA)) + scale_colour_manual(name = "Relay flags", values = c("#E69F00", "#56B4E9", "#009E73", "#EE6A50", "#000000", "#0072B2"), breaks = flags, labels = flags) + - ggtitle("Number of relays with relay flags assigned") + ggtitle("Number of relays with relay flags assigned") + + labs(caption = copyright_notice) ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -561,7 +564,7 @@ plot_torperf <- function(start, end, source, server, filesize, path) { geom_line(colour = colour, size = 0.75) + geom_ribbon(data = torperf, aes(x = date, ymin = q1/1e3, ymax = q3/1e3, fill = "ribbon")) + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", limits = c(0, NA)) + scale_fill_manual(name = paste("Measured times on", @@ -571,6 +574,7 @@ plot_torperf <- function(start, end, source, server, filesize, path) { values = paste(colour, c("", "66"), sep = "")) + ggtitle(paste("Time in seconds to complete", filesizeStr, "request to", server, "server")) + + labs(caption = copyright_notice) + theme(legend.position = "top") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -607,7 +611,7 @@ plot_torperf_failures <- function(start, end, source, server, filesize, path) { ggplot(torperf, aes(x = as.Date(date, "%Y-%m-%d"), y = value, colour = variable)) + geom_point(size = 2) + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", labels = percent) + scale_colour_hue(name = paste("Problems encountered on", @@ -616,6 +620,7 @@ plot_torperf_failures <- function(start, end, source, server, filesize, path) { labels = c("Timeouts", "Failures")) + ggtitle(paste("Timeouts and failures of", filesizeStr, "requests to", server, "server")) + + labs(caption = copyright_notice) + theme(legend.position = "top") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -634,7 +639,7 @@ plot_connbidirect <- function(start, end, path) { geom_line(size = 0.75) + geom_ribbon(aes(x = date, ymin = X0.25, ymax = X0.75, fill = direction), alpha = 0.5, show_guide = FALSE) + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", labels = percent) + scale_colour_hue(name = "Medians and interquartile ranges", @@ -646,6 +651,7 @@ plot_connbidirect <- function(start, end, path) { labels = c("Both reading and writing", "Mostly writing", "Mostly reading")) + ggtitle("Fraction of connections used uni-/bidirectionally") + + labs(caption = copyright_notice) + theme(legend.position = "top") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -696,7 +702,7 @@ plot_bandwidth_flags <- function(start, end, path) { ggplot(bandwidth, aes(x = as.Date(date, "%Y-%m-%d"), y = value * 8 / 1e9, colour = variable)) + geom_line() + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", labels = unit_format(unit = "Gbit/s"), limits = c(0, NA)) + @@ -704,6 +710,7 @@ plot_bandwidth_flags <- function(start, end, path) { values = c("#E69F00", "#D6C827", "#009E73", "#00C34F")) + ggtitle(paste("Advertised bandwidth and bandwidth history by", "relay flags")) + + labs(caption = copyright_notice) + theme(legend.position = "top") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -817,10 +824,11 @@ plot_userstats <- function(start, end, node, variable, value, events, } plot <- plot + geom_line() + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", labels = formatter, limits = c(0, NA)) + - ggtitle(title) + ggtitle(title) + + labs(caption = copyright_notice) if (length(value) > 1) { plot <- plot + scale_colour_hue(name = "", breaks = value, @@ -871,12 +879,13 @@ plot_userstats_bridge_combined <- function(start, end, country, path) { ggplot(u, aes(x = as.Date(date), ymin = low, ymax = high, colour = transport, fill = transport)) + geom_ribbon(alpha = 0.5, size = 0.5) + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", limits = c(0, NA), labels = formatter) + scale_colour_hue(paste("Top-", top, " transports", sep = "")) + scale_fill_hue(paste("Top-", top, " transports", sep = "")) + ggtitle(title) + + labs(caption = copyright_notice) + theme(legend.position = "top") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -894,13 +903,14 @@ plot_advbwdist_perc <- function(start, end, p, path) { ggplot(t, aes(x = as.Date(date), y = advbw, colour = percentile)) + facet_grid(variable ~ .) + geom_line() + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", labels = unit_format(unit = "Gbit/s"), limits = c(0, NA)) + scale_colour_hue(name = "Percentile", breaks = rev(levels(t$percentile))) + - ggtitle("Advertised bandwidth distribution") + ggtitle("Advertised bandwidth distribution") + + labs(caption = copyright_notice) ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -915,12 +925,13 @@ plot_advbwdist_relay <- function(start, end, n, path) { ggplot(t, aes(x = as.Date(date), y = advbw, colour = relay)) + facet_grid(variable ~ .) + geom_line() + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", labels = unit_format(unit = "Gbit/s"), limits = c(0, NA)) + scale_colour_hue(name = "n", breaks = levels(t$relay)) + - ggtitle("Advertised bandwidth of n-th fastest relays") + ggtitle("Advertised bandwidth of n-th fastest relays") + + labs(caption = copyright_notice) ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -933,10 +944,11 @@ plot_hidserv_dir_onions_seen <- function(start, end, path) { wiqm = ifelse(h$frac >= 0.01, h$wiqm, NA))) ggplot(h, aes(x = as.Date(date, origin = "1970-01-01"), y = wiqm)) + geom_line() + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "") + - ggtitle("Unique .onion addresses") + ggtitle("Unique .onion addresses") + + labs(caption = copyright_notice) ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -951,10 +963,11 @@ plot_hidserv_rend_relayed_cells <- function(start, end, path) { ggplot(h, aes(x = as.Date(date, origin = "1970-01-01"), y = wiqm * 8 * 512 / (86400 * 1e6))) + geom_line() + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "") + - ggtitle("Onion-service traffic in Mbit/s") + ggtitle("Onion-service traffic in Mbit/s") + + labs(caption = copyright_notice) ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -971,7 +984,7 @@ plot_hidserv_frac_reporting <- function(start, end, path) { colour = type)) + geom_line() + geom_hline(yintercept = 0.01, linetype = 2) + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", labels = percent) + scale_colour_hue(name = "", @@ -980,6 +993,7 @@ plot_hidserv_frac_reporting <- function(start, end, path) { "Unique .onion addresses")) + ggtitle(paste("Fraction of relays reporting onion-service", "statistics")) + + labs(caption = copyright_notice) + theme(legend.position = "top") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -998,12 +1012,13 @@ plot_webstats_tb <- function(start, end, path) { geom_point() + geom_line() + facet_grid(request_type ~ ., scales = "free_y") + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", labels = formatter, limits = c(0, NA)) + theme(strip.text.y = element_text(angle = 0, hjust = 0, size = rel(1.5)), strip.background = element_rect(fill = NA)) + - ggtitle("Tor Browser downloads and updates") + ggtitle("Tor Browser downloads and updates") + + labs(caption = copyright_notice) ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -1016,7 +1031,7 @@ plot_webstats_tb_platform <- function(start, end, path) { ggplot(d, aes(x = log_date, y = count, colour = platform)) + geom_point() + geom_line() + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", labels = formatter, limits = c(0, NA)) + scale_colour_hue(name = "Platform", @@ -1024,7 +1039,8 @@ plot_webstats_tb_platform <- function(start, end, path) { labels = c("Windows", "macOS", "Linux", "Other", "Unknown")) + theme(strip.text.y = element_text(angle = 0, hjust = 0, size = rel(1.5)), strip.background = element_rect(fill = NA)) + - ggtitle("Tor Browser downloads by platform") + ggtitle("Tor Browser downloads by platform") + + labs(caption = copyright_notice) ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -1041,7 +1057,7 @@ plot_webstats_tb_locale <- function(start, end, path) { ggplot(d, aes(x = log_date, y = count, colour = locale)) + geom_point() + geom_line() + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", labels = formatter, limits = c(0, NA)) + scale_colour_hue(name = "Locale", @@ -1049,7 +1065,8 @@ plot_webstats_tb_locale <- function(start, end, path) { labels = c(e$locale, "Other")) + theme(strip.text.y = element_text(angle = 0, hjust = 0, size = rel(1.5)), strip.background = element_rect(fill = NA)) + - ggtitle("Tor Browser downloads by locale") + ggtitle("Tor Browser downloads by locale") + + labs(caption = copyright_notice) ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -1065,12 +1082,13 @@ plot_webstats_tm <- function(start, end, path) { geom_point() + geom_line() + facet_grid(request_type ~ ., scales = "free_y") + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", labels = formatter, limits = c(0, NA)) + theme(strip.text.y = element_text(angle = 0, hjust = 0, size = rel(1.5)), strip.background = element_rect(fill = NA)) + - ggtitle("Tor Messenger downloads and updates") + ggtitle("Tor Messenger downloads and updates") + + labs(caption = copyright_notice) ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -1093,7 +1111,7 @@ plot_relays_ipv6 <- function(start, end, path) { value = "count") %>% ggplot(aes(x = valid_after_date, y = count, colour = category)) + geom_line() + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", limits = c(0, NA)) + scale_colour_hue(name = "", h.start = 90, @@ -1101,6 +1119,7 @@ plot_relays_ipv6 <- function(start, end, path) { labels = c("Total (IPv4) OR", "IPv6 announced OR", "IPv6 reachable OR", "IPv6 exiting")) + ggtitle("Relays by IP version") + + labs(caption = copyright_notice) + theme(legend.position = "top") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -1121,13 +1140,14 @@ plot_bridges_ipv6 <- function(start, end, path) { gather(total, announced, key = "category", value = "count") %>% ggplot(aes(x = valid_after_date, y = count, colour = category)) + geom_line() + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", limits = c(0, NA)) + scale_colour_hue(name = "", h.start = 90, breaks = c("total", "announced"), labels = c("Total (IPv4) OR", "IPv6 announced OR")) + ggtitle("Bridges by IP version") + + labs(caption = copyright_notice) + theme(legend.position = "top") ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -1157,7 +1177,7 @@ plot_advbw_ipv6 <- function(start, end, path) { ggplot(aes(x = valid_after_date, y = (count * 8) / 1e9, colour = category)) + geom_line() + - scale_x_date(name = copyright_notice, breaks = custom_breaks, + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + scale_y_continuous(name = "", labels = unit_format(unit = "Gbit/s"), limits = c(0, NA)) + @@ -1167,6 +1187,7 @@ plot_advbw_ipv6 <- function(start, end, path) { labels = c("Total (IPv4) OR", "Guard total (IPv4)", "Exit total (IPv4)", "Reachable guard IPv6 OR", "Reachable exit IPv6 OR", "IPv6 exiting")) + ggtitle("Advertised bandwidth by IP version") + + labs(caption = copyright_notice) + theme(legend.position = "top") + guides(colour = guide_legend(nrow = 2, byrow = TRUE)) ggsave(filename = path, width = 8, height = 5, dpi = 150)

1 0

[metrics-web/master] Use complete() rather than merge() for missing dates.
by karsten＠torproject.org 13 Feb '18

13 Feb '18

commit 519512c85d814985caffbbda93db00c5dd32b41f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Feb 13 15:19:21 2018 +0100 Use complete() rather than merge() for missing dates. The result is the same, but the code is much easier to read. --- src/main/R/rserver/graphs.R | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/src/main/R/rserver/graphs.R b/src/main/R/rserver/graphs.R index c7ef2bd..ab1a60d 100644 --- a/src/main/R/rserver/graphs.R +++ b/src/main/R/rserver/graphs.R @@ -1095,20 +1095,16 @@ plot_webstats_tm <- function(start, end, path) { } plot_relays_ipv6 <- function(start, end, path) { - all_relay_data <- read.csv(paste(stats_dir, "ipv6servers.csv", sep = ""), + read.csv(paste(stats_dir, "ipv6servers.csv", sep = ""), colClasses = c("valid_after_date" = "Date")) %>% - filter(server == "relay") - start_date <- max(as.Date(start), min(all_relay_data$valid_after_date)) - end_date <- min(as.Date(end), max(all_relay_data$valid_after_date)) - all_relay_data %>% - filter(valid_after_date >= start_date, valid_after_date <= end_date) %>% + filter(valid_after_date >= as.Date(start), + valid_after_date <= as.Date(end), server == "relay") %>% group_by(valid_after_date) %>% summarize(total = sum(server_count_sum_avg), announced = sum(server_count_sum_avg[announced_ipv6 == 't']), reachable = sum(server_count_sum_avg[reachable_ipv6_relay == 't']), exiting = sum(server_count_sum_avg[exiting_ipv6_relay == 't'])) %>% - merge(data.frame(valid_after_date = seq(start_date, end_date, - by = "1 day")), all = TRUE) %>% + complete(valid_after_date = full_seq(valid_after_date, period = 1)) %>% gather(total, announced, reachable, exiting, key = "category", value = "count") %>% ggplot(aes(x = valid_after_date, y = count, colour = category)) + @@ -1127,18 +1123,14 @@ plot_relays_ipv6 <- function(start, end, path) { } plot_bridges_ipv6 <- function(start, end, path) { - all_bridge_data <- read.csv(paste(stats_dir, "ipv6servers.csv", sep = ""), + read.csv(paste(stats_dir, "ipv6servers.csv", sep = ""), colClasses = c("valid_after_date" = "Date")) %>% - filter(server == "bridge") - start_date <- max(as.Date(start), min(all_bridge_data$valid_after_date)) - end_date <- min(as.Date(end), max(all_bridge_data$valid_after_date)) - all_bridge_data %>% - filter(valid_after_date >= start_date, valid_after_date <= end_date) %>% + filter(valid_after_date >= as.Date(start), + valid_after_date <= as.Date(end), server == "bridge") %>% group_by(valid_after_date) %>% summarize(total = sum(server_count_sum_avg), announced = sum(server_count_sum_avg[announced_ipv6 == 't'])) %>% - merge(data.frame(valid_after_date = seq(start_date, end_date, - by = "1 day")), all = TRUE) %>% + complete(valid_after_date = full_seq(valid_after_date, period = 1)) %>% gather(total, announced, key = "category", value = "count") %>% ggplot(aes(x = valid_after_date, y = count, colour = category)) + geom_line() + @@ -1155,13 +1147,10 @@ plot_bridges_ipv6 <- function(start, end, path) { } plot_advbw_ipv6 <- function(start, end, path) { - all_relay_data <- read.csv(paste(stats_dir, "ipv6servers.csv", sep = ""), + read.csv(paste(stats_dir, "ipv6servers.csv", sep = ""), colClasses = c("valid_after_date" = "Date")) %>% - filter(server == "relay") - start_date <- max(as.Date(start), min(all_relay_data$valid_after_date)) - end_date <- min(as.Date(end), max(all_relay_data$valid_after_date)) - all_relay_data %>% - filter(valid_after_date >= start_date, valid_after_date <= end_date) %>% + filter(valid_after_date >= as.Date(start), + valid_after_date <= as.Date(end), server == "relay") %>% group_by(valid_after_date) %>% summarize(total = sum(advertised_bandwidth_bytes_sum_avg), total_guard = sum(advertised_bandwidth_bytes_sum_avg[guard_relay != 'f']), @@ -1172,8 +1161,7 @@ plot_advbw_ipv6 <- function(start, end, path) { reachable_ipv6_relay != 'f' & exit_relay != 'f']), exiting = sum(advertised_bandwidth_bytes_sum_avg[ exiting_ipv6_relay != 'f'])) %>% - merge(data.frame(valid_after_date = seq(start_date, end_date, - by = "1 day")), all = TRUE) %>% + complete(valid_after_date = full_seq(valid_after_date, period = 1)) %>% gather(total, total_guard, total_exit, reachable_guard, reachable_exit, exiting, key = "category", value = "count") %>% ggplot(aes(x = valid_after_date, y = (count * 8) / 1e9,

1 0

[metrics-web/master] Tweak y scales some more.
by karsten＠torproject.org 13 Feb '18

13 Feb '18

commit 0021881b15972010675be6176c40160b19fa7a91 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Feb 13 15:04:52 2018 +0100 Tweak y scales some more. --- src/main/R/rserver/graphs.R | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/main/R/rserver/graphs.R b/src/main/R/rserver/graphs.R index 04f1b10..c7ef2bd 100644 --- a/src/main/R/rserver/graphs.R +++ b/src/main/R/rserver/graphs.R @@ -348,7 +348,7 @@ plot_networksize <- function(start, end, path) { colour = variable)) + geom_line() + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + - scale_y_continuous(name = "", limits = c(0, NA)) + + scale_y_continuous(name = "", labels = formatter, limits = c(0, NA)) + scale_colour_hue("", breaks = c("relays", "bridges"), labels = c("Relays", "Bridges")) + ggtitle("Number of relays") + @@ -379,7 +379,7 @@ plot_versions <- function(start, end, path) { geom_line() + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + - scale_y_continuous(name = "", limits = c(0, NA)) + + scale_y_continuous(name = "", labels = formatter, limits = c(0, NA)) + scale_colour_manual(name = "Tor version", values = colours[colours$breaks %in% visible_versions, 2], breaks = visible_versions) + @@ -401,7 +401,7 @@ plot_platforms <- function(start, end, path) { geom_line() + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + - scale_y_continuous(name = "", limits = c(0, NA)) + + scale_y_continuous(name = "", labels = formatter, limits = c(0, NA)) + scale_colour_manual(name = "Platform", breaks = c("Linux", "Darwin", "BSD", "Windows", "Other"), labels = c("Linux", "macOS", "BSD", "Windows", "Other"), @@ -525,7 +525,7 @@ plot_relayflags <- function(start, end, flags, path) { colour = as.factor(variable))) + geom_line() + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + - scale_y_continuous(name = "", limits = c(0, NA)) + + scale_y_continuous(name = "", labels = formatter, limits = c(0, NA)) + scale_colour_manual(name = "Relay flags", values = c("#E69F00", "#56B4E9", "#009E73", "#EE6A50", "#000000", "#0072B2"), breaks = flags, labels = flags) + @@ -566,13 +566,14 @@ plot_torperf <- function(start, end, source, server, filesize, path) { ymax = q3/1e3, fill = "ribbon")) + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + - scale_y_continuous(name = "", limits = c(0, NA)) + + scale_y_continuous(name = "", labels = unit_format(unit = "s"), + limits = c(0, NA)) + scale_fill_manual(name = paste("Measured times on", ifelse(source == "all", "all sources", source), "per day"), breaks = c("line", "ribbon"), labels = c("Median", "1st to 3rd quartile"), values = paste(colour, c("", "66"), sep = "")) + - ggtitle(paste("Time in seconds to complete", filesizeStr, + ggtitle(paste("Time to complete", filesizeStr, "request to", server, "server")) + labs(caption = copyright_notice) + theme(legend.position = "top") @@ -613,7 +614,7 @@ plot_torperf_failures <- function(start, end, source, server, filesize, path) { geom_point(size = 2) + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + - scale_y_continuous(name = "", labels = percent) + + scale_y_continuous(name = "", labels = percent, limits = c(0, NA)) + scale_colour_hue(name = paste("Problems encountered on", ifelse(source == "all", "all sources", source)), h.start = 45, breaks = c("timeouts", "failures"), @@ -641,7 +642,7 @@ plot_connbidirect <- function(start, end, path) { fill = direction), alpha = 0.5, show_guide = FALSE) + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + - scale_y_continuous(name = "", labels = percent) + + scale_y_continuous(name = "", labels = percent, limits = c(0, NA)) + scale_colour_hue(name = "Medians and interquartile ranges", breaks = c("both", "write", "read"), labels = c("Both reading and writing", "Mostly writing", @@ -946,7 +947,7 @@ plot_hidserv_dir_onions_seen <- function(start, end, path) { geom_line() + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + - scale_y_continuous(name = "") + + scale_y_continuous(name = "", limits = c(0, NA), labels = formatter) + ggtitle("Unique .onion addresses") + labs(caption = copyright_notice) ggsave(filename = path, width = 8, height = 5, dpi = 150) @@ -961,12 +962,13 @@ plot_hidserv_rend_relayed_cells <- function(start, end, path) { data.frame(date = as.Date(h$date, "%Y-%m-%d"), wiqm = ifelse(h$frac >= 0.01, h$wiqm, NA))) ggplot(h, aes(x = as.Date(date, origin = "1970-01-01"), - y = wiqm * 8 * 512 / (86400 * 1e6))) + + y = wiqm * 8 * 512 / (86400 * 1e9))) + geom_line() + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + - scale_y_continuous(name = "") + - ggtitle("Onion-service traffic in Mbit/s") + + scale_y_continuous(name = "", labels = unit_format(unit = "Gbit/s"), + limits = c(0, NA)) + + ggtitle("Onion-service traffic") + labs(caption = copyright_notice) ggsave(filename = path, width = 8, height = 5, dpi = 150) } @@ -986,7 +988,7 @@ plot_hidserv_frac_reporting <- function(start, end, path) { geom_hline(yintercept = 0.01, linetype = 2) + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + - scale_y_continuous(name = "", labels = percent) + + scale_y_continuous(name = "", labels = percent, limits = c(0, NA)) + scale_colour_hue(name = "", breaks = c("rend-relayed-cells", "dir-onions-seen"), labels = c("Onion-service traffic", @@ -1113,7 +1115,7 @@ plot_relays_ipv6 <- function(start, end, path) { geom_line() + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + - scale_y_continuous(name = "", limits = c(0, NA)) + + scale_y_continuous(name = "", labels = formatter, limits = c(0, NA)) + scale_colour_hue(name = "", h.start = 90, breaks = c("total", "announced", "reachable", "exiting"), labels = c("Total (IPv4) OR", "IPv6 announced OR", "IPv6 reachable OR", @@ -1142,7 +1144,7 @@ plot_bridges_ipv6 <- function(start, end, path) { geom_line() + scale_x_date(name = "", breaks = custom_breaks, labels = custom_labels, minor_breaks = custom_minor_breaks) + - scale_y_continuous(name = "", limits = c(0, NA)) + + scale_y_continuous(name = "", labels = formatter, limits = c(0, NA)) + scale_colour_hue(name = "", h.start = 90, breaks = c("total", "announced"), labels = c("Total (IPv4) OR", "IPv6 announced OR")) +

1 0

[torspec/master] Clarify what the RELAY cell's 'recognized' field is for
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit d326f4d1e39640ed9ef8ee17e4c28119c391e097 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Feb 7 09:48:19 2018 -0800 Clarify what the RELAY cell's 'recognized' field is for Our tor-spec left me pretty mystified what the 'recognized' field actually was. It discussed what to do when it was zero, but not what the field *was* or what non-zero meant. Thankfully Roger filled me in over tasty, tasty pizza. --- tor-spec.txt | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/tor-spec.txt b/tor-spec.txt index 061cc08..2272c28 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -1443,13 +1443,19 @@ see tor-design.pdf. other nodes in the circuit back to the originator. Commands marked as either can be sent either by the originator or other nodes. - The 'recognized' field in any unencrypted relay payload is always set - to zero; the 'digest' field is computed as the first four bytes of - the running digest of all the bytes that have been destined for - this hop of the circuit or originated from this hop of the circuit, - seeded from Df or Db respectively (obtained in section 5.2 above), - and including this RELAY cell's entire payload (taken with the digest - field set to zero). + The 'recognized' field is used for a simple indication for if the + cell still encrypted or not. When sending cells the unencrypted + 'recognized' MUST be set to zero. When receiving and decrypting + cells the 'recognized' will be zero if we're the endpoint the cell + is destined for, and non-zero otherwise. + + When 'recognized' in an unencrypted relay payload is zero the + 'digest' field is computed as the first four bytes of the running + digest of all the bytes that have been destined for this hop of + the circuit or originated from this hop of the circuit, seeded from + Df or Db respectively (obtained in section 5.2 above), and including + this RELAY cell's entire payload (taken with the digest field set to + zero). When the 'recognized' field of a RELAY cell is zero, and the digest is correct, the cell is considered "recognized" for the purposes of

1 0

[torspec/master] Small tweaks to clarify recognized even more
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit ef91cd6a595128847c991eb875d105b850d60fcf Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 13 09:03:58 2018 -0500 Small tweaks to clarify recognized even more --- tor-spec.txt | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tor-spec.txt b/tor-spec.txt index 7aba3da..13691b7 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -1443,22 +1443,22 @@ see tor-design.pdf. other nodes in the circuit back to the originator. Commands marked as either can be sent either by the originator or other nodes. - The 'recognized' field is used for a simple indication for if the - cell still encrypted or not. When sending cells the unencrypted - 'recognized' MUST be set to zero. When receiving and decrypting - cells the 'recognized' MAY be zero if we're the endpoint the cell - is destined for (there's a 1/2^32 chance of encrypted bytes - coincidently being zero), and non-zero otherwise. - - When 'recognized' in an unencrypted relay payload is zero the - 'digest' field is computed as the first four bytes of the running - digest of all the bytes that have been destined for this hop of - the circuit or originated from this hop of the circuit, seeded from - Df or Db respectively (obtained in section 5.2 above), and including - this RELAY cell's entire payload (taken with the digest field set to - zero). - - When the 'recognized' field of a RELAY cell is zero, and the digest + The 'recognized' field is used for a simple indication for if the cell + still encrypted or not. When sending cells, the unencrypted 'recognized' + MUST be set to zero. + + When receiving and decrypting cells the 'recognized' will always be + zero if we're the endpoint that the cell is destined for. For cells + that we should relay, the 'recognized' field will usually be nonzero, + but will accidentally be zero with P=2^-32. + + When handling a relay cell, if the 'recognized' in field in a + decrypted relay payload is zero, the 'digest' field is computed as + the first four bytes of the running digest of all the bytes that have + been destined for this hop of the circuit or originated from this hop + of the circuit, seeded from Df or Db respectively (obtained in + section 5.2 above), and including this RELAY cell's entire payload + (taken with the digest field set to zero). If the digest is correct, the cell is considered "recognized" for the purposes of decryption (see section 5.5 above).

1 0

[torspec/master] Change clause about recognized to 'may'
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit e4b7001bdfaf08f533f2716ac464f11792afc296 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Feb 8 10:02:39 2018 -0800 Change clause about recognized to 'may' Good point from Roger and Tim on... https://trac.torproject.org/projects/tor/ticket/25171 --- tor-spec.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tor-spec.txt b/tor-spec.txt index 2272c28..7aba3da 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -1446,8 +1446,9 @@ see tor-design.pdf. The 'recognized' field is used for a simple indication for if the cell still encrypted or not. When sending cells the unencrypted 'recognized' MUST be set to zero. When receiving and decrypting - cells the 'recognized' will be zero if we're the endpoint the cell - is destined for, and non-zero otherwise. + cells the 'recognized' MAY be zero if we're the endpoint the cell + is destined for (there's a 1/2^32 chance of encrypted bytes + coincidently being zero), and non-zero otherwise. When 'recognized' in an unencrypted relay payload is zero the 'digest' field is computed as the first four bytes of the running

1 0

[torspec/master] Merge remote-tracking branch 'atagar/recognized'
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit 2223efd9e717f30b9a04079e8a5f9af88bbd6d19 Merge: 39fde37 e4b7001 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 13 09:01:10 2018 -0500 Merge remote-tracking branch 'atagar/recognized' tor-spec.txt | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit 17a923941a41d9283cad0cb093024c872fafdb0a Merge: 91109bc81 e658dad62 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 13 08:50:58 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket25170 | 5 +++++ src/or/dirserv.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.9] dirserv: Improve returned message when relay is rejected
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit e658dad625ef15f3a74a76aadf382d43c4ef44d1 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Feb 8 09:42:26 2018 -0500 dirserv: Improve returned message when relay is rejected Explicitly inform the operator of the rejected relay to set a valid email address in the ContactInfo field and contact bad-relays@ mailing list. Fixes #25170 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket25170 | 5 +++++ src/or/dirserv.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/changes/ticket25170 b/changes/ticket25170 new file mode 100644 index 000000000..065213940 --- /dev/null +++ b/changes/ticket25170 @@ -0,0 +1,5 @@ + o Minor bugfix (directory authority, documentation): + - When a fingerprint or network address is marked as rejected, the + returned message by the authority now explicitly mention to set a valid + ContactInfo address and contact the bad-relays@ mailing list. Fixes bug + 25170; bugfix on 0.2.9.1. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index da34c196f..41c6bf3dc 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -401,7 +401,10 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, if (result & FP_REJECT) { if (msg) - *msg = "Fingerprint is marked rejected -- please contact us?"; + *msg = "Fingerprint is marked rejected -- if you think this is a " + "mistake please set a valid email address in ContactInfo and " + "send an email to bad-relays(a)lists.torproject.org mentioning " + "your fingerprint(s)?"; return FP_REJECT; } else if (result & FP_INVALID) { if (msg) @@ -419,7 +422,10 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, log_fn(severity, LD_DIRSERV, "Rejecting '%s' because of address '%s'", nickname, fmt_addr32(addr)); if (msg) - *msg = "Suspicious relay address range -- please contact us?"; + *msg = "Suspicious relay address range -- if you think this is a " + "mistake please set a valid email address in ContactInfo and " + "send an email to bad-relays(a)lists.torproject.org mentioning " + "your address(es) and fingerprint(s)?"; return FP_REJECT; } if (!authdir_policy_valid_address(addr, or_port)) {

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 13 Feb '18

13 Feb '18

commit 17a923941a41d9283cad0cb093024c872fafdb0a Merge: 91109bc81 e658dad62 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 13 08:50:58 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket25170 | 5 +++++ src/or/dirserv.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0