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): reject invalid model provider icon paths (#45445)

非法操作52ae152e008b
diff --git a/api/controllers/console/workspace/model_providers.py b/api/controllers/console/workspace/model_providers.py
index 14d32e1b071..0eb53b4d12d 100644
--- a/api/controllers/console/workspace/model_providers.py
+++ b/api/controllers/console/workspace/model_providers.py
@@ -1,9 +1,10 @@
import io
-from typing import Any, Literal
+from typing import Annotated, Any, Literal
+from uuid import UUID
from flask import send_file
from flask_restx import Resource
-from pydantic import BaseModel, Field, field_validator
+from pydantic import BaseModel, BeforeValidator, Field, field_validator
from controllers.common.fields import SimpleResultResponse, ValidationResultResponse
from controllers.common.rbac import RBACCheck, Workspace
@@ -39,6 +40,11 @@ class ParserModelList(BaseModel):
model_type: ModelType | None = None
+class ModelProviderIconPath(BaseModel):
+ tenant_id: UUID
+ icon_type: Annotated[Literal["icon_small", "icon_small_dark"], BeforeValidator(str.lower)]
+
+
class ParserCredentialId(BaseModel):
credential_id: str | None = None
@@ -349,12 +355,17 @@ class ModelProviderIconApi(Resource):
@console_ns.response(200, "Model provider icon")
def get(self, tenant_id: str, provider: str, icon_type: str, lang: str):
+ """Return an icon for a tenant UUID and a supported icon type.
+
+ Invalid path arguments fail before provider discovery or asset access.
+ """
# response-contract:ignore binary send_file response
+ path = ModelProviderIconPath.model_validate({"tenant_id": tenant_id, "icon_type": icon_type})
model_provider_service = ModelProviderService()
icon, mimetype = model_provider_service.get_model_provider_icon(
- tenant_id=tenant_id,
+ tenant_id=str(path.tenant_id),
provider=provider,
- icon_type=icon_type,
+ icon_type=path.icon_type,
lang=lang,
)
if icon is None:
diff --git a/api/openapi/markdown/console-openapi.md b/api/openapi/markdown/console-openapi.md
index c4da769ac2e..50497e0c6af 100644
--- a/api/openapi/markdown/console-openapi.md
+++ b/api/openapi/markdown/console-openapi.md
@@ -18772,6 +18772,10 @@ Import a Skill zip package from multipart form field `file`.
| default | Error | **application/json**: [ErrorResponse](#errorresponse)<br> |
### [GET] /workspaces/{tenant_id}/model-providers/{provider}/{icon_type}/{lang}
+**Return an icon for a tenant UUID and a supported icon type**
+
+Invalid path arguments fail before provider discovery or asset access.
+
#### Parameters
| Name | Located in | Description | Required | Schema |
diff --git a/api/tests/unit_tests/controllers/console/workspace/test_model_providers.py b/api/tests/unit_tests/controllers/console/workspace/test_model_providers.py
index 554d9307a76..7ac8cebf7a5 100644
--- a/api/tests/unit_tests/controllers/console/workspace/test_model_providers.py
+++ b/api/tests/unit_tests/controllers/console/workspace/test_model_providers.py
@@ -44,6 +44,7 @@ from graphon.model_runtime.entities.common_entities import I18nObject
from graphon.model_runtime.entities.model_entities import ModelType
from graphon.model_runtime.entities.provider_entities import ConfigurateMethod
from graphon.model_runtime.errors.validate import CredentialsValidateFailedError
+from libs.external_api import ExternalApi
from models import Account
from models.account import TenantAccountRole
from models.provider import ProviderType
@@ -631,7 +632,8 @@ class TestModelProviderValidateApi:
class TestModelProviderIconApi:
- def test_icon_success(self, app: Flask):
+ @pytest.mark.parametrize("icon_type", ["icon_small", "icon_small_dark", "ICON_SMALL", "ICON_SMALL_DARK"])
+ def test_icon_success(self, app: Flask, icon_type: str):
api = ModelProviderIconApi()
with (
@@ -641,9 +643,11 @@ class TestModelProviderIconApi:
return_value=(b"123", "image/png"),
) as get_model_provider_icon,
):
- response = api.get("t1", "openai", "logo", "en")
+ response = api.get(VALID_UUID, "openai", icon_type, "en_US")
- get_model_provider_icon.assert_called_once_with(tenant_id="t1", provider="openai", icon_type="logo", lang="en")
+ get_model_provider_icon.assert_called_once_with(
+ tenant_id=VALID_UUID, provider="openai", icon_type=icon_type.lower(), lang="en_US"
+ )
assert response.mimetype == "image/png"
response.direct_passthrough = False
assert response.get_data() == b"123"
@@ -658,8 +662,40 @@ class TestModelProviderIconApi:
return_value=(None, None),
),
):
- with pytest.raises(ValueError, match="icon not found for provider openai, icon_type logo, lang en"):
- api.get("t1", "openai", "logo", "en")
+ with pytest.raises(
+ ValueError, match="icon not found for provider openai, icon_type icon_small, lang en_US"
+ ):
+ api.get(VALID_UUID, "openai", "icon_small", "en_US")
+
+ @pytest.mark.parametrize(
+ ("tenant_id", "icon_type", "invalid_field"),
+ [
+ ("current", "icon_large", "tenant_id"),
+ ("current", "icon_small", "tenant_id"),
+ (INVALID_UUID, "icon_small", "tenant_id"),
+ (VALID_UUID, "icon_large", "icon_type"),
+ (VALID_UUID, "logo", "icon_type"),
+ ],
+ )
+ def test_invalid_icon_path_returns_bad_request(self, tenant_id: str, icon_type: str, invalid_field: str):
+ """Reject invalid paths over HTTP without configuring provider dependencies."""
+ app = Flask(__name__)
+ api = ExternalApi(app)
+ api.add_resource(
+ ModelProviderIconApi,
+ "/console/api/workspaces/<string:tenant_id>/model-providers/"
+ "<path:provider>/<string:icon_type>/<string:lang>",
+ )
+
+ response = app.test_client().get(
+ f"/console/api/workspaces/{tenant_id}/model-providers/ollama/{icon_type}/en_US"
+ )
+
+ assert response.status_code == 400
+ body = response.get_json()
+ assert body["code"] == "invalid_param"
+ assert body["status"] == 400
+ assert invalid_field in body["message"]
class TestPreferredProviderTypeUpdateApi:
diff --git a/packages/contracts/generated/api/console/workspaces/orpc.gen.ts b/packages/contracts/generated/api/console/workspaces/orpc.gen.ts
index a8065b0f3c9..5fc2e147f09 100644
--- a/packages/contracts/generated/api/console/workspaces/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/workspaces/orpc.gen.ts
@@ -6265,12 +6265,19 @@ export const switch3 = {
post: post95,
}
+/**
+ * Return an icon for a tenant UUID and a supported icon type
+ *
+ * Invalid path arguments fail before provider discovery or asset access.
+ */
export const get134 = oc
.route({
+ description: 'Invalid path arguments fail before provider discovery or asset access.',
inputStructure: 'detailed',
method: 'GET',
operationId: 'getWorkspacesByTenantIdModelProvidersByProviderByIconTypeByLang',
path: '/workspaces/{tenant_id}/model-providers/{provider}/{icon_type}/{lang}',
+ summary: 'Return an icon for a tenant UUID and a supported icon type',
tags: ['console'],
})
.input(z.object({ params: zGetWorkspacesByTenantIdModelProvidersByProviderByIconTypeByLangPath }))