aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2024-06-24 15:03:15 -0400
committerNick Mathewson <nickm@torproject.org>2024-06-26 11:42:36 -0400
commit37f95e8dd2ce877c664b8b34bc4bcc99c6ab3002 (patch)
tree23f774ca3bb1ca80573e78e7a8ff639c33b7357f /src
parent73b73c07e17ae9ff90abdec3752719c6928b9ed0 (diff)
downloadtor-37f95e8dd2ce877c664b8b34bc4bcc99c6ab3002.tar.gz
tor-37f95e8dd2ce877c664b8b34bc4bcc99c6ab3002.zip
process_descs: Authorities require TAP keys for now.
Diffstat (limited to 'src')
-rw-r--r--src/feature/dirauth/process_descs.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c
index 95acb31173..5b76e937ab 100644
--- a/src/feature/dirauth/process_descs.c
+++ b/src/feature/dirauth/process_descs.c
@@ -762,6 +762,16 @@ dirserv_add_descriptor(routerinfo_t *ri, const char **msg, const char *source)
log_info(LD_DIR, "Assessing new descriptor: %s: %s",
ri->nickname, ri->platform);
+ /* For now, TAP keys are still required. */
+ if (! ri->tap_onion_pkey) {
+ log_info(LD_DIRSERV, "Rejecting descriptor from %s (source: %s); "
+ "it has no TAP key.",
+ router_describe(ri), source);
+ *msg = "Missing TAP key in descriptor.";
+ r = ROUTER_AUTHDIR_REJECTS;
+ goto fail;
+ }
+
/* Check whether this descriptor is semantically identical to the last one
* from this server. (We do this here and not in router_add_to_routerlist
* because we want to be able to accept the newest router descriptor that