Merge pull request #2024 from ergoplatform/i1964-localOnly

Added localOnly check to peer connections
ergoplatform · Aug 24, 2023 · c9018f0 · c9018f0
2 parents 91c24c3 + f6a882d
commit c9018f0
Showing 1 changed file with 24 additions and 7 deletions.
diff --git a/src/main/scala/scorex/core/network/NetworkController.scala b/src/main/scala/scorex/core/network/NetworkController.scala
@@ -310,6 +310,19 @@ class NetworkController(ergoSettings: ErgoSettings,
     }
   }
 
+  /**
+   * Check if a given IPv4 or IPv6 address is local.
+   * @param remote - address to check
+   * @return true if the address is local, false otherwise
+   */
+  private def checkLocalOnly(remote: InetSocketAddress): Boolean =
+    if(!networkSettings.localOnly) { // not only accept local
+      val address = remote.getAddress
+      address.isSiteLocalAddress || address.isLinkLocalAddress
+    } else {
+      false
+    }
+
   /**
     * Connect to peer
     *
@@ -320,13 +333,17 @@ class NetworkController(ergoSettings: ErgoSettings,
     getPeerAddress(peer) match {
       case Some(remote) =>
         if (connectionForPeerAddress(remote).isEmpty && !unconfirmedConnections.contains(remote)) {
-          unconfirmedConnections += remote
-          tcpManager ! Connect(
-            remoteAddress = remote,
-            options = Nil,
-            timeout = Some(networkSettings.connectionTimeout),
-            pullMode = true
-          )
+          if (checkLocalOnly(remote)) {
+            log.warn(s"Prevented attempt to connect to local peer $remote. (scorex.network.localOnly is false)")
+          } else {
+            unconfirmedConnections += remote
+            tcpManager ! Connect(
+              remoteAddress = remote,
+              options = Nil,
+              timeout = Some(networkSettings.connectionTimeout),
+              pullMode = true
+            )
+          }
         } else {
           log.warn(s"Connection to peer $remote is already established")
         }