mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-11 13:43:47 +01:00
config: Move dirauth config into the dirauth module
This commit: * creates feature/dirauth/dirauth_config.[ch], * moves the dirauth config code into them, * copies some macros from src/app/config.c (we'll refactor them later in 29211), and * adds thin wrappers to make the moved code compile. No functional changes: the moved code is still enabled, even if the dirauth module is disabled. Part of 32213.
This commit is contained in:
teor
parent
40e75bc3e1
commit
5950566f1d
@ -89,11 +89,8 @@
|
|||||||
#include "feature/control/control.h"
|
#include "feature/control/control.h"
|
||||||
#include "feature/control/control_auth.h"
|
#include "feature/control/control_auth.h"
|
||||||
#include "feature/control/control_events.h"
|
#include "feature/control/control_events.h"
|
||||||
#include "feature/dirauth/bwauth.h"
|
|
||||||
#include "feature/dirauth/guardfraction.h"
|
|
||||||
#include "feature/dircache/consdiffmgr.h"
|
#include "feature/dircache/consdiffmgr.h"
|
||||||
#include "feature/dircache/dirserv.h"
|
#include "feature/dircache/dirserv.h"
|
||||||
#include "feature/dircommon/voting_schedule.h"
|
|
||||||
#include "feature/hibernate/hibernate.h"
|
#include "feature/hibernate/hibernate.h"
|
||||||
#include "feature/hs/hs_config.h"
|
#include "feature/hs/hs_config.h"
|
||||||
#include "feature/nodelist/dirlist.h"
|
#include "feature/nodelist/dirlist.h"
|
||||||
@ -157,10 +154,8 @@
|
|||||||
#include "lib/fs/conffile.h"
|
#include "lib/fs/conffile.h"
|
||||||
#include "lib/evloop/procmon.h"
|
#include "lib/evloop/procmon.h"
|
||||||
|
|
||||||
#include "feature/dirauth/dirvote.h"
|
|
||||||
#include "feature/dirauth/dirauth_periodic.h"
|
|
||||||
#include "feature/dirauth/recommend_pkg.h"
|
|
||||||
#include "feature/dirauth/authmode.h"
|
#include "feature/dirauth/authmode.h"
|
||||||
|
#include "feature/dirauth/dirauth_config.h"
|
||||||
|
|
||||||
#include "core/or/connection_st.h"
|
#include "core/or/connection_st.h"
|
||||||
#include "core/or/port_cfg_st.h"
|
#include "core/or/port_cfg_st.h"
|
||||||
@ -831,8 +826,6 @@ static int options_transition_affects_workers(
|
|||||||
const or_options_t *old_options, const or_options_t *new_options);
|
const or_options_t *old_options, const or_options_t *new_options);
|
||||||
static int options_transition_affects_descriptor(
|
static int options_transition_affects_descriptor(
|
||||||
const or_options_t *old_options, const or_options_t *new_options);
|
const or_options_t *old_options, const or_options_t *new_options);
|
||||||
static int options_transition_affects_dirauth_timing(
|
|
||||||
const or_options_t *old_options, const or_options_t *new_options);
|
|
||||||
static int normalize_nickname_list(config_line_t **normalized_out,
|
static int normalize_nickname_list(config_line_t **normalized_out,
|
||||||
const config_line_t *lst, const char *name,
|
const config_line_t *lst, const char *name,
|
||||||
char **msg);
|
char **msg);
|
||||||
@ -1828,32 +1821,6 @@ options_transition_affects_guards(const or_options_t *old_options,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Return true if changing the configuration from <b>old</b> to <b>new</b>
|
|
||||||
* affects the timing of the voting subsystem
|
|
||||||
*/
|
|
||||||
static int
|
|
||||||
options_transition_affects_dirauth_timing(const or_options_t *old_options,
|
|
||||||
const or_options_t *new_options)
|
|
||||||
{
|
|
||||||
tor_assert(old_options);
|
|
||||||
tor_assert(new_options);
|
|
||||||
|
|
||||||
if (authdir_mode_v3(old_options) != authdir_mode_v3(new_options))
|
|
||||||
return 1;
|
|
||||||
if (! authdir_mode_v3(new_options))
|
|
||||||
return 0;
|
|
||||||
YES_IF_CHANGED_INT(V3AuthVotingInterval);
|
|
||||||
YES_IF_CHANGED_INT(V3AuthVoteDelay);
|
|
||||||
YES_IF_CHANGED_INT(V3AuthDistDelay);
|
|
||||||
YES_IF_CHANGED_INT(TestingV3AuthInitialVotingInterval);
|
|
||||||
YES_IF_CHANGED_INT(TestingV3AuthInitialVoteDelay);
|
|
||||||
YES_IF_CHANGED_INT(TestingV3AuthInitialDistDelay);
|
|
||||||
YES_IF_CHANGED_INT(TestingV3AuthVotingStartOffset);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Fetch the active option list, and take actions based on it. All of the
|
/** Fetch the active option list, and take actions based on it. All of the
|
||||||
* things we do should survive being done repeatedly. If present,
|
* things we do should survive being done repeatedly. If present,
|
||||||
* <b>old_options</b> contains the previous value of the options.
|
* <b>old_options</b> contains the previous value of the options.
|
||||||
@ -1861,7 +1828,8 @@ options_transition_affects_dirauth_timing(const or_options_t *old_options,
|
|||||||
* Return 0 if all goes well, return -1 if it's time to die.
|
* Return 0 if all goes well, return -1 if it's time to die.
|
||||||
*
|
*
|
||||||
* Note: We haven't moved all the "act on new configuration" logic
|
* Note: We haven't moved all the "act on new configuration" logic
|
||||||
* here yet. Some is still in do_hup() and other places.
|
* the options_act* functions yet. Some is still in do_hup() and other
|
||||||
|
* places.
|
||||||
*/
|
*/
|
||||||
MOCK_IMPL(STATIC int,
|
MOCK_IMPL(STATIC int,
|
||||||
options_act,(const or_options_t *old_options))
|
options_act,(const or_options_t *old_options))
|
||||||
@ -2409,12 +2377,11 @@ options_act,(const or_options_t *old_options))
|
|||||||
options_transition_affects_descriptor(old_options, options))
|
options_transition_affects_descriptor(old_options, options))
|
||||||
mark_my_descriptor_dirty("config change");
|
mark_my_descriptor_dirty("config change");
|
||||||
|
|
||||||
|
if (options_act_dirauth(old_options) < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
/* We may need to reschedule some directory stuff if our status changed. */
|
/* We may need to reschedule some directory stuff if our status changed. */
|
||||||
if (old_options) {
|
if (old_options) {
|
||||||
if (options_transition_affects_dirauth_timing(old_options, options)) {
|
|
||||||
voting_schedule_recalculate_timing(options, time(NULL));
|
|
||||||
reschedule_dirvote(options);
|
|
||||||
}
|
|
||||||
if (!bool_eq(directory_fetches_dir_info_early(options),
|
if (!bool_eq(directory_fetches_dir_info_early(options),
|
||||||
directory_fetches_dir_info_early(old_options)) ||
|
directory_fetches_dir_info_early(old_options)) ||
|
||||||
!bool_eq(directory_fetches_dir_info_later(options),
|
!bool_eq(directory_fetches_dir_info_later(options),
|
||||||
@ -3641,65 +3608,8 @@ options_validate_cb(const void *old_options_, void *options_, char **msg)
|
|||||||
"features to be broken in unpredictable ways.");
|
"features to be broken in unpredictable ways.");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options->AuthoritativeDir) {
|
if (options_validate_dirauth_mode(old_options, options, msg) < 0)
|
||||||
if (!options->ContactInfo && !options->TestingTorNetwork)
|
return -1;
|
||||||
REJECT("Authoritative directory servers must set ContactInfo");
|
|
||||||
if (!options->RecommendedClientVersions)
|
|
||||||
options->RecommendedClientVersions =
|
|
||||||
config_lines_dup(options->RecommendedVersions);
|
|
||||||
if (!options->RecommendedServerVersions)
|
|
||||||
options->RecommendedServerVersions =
|
|
||||||
config_lines_dup(options->RecommendedVersions);
|
|
||||||
if (options->VersioningAuthoritativeDir &&
|
|
||||||
(!options->RecommendedClientVersions ||
|
|
||||||
!options->RecommendedServerVersions))
|
|
||||||
REJECT("Versioning authoritative dir servers must set "
|
|
||||||
"Recommended*Versions.");
|
|
||||||
|
|
||||||
#ifdef HAVE_MODULE_DIRAUTH
|
|
||||||
char *t;
|
|
||||||
/* Call these functions to produce warnings only. */
|
|
||||||
t = format_recommended_version_list(options->RecommendedClientVersions, 1);
|
|
||||||
tor_free(t);
|
|
||||||
t = format_recommended_version_list(options->RecommendedServerVersions, 1);
|
|
||||||
tor_free(t);
|
|
||||||
#endif /* defined(HAVE_MODULE_DIRAUTH) */
|
|
||||||
|
|
||||||
if (options->UseEntryGuards) {
|
|
||||||
log_info(LD_CONFIG, "Authoritative directory servers can't set "
|
|
||||||
"UseEntryGuards. Disabling.");
|
|
||||||
options->UseEntryGuards = 0;
|
|
||||||
}
|
|
||||||
if (!options->DownloadExtraInfo && authdir_mode_v3(options)) {
|
|
||||||
log_info(LD_CONFIG, "Authoritative directories always try to download "
|
|
||||||
"extra-info documents. Setting DownloadExtraInfo.");
|
|
||||||
options->DownloadExtraInfo = 1;
|
|
||||||
}
|
|
||||||
if (!(options->BridgeAuthoritativeDir ||
|
|
||||||
options->V3AuthoritativeDir))
|
|
||||||
REJECT("AuthoritativeDir is set, but none of "
|
|
||||||
"(Bridge/V3)AuthoritativeDir is set.");
|
|
||||||
#ifdef HAVE_MODULE_DIRAUTH
|
|
||||||
/* If we have a v3bandwidthsfile and it's broken, complain on startup */
|
|
||||||
if (options->V3BandwidthsFile && !old_options) {
|
|
||||||
dirserv_read_measured_bandwidths(options->V3BandwidthsFile, NULL, NULL,
|
|
||||||
NULL);
|
|
||||||
}
|
|
||||||
/* same for guardfraction file */
|
|
||||||
if (options->GuardfractionFile && !old_options) {
|
|
||||||
dirserv_read_guardfraction_file(options->GuardfractionFile, NULL);
|
|
||||||
}
|
|
||||||
#endif /* defined(HAVE_MODULE_DIRAUTH) */
|
|
||||||
}
|
|
||||||
|
|
||||||
if (options->AuthoritativeDir && !options->DirPort_set)
|
|
||||||
REJECT("Running as authoritative directory, but no DirPort set.");
|
|
||||||
|
|
||||||
if (options->AuthoritativeDir && !options->ORPort_set)
|
|
||||||
REJECT("Running as authoritative directory, but no ORPort set.");
|
|
||||||
|
|
||||||
if (options->AuthoritativeDir && options->ClientOnly)
|
|
||||||
REJECT("Running as authoritative directory, but ClientOnly also set.");
|
|
||||||
|
|
||||||
if (options->FetchDirInfoExtraEarly && !options->FetchDirInfoEarly)
|
if (options->FetchDirInfoExtraEarly && !options->FetchDirInfoEarly)
|
||||||
REJECT("FetchDirInfoExtraEarly requires that you also set "
|
REJECT("FetchDirInfoExtraEarly requires that you also set "
|
||||||
@ -4433,75 +4343,8 @@ options_validate_cb(const void *old_options_, void *options_, char **msg)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (options->V3AuthVoteDelay + options->V3AuthDistDelay >=
|
if (options_validate_dirauth_schedule(old_options, options, msg) < 0)
|
||||||
options->V3AuthVotingInterval/2) {
|
return -1;
|
||||||
/*
|
|
||||||
This doesn't work, but it seems like it should:
|
|
||||||
what code is preventing the interval being less than twice the lead-up?
|
|
||||||
if (options->TestingTorNetwork) {
|
|
||||||
if (options->V3AuthVoteDelay + options->V3AuthDistDelay >=
|
|
||||||
options->V3AuthVotingInterval) {
|
|
||||||
REJECT("V3AuthVoteDelay plus V3AuthDistDelay must be less than "
|
|
||||||
"V3AuthVotingInterval");
|
|
||||||
} else {
|
|
||||||
COMPLAIN("V3AuthVoteDelay plus V3AuthDistDelay is more than half "
|
|
||||||
"V3AuthVotingInterval. This may lead to "
|
|
||||||
"consensus instability, particularly if clocks drift.");
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
*/
|
|
||||||
REJECT("V3AuthVoteDelay plus V3AuthDistDelay must be less than half "
|
|
||||||
"V3AuthVotingInterval");
|
|
||||||
/*
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
}
|
|
||||||
|
|
||||||
if (options->V3AuthVoteDelay < MIN_VOTE_SECONDS) {
|
|
||||||
if (options->TestingTorNetwork) {
|
|
||||||
if (options->V3AuthVoteDelay < MIN_VOTE_SECONDS_TESTING) {
|
|
||||||
REJECT("V3AuthVoteDelay is way too low.");
|
|
||||||
} else {
|
|
||||||
COMPLAIN("V3AuthVoteDelay is very low. "
|
|
||||||
"This may lead to failure to vote for a consensus.");
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
REJECT("V3AuthVoteDelay is way too low.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (options->V3AuthDistDelay < MIN_DIST_SECONDS) {
|
|
||||||
if (options->TestingTorNetwork) {
|
|
||||||
if (options->V3AuthDistDelay < MIN_DIST_SECONDS_TESTING) {
|
|
||||||
REJECT("V3AuthDistDelay is way too low.");
|
|
||||||
} else {
|
|
||||||
COMPLAIN("V3AuthDistDelay is very low. "
|
|
||||||
"This may lead to missing votes in a consensus.");
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
REJECT("V3AuthDistDelay is way too low.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (options->V3AuthNIntervalsValid < 2)
|
|
||||||
REJECT("V3AuthNIntervalsValid must be at least 2.");
|
|
||||||
|
|
||||||
if (options->V3AuthVotingInterval < MIN_VOTE_INTERVAL) {
|
|
||||||
if (options->TestingTorNetwork) {
|
|
||||||
if (options->V3AuthVotingInterval < MIN_VOTE_INTERVAL_TESTING) {
|
|
||||||
REJECT("V3AuthVotingInterval is insanely low.");
|
|
||||||
} else {
|
|
||||||
COMPLAIN("V3AuthVotingInterval is very low. "
|
|
||||||
"This may lead to failure to synchronise for a consensus.");
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
REJECT("V3AuthVotingInterval is insanely low.");
|
|
||||||
}
|
|
||||||
} else if (options->V3AuthVotingInterval > 24*60*60) {
|
|
||||||
REJECT("V3AuthVotingInterval is insanely high.");
|
|
||||||
} else if (((24*60*60) % options->V3AuthVotingInterval) != 0) {
|
|
||||||
COMPLAIN("V3AuthVotingInterval does not divide evenly into 24 hours.");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hs_config_service_all(options, 1) < 0)
|
if (hs_config_service_all(options, 1) < 0)
|
||||||
REJECT("Failed to configure rendezvous options. See logs for details.");
|
REJECT("Failed to configure rendezvous options. See logs for details.");
|
||||||
@ -4576,43 +4419,8 @@ options_validate_cb(const void *old_options_, void *options_, char **msg)
|
|||||||
if (options->TestingAuthKeyLifetime < options->TestingLinkKeySlop*2)
|
if (options->TestingAuthKeyLifetime < options->TestingLinkKeySlop*2)
|
||||||
REJECT("TestingAuthKeyLifetime is too short.");
|
REJECT("TestingAuthKeyLifetime is too short.");
|
||||||
|
|
||||||
if (options->TestingV3AuthInitialVotingInterval
|
if (options_validate_dirauth_testing(old_options, options, msg) < 0)
|
||||||
< MIN_VOTE_INTERVAL_TESTING_INITIAL) {
|
return -1;
|
||||||
REJECT("TestingV3AuthInitialVotingInterval is insanely low.");
|
|
||||||
} else if (((30*60) % options->TestingV3AuthInitialVotingInterval) != 0) {
|
|
||||||
REJECT("TestingV3AuthInitialVotingInterval does not divide evenly into "
|
|
||||||
"30 minutes.");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (options->TestingV3AuthInitialVoteDelay < MIN_VOTE_SECONDS_TESTING) {
|
|
||||||
REJECT("TestingV3AuthInitialVoteDelay is way too low.");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (options->TestingV3AuthInitialDistDelay < MIN_DIST_SECONDS_TESTING) {
|
|
||||||
REJECT("TestingV3AuthInitialDistDelay is way too low.");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (options->TestingV3AuthInitialVoteDelay +
|
|
||||||
options->TestingV3AuthInitialDistDelay >=
|
|
||||||
options->TestingV3AuthInitialVotingInterval) {
|
|
||||||
REJECT("TestingV3AuthInitialVoteDelay plus TestingV3AuthInitialDistDelay "
|
|
||||||
"must be less than TestingV3AuthInitialVotingInterval");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (options->TestingV3AuthVotingStartOffset >
|
|
||||||
MIN(options->TestingV3AuthInitialVotingInterval,
|
|
||||||
options->V3AuthVotingInterval)) {
|
|
||||||
REJECT("TestingV3AuthVotingStartOffset is higher than the voting "
|
|
||||||
"interval.");
|
|
||||||
} else if (options->TestingV3AuthVotingStartOffset < 0) {
|
|
||||||
REJECT("TestingV3AuthVotingStartOffset must be non-negative.");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (options->TestingAuthDirTimeToLearnReachability < 0) {
|
|
||||||
REJECT("TestingAuthDirTimeToLearnReachability must be non-negative.");
|
|
||||||
} else if (options->TestingAuthDirTimeToLearnReachability > 2*60*60) {
|
|
||||||
COMPLAIN("TestingAuthDirTimeToLearnReachability is insanely high.");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (options->TestingEstimatedDescriptorPropagationTime < 0) {
|
if (options->TestingEstimatedDescriptorPropagationTime < 0) {
|
||||||
REJECT("TestingEstimatedDescriptorPropagationTime must be non-negative.");
|
REJECT("TestingEstimatedDescriptorPropagationTime must be non-negative.");
|
||||||
|
|||||||
@ -89,6 +89,7 @@ LIBTOR_APP_A_SOURCES = \
|
|||||||
src/feature/control/control_proto.c \
|
src/feature/control/control_proto.c \
|
||||||
src/feature/control/fmt_serverstatus.c \
|
src/feature/control/fmt_serverstatus.c \
|
||||||
src/feature/control/getinfo_geoip.c \
|
src/feature/control/getinfo_geoip.c \
|
||||||
|
src/feature/dirauth/dirauth_config.c \
|
||||||
src/feature/dircache/conscache.c \
|
src/feature/dircache/conscache.c \
|
||||||
src/feature/dircache/consdiffmgr.c \
|
src/feature/dircache/consdiffmgr.c \
|
||||||
src/feature/dircache/dircache.c \
|
src/feature/dircache/dircache.c \
|
||||||
@ -336,6 +337,7 @@ noinst_HEADERS += \
|
|||||||
src/feature/dirauth/authmode.h \
|
src/feature/dirauth/authmode.h \
|
||||||
src/feature/dirauth/bridgeauth.h \
|
src/feature/dirauth/bridgeauth.h \
|
||||||
src/feature/dirauth/bwauth.h \
|
src/feature/dirauth/bwauth.h \
|
||||||
|
src/feature/dirauth/dirauth_config.h \
|
||||||
src/feature/dirauth/dirauth_periodic.h \
|
src/feature/dirauth/dirauth_periodic.h \
|
||||||
src/feature/dirauth/dirauth_sys.h \
|
src/feature/dirauth/dirauth_sys.h \
|
||||||
src/feature/dirauth/dircollate.h \
|
src/feature/dirauth/dircollate.h \
|
||||||
|
|||||||
332
src/feature/dirauth/dirauth_config.c
Normal file
332
src/feature/dirauth/dirauth_config.c
Normal file
@ -0,0 +1,332 @@
|
|||||||
|
/* Copyright (c) 2001 Matej Pfajfar.
|
||||||
|
* Copyright (c) 2001-2004, Roger Dingledine.
|
||||||
|
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
|
||||||
|
* Copyright (c) 2007-2019, The Tor Project, Inc. */
|
||||||
|
/* See LICENSE for licensing information */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @file dirauth_config.c
|
||||||
|
* @brief Code to interpret the user's configuration of Tor's directory
|
||||||
|
* authority module.
|
||||||
|
**/
|
||||||
|
|
||||||
|
#include "orconfig.h"
|
||||||
|
#include "feature/dirauth/dirauth_config.h"
|
||||||
|
|
||||||
|
#include "lib/encoding/confline.h"
|
||||||
|
#include "lib/confmgt/confmgt.h"
|
||||||
|
|
||||||
|
/* Required for dirinfo_type_t in or_options_t */
|
||||||
|
#include "core/or/or.h"
|
||||||
|
#include "app/config/config.h"
|
||||||
|
|
||||||
|
#include "feature/dircommon/voting_schedule.h"
|
||||||
|
|
||||||
|
#include "feature/dirauth/authmode.h"
|
||||||
|
#include "feature/dirauth/bwauth.h"
|
||||||
|
#include "feature/dirauth/dirauth_periodic.h"
|
||||||
|
#include "feature/dirauth/dirvote.h"
|
||||||
|
#include "feature/dirauth/guardfraction.h"
|
||||||
|
|
||||||
|
/* Copied from config.c, we will refactor later in 29211. */
|
||||||
|
#define REJECT(arg) \
|
||||||
|
STMT_BEGIN *msg = tor_strdup(arg); return -1; STMT_END
|
||||||
|
#if defined(__GNUC__) && __GNUC__ <= 3
|
||||||
|
#define COMPLAIN(args...) \
|
||||||
|
STMT_BEGIN log_warn(LD_CONFIG, args); STMT_END
|
||||||
|
#else
|
||||||
|
#define COMPLAIN(args, ...) \
|
||||||
|
STMT_BEGIN log_warn(LD_CONFIG, args, ##__VA_ARGS__); STMT_END
|
||||||
|
#endif /* defined(__GNUC__) && __GNUC__ <= 3 */
|
||||||
|
|
||||||
|
#define YES_IF_CHANGED_INT(opt) \
|
||||||
|
if (!CFG_EQ_INT(old_options, new_options, opt)) return 1;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Legacy validation/normalization function for the dirauth mode options in
|
||||||
|
* options. Uses old_options as the previous options.
|
||||||
|
*
|
||||||
|
* Returns 0 on success, returns -1 and sets *msg to a newly allocated string
|
||||||
|
* on error.
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
options_validate_dirauth_mode(const or_options_t *old_options,
|
||||||
|
or_options_t *options,
|
||||||
|
char **msg)
|
||||||
|
{
|
||||||
|
if (BUG(!options))
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
if (BUG(!msg))
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
if (options->AuthoritativeDir) {
|
||||||
|
if (!options->ContactInfo && !options->TestingTorNetwork)
|
||||||
|
REJECT("Authoritative directory servers must set ContactInfo");
|
||||||
|
if (!options->RecommendedClientVersions)
|
||||||
|
options->RecommendedClientVersions =
|
||||||
|
config_lines_dup(options->RecommendedVersions);
|
||||||
|
if (!options->RecommendedServerVersions)
|
||||||
|
options->RecommendedServerVersions =
|
||||||
|
config_lines_dup(options->RecommendedVersions);
|
||||||
|
if (options->VersioningAuthoritativeDir &&
|
||||||
|
(!options->RecommendedClientVersions ||
|
||||||
|
!options->RecommendedServerVersions))
|
||||||
|
REJECT("Versioning authoritative dir servers must set "
|
||||||
|
"Recommended*Versions.");
|
||||||
|
|
||||||
|
#ifdef HAVE_MODULE_DIRAUTH
|
||||||
|
char *t;
|
||||||
|
/* Call these functions to produce warnings only. */
|
||||||
|
t = format_recommended_version_list(options->RecommendedClientVersions, 1);
|
||||||
|
tor_free(t);
|
||||||
|
t = format_recommended_version_list(options->RecommendedServerVersions, 1);
|
||||||
|
tor_free(t);
|
||||||
|
#endif /* defined(HAVE_MODULE_DIRAUTH) */
|
||||||
|
|
||||||
|
if (options->UseEntryGuards) {
|
||||||
|
log_info(LD_CONFIG, "Authoritative directory servers can't set "
|
||||||
|
"UseEntryGuards. Disabling.");
|
||||||
|
options->UseEntryGuards = 0;
|
||||||
|
}
|
||||||
|
if (!options->DownloadExtraInfo && authdir_mode_v3(options)) {
|
||||||
|
log_info(LD_CONFIG, "Authoritative directories always try to download "
|
||||||
|
"extra-info documents. Setting DownloadExtraInfo.");
|
||||||
|
options->DownloadExtraInfo = 1;
|
||||||
|
}
|
||||||
|
if (!(options->BridgeAuthoritativeDir ||
|
||||||
|
options->V3AuthoritativeDir))
|
||||||
|
REJECT("AuthoritativeDir is set, but none of "
|
||||||
|
"(Bridge/V3)AuthoritativeDir is set.");
|
||||||
|
#ifdef HAVE_MODULE_DIRAUTH
|
||||||
|
/* If we have a v3bandwidthsfile and it's broken, complain on startup */
|
||||||
|
if (options->V3BandwidthsFile && !old_options) {
|
||||||
|
dirserv_read_measured_bandwidths(options->V3BandwidthsFile, NULL, NULL,
|
||||||
|
NULL);
|
||||||
|
}
|
||||||
|
/* same for guardfraction file */
|
||||||
|
if (options->GuardfractionFile && !old_options) {
|
||||||
|
dirserv_read_guardfraction_file(options->GuardfractionFile, NULL);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
(void)old_options;
|
||||||
|
#endif /* defined(HAVE_MODULE_DIRAUTH) */
|
||||||
|
}
|
||||||
|
|
||||||
|
if (options->AuthoritativeDir && !options->DirPort_set)
|
||||||
|
REJECT("Running as authoritative directory, but no DirPort set.");
|
||||||
|
|
||||||
|
if (options->AuthoritativeDir && !options->ORPort_set)
|
||||||
|
REJECT("Running as authoritative directory, but no ORPort set.");
|
||||||
|
|
||||||
|
if (options->AuthoritativeDir && options->ClientOnly)
|
||||||
|
REJECT("Running as authoritative directory, but ClientOnly also set.");
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Legacy validation/normalization function for the dirauth schedule options
|
||||||
|
* in options. Uses old_options as the previous options.
|
||||||
|
*
|
||||||
|
* Returns 0 on success, returns -1 and sets *msg to a newly allocated string
|
||||||
|
* on error.
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
options_validate_dirauth_schedule(const or_options_t *old_options,
|
||||||
|
or_options_t *options,
|
||||||
|
char **msg)
|
||||||
|
{
|
||||||
|
(void)old_options;
|
||||||
|
|
||||||
|
if (BUG(!options))
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
if (BUG(!msg))
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
if (options->V3AuthVoteDelay + options->V3AuthDistDelay >=
|
||||||
|
options->V3AuthVotingInterval/2) {
|
||||||
|
/*
|
||||||
|
This doesn't work, but it seems like it should:
|
||||||
|
what code is preventing the interval being less than twice the lead-up?
|
||||||
|
if (options->TestingTorNetwork) {
|
||||||
|
if (options->V3AuthVoteDelay + options->V3AuthDistDelay >=
|
||||||
|
options->V3AuthVotingInterval) {
|
||||||
|
REJECT("V3AuthVoteDelay plus V3AuthDistDelay must be less than "
|
||||||
|
"V3AuthVotingInterval");
|
||||||
|
} else {
|
||||||
|
COMPLAIN("V3AuthVoteDelay plus V3AuthDistDelay is more than half "
|
||||||
|
"V3AuthVotingInterval. This may lead to "
|
||||||
|
"consensus instability, particularly if clocks drift.");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
*/
|
||||||
|
REJECT("V3AuthVoteDelay plus V3AuthDistDelay must be less than half "
|
||||||
|
"V3AuthVotingInterval");
|
||||||
|
/*
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
|
||||||
|
if (options->V3AuthVoteDelay < MIN_VOTE_SECONDS) {
|
||||||
|
if (options->TestingTorNetwork) {
|
||||||
|
if (options->V3AuthVoteDelay < MIN_VOTE_SECONDS_TESTING) {
|
||||||
|
REJECT("V3AuthVoteDelay is way too low.");
|
||||||
|
} else {
|
||||||
|
COMPLAIN("V3AuthVoteDelay is very low. "
|
||||||
|
"This may lead to failure to vote for a consensus.");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
REJECT("V3AuthVoteDelay is way too low.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (options->V3AuthDistDelay < MIN_DIST_SECONDS) {
|
||||||
|
if (options->TestingTorNetwork) {
|
||||||
|
if (options->V3AuthDistDelay < MIN_DIST_SECONDS_TESTING) {
|
||||||
|
REJECT("V3AuthDistDelay is way too low.");
|
||||||
|
} else {
|
||||||
|
COMPLAIN("V3AuthDistDelay is very low. "
|
||||||
|
"This may lead to missing votes in a consensus.");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
REJECT("V3AuthDistDelay is way too low.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (options->V3AuthNIntervalsValid < 2)
|
||||||
|
REJECT("V3AuthNIntervalsValid must be at least 2.");
|
||||||
|
|
||||||
|
if (options->V3AuthVotingInterval < MIN_VOTE_INTERVAL) {
|
||||||
|
if (options->TestingTorNetwork) {
|
||||||
|
if (options->V3AuthVotingInterval < MIN_VOTE_INTERVAL_TESTING) {
|
||||||
|
REJECT("V3AuthVotingInterval is insanely low.");
|
||||||
|
} else {
|
||||||
|
COMPLAIN("V3AuthVotingInterval is very low. "
|
||||||
|
"This may lead to failure to synchronise for a consensus.");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
REJECT("V3AuthVotingInterval is insanely low.");
|
||||||
|
}
|
||||||
|
} else if (options->V3AuthVotingInterval > 24*60*60) {
|
||||||
|
REJECT("V3AuthVotingInterval is insanely high.");
|
||||||
|
} else if (((24*60*60) % options->V3AuthVotingInterval) != 0) {
|
||||||
|
COMPLAIN("V3AuthVotingInterval does not divide evenly into 24 hours.");
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Legacy validation/normalization function for the dirauth testing options
|
||||||
|
* in options. Uses old_options as the previous options.
|
||||||
|
*
|
||||||
|
* Returns 0 on success, returns -1 and sets *msg to a newly allocated string
|
||||||
|
* on error.
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
options_validate_dirauth_testing(const or_options_t *old_options,
|
||||||
|
or_options_t *options,
|
||||||
|
char **msg)
|
||||||
|
{
|
||||||
|
(void)old_options;
|
||||||
|
|
||||||
|
if (BUG(!options))
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
if (BUG(!msg))
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
if (options->TestingV3AuthInitialVotingInterval
|
||||||
|
< MIN_VOTE_INTERVAL_TESTING_INITIAL) {
|
||||||
|
REJECT("TestingV3AuthInitialVotingInterval is insanely low.");
|
||||||
|
} else if (((30*60) % options->TestingV3AuthInitialVotingInterval) != 0) {
|
||||||
|
REJECT("TestingV3AuthInitialVotingInterval does not divide evenly into "
|
||||||
|
"30 minutes.");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (options->TestingV3AuthInitialVoteDelay < MIN_VOTE_SECONDS_TESTING) {
|
||||||
|
REJECT("TestingV3AuthInitialVoteDelay is way too low.");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (options->TestingV3AuthInitialDistDelay < MIN_DIST_SECONDS_TESTING) {
|
||||||
|
REJECT("TestingV3AuthInitialDistDelay is way too low.");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (options->TestingV3AuthInitialVoteDelay +
|
||||||
|
options->TestingV3AuthInitialDistDelay >=
|
||||||
|
options->TestingV3AuthInitialVotingInterval) {
|
||||||
|
REJECT("TestingV3AuthInitialVoteDelay plus TestingV3AuthInitialDistDelay "
|
||||||
|
"must be less than TestingV3AuthInitialVotingInterval");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (options->TestingV3AuthVotingStartOffset >
|
||||||
|
MIN(options->TestingV3AuthInitialVotingInterval,
|
||||||
|
options->V3AuthVotingInterval)) {
|
||||||
|
REJECT("TestingV3AuthVotingStartOffset is higher than the voting "
|
||||||
|
"interval.");
|
||||||
|
} else if (options->TestingV3AuthVotingStartOffset < 0) {
|
||||||
|
REJECT("TestingV3AuthVotingStartOffset must be non-negative.");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (options->TestingAuthDirTimeToLearnReachability < 0) {
|
||||||
|
REJECT("TestingAuthDirTimeToLearnReachability must be non-negative.");
|
||||||
|
} else if (options->TestingAuthDirTimeToLearnReachability > 2*60*60) {
|
||||||
|
COMPLAIN("TestingAuthDirTimeToLearnReachability is insanely high.");
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return true if changing the configuration from <b>old</b> to <b>new</b>
|
||||||
|
* affects the timing of the voting subsystem
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
options_transition_affects_dirauth_timing(const or_options_t *old_options,
|
||||||
|
const or_options_t *new_options)
|
||||||
|
{
|
||||||
|
tor_assert(old_options);
|
||||||
|
tor_assert(new_options);
|
||||||
|
|
||||||
|
if (authdir_mode_v3(old_options) != authdir_mode_v3(new_options))
|
||||||
|
return 1;
|
||||||
|
if (! authdir_mode_v3(new_options))
|
||||||
|
return 0;
|
||||||
|
YES_IF_CHANGED_INT(V3AuthVotingInterval);
|
||||||
|
YES_IF_CHANGED_INT(V3AuthVoteDelay);
|
||||||
|
YES_IF_CHANGED_INT(V3AuthDistDelay);
|
||||||
|
YES_IF_CHANGED_INT(TestingV3AuthInitialVotingInterval);
|
||||||
|
YES_IF_CHANGED_INT(TestingV3AuthInitialVoteDelay);
|
||||||
|
YES_IF_CHANGED_INT(TestingV3AuthInitialDistDelay);
|
||||||
|
YES_IF_CHANGED_INT(TestingV3AuthVotingStartOffset);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Fetch the active option list, and take dirauth actions based on it. All of
|
||||||
|
* the things we do should survive being done repeatedly. If present,
|
||||||
|
* <b>old_options</b> contains the previous value of the options.
|
||||||
|
*
|
||||||
|
* Return 0 if all goes well, return -1 if it's time to die.
|
||||||
|
*
|
||||||
|
* Note: We haven't moved all the "act on new configuration" logic
|
||||||
|
* into the options_act* functions yet. Some is still in do_hup() and other
|
||||||
|
* places.
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
options_act_dirauth(const or_options_t *old_options)
|
||||||
|
{
|
||||||
|
const or_options_t *options = get_options();
|
||||||
|
|
||||||
|
/* We may need to reschedule some dirauth stuff if our status changed. */
|
||||||
|
if (old_options) {
|
||||||
|
if (options_transition_affects_dirauth_timing(old_options, options)) {
|
||||||
|
voting_schedule_recalculate_timing(options, time(NULL));
|
||||||
|
reschedule_dirvote(options);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
35
src/feature/dirauth/dirauth_config.h
Normal file
35
src/feature/dirauth/dirauth_config.h
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
/* Copyright (c) 2001 Matej Pfajfar.
|
||||||
|
* Copyright (c) 2001-2004, Roger Dingledine.
|
||||||
|
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
|
||||||
|
* Copyright (c) 2007-2019, The Tor Project, Inc. */
|
||||||
|
/* See LICENSE for licensing information */
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @file dirauth_config.h
|
||||||
|
* @brief Header for feature/dirauth/dirauth_config.c
|
||||||
|
**/
|
||||||
|
|
||||||
|
#ifndef TOR_FEATURE_DIRAUTH_DIRAUTH_CONFIG_H
|
||||||
|
#define TOR_FEATURE_DIRAUTH_DIRAUTH_CONFIG_H
|
||||||
|
|
||||||
|
typedef struct or_options_t or_options_t;
|
||||||
|
|
||||||
|
int options_validate_dirauth_mode(const or_options_t *old_options,
|
||||||
|
or_options_t *options,
|
||||||
|
char **msg);
|
||||||
|
|
||||||
|
int options_validate_dirauth_schedule(const or_options_t *old_options,
|
||||||
|
or_options_t *options,
|
||||||
|
char **msg);
|
||||||
|
|
||||||
|
int options_validate_dirauth_testing(const or_options_t *old_options,
|
||||||
|
or_options_t *options,
|
||||||
|
char **msg);
|
||||||
|
|
||||||
|
int options_transition_affects_dirauth_timing(
|
||||||
|
const or_options_t *old_options,
|
||||||
|
const or_options_t *new_options);
|
||||||
|
|
||||||
|
int options_act_dirauth(const or_options_t *old_options);
|
||||||
|
|
||||||
|
#endif /* !defined(TOR_FEATURE_DIRAUTH_DIRAUTH_CONFIG_H) */
|
||||||
Loading…
Reference in New Issue
Block a user