bwauth: Allow "node_id" KeyValue without "$"

Allow "node_id" KeyValue without the dollar sign at the start of the
hexdigit in the BandwidthFiles, in order to easier database queries
combining Tor documents in which the relays fingerprint doesn't
include it.
Bugfix on all supported versions of Tor.

Closes #40891
This commit is contained in:
juga
2023-11-18 17:45:28 +00:00
committed by David Goulet
parent 8bb7d681ae
commit d8aa699253
3 changed files with 14 additions and 4 deletions
+2 -1
View File
@@ -2072,6 +2072,8 @@ test_dir_measured_bw_kb(void *arg)
int i;
const char *lines_pass[] = {
"node_id=$557365204145532d32353620696e73746561642e bw=1024\n",
/* check whether node_id does not need the dollar sign at the start */
"node_id=557365204145532d32353620696e73746561642e bw=1024\n",
"node_id=$557365204145532d32353620696e73746561642e\t bw=1024 \n",
" node_id=$557365204145532d32353620696e73746561642e bw=1024\n",
"\tnoise\tnode_id=$557365204145532d32353620696e73746561642e "
@@ -2129,7 +2131,6 @@ test_dir_measured_bw_kb(void *arg)
" node_id= ",
"node_id==$557365204145532d32353620696e73746561642e bw==1024\n",
"node_id=$55736520414552d32353620696e73746561642e bw=1024\n",
"node_id=557365204145532d32353620696e73746561642e bw=1024\n",
"node_id= $557365204145532d32353620696e73746561642e bw=0.23\n",
/* Test that a line with vote=0 will fail too, so that it is ignored. */