RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.
Go agent-harnessagent-native-databaseagentic-aiagentic-retrievalagentic-searchaiai-agentscontext-enginecontext-engineeringcontext-managementharness-engineeringknowledge-compilationragretrieval-augmented-generationretrieval-harnesssearch-harness
fix(storage): accept tenant arguments in encrypted Azure calls (#19457)
Wenchao Ancf18c94acd72
diff --git a/rag/utils/azure_sas_conn.py b/rag/utils/azure_sas_conn.pyindex bfecc64d84..3706a7abd4 100644--- a/rag/utils/azure_sas_conn.py+++ b/rag/utils/azure_sas_conn.py@@ -61,13 +61,13 @@ class RAGFlowAzureSasBlob:self.__open__()time.sleep(1)- def rm(self, bucket, fnm):+ def rm(self, bucket, fnm, tenant_id=None):try:self.conn.delete_blob(f"{bucket}/{fnm}")except Exception:logging.exception(f"Fail rm {bucket}/{fnm}")- def get(self, bucket, fnm):+ def get(self, bucket, fnm, tenant_id=None):blob_name = f"{bucket}/{fnm}"for _ in range(1):try:@@ -79,12 +79,12 @@ class RAGFlowAzureSasBlob:time.sleep(1)return None- def obj_exist(self, bucket, fnm):+ def obj_exist(self, bucket, fnm, tenant_id=None):blob_name = f"{bucket}/{fnm}"try:return self.conn.get_blob_client(f"{blob_name}").exists()except Exception:- logging.exception(f"Fail put {blob_name}")+ logging.exception(f"Fail obj_exist {blob_name}")return Falsedef get_presigned_url(self, bucket, fnm, expires):diff --git a/rag/utils/azure_spn_conn.py b/rag/utils/azure_spn_conn.pyindex ebc8585832..abd64b4f82 100644--- a/rag/utils/azure_spn_conn.py+++ b/rag/utils/azure_spn_conn.py@@ -80,14 +80,14 @@ class RAGFlowAzureSpnBlob:return Nonereturn None- def rm(self, bucket, fnm):+ def rm(self, bucket, fnm, tenant_id=None):blob = f"{bucket}/{fnm}"try:self.conn.delete_file(f"{blob}")except Exception:logging.exception(f"Fail rm {blob}")- def get(self, bucket, fnm):+ def get(self, bucket, fnm, tenant_id=None):blob = f"{bucket}/{fnm}"for _ in range(1):try:@@ -100,13 +100,13 @@ class RAGFlowAzureSpnBlob:time.sleep(1)return None- def obj_exist(self, bucket, fnm):+ def obj_exist(self, bucket, fnm, tenant_id=None):blob = f"{bucket}/{fnm}"try:client = self.conn.get_blob_client(f"{blob}")return client.exists()except Exception:- logging.exception(f"Fail put {blob}")+ logging.exception(f"Fail obj_exist {blob}")return Falsedef get_presigned_url(self, bucket, fnm, expires):diff --git a/test/unit_test/rag/utils/test_azure_encrypted_storage.py b/test/unit_test/rag/utils/test_azure_encrypted_storage.pynew file mode 100644index 0000000000..5b4d1fa83b--- /dev/null+++ b/test/unit_test/rag/utils/test_azure_encrypted_storage.py@@ -0,0 +1,100 @@+#+# Copyright 2026 The InfiniFlow Authors. All Rights Reserved.+#+# Licensed under the Apache License, Version 2.0 (the "License");+# you may not use this file except in compliance with the License.+# You may obtain a copy of the License at+#+# http://www.apache.org/licenses/LICENSE-2.0+#+# Unless required by applicable law or agreed to in writing, software+# distributed under the License is distributed on an "AS IS" BASIS,+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+# See the License for the specific language governing permissions and+# limitations under the License.+#++"""Azure adapters must accept the tenant argument forwarded by encrypted storage."""++import importlib.util+import sys+from io import BytesIO+from pathlib import Path+from types import ModuleType+from unittest.mock import Mock++import pytest+from azure.storage.blob import ContainerClient+from azure.storage.filedatalake import FileSystemClient++import common+from rag.utils.encrypted_storage import EncryptedStorageWrapper++pytestmark = pytest.mark.p2++[email protected](params=[("azure_sas_conn", "RAGFlowAzureSasBlob", ContainerClient), ("azure_spn_conn", "RAGFlowAzureSpnBlob", FileSystemClient)])+def storage(request, monkeypatch):+ """Load a fresh singleton without loading service settings or credentials."""+ name, factory, client_type = request.param+ settings = ModuleType("common.settings")+ settings.AZURE = {}+ monkeypatch.setitem(sys.modules, "common.settings", settings)+ monkeypatch.setattr(common, "settings", settings, raising=False)+ path = Path(__file__).resolve().parents[4] / "rag" / "utils" / (name + ".py")+ spec = importlib.util.spec_from_file_location("test_" + name, path)+ module = importlib.util.module_from_spec(spec)+ # Bypass only singleton/connection setup; keep all adapter method bodies.+ with monkeypatch.context() as load_patch:+ load_patch.setattr("common.decorator.singleton", lambda cls: cls)+ spec.loader.exec_module(module)+ cls = getattr(module, factory)+ adapter = cls.__new__(cls)+ adapter.conn = Mock(spec=client_type)+ return adapter, name++[email protected]("tenant_id", [None, "tenant-a"])+def test_encrypted_get_decrypts_backend_bytes(storage, tenant_id):+ adapter, name = storage+ wrapper = EncryptedStorageWrapper(adapter, key="test-key")+ encrypted = wrapper.crypto.encrypt(b"document contents")+ if name == "azure_sas_conn":+ adapter.conn.download_blob.return_value = BytesIO(encrypted)+ else:+ adapter.conn.get_file_client.return_value.download_file.return_value = BytesIO(encrypted)+ assert wrapper.get("kb", "file.txt", tenant_id) == b"document contents"++[email protected]("tenant_id", [None, "tenant-a"])+def test_encrypted_rm_deletes_same_object(storage, tenant_id):+ adapter, name = storage+ wrapper = EncryptedStorageWrapper(adapter, key="test-key")+ wrapper.rm("kb", "file.txt", tenant_id)+ delete = adapter.conn.delete_blob if name == "azure_sas_conn" else adapter.conn.delete_file+ delete.assert_called_once_with("kb/file.txt")++[email protected]("tenant_id", [None, "tenant-a"])[email protected]("exists", [False, True])+def test_encrypted_obj_exist_preserves_backend_result(storage, tenant_id, exists):+ adapter, name = storage+ if name == "azure_sas_conn":+ adapter.conn.get_blob_client.return_value.exists.return_value = exists+ else:+ adapter.conn.get_file_client.return_value.exists.return_value = exists+ # The separate SPN get_blob_client defect remains out of scope: the real+ # FileSystemClient spec rejects it, and the adapter currently returns False.+ expected = adapter.obj_exist("kb", "file.txt")+ wrapper = EncryptedStorageWrapper(adapter, key="test-key")+ assert wrapper.obj_exist("kb", "file.txt", tenant_id) is expected+++def test_direct_get_and_rm_remain_callable_without_tenant(storage):+ adapter, name = storage+ if name == "azure_sas_conn":+ adapter.conn.download_blob.return_value = BytesIO(b"plain")+ else:+ adapter.conn.get_file_client.return_value.download_file.return_value = BytesIO(b"plain")+ assert adapter.get("kb", "file.txt") == b"plain"+ adapter.rm("kb", "file.txt")