Agent: Automatically select correct output encoding for ping command

2021-08-13 08:39:08 -04:00 · 2021-08-13 08:39:08 -04:00 · 769dd67b66
parent f2148db70b
commit 769dd67b66
1 changed files with 1 additions and 2 deletions
--- a/monkey/infection_monkey/network/ping_scanner.py
+++ b/monkey/infection_monkey/network/ping_scanner.py
@ -43,13 +43,12 @@ class PingScanner(HostScanner, HostFinger):
        if not "win32" == sys.platform:
            timeout /= 1000

-        Encoding = "cp850"
        sub_proc = subprocess.Popen(
            ["ping", PING_COUNT_FLAG, "1", PING_TIMEOUT_FLAG, str(timeout), host.ip_addr],
            stdout=subprocess.PIPE,
            stderr=subprocess.PIPE,
            text=True,
-            encoding=Encoding,
+            encoding=os.device_encoding(1),
        )

        output = " ".join(sub_proc.communicate())