From bafa89f3950e73ce485ece5c871067a01b430b5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Severin=20Alexander=20B=C3=BChler?=
 <8782386+SeverinAlexB@users.noreply.github.com>
Date: Mon, 28 Apr 2025 09:59:40 +0300
Subject: [PATCH] feat(homeserver): Set default icann_domain to localhost
 (#112)

---
 pubky-homeserver/config.default.toml               |  2 +-
 pubky-homeserver/src/data_directory/config_toml.rs | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pubky-homeserver/config.default.toml b/pubky-homeserver/config.default.toml
index 80748cc..b3e1704 100644
--- a/pubky-homeserver/config.default.toml
+++ b/pubky-homeserver/config.default.toml
@@ -51,7 +51,7 @@ public_icann_http_port = 80
 # 
 # ICANN TLS is not natively supported, so you should be running
 # a reverse proxy and managing certificates yourself.
-icann_domain = "example.com"
+icann_domain = "localhost"
 
 # The interval at which user keys are republished to the DHT.
 # 0 means disabled.
diff --git a/pubky-homeserver/src/data_directory/config_toml.rs b/pubky-homeserver/src/data_directory/config_toml.rs
index 938e342..34cd312 100644
--- a/pubky-homeserver/src/data_directory/config_toml.rs
+++ b/pubky-homeserver/src/data_directory/config_toml.rs
@@ -34,7 +34,7 @@ pub struct PkdnsToml {
     pub public_icann_http_port: Option<u16>,
 
     /// Optional domain name of the regular http API.
-    #[serde(default)]
+    #[serde(default = "default_icann_domain")]
     pub icann_domain: Option<Domain>,
 
     /// The interval at which the user keys are republished in the DHT.
@@ -62,7 +62,7 @@ impl Default for PkdnsToml {
             public_ip: default_public_ip(),
             public_pubky_tls_port: Option::default(),
             public_icann_http_port: Option::default(),
-            icann_domain: Option::default(),
+            icann_domain: default_icann_domain(),
             user_keys_republisher_interval: default_user_keys_republisher_interval(),
             dht_bootstrap_nodes: default_dht_bootstrap_nodes(),
             dht_relay_nodes: default_dht_relay_nodes(),
@@ -92,6 +92,10 @@ fn default_user_keys_republisher_interval() -> u64 {
     14400
 }
 
+fn default_icann_domain() -> Option<Domain> {
+    Some(Domain::from_str("localhost").expect("localhost is a valid domain"))
+}
+
 /// All configuration related to file drive
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
 pub struct DriveToml {
@@ -268,7 +272,7 @@ mod tests {
             c.drive.icann_listen_socket,
             default_icann_drive_listen_socket()
         );
-        assert_eq!(c.pkdns.icann_domain, None);
+        assert_eq!(c.pkdns.icann_domain, default_icann_domain());
 
         assert_eq!(
             c.drive.pubky_listen_socket,