Skip to content

Commit

Permalink
Avoid leaking file descriptors for terminated sessions. fix #392
Browse files Browse the repository at this point in the history
  • Loading branch information
obilodeau committed Oct 27, 2022
1 parent 9b2290a commit cb3b6d3
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
1 change: 1 addition & 0 deletions pyrdp/mitm/TCPMITM.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ def onClientDisconnection(self, reason):
if self.recorder.recordFilename:
self.statCounter.logReport(self.log, {"replayFilename":
self.recorder.recordFilename})
self.recorder.finalize()
else:
self.statCounter.logReport(self.log)

Expand Down
13 changes: 13 additions & 0 deletions pyrdp/recording/recorder.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ def __init__(self, transports: List[LayerChainItem]):
}

self.topLayers = []
self.openFileLayers = []
self.recordFilename = None

for transport in transports:
Expand All @@ -52,6 +53,9 @@ def addTransport(self, transportLayer: LayerChainItem):
player.setPrevious(transportLayer)
self.topLayers.append(player)

if isinstance(transportLayer, FileLayer):
self.openFileLayers.append(transportLayer)

def setParser(self, messageType: PlayerPDUType, parser: Parser):
"""
Set the parser to use for a given message type.
Expand Down Expand Up @@ -81,6 +85,11 @@ def record(self, pdu: Optional[PDU], messageType: PlayerPDUType):
def getCurrentTimeStamp(self) -> int:
return PlayerLayer.timeStampFunction()

def finalize(self):
"""When the recording is finished"""
for layer in self.openFileLayers:
layer.close()


class FileLayer(LayerChainItem):
"""
Expand Down Expand Up @@ -114,3 +123,7 @@ def sendBytes(self, data: bytes):
self.fd.write(data)
else:
log.error("Recording file handle closed, cannot write message: %(message)s", {"message": data})

def close(self):
if self.fd:
self.fd.close()

0 comments on commit cb3b6d3

Please sign in to comment.