October 2020 - tor-commits - lists.torproject.org

[tor/master] lib: New metrics library
by ahf＠torproject.org 27 Oct '20

27 Oct '20

commit ec731290a5a790093961f0fdb06cf69000194adf Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Oct 19 15:15:47 2020 -0400 lib: New metrics library Used to provide an interface to create metrics store and update the entries. Related to #40063 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- Makefile.am | 6 +- src/include.am | 3 +- src/lib/metrics/include.am | 25 ++++++ src/lib/metrics/metrics_common.c | 29 +++++++ src/lib/metrics/metrics_common.h | 40 ++++++++++ src/lib/metrics/metrics_store.c | 140 ++++++++++++++++++++++++++++++++++ src/lib/metrics/metrics_store.h | 42 ++++++++++ src/lib/metrics/metrics_store_entry.c | 129 +++++++++++++++++++++++++++++++ src/lib/metrics/metrics_store_entry.h | 68 +++++++++++++++++ src/lib/metrics/prometheus.c | 56 ++++++++++++++ src/lib/metrics/prometheus.h | 18 +++++ 11 files changed, 553 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 50b002139e..96658230f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -73,7 +73,8 @@ TOR_UTIL_LIBS = \ src/lib/libtor-version.a \ src/lib/libtor-llharden.a \ src/lib/libtor-intmath.a \ - src/lib/libtor-ctime.a + src/lib/libtor-ctime.a \ + src/lib/libtor-metrics.a # Variants of the above for linking the testing variant of tor (for coverage # and tests) @@ -108,7 +109,8 @@ TOR_UTIL_TESTING_LIBS = \ src/lib/libtor-version-testing.a \ src/lib/libtor-llharden-testing.a \ src/lib/libtor-intmath.a \ - src/lib/libtor-ctime-testing.a + src/lib/libtor-ctime-testing.a \ + src/lib/libtor-metrics-testing.a endif # Internal crypto libraries used in Tor diff --git a/src/include.am b/src/include.am index 657f6e823a..95acecb057 100644 --- a/src/include.am +++ b/src/include.am @@ -22,10 +22,11 @@ include src/lib/intmath/include.am include src/lib/llharden/include.am include src/lib/lock/include.am include src/lib/log/include.am +include src/lib/malloc/include.am include src/lib/math/include.am include src/lib/memarea/include.am include src/lib/meminfo/include.am -include src/lib/malloc/include.am +include src/lib/metrics/include.am include src/lib/net/include.am include src/lib/osinfo/include.am include src/lib/process/include.am diff --git a/src/lib/metrics/include.am b/src/lib/metrics/include.am new file mode 100644 index 0000000000..62c289446e --- /dev/null +++ b/src/lib/metrics/include.am @@ -0,0 +1,25 @@ + +noinst_LIBRARIES += src/lib/libtor-metrics.a + +if UNITTESTS_ENABLED +noinst_LIBRARIES += src/lib/libtor-metrics-testing.a +endif + +# ADD_C_FILE: INSERT SOURCES HERE. +src_lib_libtor_metrics_a_SOURCES = \ + src/lib/metrics/metrics_store.c \ + src/lib/metrics/metrics_store_entry.c \ + src/lib/metrics/metrics_common.c \ + src/lib/metrics/prometheus.c + +src_lib_libtor_metrics_testing_a_SOURCES = \ + $(src_lib_libtor_metrics_a_SOURCES) +src_lib_libtor_metrics_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) +src_lib_libtor_metrics_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/lib/metrics/metrics_store.h \ + src/lib/metrics/metrics_store_entry.h \ + src/lib/metrics/metrics_common.h \ + src/lib/metrics/prometheus.h diff --git a/src/lib/metrics/metrics_common.c b/src/lib/metrics/metrics_common.c new file mode 100644 index 0000000000..5941a4d892 --- /dev/null +++ b/src/lib/metrics/metrics_common.c @@ -0,0 +1,29 @@ +/* 2020, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file metrics_common.c + * @brief Common code for the metrics library + **/ + +#include <stddef.h> + +#include "orconfig.h" + +#include "lib/log/util_bug.h" + +#include "lib/metrics/metrics_common.h" + +/** Return string representation of a metric type. */ +const char * +metrics_type_to_str(const metrics_type_t type) +{ + switch (type) { + case METRICS_TYPE_COUNTER: + return "counter"; + case METRICS_TYPE_GAUGE: + return "gauge"; + default: + tor_assert_unreached(); + } +} diff --git a/src/lib/metrics/metrics_common.h b/src/lib/metrics/metrics_common.h new file mode 100644 index 0000000000..5d1a32ea6c --- /dev/null +++ b/src/lib/metrics/metrics_common.h @@ -0,0 +1,40 @@ +/* Copyright (c) 2020, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file metrics_common.h + * @brief Header for lib/metrics/metrics_common.c + **/ + +#ifndef TOR_LIB_METRICS_METRICS_COMMON_H +#define TOR_LIB_METRICS_METRICS_COMMON_H + +#include "lib/cc/torint.h" + +/** Format output type. */ +typedef enum { + /** Prometheus data output format. */ + METRICS_FORMAT_PROMETHEUS = 1, +} metrics_format_t; + +/** Metric type. */ +typedef enum { + /* Increment only. */ + METRICS_TYPE_COUNTER, + /* Can go up or down. */ + METRICS_TYPE_GAUGE, +} metrics_type_t; + +/** Metric counter object (METRICS_TYPE_COUNTER). */ +typedef struct metrics_counter_t { + uint64_t value; +} metrics_counter_t; + +/** Metric gauge object (METRICS_TYPE_GAUGE). */ +typedef struct metrics_gauge_t { + int64_t value; +} metrics_gauge_t; + +const char *metrics_type_to_str(const metrics_type_t type); + +#endif /* !defined(TOR_LIB_METRICS_METRICS_COMMON_H) */ diff --git a/src/lib/metrics/metrics_store.c b/src/lib/metrics/metrics_store.c new file mode 100644 index 0000000000..4f048e103d --- /dev/null +++ b/src/lib/metrics/metrics_store.c @@ -0,0 +1,140 @@ +/* Copyright (c) 2020, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file metrics_store.c + * @brief Metrics interface to store them based on specific store type and get + * their MetricsPort output. + **/ + +#define METRICS_STORE_ENTRY_PRIVATE + +#include "orconfig.h" + +#include "lib/container/map.h" +#include "lib/log/util_bug.h" +#include "lib/malloc/malloc.h" + +#include "lib/metrics/metrics_store.h" +#include "lib/metrics/metrics_store_entry.h" + +/* Format Drivers. */ +#include "lib/metrics/prometheus.h" + +/** A metric store which contains a map of entries. */ +typedef struct metrics_store_t { + /** Indexed by metrics entry name. An entry is a smartlist_t of one or more + * metrics_store_entry_t allowing for multiple metrics of the same name. + * + * The reason we allow multiple entires is because there are cases where one + * metrics can be used twice by the same entity but with different labels. + * One example is an onion service with multiple ports, the port specific + * metrics will have a port value as a label. */ + strmap_t *entries; +} metrics_store_t; + +/** Function pointer to the format function of a specific driver. */ +typedef void (fmt_driver_fn_t)(const metrics_store_entry_t *, buf_t *); + +/** Helper: Free a single entry in a metrics_store_t taking a void pointer + * parameter. */ +static void +metrics_store_free_void(void *p) +{ + smartlist_t *list = p; + SMARTLIST_FOREACH(list, metrics_store_entry_t *, entry, + metrics_store_entry_free(entry)); + smartlist_free(list); +} + +/** Put the given store output in the buffer data and use the format function + * given in fmt to get it for each entry. */ +static void +get_output(const metrics_store_t *store, buf_t *data, fmt_driver_fn_t fmt) +{ + tor_assert(store); + tor_assert(data); + tor_assert(fmt); + + STRMAP_FOREACH(store->entries, key, const smartlist_t *, entries) { + SMARTLIST_FOREACH_BEGIN(entries, const metrics_store_entry_t *, entry) { + fmt(entry, data); + } SMARTLIST_FOREACH_END(entry); + } STRMAP_FOREACH_END; +} + +/** Return a newly allocated and initialized store of the given type. */ +metrics_store_t * +metrics_store_new(void) +{ + metrics_store_t *store = tor_malloc_zero(sizeof(*store)); + + store->entries = strmap_new(); + + return store; +} + +/** Free the given store including all its entries. */ +void +metrics_store_free_(metrics_store_t *store) +{ + if (store == NULL) { + return; + } + + strmap_free(store->entries, metrics_store_free_void); + tor_free(store); +} + +/** Find all metrics entry in the given store identified by name. If not found, + * NULL is returned. */ +smartlist_t * +metrics_store_get_all(const metrics_store_t *store, const char *name) +{ + tor_assert(store); + tor_assert(name); + + return strmap_get(store->entries, name); +} + +/** Add a new metrics entry to the given store and type. The name MUST be the + * unique identifier. The help string can be omitted. */ +metrics_store_entry_t * +metrics_store_add(metrics_store_t *store, metrics_type_t type, + const char *name, const char *help) +{ + smartlist_t *entries; + metrics_store_entry_t *entry; + + tor_assert(store); + tor_assert(name); + + entries = metrics_store_get_all(store, name); + if (!entries) { + entries = smartlist_new(); + strmap_set(store->entries, name, entries); + } + entry = metrics_store_entry_new(type, name, help); + smartlist_add(entries, entry); + + return entry; +} + +/** Set the output of the given store of the format fmt into the given buffer + * data. */ +void +metrics_store_get_output(const metrics_format_t fmt, + const metrics_store_t *store, buf_t *data) +{ + tor_assert(store); + + switch (fmt) { + case METRICS_FORMAT_PROMETHEUS: + get_output(store, data, prometheus_format_store_entry); + break; + default: + // LCOV_EXCL_START + tor_assert_unreached(); + // LCOV_EXCL_STOP + } +} diff --git a/src/lib/metrics/metrics_store.h b/src/lib/metrics/metrics_store.h new file mode 100644 index 0000000000..9640a5e016 --- /dev/null +++ b/src/lib/metrics/metrics_store.h @@ -0,0 +1,42 @@ +/* Copyright (c) 2020, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file metrics_store.h + * @brief Header for lib/metrics/metrics_store.c + **/ + +#ifndef TOR_LIB_METRICS_METRICS_STORE_H +#define TOR_LIB_METRICS_METRICS_STORE_H + +#include "lib/buf/buffers.h" +#include "lib/container/smartlist.h" + +#include "lib/metrics/metrics_common.h" +#include "lib/metrics/metrics_store_entry.h" + +/* Stub. */ +typedef struct metrics_store_t metrics_store_t; + +/* Allocators. */ +void metrics_store_free_(metrics_store_t *store); +#define metrics_store_free(store) \ + FREE_AND_NULL(metrics_store_t, metrics_store_free_, (store)) +metrics_store_t *metrics_store_new(void); + +/* Modifiers. */ +metrics_store_entry_t *metrics_store_add(metrics_store_t *store, + metrics_type_t type, + const char *name, const char *help); + +/* Accessors. */ +smartlist_t *metrics_store_get_all(const metrics_store_t *store, + const char *name); +void metrics_store_get_output(const metrics_format_t fmt, + const metrics_store_t *store, buf_t *data); + +#ifdef METRICS_METRICS_STORE_PRIVATE + +#endif /* METRICS_METRICS_STORE_PRIVATE. */ + +#endif /* !defined(TOR_LIB_METRICS_METRICS_STORE_H) */ diff --git a/src/lib/metrics/metrics_store_entry.c b/src/lib/metrics/metrics_store_entry.c new file mode 100644 index 0000000000..44ebb5cb84 --- /dev/null +++ b/src/lib/metrics/metrics_store_entry.c @@ -0,0 +1,129 @@ +/* Copyright (c) 2020, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file metrics_store_entry.c + * @brief Metrics store entry which contains the gathered data. + **/ + +#define METRICS_STORE_ENTRY_PRIVATE + +#include <string.h> + +#include "orconfig.h" + +#include "lib/container/smartlist.h" +#include "lib/log/util_bug.h" +#include "lib/malloc/malloc.h" + +#include "lib/metrics/metrics_store_entry.h" + +/* + * Public API. + */ + +/** Return newly allocated store entry of type COUNTER. */ +metrics_store_entry_t * +metrics_store_entry_new(const metrics_type_t type, const char *name, + const char *help) +{ + metrics_store_entry_t *entry = tor_malloc_zero(sizeof(*entry)); + + tor_assert(name); + + entry->type = type; + entry->name = tor_strdup(name); + entry->labels = smartlist_new(); + if (help) { + entry->help = tor_strdup(help); + } + + return entry; +} + +/** Free a store entry. */ +void +metrics_store_entry_free_(metrics_store_entry_t *entry) +{ + if (!entry) { + return; + } + SMARTLIST_FOREACH(entry->labels, char *, l, tor_free(l)); + smartlist_free(entry->labels); + tor_free(entry->name); + tor_free(entry->help); + tor_free(entry); +} + +/** Update a store entry with value. */ +void +metrics_store_entry_update(metrics_store_entry_t *entry, const int64_t value) +{ + tor_assert(entry); + + switch (entry->type) { + case METRICS_TYPE_COUNTER: + /* Counter can ONLY be positive. */ + if (BUG(value < 0)) { + return; + } + entry->u.counter.value += value; + break; + case METRICS_TYPE_GAUGE: + /* Gauge can increment or decrement. And can be positive or negative. */ + entry->u.gauge.value += value; + break; + } +} + +/** Reset a store entry that is set its metric data to 0. */ +void +metrics_store_entry_reset(metrics_store_entry_t *entry) +{ + tor_assert(entry); + /* Everything back to 0. */ + memset(&entry->u, 0, sizeof(entry->u)); +} + +/** Return store entry value. */ +int64_t +metrics_store_entry_get_value(const metrics_store_entry_t *entry) +{ + tor_assert(entry); + + switch (entry->type) { + case METRICS_TYPE_COUNTER: + if (entry->u.counter.value > INT64_MAX) { + return INT64_MAX; + } + return entry->u.counter.value; + case METRICS_TYPE_GAUGE: + return entry->u.gauge.value; + } + + // LCOV_EXCL_START + tor_assert_unreached(); + // LCOV_EXCL_STOP +} + +/** Add a label into the given entry.*/ +void +metrics_store_entry_add_label(metrics_store_entry_t *entry, + const char *label) +{ + tor_assert(entry); + tor_assert(label); + + smartlist_add(entry->labels, tor_strdup(label)); +} + +/** Return true iff the given entry has the given label. */ +bool +metrics_store_entry_has_label(const metrics_store_entry_t *entry, + const char *label) +{ + tor_assert(entry); + tor_assert(label); + + return smartlist_contains_string(entry->labels, label); +} diff --git a/src/lib/metrics/metrics_store_entry.h b/src/lib/metrics/metrics_store_entry.h new file mode 100644 index 0000000000..6fff9d10eb --- /dev/null +++ b/src/lib/metrics/metrics_store_entry.h @@ -0,0 +1,68 @@ +/* Copyright (c) 2020, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file metrics_store_entry.h + * @brief Header for lib/metrics/metrics_store_entry.c + **/ + +#ifndef TOR_LIB_METRICS_METRICS_STORE_ENTRY_H +#define TOR_LIB_METRICS_METRICS_STORE_ENTRY_H + +#include "lib/cc/torint.h" + +#include "lib/metrics/metrics_common.h" + +#ifdef METRICS_STORE_ENTRY_PRIVATE + +/** Metrics store entry. They reside in a metrics_store_t object and are + * opaque to the outside world. */ +typedef struct metrics_store_entry_t { + /** Type of entry. */ + metrics_type_t type; + + /** Name. */ + char *name; + + /** Help comment string. */ + char *help; + + /** Labels attached to that entry. If NULL, no labels. + * + * Labels are used to add extra context to a metrics. For example, a label + * could be an onion address so the metrics can be differentiate. */ + smartlist_t *labels; + + /* Actual data. */ + union { + metrics_counter_t counter; + metrics_gauge_t gauge; + } u; +} metrics_store_entry_t; + +#endif /* METRICS_STORE_ENTRY_PRIVATE */ + +typedef struct metrics_store_entry_t metrics_store_entry_t; + +/* Allocators. */ +metrics_store_entry_t *metrics_store_entry_new(const metrics_type_t type, + const char *name, + const char *help); + +void metrics_store_entry_free_(metrics_store_entry_t *entry); +#define metrics_store_entry_free(entry) \ + FREE_AND_NULL(metrics_store_entry_t, metrics_store_entry_free_, (entry)); + +/* Accessors. */ +int64_t metrics_store_entry_get_value(const metrics_store_entry_t *entry); +bool metrics_store_entry_has_label(const metrics_store_entry_t *entry, + const char *label); + +/* Modifiers. */ +void metrics_store_entry_add_label(metrics_store_entry_t *entry, + const char *label); +void metrics_store_entry_reset(metrics_store_entry_t *entry); +void metrics_store_entry_update(metrics_store_entry_t *entry, + const int64_t value); + +#endif /* !defined(TOR_LIB_METRICS_METRICS_STORE_ENTRY_H) */ diff --git a/src/lib/metrics/prometheus.c b/src/lib/metrics/prometheus.c new file mode 100644 index 0000000000..c2b54e436f --- /dev/null +++ b/src/lib/metrics/prometheus.c @@ -0,0 +1,56 @@ +/* Copyright (c) 2020, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file prometheus.c + * @brief Metrics format driver for Prometheus data model. + **/ + +#define METRICS_STORE_ENTRY_PRIVATE + +#include "orconfig.h" + +#include "lib/container/smartlist.h" +#include "lib/log/util_bug.h" +#include "lib/malloc/malloc.h" +#include "lib/string/printf.h" + +#include "lib/metrics/prometheus.h" + +/** Return a static buffer containing all the labels properly formatted + * for the output as a string. + * + * Subsequent calls to this invalidates the previous result. */ +static const char * +format_labels(smartlist_t *labels) +{ + static char buf[1024]; + char *line = NULL; + + if (smartlist_len(labels) == 0) { + buf[0] = '\0'; + goto end; + } + + line = smartlist_join_strings(labels, ",", 0, NULL); + tor_snprintf(buf, sizeof(buf), "{%s}", line); + + end: + tor_free(line); + return buf; +} + +/** Format the given entry in to the buffer data. */ +void +prometheus_format_store_entry(const metrics_store_entry_t *entry, buf_t *data) +{ + tor_assert(entry); + tor_assert(data); + + buf_add_printf(data, "# HELP %s %s\n", entry->name, entry->help); + buf_add_printf(data, "# TYPE %s %s\n", entry->name, + metrics_type_to_str(entry->type)); + buf_add_printf(data, "%s%s %" PRIi64 "\n", entry->name, + format_labels(entry->labels), + metrics_store_entry_get_value(entry)); +} diff --git a/src/lib/metrics/prometheus.h b/src/lib/metrics/prometheus.h new file mode 100644 index 0000000000..eea26e8ac4 --- /dev/null +++ b/src/lib/metrics/prometheus.h @@ -0,0 +1,18 @@ +/* Copyright (c) 2020, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file prometheus.h + * @brief Header for feature/metrics/prometheus.c + **/ + +#ifndef TOR_LIB_METRICS_PROMETHEUS_H +#define TOR_LIB_METRICS_PROMETHEUS_H + +#include "lib/buf/buffers.h" +#include "lib/metrics/metrics_store_entry.h" + +void prometheus_format_store_entry(const metrics_store_entry_t *entry, + buf_t *data); + +#endif /* !defined(TOR_LIB_METRICS_PROMETHEUS_H) */

