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

Jump to bottom

Close the socket if 'AdbDevice.connect' fails #20

Merged
merged 1 commit into from
Oct 5, 2019
Merged

Close the socket if 'AdbDevice.connect' fails #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions adb_shell/adb_device.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,14 @@ def connect(self, rsa_keys=None, timeout_s=None, auth_timeout_s=constants.DEFAUL

# 5. If no ``rsa_keys`` are provided, raise an exception
if not rsa_keys:
self._handle.close()
raise exceptions.DeviceAuthError('Device authentication required, no keys available.')

# 6. Loop through our keys, signing the last ``banner`` that we received
for rsa_key in rsa_keys:
# 6.1. If the last ``arg0`` was not :const:`adb_shell.constants.AUTH_TOKEN`, raise an exception
if arg0 != constants.AUTH_TOKEN:
self._handle.close()
raise exceptions.InvalidResponseError('Unknown AUTH response: %s %s %s' % (arg0, arg1, banner))

# 6.2. Sign the last ``banner`` and send it in an ``b'AUTH'`` message
Expand Down