Skip to content
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

Fix/use collections #2

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix/use collections #2

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3a8b052
fix: collections
Feb 15, 2023
62ae199
feat: collection as arg
Feb 15, 2023
53c333c
fix: folder typo error
Feb 15, 2023
b6b20e3
fix: missing comma
Feb 15, 2023
449acf1
fix: words
Feb 15, 2023
71013bc
Update bw_add_sshkeys.py
dmbuck32 Feb 20, 2023
7dec2cd
Merge branch 'fix/use-collections' of github.com:oxin-ros/bitwarden-s…
Feb 20, 2023
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
47 changes: 29 additions & 18 deletions bw_add_sshkeys.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,16 @@ def get_session(session: str) -> str:
return session


def get_folders(session: str, foldername: str) -> str:
def get_folders(session: str, foldername: str, usecollections: bool = False) -> str:
"""
Function to return the ID of the folder that matches the provided name
Function to return the ID of the folder/collection that matches the provided name
"""
logging.debug("Folder name: %s", foldername)

folder_collection_str = "Collection" if usecollections else "Folder"
logging.debug("%s name: %s", folder_collection_str, foldername)

folder_collection_option = "collections" if usecollections else "folders"
proc_folders = subprocess.run(
["bw", "list", "folders", "--search", foldername, "--session", session],
["bw", "list", folder_collection_option, "--search", foldername, "--session", session],
stdout=subprocess.PIPE,
universal_newlines=True,
check=True,
Expand All @@ -108,25 +110,27 @@ def get_folders(session: str, foldername: str) -> str:
folders = json.loads(proc_folders.stdout)

if not folders:
logging.error('"%s" folder not found', foldername)
logging.error('"%s" %s not found', foldername, folder_collection_str.lower())
return ""

# Do we have any folders
# Do we have any folders/collections
if len(folders) != 1:
logging.error('%d folders with the name "%s" found', len(folders), foldername)
logging.error('%d %ss with the name "%s" found', len(folders), folder_collection_str.lower(), foldername)
return ""

return str(folders[0]["id"])


def folder_items(session: str, folder_id: str) -> List[Dict[str, Any]]:
def folder_items(session: str, folder_id: str, usecollections: bool = False) -> List[Dict[str, Any]]:
"""
Function to return items from a folder
Function to return items from a folder/collection
"""
logging.debug("Folder ID: %s", folder_id)

folder_collection_str = "Collection" if usecollections else "Folder"
logging.debug("%s ID: %s", folder_collection_str, folder_id)

folder_collection_option = "--collectionid" if usecollections else "--folderid"
proc_items = subprocess.run(
["bw", "list", "items", "--folderid", folder_id, "--session", session],
["bw", "list", "items", folder_collection_option, folder_id, "--session", session],
stdout=subprocess.PIPE,
universal_newlines=True,
check=True,
Expand Down Expand Up @@ -255,11 +259,17 @@ def parse_args() -> argparse.Namespace:
action="store_true",
help="show debug output",
)
parser.add_argument(
"--usecollections",
action="store_true",
help="use collections instead of folders",
)
parser.add_argument(
"-f",
"--foldername",
"--collectionname",
default="ssh-agent",
help="folder name to use to search for SSH keys",
help="folder/collection name to use to search for SSH keys",
)
parser.add_argument(
"-c",
Expand Down Expand Up @@ -301,11 +311,12 @@ def main() -> None:
session = get_session(args.session)
logging.debug("Session = %s", session)

logging.info("Getting folder list")
folder_id = get_folders(session, args.foldername)
folder_collection_str = 'collection' if args.usecollections else 'folder'
logging.info("Getting %ss list", folder_collection_str)
folder_id = get_folders(session, args.foldername, args.usecollections)

logging.info("Getting folder items")
items = folder_items(session, folder_id)
logging.info("Getting %s items", folder_collection_str)
items = folder_items(session, folder_id, args.usecollections)

logging.info("Attempting to add keys to ssh-agent")
add_ssh_keys(session, items, args.customfield, args.passphrasefield)
Expand Down