Merge branch 'master' of github.com:guilt/lastpass-python

Author: guilt

lastpass/parser.py

@@ -322,10 +322,20 @@ def pad(data):
     # see http://passingcuriosity.com/2009/aes-encryption-in-python-with-m2crypto/
     padded = (BS - len(data) % BS) * chr(BS - len(data) % BS)
     if isinstance(data, str):
-        data = str.encode(data, 'latin1')
+        try:
+            data = str.encode(data, 'latin1')
+        except:
+            data = bytes(data)
     if isinstance(padded, str):
-        padded = str.encode(padded, 'latin1')
-    return data + padded
+        try:
+            padded = str.encode(padded, 'latin1')
+        except:
+            padded = bytes(data)
+    try:
+        result = bytes(data + padded)
+    except:
+        result = data + padded
+    return result
 
 
 def unpad(data):
@@ -334,7 +344,10 @@ def unpad(data):
     """
     # see http://passingcuriosity.com/2009/aes-encryption-in-python-with-m2crypto/
     if isinstance(data, str):
-        data = str.encode(data, 'latin1')
+        try:
+            data = str.encode(data, 'latin1')
+        except:
+            data = bytes(data)
     return data[0:-ord(data[-1:])]
 
 def decode_aes256(cipher, iv, data, encryption_key):

scripts/lpass

@@ -36,6 +36,7 @@ LastPass CLI in Python. Very Minimal.
 ---------------------------------------------
 """
 
+from __future__ import print_function
 import argparse
 import getpass
 import json
@@ -138,7 +139,7 @@ def command_login(args):
     if os.path.exists(LPASS_CONFIG_FILE):
         if not args.force:
             raise Exception('Unable to Overwrite Configuration.')
-    (_, password) = __get_login(args.username, None, args.mfa)
+    (_, password) = __get_login(args.username, os.getenv('LPASS_PASSWORD', None), args.mfa)
     __print_message('Logged into {}'.format(__colored(args.username, S_YELLOW)))
     __write_config(args.username, password, args.mfa)
 
@@ -273,7 +274,7 @@ def main():
     parser_login.add_argument('--plaintext-key', default=True, action='store_true')
     parser_login.add_argument('--mfa', default=False, action='store_true')
     parser_login.add_argument('--force', '-f', default=False, action='store_true')
-    parser_login.add_argument('username', type=str, default=None)
+    parser_login.add_argument('username', type=str, default=os.getenv('LPASS_USER', None))
     parser_login.set_defaults(func=command_login)
 
     parser_logout = subparsers.add_parser('logout', help='Logout from Lasspass.')