1 0

[tor/master] metrics: New feature module to track tor metrics
by ahf＠torproject.org 27 Oct '20

27 Oct '20

commit a882d1bf0abbbcf2bc4f8c039f9b82262462292c Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Oct 19 15:50:45 2020 -0400 metrics: New feature module to track tor metrics Related to #40063 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/app/main/subsystem_list.c | 2 ++ src/feature/metrics/.may_include | 1 + src/feature/metrics/include.am | 10 ++++++ src/feature/metrics/metrics.c | 66 +++++++++++++++++++++++++++++++++++++++ src/feature/metrics/metrics.h | 21 +++++++++++++ src/feature/metrics/metrics_sys.c | 37 ++++++++++++++++++++++ src/feature/metrics/metrics_sys.h | 22 +++++++++++++ src/include.am | 1 + src/lib/subsys/subsys.h | 12 +++++++ 9 files changed, 172 insertions(+) diff --git a/src/app/main/subsystem_list.c b/src/app/main/subsystem_list.c index c6da6f4893..9562b99030 100644 --- a/src/app/main/subsystem_list.c +++ b/src/app/main/subsystem_list.c @@ -31,6 +31,7 @@ #include "lib/evloop/evloop_sys.h" #include "feature/dirauth/dirauth_sys.h" +#include "feature/metrics/metrics_sys.h" #include "feature/relay/relay_sys.h" #include <stddef.h> @@ -68,6 +69,7 @@ const subsys_fns_t *tor_subsystems[] = { &sys_btrack, &sys_dirauth, + &sys_metrics, }; const unsigned n_tor_subsystems = ARRAY_LENGTH(tor_subsystems); diff --git a/src/feature/metrics/.may_include b/src/feature/metrics/.may_include new file mode 100644 index 0000000000..424c745c12 --- /dev/null +++ b/src/feature/metrics/.may_include @@ -0,0 +1 @@ +*.h diff --git a/src/feature/metrics/include.am b/src/feature/metrics/include.am new file mode 100644 index 0000000000..0e875f43ad --- /dev/null +++ b/src/feature/metrics/include.am @@ -0,0 +1,10 @@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/feature/metrics/metrics.c \ + src/feature/metrics/metrics_sys.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/feature/metrics/metrics.h \ + src/feature/metrics/metrics_sys.h diff --git a/src/feature/metrics/metrics.c b/src/feature/metrics/metrics.c new file mode 100644 index 0000000000..5f6fe776b7 --- /dev/null +++ b/src/feature/metrics/metrics.c @@ -0,0 +1,66 @@ +/* Copyright (c) 2007-2020, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file metrics.c + * @brief Metrics subsystem. + **/ + +#include "orconfig.h" + +#include "lib/container/smartlist.h" +#include "lib/log/util_bug.h" +#include "lib/malloc/malloc.h" +#include "lib/metrics/metrics_store.h" +#include "lib/string/printf.h" + +#include "feature/metrics/metrics.h" + +#include "app/main/subsysmgr.h" + +/** Return newly allocated string containing the output of all subsystems + * having metrics. + * + * This is used to output the content on the MetricsPort. */ +char * +metrics_get_output(const metrics_format_t fmt) +{ + char *data; + smartlist_t *chunks = smartlist_new(); + + /* Go over all subsystems that exposes a metrics store. */ + for (unsigned i = 0; i < n_tor_subsystems; ++i) { + const smartlist_t *stores; + const subsys_fns_t *sys = tor_subsystems[i]; + + /* Skip unsupported subsystems. */ + if (!sys->supported) { + continue; + } + + if (sys->get_metrics && (stores = sys->get_metrics())) { + SMARTLIST_FOREACH_BEGIN(stores, const metrics_store_t *, store) { + smartlist_add(chunks, metrics_store_get_output(fmt, store)); + } SMARTLIST_FOREACH_END(store); + } + } + + data = smartlist_join_strings(chunks, "\n", 0, NULL); + + SMARTLIST_FOREACH(chunks, char *, c, tor_free(c)); + smartlist_free(chunks); + + return data; +} + +/** Initialize the subsystem. */ +void +metrics_init(void) +{ +} + +/** Cleanup and free any global memory of this subsystem. */ +void +metrics_cleanup(void) +{ +} diff --git a/src/feature/metrics/metrics.h b/src/feature/metrics/metrics.h new file mode 100644 index 0000000000..a30c271bea --- /dev/null +++ b/src/feature/metrics/metrics.h @@ -0,0 +1,21 @@ +/* Copyright (c) 2020, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file metrics.h + * @brief Header for feature/metrics/metrics.c + **/ + +#ifndef TOR_FEATURE_METRICS_METRICS_H +#define TOR_FEATURE_METRICS_METRICS_H + +#include "lib/metrics/metrics_common.h" + +/* Initializer / Cleanup. */ +void metrics_init(void); +void metrics_cleanup(void); + +/* Accessors. */ +char *metrics_get_output(const metrics_format_t fmt); + +#endif /* !defined(TOR_FEATURE_METRICS_METRICS_H) */ diff --git a/src/feature/metrics/metrics_sys.c b/src/feature/metrics/metrics_sys.c new file mode 100644 index 0000000000..419318068e --- /dev/null +++ b/src/feature/metrics/metrics_sys.c @@ -0,0 +1,37 @@ +/* Copyright (c) 2020, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file metrics_sys.c + * @brief Setup and tear down the metrics subsystem. + **/ + +#include "lib/subsys/subsys.h" + +#include "feature/metrics/metrics.h" +#include "feature/metrics/metrics_sys.h" + +static int +subsys_metrics_initialize(void) +{ + metrics_init(); + return 0; +} + +static void +subsys_metrics_shutdown(void) +{ + metrics_cleanup(); +} + +const subsys_fns_t sys_metrics = { + SUBSYS_DECLARE_LOCATION(), + + .name = "metrics", + .supported = true, + .level = METRICS_SUBSYS_LEVEL, + + .initialize = subsys_metrics_initialize, + .shutdown = subsys_metrics_shutdown, +}; + diff --git a/src/feature/metrics/metrics_sys.h b/src/feature/metrics/metrics_sys.h new file mode 100644 index 0000000000..30c1b14836 --- /dev/null +++ b/src/feature/metrics/metrics_sys.h @@ -0,0 +1,22 @@ +/* Copyright (c) 2020, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file metrics_sys.h + * @brief Header for feature/metrics/metrics_sys.c + **/ + +#ifndef TOR_FEATURE_METRICS_METRICS_SYS_H +#define TOR_FEATURE_METRICS_METRICS_SYS_H + +extern const struct subsys_fns_t sys_metrics; + +/** + * Subsystem level for the metrics system. + * + * Defined here so that it can be shared between the real and stub + * definitions. + **/ +#define METRICS_SUBSYS_LEVEL (99) + +#endif /* !defined(TOR_FEATURE_METRICS_METRICS_SYS_H) */ diff --git a/src/include.am b/src/include.am index 95acecb057..0826da7548 100644 --- a/src/include.am +++ b/src/include.am @@ -73,6 +73,7 @@ include src/feature/hibernate/include.am include src/feature/hs_common/include.am include src/feature/hs/include.am include src/feature/keymgt/include.am +include src/feature/metrics/include.am include src/feature/nodelist/include.am include src/feature/relay/include.am include src/feature/rend/include.am diff --git a/src/lib/subsys/subsys.h b/src/lib/subsys/subsys.h index 62c0de026d..4cff5f0b6e 100644 --- a/src/lib/subsys/subsys.h +++ b/src/lib/subsys/subsys.h @@ -15,6 +15,7 @@ struct pubsub_connector_t; struct config_format_t; +struct smartlist_t; /** * A subsystem is a part of Tor that is initialized, shut down, configured, @@ -190,6 +191,17 @@ typedef struct subsys_fns_t { * to disk. **/ int (*flush_state)(void *); + + /** + * Return a list of metrics store of this subsystem. This is called + * everytime a request arrives on the MetricsPort. + * + * The list MUST contain metrics_store_t object and contains entries so it + * can be formatted for the metrics port. + * + * This can return NULL or be NULL. + **/ + const struct smartlist_t *(*get_metrics)(void); } subsys_fns_t; #ifndef COCCI

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 27 Oct '20

