vodorod/Dorod-Sky
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add Timeout to bitwarden subprocess call so it doesn't wait forever for things that don't exist (ie TOTPs) (#703)

Browse Source
This commit is contained in:
Kerem Yilmaz
2024-08-14 06:58:35 +03:00
committed by GitHub
parent 3d17b0cb4e
commit fd6da6681c
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
skyvern/forge/sdk/services/bitwarden.py
View File

@@ -53,7 +53,11 @@ class BitwardenService:
if additional_env: if additional_env:
env.update(additional_env) # Update with any additional environment variables env.update(additional_env) # Update with any additional environment variables
return subprocess.run(command, capture_output=True, text=True, env=env) try:
return subprocess.run(command, capture_output=True, text=True, env=env, timeout=60)
except subprocess.TimeoutExpired as e:
LOG.error("Bitwarden command timed out after 60 seconds", stdout=e.stdout, stderr=e.stderr)
raise e
@staticmethod @staticmethod
def _extract_session_key(unlock_cmd_output: str) -> str | None: def _extract_session_key(unlock_cmd_output: str) -> str | None:
@@ -295,9 +299,12 @@ class BitwardenService:
# The identity item may store sensitive information in custom fields or default fields # The identity item may store sensitive information in custom fields or default fields
# Custom fields are prioritized over default fields # Custom fields are prioritized over default fields
# TODO (kerem): Make this case insensitive? # TODO (kerem): Make this case insensitive?
if field in identity_item["fields"]: for item in identity_item["fields"]:
sensitive_information[field] = identity_item["fields"][field]["value"] if item["name"] == field:
elif field in identity_item["identity"]: sensitive_information[field] = item["value"]
break
if field in identity_item["identity"] and field not in sensitive_information:
sensitive_information[field] = identity_item["identity"][field] sensitive_information[field] = identity_item["identity"][field]
return sensitive_information return sensitive_information