init: Abort if i2p/cjdns are chosen via -onlynet but unreachable

mzumsande · mzumsande · commit a8a9ed67cc44 · 2022-09-19T11:06:43.000-04:00
...because -i2psam or -cjdnsreachable are not provided.
This mimics existing behavior for -onlynet=onion and non-specified proxy.
diff --git a/src/init.cpp b/src/init.cpp
@@ -1284,6 +1284,11 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     }
 
     if (!args.IsArgSet("-cjdnsreachable")) {
+        if (args.IsArgSet("-onlynet") && IsReachable(NET_CJDNS)) {
+            return InitError(
+                _("Outbound connections restricted to CJDNS (-onlynet=cjdns) but "
+                  "-cjdnsreachable is not provided"));
+        }
         SetReachable(NET_CJDNS, false);
     }
     // Now IsReachable(NET_CJDNS) is true if:
@@ -1756,6 +1761,11 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
         }
         SetProxy(NET_I2P, Proxy{addr});
     } else {
+        if (args.IsArgSet("-onlynet") && IsReachable(NET_I2P)) {
+            return InitError(
+                _("Outbound connections restricted to i2p (-onlynet=i2p) but "
+                  "-i2psam is not provided"));
+        }
         SetReachable(NET_I2P, false);
     }
 
diff --git a/test/functional/feature_proxy.py b/test/functional/feature_proxy.py
@@ -332,6 +332,16 @@ def networks_dict(d):
         msg = "Error: Invalid -i2psam address or hostname: 'def:xyz'"
         self.nodes[1].assert_start_raises_init_error(expected_msg=msg)
 
+        self.log.info("Test passing invalid -onlynet=i2p without -i2psam raises expected init error")
+        self.nodes[1].extra_args = ["-onlynet=i2p"]
+        msg = "Error: Outbound connections restricted to i2p (-onlynet=i2p) but -i2psam is not provided"
+        self.nodes[1].assert_start_raises_init_error(expected_msg=msg)
+
+        self.log.info("Test passing invalid -onlynet=cjdns without -cjdnsreachable raises expected init error")
+        self.nodes[1].extra_args = ["-onlynet=cjdns"]
+        msg = "Error: Outbound connections restricted to CJDNS (-onlynet=cjdns) but -cjdnsreachable is not provided"
+        self.nodes[1].assert_start_raises_init_error(expected_msg=msg)
+
         self.log.info("Test passing -onlynet=onion with -onion=0/-noonion raises expected init error")
         msg = (
             "Error: Outbound connections restricted to Tor (-onlynet=onion) but "

Original file line number	Diff line number	Diff line change
`@@ -1284,6 +1284,11 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)`
`1284`	`1284`	`}`
`1285`	`1285`
`1286`	`1286`	`if (!args.IsArgSet("-cjdnsreachable")) {`
	`1287`	`+ if (args.IsArgSet("-onlynet") && IsReachable(NET_CJDNS)) {`
	`1288`	`+ return InitError(`
	`1289`	`+ _("Outbound connections restricted to CJDNS (-onlynet=cjdns) but "`
	`1290`	`+ "-cjdnsreachable is not provided"));`
	`1291`	`+ }`
`1287`	`1292`	`SetReachable(NET_CJDNS, false);`
`1288`	`1293`	`}`
`1289`	`1294`	`// Now IsReachable(NET_CJDNS) is true if:`
`@@ -1756,6 +1761,11 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)`
`1756`	`1761`	`}`
`1757`	`1762`	`SetProxy(NET_I2P, Proxy{addr});`
`1758`	`1763`	`} else {`
	`1764`	`+ if (args.IsArgSet("-onlynet") && IsReachable(NET_I2P)) {`
	`1765`	`+ return InitError(`
	`1766`	`+ _("Outbound connections restricted to i2p (-onlynet=i2p) but "`
	`1767`	`+ "-i2psam is not provided"));`
	`1768`	`+ }`
`1759`	`1769`	`SetReachable(NET_I2P, false);`
`1760`	`1770`	`}`
`1761`	`1771`