iroh_net/discovery.rs
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882
//! Node address discovery.
//!
//! To connect to an iroh-net node a [`NodeAddr`] is needed, which may contain a
//! [`RelayUrl`] or one or more *direct addresses* in addition to the [`NodeId`].
//!
//! Since there is a conversion from [`NodeId`] to [`NodeAddr`], you can also use
//! connect directly with a [`NodeId`].
//!
//! For this to work however, the endpoint has to get the addressing information by
//! other means. This can be done by manually calling [`Endpoint::add_node_addr`],
//! but that still requires knowing the other addressing information.
//!
//! Node discovery is an automated system for an [`Endpoint`] to retrieve this addressing
//! information. Each iroh-net node will automatically publish their own addressing
//! information. Usually this means publishing which [`RelayUrl`] to use for their
//! [`NodeId`], but they could also publish their direct addresses.
//!
//! The [`Discovery`] trait is used to define node discovery. This allows multiple
//! implementations to co-exist because there are many possible ways to implement this.
//! Each [`Endpoint`] can use the discovery mechanisms most suitable to the application.
//! The [`Builder::discovery`] method is used to add a discovery mechanism to an
//! [`Endpoint`].
//!
//! Some generally useful discovery implementations are provided:
//!
//! - The [`DnsDiscovery`] which performs lookups via the standard DNS systems. To publish
//! to this DNS server a [`PkarrPublisher`] is needed. [Number 0] runs a public instance
//! of a [`PkarrPublisher`] with attached DNS server which is globally available and a
//! reliable default choice.
//!
//! - The [`PkarrResolver`] which can perform lookups from designated [pkarr relay servers]
//! using HTTP.
//!
//! - The [`LocalSwarmDiscovery`] discovers iroh-net nodes present on the local network,
//! very similar to mdNS.
//!
//! - The [`DhtDiscovery`] also uses the [`pkarr`] system but can also publish and lookup
//! records to/from the Mainline DHT.
//!
//! To use multiple discovery systems simultaneously use [`ConcurrentDiscovery`] which will
//! perform lookups to all discovery systems at the same time.
//!
//! # Examples
//!
//! A very common setup is to enable DNS discovery, which needs to be done in two parts as a
//! [`PkarrPublisher`] and [`DnsDiscovery`]:
//!
//! ```no_run
//! use iroh_net::discovery::dns::DnsDiscovery;
//! use iroh_net::discovery::pkarr::PkarrPublisher;
//! use iroh_net::discovery::ConcurrentDiscovery;
//! use iroh_net::key::SecretKey;
//! use iroh_net::Endpoint;
//!
//! # async fn wrapper() -> anyhow::Result<()> {
//! let secret_key = SecretKey::generate();
//! let discovery = ConcurrentDiscovery::from_services(vec![
//! Box::new(PkarrPublisher::n0_dns(secret_key.clone())),
//! Box::new(DnsDiscovery::n0_dns()),
//! ]);
//! let ep = Endpoint::builder()
//! .secret_key(secret_key)
//! .discovery(Box::new(discovery))
//! .bind()
//! .await?;
//! # Ok(())
//! # }
//! ```
//!
//! To also enable [`LocalSwarmDiscovery`], it can be added as another service in the
//! [`ConcurrentDiscovery`]:
//!
//! ```no_run
//! # use iroh_net::discovery::dns::DnsDiscovery;
//! # use iroh_net::discovery::local_swarm_discovery::LocalSwarmDiscovery;
//! # use iroh_net::discovery::pkarr::PkarrPublisher;
//! # use iroh_net::discovery::ConcurrentDiscovery;
//! # use iroh_net::key::SecretKey;
//! #
//! # async fn wrapper() -> anyhow::Result<()> {
//! # let secret_key = SecretKey::generate();
//! let discovery = ConcurrentDiscovery::from_services(vec![
//! Box::new(PkarrPublisher::n0_dns(secret_key.clone())),
//! Box::new(DnsDiscovery::n0_dns()),
//! Box::new(LocalSwarmDiscovery::new(secret_key.public())?),
//! ]);
//! # Ok(())
//! # }
//! ```
//!
//! [`RelayUrl`]: crate::relay::RelayUrl
//! [`Builder::discovery`]: crate::endpoint::Builder::discovery
//! [`DnsDiscovery`]: dns::DnsDiscovery
//! [Number 0]: https://n0.computer
//! [`PkarrResolver`]: pkarr::PkarrResolver
//! [`PkarrPublisher`]: pkarr::PkarrPublisher
//! [`LocalSwarmDiscovery`]: local_swarm_discovery::LocalSwarmDiscovery
//! [`DhtDiscovery`]: pkarr::dht::DhtDiscovery
//! [pkarr relay servers]: https://pkarr.org/#servers
use std::time::Duration;
use anyhow::{anyhow, ensure, Result};
use futures_lite::stream::{Boxed as BoxStream, StreamExt};
use iroh_base::node_addr::NodeAddr;
use tokio::{sync::oneshot, task::JoinHandle};
use tracing::{debug, error_span, warn, Instrument};
use crate::{AddrInfo, Endpoint, NodeId};
pub mod dns;
#[cfg(feature = "discovery-local-network")]
#[cfg_attr(iroh_docsrs, doc(cfg(feature = "discovery-local-network")))]
pub mod local_swarm_discovery;
pub mod pkarr;
pub mod static_provider;
/// Node discovery for [`super::Endpoint`].
///
/// This trait defines publishing and resolving addressing information for a [`NodeId`].
/// This enables connecting to other nodes with only knowing the [`NodeId`], by using this
/// [`Discovery`] system to look up the actual addressing information. It is common for
/// implementations to require each node to publish their own information before it can be
/// looked up by other nodes.
///
/// The published addressing information can include both a [`RelayUrl`] and/or direct
/// addresses.
///
/// To allow for discovery, the [`super::Endpoint`] will call `publish` whenever
/// discovery information changes. If a discovery mechanism requires a periodic
/// refresh, it should start its own task.
///
/// [`RelayUrl`]: crate::relay::RelayUrl
pub trait Discovery: std::fmt::Debug + Send + Sync {
/// Publishes the given [`AddrInfo`] to the discovery mechanism.
///
/// This is fire and forget, since the [`Endpoint`] can not wait for successful
/// publishing. If publishing is async, the implementation should start it's own task.
///
/// This will be called from a tokio task, so it is safe to spawn new tasks.
/// These tasks will be run on the runtime of the [`super::Endpoint`].
fn publish(&self, _info: &AddrInfo) {}
/// Resolves the [`AddrInfo`] for the given [`NodeId`].
///
/// Once the returned [`BoxStream`] is dropped, the service should stop any pending
/// work.
fn resolve(
&self,
_endpoint: Endpoint,
_node_id: NodeId,
) -> Option<BoxStream<Result<DiscoveryItem>>> {
None
}
/// Subscribe to all addresses that get *passively* discovered.
///
/// An implementation may choose to defer emitting passively discovered nodes
/// until the stream is actually polled. To avoid missing discovered nodes,
/// poll the stream as soon as possible.
///
/// If you do not regularly poll the stream, you may miss discovered nodes.
///
/// Any discovery systems that only discover when explicitly resolving a
/// specific [`NodeId`] do not need to implement this method. Any nodes or
/// addresses that are discovered by calling `resolve` should NOT be added
/// to the `subscribe` stream.
///
/// Discovery systems that are capable of receiving information about [`NodeId`]s
/// and their [`AddrInfo`]s without explicitly calling `resolve`, i.e.,
/// systems that do "passive" discovery, should implement this method. If
/// `subscribe` is called multiple times, the passively discovered addresses
/// should be sent on all streams.
///
/// The [`crate::endpoint::Endpoint`] will `subscribe` to the discovery system
/// and add the discovered addresses to the internal address book as they arrive
/// on this stream.
fn subscribe(&self) -> Option<BoxStream<DiscoveryItem>> {
None
}
}
/// The results returned from [`Discovery::resolve`].
#[derive(Debug, Clone)]
pub struct DiscoveryItem {
/// The [`NodeId`] whose address we have discovered
pub node_id: NodeId,
/// A static string to identify the discovery source.
///
/// Should be uniform per discovery service.
pub provenance: &'static str,
/// Optional timestamp when this node address info was last updated.
///
/// Must be microseconds since the unix epoch.
// TODO(ramfox): this is currently unused. As we develop more `DiscoveryService`s, we may discover that we do not need this. It is only truly relevant when comparing `relay_urls`, since we can attempt to dial any number of socket addresses, but expect each node to have one "home relay" that we will attempt to contact them on. This means we would need some way to determine which relay url to choose between, if more than one relay url is reported.
pub last_updated: Option<u64>,
/// The address info for the node being resolved.
pub addr_info: AddrInfo,
}
/// A discovery service that combines multiple discovery sources.
///
/// The discovery services will resolve concurrently.
#[derive(Debug, Default)]
pub struct ConcurrentDiscovery {
services: Vec<Box<dyn Discovery>>,
}
impl ConcurrentDiscovery {
/// Creates an empty [`ConcurrentDiscovery`].
pub fn empty() -> Self {
Self::default()
}
/// Creates a new [`ConcurrentDiscovery`].
pub fn from_services(services: Vec<Box<dyn Discovery>>) -> Self {
Self { services }
}
/// Adds a [`Discovery`] service.
pub fn add(&mut self, service: impl Discovery + 'static) {
self.services.push(Box::new(service));
}
}
impl<T> From<T> for ConcurrentDiscovery
where
T: IntoIterator<Item = Box<dyn Discovery>>,
{
fn from(iter: T) -> Self {
let services = iter.into_iter().collect::<Vec<_>>();
Self { services }
}
}
impl Discovery for ConcurrentDiscovery {
fn publish(&self, info: &AddrInfo) {
for service in &self.services {
service.publish(info);
}
}
fn resolve(
&self,
endpoint: Endpoint,
node_id: NodeId,
) -> Option<BoxStream<Result<DiscoveryItem>>> {
let streams = self
.services
.iter()
.filter_map(|service| service.resolve(endpoint.clone(), node_id));
let streams = futures_buffered::MergeBounded::from_iter(streams);
Some(Box::pin(streams))
}
fn subscribe(&self) -> Option<BoxStream<DiscoveryItem>> {
let mut streams = vec![];
for service in self.services.iter() {
if let Some(stream) = service.subscribe() {
streams.push(stream)
}
}
let streams = futures_buffered::MergeBounded::from_iter(streams);
Some(Box::pin(streams))
}
}
/// Maximum duration since the last control or data message received from an endpoint to make us
/// start a discovery task.
const MAX_AGE: Duration = Duration::from_secs(10);
/// A wrapper around a tokio task which runs a node discovery.
pub(super) struct DiscoveryTask {
on_first_rx: oneshot::Receiver<Result<()>>,
task: JoinHandle<()>,
}
impl DiscoveryTask {
/// Starts a discovery task.
pub(super) fn start(ep: Endpoint, node_id: NodeId) -> Result<Self> {
ensure!(ep.discovery().is_some(), "No discovery services configured");
let (on_first_tx, on_first_rx) = oneshot::channel();
let me = ep.node_id();
let task = tokio::task::spawn(
async move { Self::run(ep, node_id, on_first_tx).await }.instrument(
error_span!("discovery", me = %me.fmt_short(), node = %node_id.fmt_short()),
),
);
Ok(Self { task, on_first_rx })
}
/// Starts a discovery task after a delay and only if no path to the node was recently active.
///
/// This returns `None` if we received data or control messages from the remote endpoint
/// recently enough. If not it returns a [`DiscoveryTask`].
///
/// If `delay` is set, the [`DiscoveryTask`] will first wait for `delay` and then check again
/// if we recently received messages from remote endpoint. If true, the task will abort.
/// Otherwise, or if no `delay` is set, the discovery will be started.
pub(super) fn maybe_start_after_delay(
ep: &Endpoint,
node_id: NodeId,
delay: Option<Duration>,
) -> Result<Option<Self>> {
// If discovery is not needed, don't even spawn a task.
if !Self::needs_discovery(ep, node_id) {
return Ok(None);
}
ensure!(ep.discovery().is_some(), "No discovery services configured");
let (on_first_tx, on_first_rx) = oneshot::channel();
let ep = ep.clone();
let me = ep.node_id();
let task = tokio::task::spawn(
async move {
// If delay is set, wait and recheck if discovery is needed. If not, early-exit.
if let Some(delay) = delay {
tokio::time::sleep(delay).await;
if !Self::needs_discovery(&ep, node_id) {
debug!("no discovery needed, abort");
on_first_tx.send(Ok(())).ok();
return;
}
}
Self::run(ep, node_id, on_first_tx).await
}
.instrument(
error_span!("discovery", me = %me.fmt_short(), node = %node_id.fmt_short()),
),
);
Ok(Some(Self { task, on_first_rx }))
}
/// Waits until the discovery task produced at least one result.
pub(super) async fn first_arrived(&mut self) -> Result<()> {
let fut = &mut self.on_first_rx;
fut.await??;
Ok(())
}
/// Cancels the discovery task.
pub(super) fn cancel(&self) {
self.task.abort();
}
fn create_stream(ep: &Endpoint, node_id: NodeId) -> Result<BoxStream<Result<DiscoveryItem>>> {
let discovery = ep
.discovery()
.ok_or_else(|| anyhow!("No discovery service configured"))?;
let stream = discovery
.resolve(ep.clone(), node_id)
.ok_or_else(|| anyhow!("No discovery service can resolve node {node_id}",))?;
Ok(stream)
}
/// We need discovery if we have no paths to the node, or if the paths we do have
/// have timed out.
fn needs_discovery(ep: &Endpoint, node_id: NodeId) -> bool {
match ep.remote_info(node_id) {
// No info means no path to node -> start discovery.
None => true,
Some(info) => {
match (
info.last_received(),
info.relay_url.as_ref().and_then(|r| r.last_alive),
) {
// No path to node -> start discovery.
(None, None) => true,
// If we haven't received on direct addresses or the relay for MAX_AGE,
// start discovery.
(Some(elapsed), Some(elapsed_relay)) => {
elapsed > MAX_AGE && elapsed_relay > MAX_AGE
}
(Some(elapsed), _) | (_, Some(elapsed)) => elapsed > MAX_AGE,
}
}
}
}
async fn run(ep: Endpoint, node_id: NodeId, on_first_tx: oneshot::Sender<Result<()>>) {
let mut stream = match Self::create_stream(&ep, node_id) {
Ok(stream) => stream,
Err(err) => {
on_first_tx.send(Err(err)).ok();
return;
}
};
let mut on_first_tx = Some(on_first_tx);
debug!("discovery: start");
loop {
let next = tokio::select! {
_ = ep.cancelled() => break,
next = stream.next() => next
};
match next {
Some(Ok(r)) => {
if r.addr_info.is_empty() {
debug!(provenance = %r.provenance, addr = ?r.addr_info, "discovery: empty address found");
continue;
}
debug!(provenance = %r.provenance, addr = ?r.addr_info, "discovery: new address found");
let addr = NodeAddr {
info: r.addr_info,
node_id,
};
ep.add_node_addr_with_source(addr, r.provenance).ok();
if let Some(tx) = on_first_tx.take() {
tx.send(Ok(())).ok();
}
}
Some(Err(err)) => {
warn!(?err, "discovery service produced error");
break;
}
None => break,
}
}
if let Some(tx) = on_first_tx.take() {
let err = anyhow!("Discovery produced no results for {}", node_id.fmt_short());
tx.send(Err(err)).ok();
}
}
}
impl Drop for DiscoveryTask {
fn drop(&mut self) {
self.task.abort();
}
}
#[cfg(test)]
mod tests {
use std::{
collections::{BTreeSet, HashMap},
net::SocketAddr,
sync::Arc,
time::SystemTime,
};
use parking_lot::Mutex;
use rand::Rng;
use tokio_util::task::AbortOnDropHandle;
use super::*;
use crate::{key::SecretKey, relay::RelayMode};
#[derive(Debug, Clone, Default)]
struct TestDiscoveryShared {
nodes: Arc<Mutex<HashMap<NodeId, (AddrInfo, u64)>>>,
}
impl TestDiscoveryShared {
pub fn create_discovery(&self, node_id: NodeId) -> TestDiscovery {
TestDiscovery {
node_id,
shared: self.clone(),
publish: true,
resolve_wrong: false,
delay: Duration::from_millis(200),
}
}
pub fn create_lying_discovery(&self, node_id: NodeId) -> TestDiscovery {
TestDiscovery {
node_id,
shared: self.clone(),
publish: false,
resolve_wrong: true,
delay: Duration::from_millis(100),
}
}
}
#[derive(Debug)]
struct TestDiscovery {
node_id: NodeId,
shared: TestDiscoveryShared,
publish: bool,
resolve_wrong: bool,
delay: Duration,
}
impl Discovery for TestDiscovery {
fn publish(&self, info: &AddrInfo) {
if !self.publish {
return;
}
let now = system_time_now();
self.shared
.nodes
.lock()
.insert(self.node_id, (info.clone(), now));
}
fn resolve(
&self,
endpoint: Endpoint,
node_id: NodeId,
) -> Option<BoxStream<Result<DiscoveryItem>>> {
let addr_info = match self.resolve_wrong {
false => self.shared.nodes.lock().get(&node_id).cloned(),
true => {
let ts = system_time_now() - 100_000;
let port: u16 = rand::thread_rng().gen_range(10_000..20_000);
// "240.0.0.0/4" is reserved and unreachable
let addr: SocketAddr = format!("240.0.0.1:{port}").parse().unwrap();
let addr_info = AddrInfo {
relay_url: None,
direct_addresses: BTreeSet::from([addr]),
};
Some((addr_info, ts))
}
};
let stream = match addr_info {
Some((addr_info, ts)) => {
let item = DiscoveryItem {
node_id,
provenance: "test-disco",
last_updated: Some(ts),
addr_info,
};
let delay = self.delay;
let fut = async move {
tokio::time::sleep(delay).await;
tracing::debug!(
"resolve on {}: {} = {item:?}",
endpoint.node_id().fmt_short(),
node_id.fmt_short()
);
Ok(item)
};
futures_lite::stream::once_future(fut).boxed()
}
None => futures_lite::stream::empty().boxed(),
};
Some(stream)
}
}
#[derive(Debug)]
struct EmptyDiscovery;
impl Discovery for EmptyDiscovery {
fn publish(&self, _info: &AddrInfo) {}
fn resolve(
&self,
_endpoint: Endpoint,
_node_id: NodeId,
) -> Option<BoxStream<Result<DiscoveryItem>>> {
Some(futures_lite::stream::empty().boxed())
}
}
const TEST_ALPN: &[u8] = b"n0/iroh/test";
/// This is a smoke test for our discovery mechanism.
#[tokio::test]
async fn endpoint_discovery_simple_shared() -> anyhow::Result<()> {
let _guard = iroh_test::logging::setup();
let disco_shared = TestDiscoveryShared::default();
let (ep1, _guard1) = {
let secret = SecretKey::generate();
let disco = disco_shared.create_discovery(secret.public());
new_endpoint(secret, disco).await
};
let (ep2, _guard2) = {
let secret = SecretKey::generate();
let disco = disco_shared.create_discovery(secret.public());
new_endpoint(secret, disco).await
};
let ep1_addr = NodeAddr::new(ep1.node_id());
// wait for out address to be updated and thus published at least once
ep1.node_addr().await?;
let _conn = ep2.connect(ep1_addr, TEST_ALPN).await?;
Ok(())
}
/// This test adds an empty discovery which provides no addresses.
#[tokio::test]
async fn endpoint_discovery_combined_with_empty() -> anyhow::Result<()> {
let _guard = iroh_test::logging::setup();
let disco_shared = TestDiscoveryShared::default();
let (ep1, _guard1) = {
let secret = SecretKey::generate();
let disco = disco_shared.create_discovery(secret.public());
new_endpoint(secret, disco).await
};
let (ep2, _guard2) = {
let secret = SecretKey::generate();
let disco1 = EmptyDiscovery;
let disco2 = disco_shared.create_discovery(secret.public());
let mut disco = ConcurrentDiscovery::empty();
disco.add(disco1);
disco.add(disco2);
new_endpoint(secret, disco).await
};
let ep1_addr = NodeAddr::new(ep1.node_id());
// wait for out address to be updated and thus published at least once
ep1.node_addr().await?;
let _conn = ep2.connect(ep1_addr, TEST_ALPN).await?;
Ok(())
}
/// This test adds a "lying" discovery which provides a wrong address.
/// This is to make sure that as long as one of the discoveries returns a working address, we
/// will connect successfully.
#[tokio::test]
async fn endpoint_discovery_combined_with_empty_and_wrong() -> anyhow::Result<()> {
let _guard = iroh_test::logging::setup();
let disco_shared = TestDiscoveryShared::default();
let (ep1, _guard1) = {
let secret = SecretKey::generate();
let disco = disco_shared.create_discovery(secret.public());
new_endpoint(secret, disco).await
};
let (ep2, _guard2) = {
let secret = SecretKey::generate();
let disco1 = EmptyDiscovery;
let disco2 = disco_shared.create_lying_discovery(secret.public());
let disco3 = disco_shared.create_discovery(secret.public());
let mut disco = ConcurrentDiscovery::empty();
disco.add(disco1);
disco.add(disco2);
disco.add(disco3);
new_endpoint(secret, disco).await
};
let ep1_addr = NodeAddr::new(ep1.node_id());
// wait for out address to be updated and thus published at least once
ep1.node_addr().await?;
let _conn = ep2.connect(ep1_addr, TEST_ALPN).await?;
Ok(())
}
/// This test only has the "lying" discovery. It is here to make sure that this actually fails.
#[tokio::test]
async fn endpoint_discovery_combined_wrong_only() -> anyhow::Result<()> {
let _guard = iroh_test::logging::setup();
let disco_shared = TestDiscoveryShared::default();
let (ep1, _guard1) = {
let secret = SecretKey::generate();
let disco = disco_shared.create_discovery(secret.public());
new_endpoint(secret, disco).await
};
let (ep2, _guard2) = {
let secret = SecretKey::generate();
let disco1 = disco_shared.create_lying_discovery(secret.public());
let disco = ConcurrentDiscovery::from_services(vec![Box::new(disco1)]);
new_endpoint(secret, disco).await
};
let ep1_addr = NodeAddr::new(ep1.node_id());
// wait for out address to be updated and thus published at least once
ep1.node_addr().await?;
let res = ep2.connect(ep1_addr, TEST_ALPN).await;
assert!(res.is_err());
Ok(())
}
/// This test first adds a wrong address manually (e.g. from an outdated&node_id ticket).
/// Connect should still succeed because the discovery service will be invoked (after a delay).
#[tokio::test]
async fn endpoint_discovery_with_wrong_existing_addr() -> anyhow::Result<()> {
let _guard = iroh_test::logging::setup();
let disco_shared = TestDiscoveryShared::default();
let (ep1, _guard1) = {
let secret = SecretKey::generate();
let disco = disco_shared.create_discovery(secret.public());
new_endpoint(secret, disco).await
};
let (ep2, _guard2) = {
let secret = SecretKey::generate();
let disco = disco_shared.create_discovery(secret.public());
new_endpoint(secret, disco).await
};
// wait for out address to be updated and thus published at least once
ep1.node_addr().await?;
let ep1_wrong_addr = NodeAddr {
node_id: ep1.node_id(),
info: AddrInfo {
relay_url: None,
direct_addresses: BTreeSet::from(["240.0.0.1:1000".parse().unwrap()]),
},
};
let _conn = ep2.connect(ep1_wrong_addr, TEST_ALPN).await?;
Ok(())
}
async fn new_endpoint(
secret: SecretKey,
disco: impl Discovery + 'static,
) -> (Endpoint, AbortOnDropHandle<anyhow::Result<()>>) {
let ep = Endpoint::builder()
.secret_key(secret)
.discovery(Box::new(disco))
.relay_mode(RelayMode::Disabled)
.alpns(vec![TEST_ALPN.to_vec()])
.bind()
.await
.unwrap();
let handle = tokio::spawn({
let ep = ep.clone();
async move {
// we skip accept() errors, they can be caused by retransmits
while let Some(connecting) = ep.accept().await.and_then(|inc| inc.accept().ok()) {
let _conn = connecting.await?;
// Just accept incoming connections, but don't do anything with them.
}
anyhow::Ok(())
}
});
(ep, AbortOnDropHandle::new(handle))
}
fn system_time_now() -> u64 {
SystemTime::now()
.duration_since(SystemTime::UNIX_EPOCH)
.expect("time drift")
.as_micros() as u64
}
}
/// This module contains end-to-end tests for DNS node discovery.
///
/// The tests run a minimal test DNS server to resolve against, and a minimal pkarr relay to
/// publish to. The DNS and pkarr servers share their state.
#[cfg(test)]
mod test_dns_pkarr {
use std::time::Duration;
use anyhow::Result;
use iroh_base::key::SecretKey;
use tokio_util::task::AbortOnDropHandle;
use crate::{
discovery::pkarr::PkarrPublisher,
dns::{node_info::NodeInfo, ResolverExt},
relay::{RelayMap, RelayMode},
test_utils::{
dns_server::{create_dns_resolver, run_dns_server},
pkarr_dns_state::State,
run_relay_server, DnsPkarrServer,
},
AddrInfo, Endpoint, NodeAddr,
};
const PUBLISH_TIMEOUT: Duration = Duration::from_secs(10);
#[tokio::test]
async fn dns_resolve() -> Result<()> {
let _logging_guard = iroh_test::logging::setup();
let origin = "testdns.example".to_string();
let state = State::new(origin.clone());
let (nameserver, _dns_drop_guard) = run_dns_server(state.clone()).await?;
let secret_key = SecretKey::generate();
let node_info = NodeInfo::new(
secret_key.public(),
Some("https://relay.example".parse().unwrap()),
Default::default(),
);
let signed_packet = node_info.to_pkarr_signed_packet(&secret_key, 30)?;
state.upsert(signed_packet)?;
let resolver = create_dns_resolver(nameserver)?;
let resolved = resolver.lookup_by_id(&node_info.node_id, &origin).await?;
assert_eq!(resolved, node_info.into());
Ok(())
}
#[tokio::test]
async fn pkarr_publish_dns_resolve() -> Result<()> {
let _logging_guard = iroh_test::logging::setup();
let origin = "testdns.example".to_string();
let dns_pkarr_server = DnsPkarrServer::run_with_origin(origin.clone()).await?;
let secret_key = SecretKey::generate();
let node_id = secret_key.public();
let addr_info = AddrInfo {
relay_url: Some("https://relay.example".parse().unwrap()),
..Default::default()
};
let resolver = create_dns_resolver(dns_pkarr_server.nameserver)?;
let publisher = PkarrPublisher::new(secret_key, dns_pkarr_server.pkarr_url.clone());
// does not block, update happens in background task
publisher.update_addr_info(&addr_info);
// wait until our shared state received the update from pkarr publishing
dns_pkarr_server.on_node(&node_id, PUBLISH_TIMEOUT).await?;
let resolved = resolver.lookup_by_id(&node_id, &origin).await?;
let expected = NodeAddr {
info: addr_info,
node_id,
};
assert_eq!(resolved, expected);
Ok(())
}
const TEST_ALPN: &[u8] = b"TEST";
#[tokio::test]
async fn pkarr_publish_dns_discover() -> Result<()> {
let _logging_guard = iroh_test::logging::setup();
let dns_pkarr_server = DnsPkarrServer::run().await?;
let (relay_map, _relay_url, _relay_guard) = run_relay_server().await?;
let (ep1, _guard1) = ep_with_discovery(&relay_map, &dns_pkarr_server).await?;
let (ep2, _guard2) = ep_with_discovery(&relay_map, &dns_pkarr_server).await?;
// wait until our shared state received the update from pkarr publishing
dns_pkarr_server
.on_node(&ep1.node_id(), PUBLISH_TIMEOUT)
.await?;
// we connect only by node id!
let res = ep2.connect(ep1.node_id(), TEST_ALPN).await;
assert!(res.is_ok(), "connection established");
Ok(())
}
#[tokio::test]
async fn pkarr_publish_dns_discover_empty_node_addr() -> Result<()> {
let _logging_guard = iroh_test::logging::setup();
let dns_pkarr_server = DnsPkarrServer::run().await?;
let (relay_map, _relay_url, _relay_guard) = run_relay_server().await?;
let (ep1, _guard1) = ep_with_discovery(&relay_map, &dns_pkarr_server).await?;
let (ep2, _guard2) = ep_with_discovery(&relay_map, &dns_pkarr_server).await?;
// wait until our shared state received the update from pkarr publishing
dns_pkarr_server
.on_node(&ep1.node_id(), PUBLISH_TIMEOUT)
.await?;
// we connect only by node id!
let res = ep2.connect(ep1.node_id(), TEST_ALPN).await;
assert!(res.is_ok(), "connection established");
Ok(())
}
async fn ep_with_discovery(
relay_map: &RelayMap,
dns_pkarr_server: &DnsPkarrServer,
) -> Result<(Endpoint, AbortOnDropHandle<Result<()>>)> {
let secret_key = SecretKey::generate();
let ep = Endpoint::builder()
.relay_mode(RelayMode::Custom(relay_map.clone()))
.insecure_skip_relay_cert_verify(true)
.secret_key(secret_key.clone())
.alpns(vec![TEST_ALPN.to_vec()])
.dns_resolver(dns_pkarr_server.dns_resolver())
.discovery(dns_pkarr_server.discovery(secret_key))
.bind()
.await?;
let handle = tokio::spawn({
let ep = ep.clone();
async move {
// we skip accept() errors, they can be caused by retransmits
while let Some(connecting) = ep.accept().await.and_then(|inc| inc.accept().ok()) {
let _conn = connecting.await?;
// Just accept incoming connections, but don't do anything with them.
}
anyhow::Ok(())
}
});
Ok((ep, AbortOnDropHandle::new(handle)))
}
}