vincenzopalazzo
/
arti
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tor-netdir: Use `hsdir_index` for hidden service directory hashval 

The hidden services directory hashring is a ring of hsdir relays,
sorted by a hash that the spec calls the "index".  That's `HsDirIndex`.

This was a bad idea because the word "index" is seriously overused,
but in Arti we must use the same terminology.

At least, qualify it everywhere.  Now one of these hsdir sort position
hashes is always, in our code, an `hsdir_index`.

I think this is necessary even inside modules called `hsdir_*`,
because those can deal with other kind of "index" too.
This commit is contained in:
Ian Jackson 2023-03-27 17:16:08 +01:00
parent a746e17c8e
commit 325526a903
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crates/tor-netdir/src/hsdir_ring.rs
View File

@ -65,7 +65,7 @@ pub(crate) struct HsDirRing {
}
/// Compute the [`HsDirIndex`] for a given relay.
pub(crate) fn relay_index(kp_relayid_ed: &Ed25519Identity, params: &HsDirParams) -> HsDirIndex {
pub(crate) fn relay_hsdir_index(kp_relayid_ed: &Ed25519Identity, params: &HsDirParams) -> HsDirIndex {
// rend-spec-v3 2.2.3 "hsdir_index(node)"
//
// hsdir_index(node) = H("node-idx" | node_identity |
@ -85,7 +85,7 @@ pub(crate) fn relay_index(kp_relayid_ed: &Ed25519Identity, params: &HsDirParams)
}
/// Compute the starting [`HsDirIndex`] for a given descriptor replica.
pub(crate) fn service_index(
pub(crate) fn service_hsdir_index(
kp_hs_blind_id: &HsBlindId,
replica: u8,
params: &HsDirParams,
@ -178,7 +178,7 @@ impl HsDirRing {
.get(ed_id)
.cloned()
.cloned()
.unwrap_or_else(|| relay_index(ed_id, &new_params));
.unwrap_or_else(|| relay_hsdir_index(ed_id, &new_params));
(hsdir_index, rsidx)
})
.collect();
@ -192,20 +192,20 @@ impl HsDirRing {
}
}
/// Find the location or (notional) insertion point for `idx` within `ring`.
fn find_pos(&self, idx: HsDirIndex) -> usize {
/// Find the location or (notional) insertion point for `hsdir_index` within `ring`.
fn find_pos(&self, hsdir_index: HsDirIndex) -> usize {
// TODO hs implement this
todo!()
}
/// Yield items from `ring` starting with `idx`, wrapping around once when we
/// Yield items from `ring` starting with `hsdir_index`, wrapping around once when we
/// reach the end, and yielding no element more than once.
pub(crate) fn ring_items_at(
&self,
idx: HsDirIndex,
hsdir_index: HsDirIndex,
) -> impl Iterator<Item = &(HsDirIndex, RouterStatusIdx)> {
let idx = self.find_pos(idx);
self.ring[idx..].iter().chain(&self.ring[..idx])
let pos = self.find_pos(hsdir_index);
self.ring[pos..].iter().chain(&self.ring[..pos])
}
/// Return the time period for which this ring applies.
@ -255,7 +255,7 @@ mod test {
{
let kp_hs_blind_id = [0x42; 32].into();
let replica = 1;
let got = service_index(&kp_hs_blind_id, replica, &params);
let got = service_hsdir_index(&kp_hs_blind_id, replica, &params);
assert_eq!(
hex::encode(got.as_ref()),
"37e5cbbd56a22823714f18f1623ece5983a0d64c78495a8cfab854245e5f9a8a",
@ -265,7 +265,7 @@ mod test {
// relay_index AKA hsdir_index
{
let kp_relayid_ed = [0x42; 32].into();
let got = relay_index(&kp_relayid_ed, &params);
let got = relay_hsdir_index(&kp_relayid_ed, &params);
assert_eq!(
hex::encode(got.as_ref()),
"db475361014a09965e7e5e4d4a25b8f8d4b8f16cb1d8a7e95eed50249cc1a2d5",