Skip to content

Automate browser based workflows with AI

fix: allow artifact bucket URIs in managed file access check (SKY-8520) (#5210)

Celal Zamanoğlu85487a7b7204
diff --git a/skyvern/forge/sdk/artifact/storage/azure.py b/skyvern/forge/sdk/artifact/storage/azure.py
index 79b832b4b..c937266f3 100644
--- a/skyvern/forge/sdk/artifact/storage/azure.py
+++ b/skyvern/forge/sdk/artifact/storage/azure.py
@@ -552,14 +552,22 @@ class AzureStorage(BaseStorage):
except Exception as e:
raise PermissionError(f"No permission to access storage URI: {uri}") from e
- allowed_prefixes = (
- f"{settings.ENV}/{organization_id}/",
- f"{DOWNLOAD_FILE_PREFIX}/{settings.ENV}/{organization_id}/",
- )
- if parsed_uri.container != settings.AZURE_STORAGE_CONTAINER_UPLOADS or not any(
- parsed_uri.blob_path.startswith(prefix) for prefix in allowed_prefixes
- ):
- raise PermissionError(f"No permission to access storage URI: {uri}")
+ # Uploads container: blob paths use {env}/{org}/ or downloads/{env}/{org}/
+ if parsed_uri.container == settings.AZURE_STORAGE_CONTAINER_UPLOADS:
+ allowed_prefixes = (
+ f"{settings.ENV}/{organization_id}/",
+ f"{DOWNLOAD_FILE_PREFIX}/{settings.ENV}/{organization_id}/",
+ )
+ if any(parsed_uri.blob_path.startswith(prefix) for prefix in allowed_prefixes):
+ return
+
+ # Artifacts container: blob paths use v1/{env}/{org}/
+ if parsed_uri.container == settings.AZURE_STORAGE_CONTAINER_ARTIFACTS:
+ artifact_prefix = f"{self._PATH_VERSION}/{settings.ENV}/{organization_id}/"
+ if parsed_uri.blob_path.startswith(artifact_prefix):
+ return
+
+ raise PermissionError(f"No permission to access storage URI: {uri}")
async def download_managed_file(self, uri: str, organization_id: str) -> bytes | None:
"""Download a managed org-scoped file from Azure."""
diff --git a/skyvern/forge/sdk/artifact/storage/s3.py b/skyvern/forge/sdk/artifact/storage/s3.py
index 2435bbb60..25dffb623 100644
--- a/skyvern/forge/sdk/artifact/storage/s3.py
+++ b/skyvern/forge/sdk/artifact/storage/s3.py
@@ -575,14 +575,22 @@ class S3Storage(BaseStorage):
except Exception as e:
raise PermissionError(f"No permission to access storage URI: {uri}") from e
- allowed_prefixes = (
- f"{settings.ENV}/{organization_id}/",
- f"{DOWNLOAD_FILE_PREFIX}/{settings.ENV}/{organization_id}/",
- )
- if parsed_uri.bucket != settings.AWS_S3_BUCKET_UPLOADS or not any(
- parsed_uri.key.startswith(prefix) for prefix in allowed_prefixes
- ):
- raise PermissionError(f"No permission to access storage URI: {uri}")
+ # Uploads bucket: keys use {env}/{org}/ or downloads/{env}/{org}/
+ if parsed_uri.bucket == settings.AWS_S3_BUCKET_UPLOADS:
+ allowed_prefixes = (
+ f"{settings.ENV}/{organization_id}/",
+ f"{DOWNLOAD_FILE_PREFIX}/{settings.ENV}/{organization_id}/",
+ )
+ if any(parsed_uri.key.startswith(prefix) for prefix in allowed_prefixes):
+ return
+
+ # Artifacts bucket: keys use v1/{env}/{org}/
+ if parsed_uri.bucket == settings.AWS_S3_BUCKET_ARTIFACTS:
+ artifact_prefix = f"{self._PATH_VERSION}/{settings.ENV}/{organization_id}/"
+ if parsed_uri.key.startswith(artifact_prefix):
+ return
+
+ raise PermissionError(f"No permission to access storage URI: {uri}")
async def download_managed_file(self, uri: str, organization_id: str) -> bytes | None:
"""Download a managed org-scoped file from S3."""
diff --git a/skyvern/forge/sdk/artifact/storage/test_azure_storage.py b/skyvern/forge/sdk/artifact/storage/test_azure_storage.py
index 742a0ec6d..5153a41e1 100644
--- a/skyvern/forge/sdk/artifact/storage/test_azure_storage.py
+++ b/skyvern/forge/sdk/artifact/storage/test_azure_storage.py
@@ -156,11 +156,30 @@ class TestAzureStorageBrowserSessionFiles:
azure_storage.assert_managed_file_access(legacy_uri, TEST_ORGANIZATION_ID)
azure_storage.assert_managed_file_access(downloads_uri, TEST_ORGANIZATION_ID)
+ async def test_assert_managed_file_access_accepts_artifact_container(
+ self, azure_storage: AzureStorageForTests
+ ) -> None:
+ artifact_uri = (
+ f"azure://{settings.AZURE_STORAGE_CONTAINER_ARTIFACTS}/v1/{settings.ENV}/{TEST_ORGANIZATION_ID}/"
+ "workflow_runs/wr_123/wrb_456/2026-03-23T17:57:58.370827_a_789_pdf.pdf"
+ )
+ azure_storage.assert_managed_file_access(artifact_uri, TEST_ORGANIZATION_ID)
+
async def test_assert_managed_file_access_rejects_other_org(self, azure_storage: AzureStorageForTests) -> None:
uri = f"azure://{settings.AZURE_STORAGE_CONTAINER_UPLOADS}/{settings.ENV}/o_other/file.pdf"
with pytest.raises(PermissionError, match="No permission to access storage URI"):
azure_storage.assert_managed_file_access(uri, TEST_ORGANIZATION_ID)
+ async def test_assert_managed_file_access_rejects_other_org_artifact_container(
+ self, azure_storage: AzureStorageForTests
+ ) -> None:
+ uri = (
+ f"azure://{settings.AZURE_STORAGE_CONTAINER_ARTIFACTS}/v1/{settings.ENV}/o_other/"
+ "workflow_runs/wr_123/wrb_456/artifact.pdf"
+ )
+ with pytest.raises(PermissionError, match="No permission to access storage URI"):
+ azure_storage.assert_managed_file_access(uri, TEST_ORGANIZATION_ID)
+
async def test_download_managed_file(self, azure_storage: AzureStorageForTests) -> None:
"""Test downloading a managed file."""
test_data = b"uploaded file content"
diff --git a/skyvern/forge/sdk/artifact/storage/test_s3_storage.py b/skyvern/forge/sdk/artifact/storage/test_s3_storage.py
index 3c28db3e6..f18febc51 100644
--- a/skyvern/forge/sdk/artifact/storage/test_s3_storage.py
+++ b/skyvern/forge/sdk/artifact/storage/test_s3_storage.py
@@ -388,11 +388,26 @@ class TestS3StorageBrowserSessionFiles:
s3_storage.assert_managed_file_access(legacy_uri, TEST_ORGANIZATION_ID)
s3_storage.assert_managed_file_access(downloads_uri, TEST_ORGANIZATION_ID)
+ async def test_assert_managed_file_access_accepts_artifact_bucket(self, s3_storage: S3Storage) -> None:
+ artifact_uri = (
+ f"s3://{settings.AWS_S3_BUCKET_ARTIFACTS}/v1/{settings.ENV}/{TEST_ORGANIZATION_ID}/"
+ "workflow_runs/wr_123/wrb_456/2026-03-23T17:57:58.370827_a_789_pdf.pdf"
+ )
+ s3_storage.assert_managed_file_access(artifact_uri, TEST_ORGANIZATION_ID)
+
async def test_assert_managed_file_access_rejects_other_org(self, s3_storage: S3Storage) -> None:
uri = f"s3://{settings.AWS_S3_BUCKET_UPLOADS}/{settings.ENV}/o_other/uploaded.pdf"
with pytest.raises(PermissionError, match="No permission to access storage URI"):
s3_storage.assert_managed_file_access(uri, TEST_ORGANIZATION_ID)
+ async def test_assert_managed_file_access_rejects_other_org_artifact_bucket(self, s3_storage: S3Storage) -> None:
+ uri = (
+ f"s3://{settings.AWS_S3_BUCKET_ARTIFACTS}/v1/{settings.ENV}/o_other/"
+ "workflow_runs/wr_123/wrb_456/artifact.pdf"
+ )
+ with pytest.raises(PermissionError, match="No permission to access storage URI"):
+ s3_storage.assert_managed_file_access(uri, TEST_ORGANIZATION_ID)
+
async def test_download_managed_file(self, s3_storage: S3Storage) -> None:
"""Test downloading a managed file."""
test_data = b"uploaded file content"
diff --git a/tests/unit/test_file_download_access_control.py b/tests/unit/test_file_download_access_control.py
index c99944f6e..2995ac682 100644
--- a/tests/unit/test_file_download_access_control.py
+++ b/tests/unit/test_file_download_access_control.py
@@ -25,11 +25,20 @@ def _downloads_s3_uri(organization_id: str) -> str:
)
+def _artifact_s3_uri(organization_id: str) -> str:
+ return (
+ f"s3://{settings.AWS_S3_BUCKET_ARTIFACTS}/"
+ f"v1/{settings.ENV}/{organization_id}/workflow_runs/wr_123/wrb_456/artifact.pdf"
+ )
+
+
@pytest.fixture(autouse=True)
def storage(monkeypatch: pytest.MonkeyPatch) -> SimpleNamespace:
def assert_managed_file_access(uri: str, organization_id: str) -> None:
if organization_id == ATTACKER_ORG_ID and (
- uri == _legacy_s3_uri(ATTACKER_ORG_ID) or uri == _downloads_s3_uri(ATTACKER_ORG_ID)
+ uri == _legacy_s3_uri(ATTACKER_ORG_ID)
+ or uri == _downloads_s3_uri(ATTACKER_ORG_ID)
+ or uri == _artifact_s3_uri(ATTACKER_ORG_ID)
):
return
raise PermissionError(f"No permission to access storage URI: {uri}")
@@ -86,6 +95,35 @@ async def test_download_file_allows_same_org_downloaded_artifact(storage: Simple
os.unlink(path)
+async def test_download_file_allows_same_org_artifact_uri(storage: SimpleNamespace) -> None:
+ path = await files.download_file(_artifact_s3_uri(ATTACKER_ORG_ID), organization_id=ATTACKER_ORG_ID)
+
+ storage.assert_managed_file_access.assert_called_once_with(_artifact_s3_uri(ATTACKER_ORG_ID), ATTACKER_ORG_ID)
+ storage.download_managed_file.assert_awaited_once_with(_artifact_s3_uri(ATTACKER_ORG_ID), ATTACKER_ORG_ID)
+ try:
+ with open(path, "rb") as f:
+ assert f.read() == b"tenant-secret-bytes"
+ finally:
+ os.unlink(path)
+
+
+async def test_download_file_rejects_cross_org_artifact_uri(storage: SimpleNamespace) -> None:
+ with pytest.raises(PermissionError, match="No permission to access storage URI"):
+ await files.download_file(_artifact_s3_uri(VICTIM_ORG_ID), organization_id=ATTACKER_ORG_ID)
+
+ storage.download_managed_file.assert_not_called()
+
+
+def test_validate_download_url_allows_same_org_artifact_uri() -> None:
+ assert files.validate_download_url(_artifact_s3_uri(ATTACKER_ORG_ID), organization_id=ATTACKER_ORG_ID) is True
+
+
+def test_validate_download_url_rejects_cross_org_artifact_uri() -> None:
+ assert files.validate_download_url(_artifact_s3_uri(VICTIM_ORG_ID), organization_id=ATTACKER_ORG_ID) is False
+
+
def test_validate_download_url_rejects_s3_uri_without_org_id() -> None:
assert files.validate_download_url(_legacy_s3_uri(ATTACKER_ORG_ID), organization_id=None) is False