Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

fix(api): compare datasource credentials as JSON on MySQL (#44039)

非法操作ca7065e69b6d
diff --git a/api/repositories/data_source/credential_repository.py b/api/repositories/data_source/credential_repository.py
index 3d818301808..470648e25a3 100644
--- a/api/repositories/data_source/credential_repository.py
+++ b/api/repositories/data_source/credential_repository.py
@@ -4,6 +4,7 @@ from collections.abc import Mapping
from typing import cast
from pydantic import TypeAdapter, ValidationError
+from sqlalchemy import cast as sql_cast
from sqlalchemy import select, update
from sqlalchemy.engine import CursorResult
from sqlalchemy.orm import Session, sessionmaker
@@ -205,6 +206,13 @@ def _update_datasource_credentials_if_unchanged(
expires_at: int,
) -> bool:
credentials = _CREDENTIALS_ADAPTER.validate_python(encrypted_credentials)
+ expected_credentials = _CREDENTIALS_ADAPTER.validate_python(record.encrypted_credentials)
+ credentials_match = DatasourceProvider.encrypted_credentials == expected_credentials
+ if session.get_bind().dialect.name == "mysql":
+ # MySQL otherwise compares the JSON column with the bound value as a string scalar.
+ credentials_match = DatasourceProvider.encrypted_credentials == sql_cast(
+ expected_credentials, DatasourceProvider.encrypted_credentials.type
+ )
result = session.execute(
update(DatasourceProvider)
.where(
@@ -213,8 +221,7 @@ def _update_datasource_credentials_if_unchanged(
DatasourceProvider.provider == record.provider,
DatasourceProvider.plugin_id == record.plugin_id,
DatasourceProvider.user_id == record.owner_id,
- DatasourceProvider.encrypted_credentials
- == _CREDENTIALS_ADAPTER.validate_python(record.encrypted_credentials),
+ credentials_match,
DatasourceProvider.expires_at == record.expires_at,
)
.values(
diff --git a/api/tests/unit_tests/repositories/data_source/test_credential_repository.py b/api/tests/unit_tests/repositories/data_source/test_credential_repository.py
index 23ab5055a5a..e12bb2c15f8 100644
--- a/api/tests/unit_tests/repositories/data_source/test_credential_repository.py
+++ b/api/tests/unit_tests/repositories/data_source/test_credential_repository.py
@@ -1,14 +1,21 @@
import json
+from datetime import datetime
+from unittest.mock import create_autospec
import pytest
from sqlalchemy import select
+from sqlalchemy.dialects import mysql, postgresql, sqlite
+from sqlalchemy.engine import Dialect
from sqlalchemy.orm import Session, sessionmaker
from models.credential_permission import CredentialPermission, CredentialType
from models.dataset import Dataset, Document
from models.enums import DataSourceType, DocumentCreatedFrom, PermissionEnum
from models.oauth import DatasourceOauthParamConfig, DatasourceOauthTenantParamConfig, DatasourceProvider
-from repositories.data_source.credential_repository import SQLAlchemyDatasourceCredentialRepository
+from repositories.data_source.credential_repository import (
+ SQLAlchemyDatasourceCredentialRepository,
+ _update_datasource_credentials_if_unchanged,
+)
from services.data_source.entities.credential import DatasourceCredentialRecord
@@ -340,6 +347,45 @@ def test_update_if_unchanged_persists_refreshed_snapshot(
assert stored.updated_at >= record.updated_at
+ ("dialect", "expected_fragment"),
+ [
+ (mysql.dialect(), "encrypted_credentials = CAST(%s AS JSON)"),
+ (postgresql.dialect(), "::JSONB"),
+ (sqlite.dialect(), "encrypted_credentials = ?"),
+ ],
+ ids=["mysql", "postgresql", "sqlite"],
+)
+def test_update_if_unchanged_compiles_json_comparison_for_dialect(dialect: Dialect, expected_fragment: str) -> None:
+ session = create_autospec(Session, instance=True, spec_set=True)
+ session.get_bind.return_value.dialect.name = dialect.name
+ session.execute.return_value.rowcount = 1
+ record = DatasourceCredentialRecord(
+ id="credential-1",
+ workspace_id="workspace-1",
+ owner_id="owner-1",
+ name="Notion",
+ provider="notion_datasource",
+ plugin_id="langgenius/notion_datasource",
+ auth_type="oauth2",
+ encrypted_credentials={"integration_secret": "encrypted"},
+ expires_at=-1,
+ updated_at=datetime(2026, 1, 1),
+ )
+
+ assert _update_datasource_credentials_if_unchanged(
+ session,
+ record=record,
+ encrypted_credentials={"integration_secret": "new"},
+ expires_at=100,
+ )
+
+ statement = session.execute.call_args.args[0]
+ compiled = str(statement.compile(dialect=dialect))
+ assert expected_fragment in compiled
+ assert ("CAST(" in compiled) is (dialect.name == "mysql")
+
+
def test_get_for_stored_document_reconstructs_complete_owner_chain(
sqlite_session_factory: sessionmaker[Session],
) -> None: