Merge pull request #1695 from stratosphereips/alya/fix_p2p_bin_unable_to_connect_to_redis

Fix P2P pigeon unable to connect to the redis database given to it by slips.

Author: AlyaGomaa

fides

@@ -27,6 +27,8 @@
     Direction,
 )
 
+LOCALHOST = "127.0.0.1"
+
 
 def validate_slips_data(message_data: str) -> (str, int):
     """
@@ -197,30 +199,23 @@ def _configure(self):
                     f"Did you include it in PATH?. Exiting process."
                 )
                 return
-            executable = [self.pigeon_binary]
-            port_param = ["-port", str(self.port)]
-            # if '-ip' in sys.argv:
-            #     ip_to_listen_on = sys.argv[sys.argv.index('-ip')+1]
-            #     host_param = ["-host", ip_to_listen_on ]
-            #     print(f"P2P modules is listening on ip {ip_to_listen_on} port: {self.port}, using '-ip' parameter")
-            # else:
-            host_param = ["-host", self.host]
+
+            params = {
+                "-port": str(self.port),
+                "-host": self.host,
+                "-key-file": self.pigeon_key_file,
+                "--redis-db": f"localhost:{self.redis_port}",
+                "-redis-channel-pygo": self.pygo_channel_raw,
+                "-redis-channel-gopy": self.gopy_channel_raw,
+            }
             self.print(
-                f"P2p is listening on {self.host} port {self.port} determined "
-                f"by p2p module"
+                f"P2P is listening on {self.host} port {self.port} "
+                f"(determined by p2p module)"
             )
+            executable = [self.pigeon_binary] + [
+                item for pair in params.items() for item in pair
+            ]
 
-            keyfile_param = ["-key-file", self.pigeon_key_file]
-            # rename_with_port_param = ["-rename-with-port",
-            # str(self.rename_with_port).lower()]
-            pygo_channel_param = ["-redis-channel-pygo", self.pygo_channel_raw]
-            gopy_channel_param = ["-redis-channel-gopy", self.gopy_channel_raw]
-            executable.extend(port_param)
-            executable.extend(host_param)
-            executable.extend(keyfile_param)
-            # executable.extend(rename_with_port_param)
-            executable.extend(pygo_channel_param)
-            executable.extend(gopy_channel_param)
             if self.create_p2p_logfile:
                 outfile = open(self.pigeon_logfile, "+w")
             else:
@@ -649,7 +644,7 @@ def main(self):
                 # give the pigeon time to put the multiaddr in the db
                 time.sleep(2)
                 multiaddr = self.db.get_multiaddr()
-                self.print(f"You Multiaddress is: {multiaddr}")
+                self.print(f"You Multiaddress is: {multiaddr}\n")
                 self.mutliaddress_printed = True
 
         except Exception:

modules/p2ptrust/p2ptrust.py

@@ -30,6 +30,7 @@
 )
 
 RUNNING_IN_DOCKER = os.environ.get("IS_IN_A_DOCKER_CONTAINER", False)
+LOCALHOST = "127.0.0.1"
 
 
 class RedisDB(IoCHandler, AlertHandler, ProfileHandler, P2PHandler):
@@ -332,7 +333,7 @@ def _confirm_redis_is_listening(cls, timeout: float = 5.0) -> (bool, str):
             with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
                 sock.settimeout(0.2)
                 try:
-                    sock.connect(("127.0.0.1", cls.redis_port))
+                    sock.connect((LOCALHOST, cls.redis_port))
                     return True, ""  # Redis is up
                 except (ConnectionRefusedError, OSError):
                     time.sleep(0.2)
@@ -348,7 +349,7 @@ def _start_a_redis_server(cls) -> bool:
         cmd = (
             f"redis-server {cls._conf_file} "
             f"--port {cls.redis_port} "
-            f"--bind 127.0.0.1 "
+            f"--bind {LOCALHOST} "
             f"--daemonize yes"
         )
         process = subprocess.Popen(
@@ -942,7 +943,7 @@ def should_store_resolution(
         # don't store this as a valid dns resolution
         if query != "localhost":
             for answer in answers:
-                if answer in ("127.0.0.1", "0.0.0.0"):
+                if answer in (LOCALHOST, "0.0.0.0"):
                     return False
 
         return True
@@ -1262,7 +1263,8 @@ def get_ip_identification(
 
     def get_multiaddr(self):
         """
-        this is can only be called when p2p is enabled, this value is set by p2p pigeon
+        this can only be called when p2p is enabled,
+        this value is set by p2p pigeon in the db
         """
         return self.r.get(self.constants.MULTICAST_ADDRESS)