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): validate member invitation email addresses (#43643)

林玮 (Jade Lin)99650364b124
diff --git a/api/controllers/console/workspace/members.py b/api/controllers/console/workspace/members.py
index 391aa52637d..9a856fce14b 100644
--- a/api/controllers/console/workspace/members.py
+++ b/api/controllers/console/workspace/members.py
@@ -29,7 +29,7 @@ from enums.account import TenantAccountRole
from extensions.ext_application_services import application_services
from fields.base import ResponseModel
from fields.member_fields import AccountWithRoleListResponse, AccountWithRoleResponse
-from libs.helper import dump_response, extract_remote_ip
+from libs.helper import EmailStr, dump_response, extract_remote_ip
from machinery.context import RequestContext
from services.account_errors import AccountNotFoundError
from services.errors import workspace as workspace_errors
@@ -42,7 +42,7 @@ from services.errors.workspace import (
class MemberInvitePayload(BaseModel):
- emails: list[str] = Field(min_length=1)
+ emails: list[EmailStr] = Field(min_length=1)
role: str
language: str | None = None
@@ -169,7 +169,7 @@ class MemberInviteEmailApi(Resource):
@console_ns.response(HTTPStatus.CREATED, "Success", console_ns.models[MemberInviteResponse.__name__])
@console_ns.response(
HTTPStatus.BAD_REQUEST,
- "Invalid role or workspace member limit exceeded",
+ "Invalid email, role, or workspace member limit exceeded",
console_ns.models[MemberInviteErrorResponse.__name__],
)
@console_account_admission()
diff --git a/api/openapi/markdown/console-openapi.md b/api/openapi/markdown/console-openapi.md
index 19ac05f600f..a06b2e6da02 100644
--- a/api/openapi/markdown/console-openapi.md
+++ b/api/openapi/markdown/console-openapi.md
@@ -10337,7 +10337,7 @@ Update a plugin endpoint
| Code | Description | Schema |
| ---- | ----------- | ------ |
| 201 | Success | **application/json**: [MemberInviteResponse](#memberinviteresponse)<br> |
-| 400 | Invalid role or workspace member limit exceeded | **application/json**: [MemberInviteErrorResponse](#memberinviteerrorresponse)<br> |
+| 400 | Invalid email, role, or workspace member limit exceeded | **application/json**: [MemberInviteErrorResponse](#memberinviteerrorresponse)<br> |
### [POST] /workspaces/current/members/owner-transfer-check
#### Request Body
diff --git a/api/tests/unit_tests/controllers/console/workspace/test_members.py b/api/tests/unit_tests/controllers/console/workspace/test_members.py
index b2e2f6112ff..d542d8c7322 100644
--- a/api/tests/unit_tests/controllers/console/workspace/test_members.py
+++ b/api/tests/unit_tests/controllers/console/workspace/test_members.py
@@ -8,6 +8,7 @@ from unittest.mock import Mock, create_autospec, patch
import pytest
from flask import Flask
from flask_restx import Api, Resource
+from pydantic import ValidationError
from werkzeug.exceptions import Forbidden, NotFound
from controllers.console.auth.error import (
@@ -308,6 +309,24 @@ def test_bulk_invite_serializes_results_and_normalizes_input(app: Flask, service
)
+ "invalid_email",
+ ["", "invalid-email", "@example.com", "user@", "user@example", "[email protected]\n", "[email protected]\r\n"],
+)
+def test_bulk_invite_rejects_invalid_email_before_inviting(app: Flask, services: Mock, invalid_email: str) -> None:
+ api = MemberInviteEmailApi()
+ with (
+ app.test_request_context(
+ "/", method="POST", json={"emails": ["[email protected]", invalid_email], "role": "normal"}
+ ),
+ pytest.raises(ValidationError, match="not a valid email") as error,
+ ):
+ unwrap(api.post)(api, RequestContext("request", None, "owner", "workspace"))
+
+ assert error.value.errors()[0]["loc"] == ("emails", 1)
+ services.workspaces.invitations.invite_many.assert_not_called()
+
+
@pytest.mark.parametrize(("seats", "expected"), [(True, SeatsLimitExceeded), (False, WorkspaceMembersLimitExceeded)])
def test_invite_maps_capacity_error(app: Flask, services: Mock, seats: bool, expected: type[Exception]) -> None:
from services.errors.workspace import WorkspaceInvitationQuotaError