Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix case of reading from closed socket #168

Merged
merged 2 commits into from
Oct 20, 2021
Merged

fix case of reading from closed socket #168

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4666f3
tcp_forwarder: add listening event for threading purpose
ohadshai Oct 20, 2021
fd9fad9
tcp_forwarder: bugfix: validation of closed sockets within _handle_data
ohadshai Oct 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions pymobiledevice3/tcp_forwarder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ class TcpForwarder:
MAX_FORWARDED_CONNECTIONS = 200
TIMEOUT = 1

def __init__(self, lockdown: LockdownClient, src_port: int, dst_port: int, enable_ssl=False):
def __init__(self, lockdown: LockdownClient, src_port: int, dst_port: int, enable_ssl=False,
listening_event: threading.Event = None):
self.logger = logging.getLogger(__name__)
self.lockdown = lockdown
self.src_port = src_port
Expand All @@ -20,6 +21,7 @@ def __init__(self, lockdown: LockdownClient, src_port: int, dst_port: int, enabl
self.inputs = []
self.enable_ssl = enable_ssl
self.stopped = threading.Event()
self.listening_event = listening_event

# dictionaries containing the required maps to transfer data between each local
# socket to its remote socket and vice versa
Expand All @@ -37,6 +39,8 @@ def start(self, address='0.0.0.0'):
self.server_socket.setblocking(False)

self.inputs = [self.server_socket]
if self.listening_event:
self.listening_event.set()

while self.inputs:
# will only perform the socket select on the inputs. the outputs will handled
Expand All @@ -45,11 +49,13 @@ def start(self, address='0.0.0.0'):
if self.stopped.is_set():
break

closed_sockets = set()
for current_sock in readable:
if current_sock is self.server_socket:
self._handle_server_connection()
else:
self._handle_data(current_sock)
if current_sock not in closed_sockets:
self._handle_data(current_sock, closed_sockets)

for current_sock in exceptional:
self._handle_close_or_error(current_sock)
Expand All @@ -65,12 +71,14 @@ def _handle_close_or_error(self, from_sock):

self.logger.info(f'connection {other_sock} was closed')

def _handle_data(self, from_sock):
def _handle_data(self, from_sock, closed_sockets):
data = from_sock.recv(1024)

if len(data) == 0:
# no data means socket was closed
self._handle_close_or_error(from_sock)
closed_sockets.add(from_sock)
closed_sockets.add(self.connections[from_sock])
return

# when data is received from one end, just forward it to the other
Expand Down