Import Local Blob fetching code, with changes from erikson1970/lastpass-python.

Import SecureNote parsing code, with changes from nadavshalev/lastpass-python.
Pylint pass and uncrustify code.
Fix pycodestyle issues.

Author: guilt

.gitignore

@@ -4,7 +4,9 @@ example/credentials.json
 
 *.egg-info/
 dist/
+build
 .tox
+.eggs
 
 .python-version
 .idea/

example/example.py

@@ -36,4 +36,4 @@
 
 
 for index, i in enumerate(vault.accounts):
-    print("{} {} {} {} {} {} {} {}".format(index + 1, i.id, i.name, i.username, i.password, i.url, i.group, i.notes))
+    print("{} {}".format(index + 1, str(i)))

lastpass/account.py

@@ -1,10 +1,47 @@
 # coding: utf-8
+import types
+
+
 class Account(object):
-    def __init__(self, id, name, username, password, url, group, notes=None):
-        self.id = id
+    """
+    Lastpass Password Account
+    """
+    def __init__(self, _id, name, username, password, url, group, notes=None):
+        self.id = _id
         self.name = name
         self.username = username
         self.password = password
         self.url = url
         self.group = group
         self.notes = notes
+
+    def notes_string(self):
+        if type(self.notes) == bytes:
+            note_str = '{}'.format(self.notes.decode())
+        else:
+            note_str = '{}'.format(str(self.notes))
+        return note_str
+
+    def fields(self):
+        result_fields = []
+        for field in dir(self):
+            if not field.startswith('_') and not callable(getattr(self, field)):
+                result_fields.append(field)
+        return result_fields
+
+    def __str__(self):
+        return "name: {}\n\tusername: {}\n\tpassword: {}\n\turl: {}\n\tgroup: {}\n\tnotes: {}".format(self.name, self.username, self.password, self.url, self.group, self.notes_string())
+
+
+class SecureNote(Account):
+    """
+    Lastpass Secure Note
+    """
+    def __init__(self):
+        pass
+
+    def __str__(self):
+        try:
+            return getattr(self, 'unparsed_notes_0').decode()
+        except AttributeError:
+            return '\n'.join(['\t\t{}: {}'.format(field, getattr(self, field).decode()) for field in self.fields()])

lastpass/blob.py

@@ -1,7 +1,7 @@
 # coding: utf-8
 class Blob(object):
-    def __init__(self, bytes, key_iteration_count):
-        self.bytes = bytes
+    def __init__(self, bytes_, key_iteration_count):
+        self.bytes = bytes_
         self.key_iteration_count = key_iteration_count
 
     def encryption_key(self, username, password):

lastpass/chunk.py

@@ -1,7 +1,7 @@
 # coding: utf-8
 class Chunk(object):
-    def __init__(self, id, payload):
-        self.id = id
+    def __init__(self, id_, payload):
+        self.id = id_
         self.payload = payload
 
     def __eq__(self, other):

lastpass/fetcher.py

@@ -4,8 +4,9 @@
 import string
 from base64 import b64decode
 from binascii import hexlify
-import requests
 from xml.etree import ElementTree as etree
+import requests
+
 from . import blob
 from .exceptions import (
     NetworkError,
@@ -59,7 +60,7 @@ def request_iteration_count(username, web_client=http):
 
     try:
         count = int(response.content)
-    except:
+    except Exception:
         raise InvalidResponseError('Key iteration count is invalid')
 
     if count > 0:
@@ -123,7 +124,6 @@ def oob_login(web_client, parsed_response, body, key_iteration_count, trust_id):
         'error')
     if 'outofbandname' not in error.attrib or 'capabilities' not in error.attrib:
         return (None, parsed_response)
-    oob_name = error.attrib['outofbandname']
     oob_capabilities = error.attrib['capabilities'].split(',')
     can_do_passcode = 'passcode' in oob_capabilities
     if can_do_passcode and 'outofband' not in oob_capabilities:
@@ -173,11 +173,12 @@ def create_session(parsed_response, key_iteration_count, trust_id):
         token = ok_response.attrib.get('token')
         if isinstance(session_id, str):
             return Session(session_id, key_iteration_count, token, trust_id)
+    return None
 
 
 def login_error(parsed_response):
     error = None if parsed_response.tag != 'response' else parsed_response.find('error')
-    if error is None or len(error.attrib) == 0:
+    if error is None or not error.attrib:
         raise UnknownResponseSchemaError()
 
     exceptions = {
@@ -198,27 +199,25 @@ def login_error(parsed_response):
     return InvalidResponseError(message)
 
 
-def decode_blob(blob):
-    return b64decode(blob)
+def decode_blob(blob_):
+    return b64decode(blob_)
 
 
 def make_key(username, password, key_iteration_count):
     # type: (str, str, int) -> bytes
     if key_iteration_count == 1:
         return hashlib.sha256(username.encode('utf-8') + password.encode('utf-8')).digest()
-    else:
-        return hashlib.pbkdf2_hmac('sha256', password.encode('utf-8'), username.encode('utf-8'), key_iteration_count, 32)
+    return hashlib.pbkdf2_hmac('sha256', password.encode('utf-8'), username.encode('utf-8'), key_iteration_count, 32)
 
 
 def make_hash(username, password, key_iteration_count):
     # type: (str, str, int) -> bytes
     if key_iteration_count == 1:
         return bytearray(hashlib.sha256(hexlify(make_key(username, password, 1)) + password.encode('utf-8')).hexdigest(), 'ascii')
-    else:
-        return hexlify(hashlib.pbkdf2_hmac(
-            'sha256',
-            make_key(username, password, key_iteration_count),
-            password.encode('utf-8'),
-            1,
-            32
-        ))
+    return hexlify(hashlib.pbkdf2_hmac(
+        'sha256',
+        make_key(username, password, key_iteration_count),
+        password.encode('utf-8'),
+        1,
+        32
+    ))