Skip to content

Handle Bitwarden fields #60

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

Open
osamamragab wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle Bitwarden fields #60

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
13 changes: 10 additions & 3 deletions ffpass/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,15 @@ def lower_header(csv_file):
def readCSV(csv_file):
logins = []
reader = csv.DictReader(lower_header(csv_file))
for row in reader:
logins.append((rawURL(row["url"]), row["username"], row["password"]))
try:
for row in reader:
url = row["url"] if "url" in row else row["login_uri"]
username = row["username"] if "username" in row else row["login_username"]
password = row["password"] if "password" in row else row["login_password"]
logins.append((rawURL(url), username, password))
except KeyError as e:
logging.error(f"key not found {e.args[0]}")
sys.exit(1)
logging.info(f'read {len(logins)} logins')
return logins

Expand Down Expand Up @@ -306,7 +313,7 @@ def askpass(directory):
try:
key = getKey(directory, password)
except WrongPassword:
password = getpass("Master Password:")
password = getpass("Master Password: ")
else:
break
return key
Expand Down