diff --git a/pyrdp/convert/PCAPConverter.py b/pyrdp/convert/PCAPConverter.py index 2ccbff932..7f87ad130 100644 --- a/pyrdp/convert/PCAPConverter.py +++ b/pyrdp/convert/PCAPConverter.py @@ -104,6 +104,7 @@ def processStream(self, startTimeStamp: int, stream: PCAPStream): "src": stream.client, "dst": stream.server }) + sessionID = sessionID.replace(":", "_") handler, _ = createHandler(self.format, self.outputPrefix + sessionID) replayer = RDPReplayer(handler, self.outputPrefix, sessionID) diff --git a/pyrdp/recording/recorder.py b/pyrdp/recording/recorder.py index 41d7220d0..ef3bd1c22 100644 --- a/pyrdp/recording/recorder.py +++ b/pyrdp/recording/recorder.py @@ -105,6 +105,8 @@ def __init__(self, fileName: Union[str, Path]): self.pending = b'' self.filename = fileName + self.filename = str(self.filename).replace(":", "_") + self.fd: BufferedIOBase = None def sendBytes(self, data: bytes): diff --git a/test/integration.sh b/test/integration.sh index b74985f8a..16e70a2af 100755 --- a/test/integration.sh +++ b/test/integration.sh @@ -64,8 +64,8 @@ echo echo =================================================== echo Verify the PCAP to JSON file -./test/validate_json.sh "20200319000716_192.168.38.1:20989-192.168.38.1:3389.json" -rm "20200319000716_192.168.38.1:20989-192.168.38.1:3389.json" +./test/validate_json.sh "20200319000716_192.168.38.1_20989-192.168.38.1_3389.json" +rm "20200319000716_192.168.38.1_20989-192.168.38.1_3389.json" echo echo =================================================== @@ -75,8 +75,8 @@ echo echo =================================================== echo Verify that the replay file exists -file -E "20200319000716_192.168.38.1:20989-192.168.38.1:3389.pyrdp" -rm "20200319000716_192.168.38.1:20989-192.168.38.1:3389.pyrdp" +file -E "20200319000716_192.168.38.1_20989-192.168.38.1_3389.pyrdp" +rm "20200319000716_192.168.38.1_20989-192.168.38.1_3389.pyrdp" echo =================================================== echo pyrdp-convert.py regression issue 428