27 Oct '20

commit c7876127a6197cfb411753c7a4c183ff7352ef57 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 27 14:47:22 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr.po b/tr.po index 5bb1a7e547..54e79c343d 100644 --- a/tr.po +++ b/tr.po @@ -33,8 +33,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-10-26 09:57+0100\n" -"PO-Revision-Date: 2020-10-19 12:13+0000\n" -"Last-Translator: Emma Peel\n" +"PO-Revision-Date: 2020-10-27 14:22+0000\n" +"Last-Translator: T. E. Kalayci <tekrei(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 27 Oct '20

27 Oct '20

commit 0aeb919e73d4395ec4942b18d6b671f4738afbed Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 27 14:46:21 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- tr.po | 70 +++++++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/tr.po b/tr.po index f887cb98f5..55a0c6cd7f 100644 --- a/tr.po +++ b/tr.po @@ -32,9 +32,9 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-10-18 11:26+0200\n" -"PO-Revision-Date: 2020-10-19 12:13+0000\n" -"Last-Translator: Emma Peel\n" +"POT-Creation-Date: 2020-10-26 09:57+0100\n" +"PO-Revision-Date: 2020-10-27 14:22+0000\n" +"Last-Translator: T. E. Kalayci <tekrei(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -360,11 +360,11 @@ msgstr "Ağ kapatılamadı" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:750 msgid "Error while cancelling the upgrade download" -msgstr "" +msgstr "Yükseltme indirmesini iptal ederken bir hata oluştu" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:751 msgid "Failed to cancel the upgrade download" -msgstr "" +msgstr "Yükseltme indirmesini iptal etme başarısız oldu" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:757 msgid "Upgrading the system" @@ -1261,22 +1261,23 @@ msgstr "İçe Aktarma Tamamlanamadı" #. Translators: Don't translate {path} or {error}, #. they are placeholders and will be replaced. -#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:45 +#. They need to be present in the translated string. +#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:46 #, python-brace-format msgid "" "Failed to import keys from {path}:\n" "{error}" msgstr "Anahtarlar {path} üzerinden içe aktarılamadı:\n{error}" -#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:53 +#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:54 msgid "Key Imported" msgid_plural "Keys Imported" msgstr[0] "Anahtar İçe Aktarıldı" msgstr[1] "Anahtarlar İçe Aktarıldı" #. Translators: Don't translate {uids}, it's a placeholder and -#. will be replaced. -#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:56 +#. will be replaced. It needs to be present in the translated string. +#: config/chroot_local-includes/usr/local/lib/seahorse-tool-wrapper:57 #, python-brace-format msgid "Imported a key for {uids}" msgid_plural "Imported keys for {uids}" @@ -1649,36 +1650,40 @@ msgid "Open Onion Circuits" msgstr "Açık Onion Devreleri" #. Translators: Don't translate {volume_label} or {volume_size}, -#. they are placeholders and will be replaced. -#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:64 +#. they are placeholders and will be replaced. They need +#. to be present in the translated string. +#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:65 #, python-brace-format msgid "{volume_label} ({volume_size})" msgstr "{volume_label} ({volume_size})" #. Translators: Don't translate {partition_name} or {partition_size}, -#. they are placeholders and will be replaced. -#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:69 +#. they are placeholders and will be replaced. They need +#. to be present in the translated string. +#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:71 #, python-brace-format msgid "{partition_name} ({partition_size})" msgstr "{partition_name} ({partition_size})" #. Translators: Don't translate {volume_size}, it's a placeholder -#. and will be replaced. -#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:74 +#. and will be replaced. It needs to be present in the translated +#. string. +#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:77 #, python-brace-format msgid "{volume_size} Volume" msgstr "{volume_size} Birim" #. Translators: Don't translate {volume_name}, it's a placeholder and -#. will be replaced. -#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:113 +#. will be replaced. It needs to be present in the translated string. +#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:116 #, python-brace-format msgid "{volume_name} (Read-Only)" msgstr "{volume_name} (Salt Okunur)" #. Translators: Don't translate {partition_name} and {container_path}, they -#. are placeholders and will be replaced. -#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:121 +#. are placeholders and will be replaced. They need to be present +#. in the translated string. +#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:125 #, python-brace-format msgid "{partition_name} in {container_path}" msgstr "{container_path} içindeki {partition_name}" @@ -1687,14 +1692,15 @@ msgstr "{container_path} içindeki {partition_name}" #. they are placeholders and will be replaced. You should only have to #. translate #. this string if it makes sense to reverse the order of the placeholders. -#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:128 +#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:132 #, python-brace-format msgid "{volume_name} – {path_to_file_container}" msgstr "{volume_name} – {path_to_file_container}" #. Translators: Don't translate {partition_name} and {drive_name}, they -#. are placeholders and will be replaced. -#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:134 +#. are placeholders and will be replaced. They need to be present +#. in the translated string. +#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:139 #, python-brace-format msgid "{partition_name} on {drive_name}" msgstr "{drive_name} üzerindeki {partition_name}" @@ -1703,42 +1709,44 @@ msgstr "{drive_name} üzerindeki {partition_name}" #. they are placeholders and will be replaced. You should only have to #. translate #. this string if it makes sense to reverse the order of the placeholders. -#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:141 +#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:146 #, python-brace-format msgid "{volume_name} – {drive_name}" msgstr "{volume_name} – {drive_name}" -#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:229 +#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:234 msgid "Wrong passphrase or parameters" msgstr "Parola ya da parametreler hatalı" -#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:231 +#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:236 msgid "Error unlocking volume" msgstr "Birim kilidi açılırken sorun çıktı" #. Translators: Don't translate {volume_name} or {error_message}, -#. they are placeholder and will be replaced. -#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:235 +#. they are placeholder and will be replaced. They need +#. to be present in the translated string. +#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:241 #, python-brace-format msgid "" "Couldn't unlock volume {volume_name}:\n" "{error_message}" msgstr "{volume_name} biriminin kilidi açılamadı:\n{error_message}" -#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:337 +#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:343 msgid "One or more applications are keeping the volume busy." msgstr "Bir ya da birkaç uygulama bu birimi meşgul ediyor." #. Translators: Don't translate {volume_name} or {error_message}, -#. they are placeholder and will be replaced. -#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:343 +#. they are placeholder and will be replaced. They need +#. to be present in the translated string. +#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:350 #, python-brace-format msgid "" "Couldn't lock volume {volume_name}:\n" "{error_message}" msgstr "Birim kilitlenemedi {volume_name}:\n{error_message}" -#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:345 +#: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:352 msgid "Locking the volume failed" msgstr "Birim kilitlenemedi"

1 0

[translation/fenix-torbrowserstringsxml_completed] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml_completed
by translation＠torproject.org 27 Oct '20

27 Oct '20

commit deec56de20c82d7e81de6611e188aaf4ec234f70 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 27 14:45:39 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstr… --- tr/torbrowser_strings.xml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tr/torbrowser_strings.xml b/tr/torbrowser_strings.xml index 21b1f0caf7..30ec75fc49 100644 --- a/tr/torbrowser_strings.xml +++ b/tr/torbrowser_strings.xml @@ -20,12 +20,6 @@ <string name="tor_onboarding_security_level">Güvenlik Düzeyinizi Ayarlayın</string> <string name="tor_onboarding_security_level_description">Size saldırmak, güvenliğinize, anonimliğinize ve kişisel gizliliğinize zarar vermek için kullanılacak belirli web özelliklerini devre dışı bırakır.</string> - <string name="tor_onboarding_security_level_standard_option">Standart</string> - <string name="tor_onboarding_security_level_standard_button_description">Tüm Tor Browser ve web sitesi özellikleri kullanılabilir.</string> - <string name="tor_onboarding_security_level_safer_option">Daha Güvenli</string> - <string name="tor_onboarding_security_level_safer_button_description">Sıklıkla tehlikeli olan web sitesi özellikleri devre dışı bırakılır ve bazı sitelerin işlevlerinde kayıplar olabilir.</string> - <string name="tor_onboarding_security_level_safest_option">En Güvenli</string> - <string name="tor_onboarding_security_level_safest_button_description">Yalnız durağan siteler ve temel hizmetler için gerekli web sitesi özelliklerine izin verilir. Bu değişiklikler görselleri, ortamları ve betikleri etkiler.</string> <string name="tor_onboarding_security_settings_button">Güvenlik Ayarlarını Aç</string> <string name="tor_onboarding_donate_header">Bağış yaparak Tor Projesini koruyun</string> <string name="tor_onboarding_donate_description">Tor sizin gibi insanların bağışları ile desteklendiği için ücretsiz olarak kullanılabiliyor.</string> @@ -59,4 +53,5 @@ <string name="preferences_tor_network_settings_connected">Bağlantı kuruldu</string> <string name="preferences_tor_network_settings_restarting">Yeniden başlatılıyor</string> <string name="preferences_tor_network_settings_bridges_enabled">Etkin köprüler: %s</string> -</resources> + + </resources>

1 0

[translation/fenix-torbrowserstringsxml] https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstringsxml
by translation＠torproject.org 27 Oct '20

27 Oct '20

commit 2658b9d14a4a5f1282e0dc83f9af70de10092fc2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 27 14:45:35 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=fenix-torbrowserstr… --- tr/torbrowser_strings.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tr/torbrowser_strings.xml b/tr/torbrowser_strings.xml index 6c54cf11be..b01b08197c 100644 --- a/tr/torbrowser_strings.xml +++ b/tr/torbrowser_strings.xml @@ -2,6 +2,9 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <resources> +  + <string name="tor_about_content">%1$s, Birleşik Devletlerde 501(c)(3) maddesi kapsamında kar amacı gütmeden çalışan Tor Projesi tarafından üretilmiştir.</string> +  <string name="preferences_disable_normal_mode">Yalnız Gizli Gezinti Kipi Kullanılabilsin</string>  @@ -20,6 +23,7 @@ <string name="tor_onboarding_security_level">Güvenlik Düzeyinizi Ayarlayın</string> <string name="tor_onboarding_security_level_description">Size saldırmak, güvenliğinize, anonimliğinize ve kişisel gizliliğinize zarar vermek için kullanılacak belirli web özelliklerini devre dışı bırakır.</string> + <string name="tor_onboarding_chosen_security_level_label">Mevcut Güvenlik Düzeyi: %s</string> <string name="tor_onboarding_security_settings_button">Güvenlik Ayarlarını Aç</string> <string name="tor_onboarding_donate_header">Bağış yaparak Tor Projesini koruyun</string> <string name="tor_onboarding_donate_description">Tor sizin gibi insanların bağışları ile desteklendiği için ücretsiz olarak kullanılabiliyor.</string> @@ -66,4 +70,6 @@ <string name="tor_security_level_safest_option">En Güvenli</string> <string name="tor_security_level_safest_description">Yalnız durağan siteler ve temel hizmetler için gerekli web sitesi özelliklerine izin verilir. Bu değişiklikler görselleri, ortamları ve betikleri etkiler.</string> - </resources> +  + <string name="tor_spoof_english">Daha güvenilir gizlilik için web sayfalarının İngilizce sürümlerini talep edin</string> +</resources>

1 0

[tor/maint-0.4.4] Split required/recommended protocol lists into multiple lines
by dgoulet＠torproject.org 27 Oct '20

27 Oct '20

commit 4298d87756e5bdb83276de1f361860c198b3c0c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 18 16:18:42 2020 -0400 Split required/recommended protocol lists into multiple lines This should make diffs easier to read. --- src/feature/dirauth/dirvote.h | 49 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h index 1b1c9f2cc7..7cfa72ead5 100644 --- a/src/feature/dirauth/dirvote.h +++ b/src/feature/dirauth/dirvote.h @@ -239,31 +239,62 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, * Recommending a new protocol causes old tor versions to log a warning. */ #define DIRVOTE_RECOMMEND_RELAY_PROTO \ - "Cons=1-2 Desc=1-2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 " \ - "Link=5 LinkAuth=3 Microdesc=1-2 Relay=2" + "Cons=2 " \ + "Desc=2 " \ + "DirCache=1-2 " \ + "HSDir=1 " \ + "HSIntro=3 " \ + "HSRend=1 " \ + "Link=4 " \ + "Microdesc=2 " \ + "Relay=2" + /** The recommended client protocols for this authority's votes. * Recommending a new protocol causes old tor versions to log a warning. */ #define DIRVOTE_RECOMMEND_CLIENT_PROTO \ - "Cons=1-2 Desc=1-2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 " \ - "Link=5 LinkAuth=3 Microdesc=1-2 Relay=2" + "Cons=1-2 " \ + "Desc=1-2 " \ + "DirCache=2 " \ + "HSDir=2 " \ + "HSIntro=4 " \ + "HSRend=2 " \ + "Link=5 " \ + "LinkAuth=3 " \ + "Microdesc=1-2 " \ + "Relay=2" /** The required relay protocols for this authority's votes. * WARNING: Requiring a new protocol causes old tor versions to shut down. * Requiring the wrong protocols can break the tor network. * See Proposal 303: When and how to remove support for protocol versions. */ -#define DIRVOTE_REQUIRE_RELAY_PROTO \ - "Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \ - "Link=3-4 Microdesc=1 Relay=1-2" +#define DIRVOTE_REQUIRE_RELAY_PROTO \ + "Cons=1 " \ + "Desc=1 " \ + "DirCache=1 " \ + "HSDir=1 " \ + "HSIntro=3 " \ + "HSRend=1 " \ + "Link=3-4 " \ + "Microdesc=1 " \ + "Relay=1-2" \ + /** The required relay protocols for this authority's votes. * WARNING: Requiring a new protocol causes old tor versions to shut down. * Requiring the wrong protocols can break the tor network. * See Proposal 303: When and how to remove support for protocol versions. */ #define DIRVOTE_REQUIRE_CLIENT_PROTO \ - "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \ - "Link=4 Microdesc=1-2 Relay=2" + "Cons=1-2 " \ + "Desc=1-2 " \ + "DirCache=1 " \ + "HSDir=1 " \ + "HSIntro=3 " \ + "HSRend=1 " \ + "Link=4 " \ + "Microdesc=1-2 " \ + "Relay=2" #endif /* defined(DIRVOTE_PRIVATE) */

1 0

[tor/maint-0.4.4] Update required/recommended protocol versions.
by dgoulet＠torproject.org 27 Oct '20

27 Oct '20

commit d872c6925516a571b0ce624e913b620ba9324740 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Oct 18 16:09:25 2020 -0400 Update required/recommended protocol versions. Cons=1 is the old format of consensuses, without ed25519 keys. It is no longer required or recommended. Cons=2 is the new format of consensuses, with ed25519 keys. It is now required. (Similarly for Desc=1,2 and Microdesc=1,2) No supported client or relay versions should be affected by this change, since these versions are supported by clients and relays running 0.2.9 and later. It will only take effect once enough authorities vote for it. Closes ticket 40162. --- changes/ticket40162 | 7 +++++++ src/feature/dirauth/dirvote.h | 16 ++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/changes/ticket40162 b/changes/ticket40162 new file mode 100644 index 0000000000..5a8a76bfd8 --- /dev/null +++ b/changes/ticket40162 @@ -0,0 +1,7 @@ + o Minor features (authorities): + - Authorities now list the directory formats used by currently supported + Tor releases as required. Previously, they listed only the formats + supported by older Tor releases as required. This change makes + the subprotocols "Cons=2 Desc=2 Microdesc=2" required, and makes + "Cons=1 Desc=1 Microdesc=1" no longer required or recommended. + Closes ticket 40162. diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h index 7cfa72ead5..69c8a025c4 100644 --- a/src/feature/dirauth/dirvote.h +++ b/src/feature/dirauth/dirvote.h @@ -253,8 +253,8 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, * Recommending a new protocol causes old tor versions to log a warning. */ #define DIRVOTE_RECOMMEND_CLIENT_PROTO \ - "Cons=1-2 " \ - "Desc=1-2 " \ + "Cons=2 " \ + "Desc=2 " \ "DirCache=2 " \ "HSDir=2 " \ "HSIntro=4 " \ @@ -270,14 +270,14 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, * See Proposal 303: When and how to remove support for protocol versions. */ #define DIRVOTE_REQUIRE_RELAY_PROTO \ - "Cons=1 " \ - "Desc=1 " \ + "Cons=2 " \ + "Desc=2 " \ "DirCache=1 " \ "HSDir=1 " \ "HSIntro=3 " \ "HSRend=1 " \ "Link=3-4 " \ - "Microdesc=1 " \ + "Microdesc=2 " \ "Relay=1-2" \ /** The required relay protocols for this authority's votes. @@ -286,14 +286,14 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, * See Proposal 303: When and how to remove support for protocol versions. */ #define DIRVOTE_REQUIRE_CLIENT_PROTO \ - "Cons=1-2 " \ - "Desc=1-2 " \ + "Cons=2 " \ + "Desc=2 " \ "DirCache=1 " \ "HSDir=1 " \ "HSIntro=3 " \ "HSRend=1 " \ "Link=4 " \ - "Microdesc=1-2 " \ + "Microdesc=2 " \ "Relay=2" #endif /* defined(DIRVOTE_PRIVATE) */

1 0

[tor/maint-0.4.4] Update required/recommended protocol lists more systematically
by dgoulet＠torproject.org 27 Oct '20

27 Oct '20

commit fd58e74ddcb012892bd7e59ef1587fc4faa2ab35 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 23 11:23:08 2020 -0400 Update required/recommended protocol lists more systematically First I began with a set of candidates: The client's _required_ list starts with all the protocols supported by every release in 0.2.9-stable through current master. The client's _required_ list starts with all the protocols supported by every release in 0.3.5-stable through current master. Everybody's _recommended_ list starts with all the protocols supported by every release in 0.3.5-stable through current master. Then I removed the protocol versions that we do not actually want to require or recommend: DirCache=1 (deprecated) HSDir=1, HSIntro=1-3, HSRend=1 (deprecated) (All HS* protocol requirements for clients) Link=1-3 (deprecated) LinkAuth=1 (obsolete) Relay=1 (obsolete) --- changes/ticket40162 | 10 +++---- src/feature/dirauth/dirvote.h | 65 +++++++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 39 deletions(-) diff --git a/changes/ticket40162 b/changes/ticket40162 index 5a8a76bfd8..093042f9af 100644 --- a/changes/ticket40162 +++ b/changes/ticket40162 @@ -1,7 +1,7 @@ o Minor features (authorities): - - Authorities now list the directory formats used by currently supported - Tor releases as required. Previously, they listed only the formats - supported by older Tor releases as required. This change makes - the subprotocols "Cons=2 Desc=2 Microdesc=2" required, and makes - "Cons=1 Desc=1 Microdesc=1" no longer required or recommended. + - Authorities now list a different set of protocols as required and + recommended. These lists are chosen so that only truly recommended + and/or required protocols are included, and so that clients using 0.2.9 + or later will continue to work (even though they are not supported), + whereas only relays running 0.3.5 or later will meet the requirements. Closes ticket 40162. diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h index 69c8a025c4..a9b356b387 100644 --- a/src/feature/dirauth/dirvote.h +++ b/src/feature/dirauth/dirvote.h @@ -238,30 +238,30 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, /** The recommended relay protocols for this authority's votes. * Recommending a new protocol causes old tor versions to log a warning. */ -#define DIRVOTE_RECOMMEND_RELAY_PROTO \ - "Cons=2 " \ - "Desc=2 " \ - "DirCache=1-2 " \ - "HSDir=1 " \ - "HSIntro=3 " \ - "HSRend=1 " \ - "Link=4 " \ - "Microdesc=2 " \ +#define DIRVOTE_RECOMMEND_RELAY_PROTO \ + "Cons=2 " \ + "Desc=2 " \ + "DirCache=2 " \ + "HSDir=2 " \ + "HSIntro=4 " \ + "HSRend=2 " \ + "Link=4-5 " \ + "LinkAuth=3 " \ + "Microdesc=2 " \ "Relay=2" /** The recommended client protocols for this authority's votes. * Recommending a new protocol causes old tor versions to log a warning. */ -#define DIRVOTE_RECOMMEND_CLIENT_PROTO \ - "Cons=2 " \ - "Desc=2 " \ - "DirCache=2 " \ - "HSDir=2 " \ - "HSIntro=4 " \ - "HSRend=2 " \ - "Link=5 " \ - "LinkAuth=3 " \ - "Microdesc=1-2 " \ +#define DIRVOTE_RECOMMEND_CLIENT_PROTO \ + "Cons=2 " \ + "Desc=2 " \ + "DirCache=2 " \ + "HSDir=2 " \ + "HSIntro=4 " \ + "HSRend=2 " \ + "Link=4-5 " \ + "Microdesc=2 " \ "Relay=2" /** The required relay protocols for this authority's votes. @@ -272,28 +272,25 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, #define DIRVOTE_REQUIRE_RELAY_PROTO \ "Cons=2 " \ "Desc=2 " \ - "DirCache=1 " \ - "HSDir=1 " \ - "HSIntro=3 " \ - "HSRend=1 " \ - "Link=3-4 " \ + "DirCache=2 " \ + "HSDir=2 " \ + "HSIntro=4 " \ + "HSRend=2 " \ + "Link=4-5 " \ + "LinkAuth=3 " \ "Microdesc=2 " \ - "Relay=1-2" \ + "Relay=2" /** The required relay protocols for this authority's votes. * WARNING: Requiring a new protocol causes old tor versions to shut down. * Requiring the wrong protocols can break the tor network. * See Proposal 303: When and how to remove support for protocol versions. */ -#define DIRVOTE_REQUIRE_CLIENT_PROTO \ - "Cons=2 " \ - "Desc=2 " \ - "DirCache=1 " \ - "HSDir=1 " \ - "HSIntro=3 " \ - "HSRend=1 " \ - "Link=4 " \ - "Microdesc=2 " \ +#define DIRVOTE_REQUIRE_CLIENT_PROTO \ + "Cons=2 " \ + "Desc=2 " \ + "Link=4 " \ + "Microdesc=2 " \ "Relay=2" #endif /* defined(DIRVOTE_PRIVATE) */

1 0

[tor/maint-0.4.4] Merge branch 'tor-gitlab/mr/176' into maint-0.4.4
by dgoulet＠torproject.org 27 Oct '20

27 Oct '20

commit 26cfac18803ae1eb9f449d563842347f4d9340f9 Merge: c1bcc1da03 fd58e74ddc Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 27 10:18:16 2020 -0400 Merge branch 'tor-gitlab/mr/176' into maint-0.4.4 changes/ticket40162 | 7 ++++++ src/feature/dirauth/dirvote.h | 52 +++++++++++++++++++++++++++++++++---------- 2 files changed, 47 insertions(+), 12 deletions(-)

1 0