Skip to content

Fixed crash during connection with 'plaintext_login' option #94

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

Closed
Njinx wants to merge 1 commit into from
Closed

Fixed crash during connection with 'plaintext_login' option #94

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
19 changes: 13 additions & 6 deletions routeros_api/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ class RouterOsApiPool(object):

def __init__(self, host, username='admin', password='', port=None, plaintext_login=False, use_ssl=False, ssl_verify=True, ssl_verify_hostname=True, ssl_context=None):
self.host = host

if isinstance(username, bytes):
username = username.decode()
if isinstance(password, bytes):
password = password.decode()

self.username = username
self.password = password

Expand Down Expand Up @@ -77,24 +83,25 @@ def __init__(self, communicator):
self.communicator = communicator

def login(self, login, password, plaintext_login):
if isinstance(login, str):
login = login.encode()
if isinstance(password, str):
password = password.encode()

response = None
if plaintext_login:
if isinstance(login, str):
login = login.encode()
if isinstance(password, str):
password = password.encode()
response = self.get_binary_resource('/').call('login',{ 'name': login, 'password': password })
else:
response = self.get_binary_resource('/').call('login')
if 'ret' in response.done_message:
token = binascii.unhexlify(response.done_message['ret'])
hasher = hashlib.md5()
hasher.update(b'\x00')
hasher.update(password.encode())
hasher.update(password)
hasher.update(token)
hashed = b'00' + hasher.hexdigest().encode('ascii')
self.get_binary_resource('/').call(
'login', {'name': login.encode(), 'response': hashed})
'login', {'name': login, 'response': hashed})

def get_resource(self, path, structure=None):
structure = structure or api_structure.default_structure
Expand Down