mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
Prevent bridges from publishing router descriptors.
Bridges are not supposed to publish router descriptors to the directory authorities. It defeats the point of bridges when they are included in the public relay directory. This patch puts out a warning and exits when the node is configured as a bridge and to publish v1, v2, or v3 descriptors at the same time. Also fixes part of bug 932.
This commit is contained in:
parent
fc091e8a96
commit
9e97067b2f
@ -3238,6 +3238,15 @@ options_validate(or_options_t *old_options, or_options_t *options,
|
||||
return -1;
|
||||
}
|
||||
|
||||
if ((options->BridgeRelay
|
||||
|| options->_PublishServerDescriptor & BRIDGE_AUTHORITY)
|
||||
&& options->_PublishServerDescriptor
|
||||
& (V1_AUTHORITY + V2_AUTHORITY + V3_AUTHORITY)) {
|
||||
REJECT("Bridges are not supposed to publish router descriptors to the "
|
||||
"directory authorities. Please correct your "
|
||||
"PublishServerDescriptor line.");
|
||||
}
|
||||
|
||||
if (options->MinUptimeHidServDirectoryV2 < 0) {
|
||||
log_warn(LD_CONFIG, "MinUptimeHidServDirectoryV2 option must be at "
|
||||
"least 0 seconds. Changing to 0.");
|
||||
|
Loading…
Reference in New Issue
Block a user