Merge pull request #32 from stevehaskew/v6.43-support

Basic support for new login method.

routeros_api/api.py

@@ -9,18 +9,20 @@
 from routeros_api import resource
 
 
-def connect(host, username='admin', password='', port=None, use_ssl=False, ssl_verify=True, ssl_verify_hostname=True, ssl_context=None):
-    return RouterOsApiPool(host, username, password, port, use_ssl, ssl_verify, ssl_verify_hostname, ssl_context).get_api()
+def connect(host, username='admin', password='', port=None, plaintext_login=False, use_ssl=False, ssl_verify=True, ssl_verify_hostname=True, ssl_context=None):
+    return RouterOsApiPool(host, username, password, port, plaintext_login, use_ssl, ssl_verify, ssl_verify_hostname, ssl_context).get_api()
 
 
 class RouterOsApiPool(object):
     socket_timeout = 15.0
 
-    def __init__(self, host, username='admin', password='', port=None, use_ssl=False, ssl_verify=True, ssl_verify_hostname=True, ssl_context=None):
+    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
         self.username = username
         self.password = password
 
+        self.plaintext_login = plaintext_login
+
         self.ssl_context = ssl_context
         # Use SSL? Ignored when using a context, so we will set it for simple reference when port-switching:
         if ssl_context is not None:
@@ -29,7 +31,7 @@ def __init__(self, host, username='admin', password='', port=None, use_ssl=False
             self.use_ssl = use_ssl
         self.ssl_verify = ssl_verify
         self.ssl_verify_hostname = ssl_verify_hostname
-        
+
         self.port = port or self._select_default_port(self.use_ssl)
 
         self.connected = False
@@ -46,7 +48,7 @@ def get_api(self):
             self.api = RouterOsApi(communicator)
             for handler in self._get_exception_handlers():
                 communicator.add_exception_handler(handler)
-            self.api.login(self.username, self.password)
+            self.api.login(self.username, self.password, self.plaintext_login)
             self.connected = True
         return self.api
 
@@ -74,16 +76,21 @@ class RouterOsApi(object):
     def __init__(self, communicator):
         self.communicator = communicator
 
-    def login(self, login, password):
-        response = self.get_binary_resource('/').call('login')
-        token = binascii.unhexlify(response.done_message['ret'])
-        hasher = hashlib.md5()
-        hasher.update(b'\x00')
-        hasher.update(password.encode())
-        hasher.update(token)
-        hashed = b'00' + hasher.hexdigest().encode('ascii')
-        self.get_binary_resource('/').call(
-            'login', {'name': login.encode(), 'response': hashed})
+    def login(self, login, password, plaintext_login):
+        response = None
+        if plaintext_login:
+            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(token)
+            hashed = b'00' + hasher.hexdigest().encode('ascii')
+            self.get_binary_resource('/').call(
+                'login', {'name': login.encode(), 'response': hashed})
 
     def get_resource(self, path, structure=None):
         structure = structure or api_structure.default_structure