mirror of
https://github.com/Skyvern-AI/skyvern.git
synced 2026-04-28 11:40:32 +00:00
Add Bitwarden email-auth fallback to global credentials on timeout (#5231)
Co-authored-by: Suchintan Singh <suchintan@skyvern.com> Co-authored-by: Shuchang Zheng <wintonzheng0325@gmail.com>
This commit is contained in:
parent
a48d2cff92
commit
9d2c2543c1
4 changed files with 304 additions and 64 deletions
123
tests/unit/workflow/test_bitwarden_email_auth_fallback.py
Normal file
123
tests/unit/workflow/test_bitwarden_email_auth_fallback.py
Normal file
|
|
@ -0,0 +1,123 @@
|
|||
from datetime import UTC, datetime
|
||||
from types import SimpleNamespace
|
||||
|
||||
import pytest
|
||||
|
||||
from skyvern.exceptions import BitwardenListItemsError
|
||||
from skyvern.forge.sdk.workflow import context_manager as cm
|
||||
from skyvern.forge.sdk.workflow.context_manager import WorkflowRunContext
|
||||
from skyvern.forge.sdk.workflow.models.parameter import BitwardenLoginCredentialParameter
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_org_email_bitwarden_auth_falls_back_to_global_credentials(
|
||||
monkeypatch: pytest.MonkeyPatch,
|
||||
) -> None:
|
||||
org_token = SimpleNamespace(
|
||||
credential=SimpleNamespace(
|
||||
email="test@example.com",
|
||||
master_password="org-master-password",
|
||||
)
|
||||
)
|
||||
|
||||
class FakeDatabase:
|
||||
async def get_valid_org_auth_token(self, organization_id: str, token_type: str) -> object:
|
||||
assert organization_id == "org-1"
|
||||
assert token_type == "bitwarden_credential"
|
||||
return org_token
|
||||
|
||||
fake_app = SimpleNamespace(DATABASE=FakeDatabase())
|
||||
monkeypatch.setattr(cm, "app", fake_app)
|
||||
|
||||
fake_settings = SimpleNamespace(
|
||||
BITWARDEN_CLIENT_ID="global-client-id",
|
||||
BITWARDEN_CLIENT_SECRET="global-client-secret",
|
||||
BITWARDEN_MASTER_PASSWORD="global-master-password",
|
||||
BITWARDEN_EMAIL=None,
|
||||
)
|
||||
monkeypatch.setattr(cm, "settings", fake_settings)
|
||||
|
||||
calls: list[dict[str, object]] = []
|
||||
|
||||
async def fake_get_secret_value_from_url(
|
||||
client_id: str | None,
|
||||
client_secret: str | None,
|
||||
master_password: str,
|
||||
bw_organization_id: str | None,
|
||||
bw_collection_ids: list[str] | None,
|
||||
url: str | None = None,
|
||||
collection_id: str | None = None,
|
||||
item_id: str | None = None,
|
||||
max_retries: int = 2,
|
||||
timeout: int = 60,
|
||||
email: str | None = None,
|
||||
) -> dict[str, str]:
|
||||
calls.append(
|
||||
{
|
||||
"client_id": client_id,
|
||||
"client_secret": client_secret,
|
||||
"master_password": master_password,
|
||||
"email": email,
|
||||
"url": url,
|
||||
"collection_id": collection_id,
|
||||
"item_id": item_id,
|
||||
}
|
||||
)
|
||||
if len(calls) == 1:
|
||||
raise BitwardenListItemsError(
|
||||
"Bitwarden CLI failed after all retry attempts. Fail reasons: ['TimeoutError: ']"
|
||||
)
|
||||
return {
|
||||
"BW_USERNAME": "fallback-user",
|
||||
"BW_PASSWORD": "fallback-password",
|
||||
"BW_TOTP": "",
|
||||
}
|
||||
|
||||
monkeypatch.setattr(cm.BitwardenService, "get_secret_value_from_url", fake_get_secret_value_from_url)
|
||||
|
||||
context = WorkflowRunContext(
|
||||
workflow_title="title",
|
||||
workflow_id="wf-1",
|
||||
workflow_permanent_id="wfp-1",
|
||||
workflow_run_id="wr-1",
|
||||
aws_client=SimpleNamespace(),
|
||||
)
|
||||
context.values["target_url"] = "https://www.example.com/login"
|
||||
|
||||
parameter = BitwardenLoginCredentialParameter(
|
||||
key="bitwarden_login",
|
||||
description="Bitwarden login",
|
||||
bitwarden_login_credential_parameter_id="blc_1",
|
||||
workflow_id="wf-1",
|
||||
bitwarden_client_id_aws_secret_key="unused-client-id-secret",
|
||||
bitwarden_client_secret_aws_secret_key="unused-client-secret",
|
||||
bitwarden_master_password_aws_secret_key="unused-master-password",
|
||||
url_parameter_key="target_url",
|
||||
bitwarden_collection_id=None,
|
||||
bitwarden_item_id=None,
|
||||
created_at=datetime.now(UTC),
|
||||
modified_at=datetime.now(UTC),
|
||||
)
|
||||
|
||||
organization = SimpleNamespace(
|
||||
organization_id="org-1",
|
||||
bw_organization_id="bw-org-1",
|
||||
bw_collection_ids=["col-1"],
|
||||
)
|
||||
|
||||
await context.register_bitwarden_login_credential_parameter_value(parameter, organization)
|
||||
|
||||
assert len(calls) == 2
|
||||
assert calls[0]["email"] == "test@example.com"
|
||||
assert calls[0]["client_id"] is None
|
||||
assert calls[0]["client_secret"] is None
|
||||
assert calls[0]["master_password"] == "org-master-password"
|
||||
|
||||
assert calls[1]["email"] is None
|
||||
assert calls[1]["client_id"] == "global-client-id"
|
||||
assert calls[1]["client_secret"] == "global-client-secret"
|
||||
assert calls[1]["master_password"] == "global-master-password"
|
||||
|
||||
stored = context.values["bitwarden_login"]
|
||||
assert stored["username"].endswith("_username")
|
||||
assert stored["password"].endswith("_password")
|
||||
Loading…
Add table
Add a link
Reference in a new issue