feat: harden support, localize knowledge and add operator availability [skip ci]
Source-only publication of reviewed commit 64e96a7f423673dc29ad56485be9fc79bce8af1c.
Passed in isolation: focused frontend/backend tests, race checks, TypeScript typecheck, lint, Go compilation, Flowgram build, and deterministic SDK build/tests.
Not accepted as a production release: Next.js export/native assembly remains blocked by environment memory limits; browser interaction and MySQL staging acceptance remain unverified. No production server, database/schema, runtime configuration, deployment, release tag, or workflow execution was performed.
Expected source tree: 0a4a7528e9.
This commit is contained in:
22
AGENTS.md
22
AGENTS.md
@@ -273,3 +273,25 @@ Before handing off a change, confirm the applicable items:
|
|||||||
- Generated files were regenerated from their source and were not manually edited.
|
- Generated files were regenerated from their source and were not manually edited.
|
||||||
- Relevant tests/typechecks/lint/build/browser checks were run, and any validation limitation is reported.
|
- Relevant tests/typechecks/lint/build/browser checks were run, and any validation limitation is reported.
|
||||||
- `git diff --check` passes and unrelated worktree changes remain untouched.
|
- `git diff --check` passes and unrelated worktree changes remain untouched.
|
||||||
|
|
||||||
|
|
||||||
|
## Independent hardening fork boundaries
|
||||||
|
|
||||||
|
Modified in this independent fork. Preserve the upstream license and existing
|
||||||
|
notices. Public history begins from a source snapshot, not the upstream Git
|
||||||
|
history. See docs/hardening/README.md for the source revision and release gate.
|
||||||
|
|
||||||
|
- Treat canonical customer/channel identity, scoped issuer proof, live-session
|
||||||
|
revalidation and permission-filtered WebSocket delivery as security invariants.
|
||||||
|
Never restore raw external-ID topic routing or unscoped public identity lookup.
|
||||||
|
- Old customer tokens and legacy identity reconciliation have explicit upgrade
|
||||||
|
implications. Do not auto-merge legacy customers or delete history to make a
|
||||||
|
migration pass; follow docs/hardening/CUSTOMER_IDENTITY_UPGRADE.md.
|
||||||
|
- Setup repair previews must bind exact named changes to the caller and current
|
||||||
|
state. Apply requires explicit matching approval and transactional writes.
|
||||||
|
Never resurrect deleted configuration or silently create working schedules.
|
||||||
|
- Keep editor drafts, sends and delayed async responses bound to their captured
|
||||||
|
identity and conversation. Clear only the sent draft revision after success.
|
||||||
|
- Maintain Russian alongside English and Chinese for every changed UI/API string.
|
||||||
|
- Keep docs/hardening/VALIDATION.md accurate. Tests authored but not executed are
|
||||||
|
not passing tests; source parsing is not a build or browser acceptance check.
|
||||||
|
|||||||
202
MODIFIED_FILES.md
Normal file
202
MODIFIED_FILES.md
Normal file
@@ -0,0 +1,202 @@
|
|||||||
|
# Modified-file notice
|
||||||
|
|
||||||
|
This independent fork modifies the source snapshot from
|
||||||
|
MonoVerseNS/agent-desk-ng revision
|
||||||
|
`b06954b0a495389cbb5194e0d388342eabe60636` on 2026-10-16.
|
||||||
|
The initial Gitea snapshot `e57610a27c556e005b9b3b68115477ba1fdd3f1b`
|
||||||
|
has the same source tree without importing the old upstream history.
|
||||||
|
Upstream Apache-2.0 licensing and notices are retained.
|
||||||
|
|
||||||
|
Changes include security and chat recovery, knowledge localization, operator
|
||||||
|
availability, calendars, and supporting lifecycle fixes. See
|
||||||
|
[hardening notes](docs/hardening/README.md),
|
||||||
|
[knowledge localization](docs/knowledge-localization.md), and
|
||||||
|
[availability](docs/features/support-availability.md). Actual validation and
|
||||||
|
remaining release gates are [recorded separately](docs/hardening/VALIDATION.md).
|
||||||
|
This inventory is not a production-release or deployment claim.
|
||||||
|
|
||||||
|
Modified source files carry a change notice. JSON catalogs retain their
|
||||||
|
accompanying `.license` notices; generated enums retain their generator header
|
||||||
|
and are identified here.
|
||||||
|
|
||||||
|
## Modified upstream files
|
||||||
|
|
||||||
|
- `AGENTS.md`
|
||||||
|
- `README.md`
|
||||||
|
- `internal/ai/rag/answer.go`
|
||||||
|
- `internal/ai/rag/answer_test.go`
|
||||||
|
- `internal/ai/rag/index.go`
|
||||||
|
- `internal/ai/rag/index_retrieve_helpers_test.go`
|
||||||
|
- `internal/ai/rag/retrieve.go`
|
||||||
|
- `internal/ai/rag/retrieve_context.go`
|
||||||
|
- `internal/ai/rag/retrieve_search.go`
|
||||||
|
- `internal/bootstrap/routes.go`
|
||||||
|
- `internal/bootstrap/server.go`
|
||||||
|
- `internal/builders/conversation_builder.go`
|
||||||
|
- `internal/builders/knowledge_builder.go`
|
||||||
|
- `internal/handlers/api/customer_handler.go`
|
||||||
|
- `internal/handlers/dashboard/agent_handler.go`
|
||||||
|
- `internal/handlers/dashboard/knowledge_base_handler.go`
|
||||||
|
- `internal/handlers/dashboard/knowledge_directory_handler.go`
|
||||||
|
- `internal/handlers/dashboard/knowledge_document_handler.go`
|
||||||
|
- `internal/handlers/dashboard/knowledge_faq_handler.go`
|
||||||
|
- `internal/handlers/dashboard/knowledge_retrieve_handler.go`
|
||||||
|
- `internal/handlers/dashboard/knowledge_retrieve_log_handler.go`
|
||||||
|
- `internal/models/models.go`
|
||||||
|
- `internal/pkg/dto/dto.go`
|
||||||
|
- `internal/pkg/dto/request/setup_readiness_req.go`
|
||||||
|
- `internal/pkg/dto/response/setup_readiness_resp.go`
|
||||||
|
- `internal/pkg/enums/agent.go`
|
||||||
|
- `internal/pkg/eventbus/bus.go`
|
||||||
|
- `internal/pkg/eventbus/bus_test.go`
|
||||||
|
- `internal/pkg/i18nx/context.go`
|
||||||
|
- `internal/pkg/i18nx/locales/en-US.yml`
|
||||||
|
- `internal/pkg/i18nx/locales/ru-RU.yml`
|
||||||
|
- `internal/pkg/i18nx/locales/zh-CN.yml`
|
||||||
|
- `internal/pkg/openidentity/external_identity_test.go`
|
||||||
|
- `internal/pkg/openidentity/openidentity.go`
|
||||||
|
- `internal/repositories/customer_identity_repository.go`
|
||||||
|
- `internal/services/agent_profile_service.go`
|
||||||
|
- `internal/services/auth_service.go`
|
||||||
|
- `internal/services/channel_service.go`
|
||||||
|
- `internal/services/conversation_dispatch_service.go`
|
||||||
|
- `internal/services/conversation_human_dispatch_realtime_test.go`
|
||||||
|
- `internal/services/conversation_human_dispatch_service_test.go`
|
||||||
|
- `internal/services/conversation_service.go`
|
||||||
|
- `internal/services/customer_service.go`
|
||||||
|
- `internal/services/customer_session_service.go`
|
||||||
|
- `internal/services/dashboard_service.go`
|
||||||
|
- `internal/services/knowledge_base_service.go`
|
||||||
|
- `internal/services/knowledge_base_service_test.go`
|
||||||
|
- `internal/services/knowledge_faq_excel.go`
|
||||||
|
- `internal/services/knowledge_faq_excel_test.go`
|
||||||
|
- `internal/services/setup_readiness_service.go`
|
||||||
|
- `internal/services/setup_readiness_service_test.go`
|
||||||
|
- `internal/services/ws_connection_manager.go`
|
||||||
|
- `internal/services/ws_realtime_types.go`
|
||||||
|
- `internal/services/ws_service.go`
|
||||||
|
- `internal/services/ws_service_test.go`
|
||||||
|
- `web/app/(dashboard)/dashboard/_components/setup-readiness-banner.tsx`
|
||||||
|
- `web/app/(dashboard)/dashboard/agent-team-schedules/page.tsx`
|
||||||
|
- `web/app/(dashboard)/dashboard/agents/_components/edit.tsx`
|
||||||
|
- `web/app/(dashboard)/dashboard/agents/page.tsx`
|
||||||
|
- `web/app/(dashboard)/dashboard/channels/_components/edit.tsx`
|
||||||
|
- `web/app/(dashboard)/dashboard/conversations/_components/agent-message-editor.tsx`
|
||||||
|
- `web/app/(dashboard)/dashboard/conversations/_components/chat-panel.tsx`
|
||||||
|
- `web/app/(dashboard)/dashboard/knowledge/_components/debug-panel.tsx`
|
||||||
|
- `web/app/(dashboard)/dashboard/knowledge/_components/document-list.tsx`
|
||||||
|
- `web/app/(dashboard)/dashboard/knowledge/_components/faq-list.tsx`
|
||||||
|
- `web/app/(dashboard)/dashboard/knowledge/_components/knowledge-bulk-move-dialog.tsx`
|
||||||
|
- `web/app/(dashboard)/dashboard/knowledge/_components/knowledge-content-detail.tsx`
|
||||||
|
- `web/app/(dashboard)/dashboard/knowledge/_components/retrieve-log-detail.tsx`
|
||||||
|
- `web/app/(dashboard)/dashboard/knowledge/_components/retrieve-log-list.tsx`
|
||||||
|
- `web/app/(dashboard)/dashboard/knowledge/page.tsx`
|
||||||
|
- `web/app/(dashboard)/dashboard/setup/_components/setup-wizard-view.tsx`
|
||||||
|
- `web/app/(support)/support/chat/closed/page.tsx`
|
||||||
|
- `web/components/agent-realtime-provider.test.mjs`
|
||||||
|
- `web/components/auth-provider.tsx`
|
||||||
|
- `web/components/chat/shared-message-editor.tsx`
|
||||||
|
- `web/components/content-editor/html-editor.tsx`
|
||||||
|
- `web/components/content-editor/index.tsx`
|
||||||
|
- `web/components/conversation-actions/transfer-dialog.tsx`
|
||||||
|
- `web/components/nav-main.test.mjs`
|
||||||
|
- `web/components/notification-provider.tsx`
|
||||||
|
- `web/components/operator-readiness-indicator.tsx`
|
||||||
|
- `web/components/option-combobox.tsx`
|
||||||
|
- `web/components/palette-toggle.tsx`
|
||||||
|
- `web/components/session-provider.tsx`
|
||||||
|
- `web/components/site-header.tsx`
|
||||||
|
- `web/components/support-chat/chat-shell.tsx`
|
||||||
|
- `web/components/support-chat/close-navigation.test.mjs`
|
||||||
|
- `web/components/support-chat/close-navigation.ts`
|
||||||
|
- `web/components/support-chat/connection-status.tsx`
|
||||||
|
- `web/components/support-chat/customer-message-editor.tsx`
|
||||||
|
- `web/components/workbench-header.tsx`
|
||||||
|
- `web/components/workspace-switcher.test.mjs`
|
||||||
|
- `web/hooks/use-agent-conversation-realtime.ts`
|
||||||
|
- `web/lib/api/auth.ts`
|
||||||
|
- `web/lib/api/client.ts`
|
||||||
|
- `web/lib/api/im.ts`
|
||||||
|
- `web/lib/api/setup-readiness.ts`
|
||||||
|
- `web/lib/generated/enums.ts`
|
||||||
|
- `web/lib/knowledge-i18n.test.mjs`
|
||||||
|
- `web/lib/knowledge-i18n.ts`
|
||||||
|
- `web/lib/navigation.tsx`
|
||||||
|
- `web/lib/realtime-connection.test.mjs`
|
||||||
|
- `web/lib/realtime-connection.ts`
|
||||||
|
- `web/lib/stores/agent-conversations.ts`
|
||||||
|
- `web/lib/stores/support-chat.ts`
|
||||||
|
- `web/messages/en-US.json`
|
||||||
|
- `web/messages/ru-RU.json`
|
||||||
|
- `web/messages/zh-CN.json`
|
||||||
|
|
||||||
|
## Added files
|
||||||
|
|
||||||
|
- `MODIFIED_FILES.md`
|
||||||
|
- `docs/features/support-availability.md`
|
||||||
|
- `docs/fixes/chat-realtime-recovery.md`
|
||||||
|
- `docs/hardening/CUSTOMER_IDENTITY_UPGRADE.md`
|
||||||
|
- `docs/hardening/README.md`
|
||||||
|
- `docs/hardening/SETUP_PREVIEW.md`
|
||||||
|
- `docs/hardening/VALIDATION.md`
|
||||||
|
- `docs/knowledge-localization.md`
|
||||||
|
- `docs/support-availability-ui.md`
|
||||||
|
- `internal/ai/rag/faq_content.go`
|
||||||
|
- `internal/ai/rag/localization_test.go`
|
||||||
|
- `internal/builders/knowledge_builder_i18n_test.go`
|
||||||
|
- `internal/handlers/api/support_status_handler.go`
|
||||||
|
- `internal/handlers/dashboard/knowledge_retrieve_handler_test.go`
|
||||||
|
- `internal/handlers/dashboard/support_availability_handler.go`
|
||||||
|
- `internal/handlers/dashboard/support_availability_handler_test.go`
|
||||||
|
- `internal/models/support_availability.go`
|
||||||
|
- `internal/pkg/dto/request/support_availability_req.go`
|
||||||
|
- `internal/pkg/dto/response/support_availability_resp.go`
|
||||||
|
- `internal/pkg/i18nx/context_test.go`
|
||||||
|
- `internal/repositories/auth_scope_repository.go`
|
||||||
|
- `internal/repositories/channel_config_repository.go`
|
||||||
|
- `internal/repositories/conversation_dispatch_queries.go`
|
||||||
|
- `internal/repositories/customer_identity_scope.go`
|
||||||
|
- `internal/repositories/support_availability_repository.go`
|
||||||
|
- `internal/services/agent_presence_service.go`
|
||||||
|
- `internal/services/auth_session_security_test.go`
|
||||||
|
- `internal/services/channel_policy_concurrency_test.go`
|
||||||
|
- `internal/services/customer_identity_security_test.go`
|
||||||
|
- `internal/services/support_availability_edge_review_test.go`
|
||||||
|
- `internal/services/support_availability_service.go`
|
||||||
|
- `internal/services/support_availability_service_test.go`
|
||||||
|
- `internal/services/support_calendar_service.go`
|
||||||
|
- `internal/services/test_network_test.go`
|
||||||
|
- `internal/services/ws_auth_security_test.go`
|
||||||
|
- `internal/services/ws_pump_security_test.go`
|
||||||
|
- `internal/services/ws_session_concurrency_test.go`
|
||||||
|
- `scripts/audit-customer-identity-scopes.sql`
|
||||||
|
- `web/app/(dashboard)/dashboard/support-availability/_components/calendar-editor.tsx`
|
||||||
|
- `web/app/(dashboard)/dashboard/support-availability/page.tsx`
|
||||||
|
- `web/components/lifecycle-regressions.test.mjs`
|
||||||
|
- `web/components/support-availability/lifecycle.test.mjs`
|
||||||
|
- `web/components/support-availability/operator-status.tsx`
|
||||||
|
- `web/components/support-availability/public-status.tsx`
|
||||||
|
- `web/lib/api/im-session.test.mjs`
|
||||||
|
- `web/lib/api/session-isolation.test.mjs`
|
||||||
|
- `web/lib/api/setup-readiness.test.mjs`
|
||||||
|
- `web/lib/api/support-availability.transport.test.mjs`
|
||||||
|
- `web/lib/api/support-availability.ts`
|
||||||
|
- `web/lib/message-editor-drafts.test.mjs`
|
||||||
|
- `web/lib/message-editor-drafts.ts`
|
||||||
|
- `web/lib/message-file-identity.test.mjs`
|
||||||
|
- `web/lib/message-file-identity.ts`
|
||||||
|
- `web/lib/realtime-log-context.test.mjs`
|
||||||
|
- `web/lib/realtime-log-context.ts`
|
||||||
|
- `web/lib/session-request-guard.test.mjs`
|
||||||
|
- `web/lib/session-request-guard.ts`
|
||||||
|
- `web/lib/stores/agent-conversations.test.mjs`
|
||||||
|
- `web/lib/stores/support-chat-realtime.test.mjs`
|
||||||
|
- `web/lib/stores/support-chat.test.mjs`
|
||||||
|
- `web/lib/support-availability-i18n.ts`
|
||||||
|
- `web/lib/support-availability.locale-edge.test.mjs`
|
||||||
|
- `web/lib/support-availability.test.mjs`
|
||||||
|
- `web/lib/support-availability.ts`
|
||||||
|
- `web/lib/test-support/load-typescript-module.mjs`
|
||||||
|
- `web/messages/en-US.json.license`
|
||||||
|
- `web/messages/ru-RU.json.license`
|
||||||
|
- `web/messages/zh-CN.json.license`
|
||||||
@@ -1,5 +1,11 @@
|
|||||||
# AgentDesk
|
# AgentDesk
|
||||||
|
|
||||||
|
<!-- Modified in the independent hardening fork; upstream notices retained. -->
|
||||||
|
|
||||||
|
> Independent source snapshot with security and reliability changes. Read the
|
||||||
|
> [hardening and upgrade notes](docs/hardening/README.md) and
|
||||||
|
> [actual validation status](docs/hardening/VALIDATION.md) before deployment.
|
||||||
|
|
||||||
English | [简体中文](README_ZH.md)
|
English | [简体中文](README_ZH.md)
|
||||||
|
|
||||||
An open-source AI Agent customer support system with knowledge-based answers, human handoff, ticket workflows, and self-hosted deployment.
|
An open-source AI Agent customer support system with knowledge-based answers, human handoff, ticket workflows, and self-hosted deployment.
|
||||||
|
|||||||
78
docs/features/support-availability.md
Normal file
78
docs/features/support-availability.md
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
# Human support availability and calendars
|
||||||
|
|
||||||
|
This change separates platform presence, working availability, account enablement, and team opening hours. It does not move, close, or reassign existing conversations when an operator goes on leave or becomes unavailable.
|
||||||
|
|
||||||
|
## Presence is a live authenticated connection
|
||||||
|
|
||||||
|
Only authenticated employee connections to the dashboard or dashboard-notification WebSocket establish presence. The notification connection is mounted across the dashboard and workbench. Visitor WebSockets, conversation typing/viewing events, enabled account records, login history, and `LastOnlineAt` do not establish operator presence.
|
||||||
|
|
||||||
|
Each connection obtains a server-generated random lease ID. The database stores that ID, user ID, internal login-session ID, and expiration, never the bearer token or client IP. Authenticated application pings or protocol pongs renew the lease at most once every 15 seconds. The lease lasts at most 90 seconds and never outlives the login's absolute expiration. A clean disconnect shortens only that connection's lease to at most 15 seconds; other tabs/devices remain effective. A process crash or lost network is bounded by the 90-second lease, subject to synchronized server clocks. Closed connections cannot renew a lease afterward. Expired rows are pruned by the existing pending-dispatch loop.
|
||||||
|
|
||||||
|
Every eligibility/presence read checks current session expiration/revocation, account status/deletion/type, and current conversation-view permission. A logout or removed privilege therefore does not wait for the lease TTL. Browser-background tabs still count as an open platform session; this is connectivity, not a claim that a person is looking at the screen. The bounded grace/TTL avoids false offline flicker without claiming instantaneous disconnect detection.
|
||||||
|
|
||||||
|
Leases use the shared application database, not a per-process map, and unique connection IDs prevent collisions across replicas. All replicas must share that database and have synchronized clocks. This does not add distributed WebSocket message fanout, which is a separate pre-existing deployment concern.
|
||||||
|
|
||||||
|
## Working state and dated absence
|
||||||
|
|
||||||
|
Existing numeric values remain compatible: Idle/ready = 0 and Busy = 1. New values are Break = 2, Unavailable = 3, and Vacation = 4. Account/profile/team disabled status remains separate.
|
||||||
|
|
||||||
|
Vacation requires explicit-offset RFC3339 start and end timestamps. The interval is half-open: start inclusive, end exclusive. Scheduling vacation captures the current manual state as `returnServiceStatus`; that state remains effective before the start and after the end. Updating an already scheduled vacation preserves that return state. A later manual Ready/Busy/Break/Unavailable choice cancels the interval. No timer is required: all evaluation derives the effective state from the current instant. Raw `serviceStatus` may retain Vacation after the interval as configuration/history; `effectiveServiceStatus` is authoritative for badges, readiness, routing, and effective-status list filters.
|
||||||
|
|
||||||
|
`POST /api/dashboard/support_availability/me` always targets the authenticated user's existing enabled employee operator profile. A supplied `userId` cannot change the target or create operator privileges. Administrative state changes require `agent.update`. Generic profile edits preserve working state so a stale profile form cannot cancel newly scheduled leave.
|
||||||
|
|
||||||
|
`ReceiveOfflineMessage` is retained for database/API compatibility but deprecated and nonfunctional for live routing. It never overrides presence, leave, calendar, enabled-state, or capacity checks. Offline requests stay in the existing pending pools; no new delivery or assignment promise is attached to that old flag.
|
||||||
|
|
||||||
|
## One authoritative calendar per team
|
||||||
|
|
||||||
|
`SupportCalendar` contains one optional row per team. Team ID 0 is deployment-wide timezone configuration only, not an organization and not an implicit schedule. The default for new explicitly enabled recurring calendars is the explicit IANA zone `UTC`; a team can specify another IANA timezone or inherit the deployment default. The Go binary embeds timezone data. Docker's historical `Asia/Shanghai` setting is not evidence of the active server's timezone and is not used to reinterpret saved shifts.
|
||||||
|
|
||||||
|
Modes:
|
||||||
|
|
||||||
|
- `legacy` (shown as dated shifts): the default when a team has no new calendar row. Existing `AgentTeamSchedule` rows are evaluated as the exact stored instants. Their existing process-local input/display convention is unchanged. The response labels the real legacy process zone, which can be `Local`, rather than pretending it is a new IANA setting.
|
||||||
|
- `recurring`: an explicit administrator opt-in. Only the saved weekly rules and date exceptions are used. Existing dated rows are retained but inactive. Switching back to dated-shift mode uses those unchanged rows again. There is no silent conversion, bulk backfill, year-long shift, or schedule merging.
|
||||||
|
|
||||||
|
`deploymentTimezone` always identifies the new configured default independently of the legacy display zone. A legacy-to-recurring editor must use this field, not reinterpret the legacy zone. Preview returns the evaluated mode, timezone, open flag, and an explicit UTC RFC3339 next-opening instant when known.
|
||||||
|
|
||||||
|
Weekly rules use ISO weekdays 1 (Monday) through 7 (Sunday), with one or more HH:mm intervals per day. `24:00` is allowed only as an end boundary. Equal start/end is rejected; end before start denotes an overnight interval. Split shifts are supported. A date exception replaces that entire civil date: `closed` means a holiday/closure, otherwise its intervals replace the weekly intervals. An exception also cuts off a preceding overnight carry at midnight. Overlapping intervals are treated as their union, never duplicate capacity.
|
||||||
|
|
||||||
|
DST is defined, not left to host normalization: a nonexistent boundary advances to the first valid local minute; an ambiguous start uses the earlier occurrence and an ambiguous end the later occurrence. A fold-spanning interval is continuous between those instants. An interval entirely swallowed by a forward jump has no duration and is closed. Tests cover New York hour transitions and Lord Howe half-hour transitions.
|
||||||
|
|
||||||
|
For recurring calendars the next-opening search is bounded to 366 future civil days. A missing `nextOpeningAt` means no opening was found in that horizon, not a guarantee of permanent closure. Dated mode uses the earliest stored future opening. A calendar opening is not a promise that a ready operator will be online then, and no waiting-time estimate is invented.
|
||||||
|
|
||||||
|
## Eligibility, assignment, and public status
|
||||||
|
|
||||||
|
The shared eligibility evaluator is used by automatic candidates, manual assignment/transfer target lists and commits, readiness/simulation, and public status. It checks profile, employee account, team enablement, the authoritative calendar, authenticated presence, effective working state, automatic-assignment opt-in when appropriate, and capacity. Manual assignment does not require auto-assign opt-in, but cannot bypass the other checks or the conversation AI agent's team scope. Empty configured team IDs retain the existing all-enabled-team fallback.
|
||||||
|
|
||||||
|
`maxConcurrentCount = 0` consistently means unlimited, as in the original dispatcher. Negative values remain invalid. Assignment and transfer acquire the target profile's portable database write lock before the transaction's first consistent read, then reload eligibility and active load before committing. SQLite serializes writes; MySQL acquires the target row lock before establishing the repeatable-read snapshot. A conditional conversation update prevents concurrent targets from both winning. Changing availability does not consume or silently relinquish existing conversations.
|
||||||
|
|
||||||
|
The unauthenticated `GET /api/support/status` resolves the enabled channel through the existing channel header and returns only `available`, `reason`, `timezone`, and optional `nextOpeningAt`. It is unrelated to the visitor's own WebSocket connection indicator. No employee identities, absence dates, private absence reasons, team counts, or invented wait times are returned. The endpoint uses the existing per-address public rate-limit middleware (120 requests per configured window).
|
||||||
|
|
||||||
|
Public reason precedence is:
|
||||||
|
|
||||||
|
1. `available`: at least one currently eligible automatically routable human.
|
||||||
|
2. `outside_hours`: no enabled routed team has an open calendar. If known, report the earliest opening and its matching timezone.
|
||||||
|
3. `capacity`: calendars are open and at least one otherwise eligible operator is at capacity.
|
||||||
|
4. `temporarily_absent`: other cases such as disconnected, busy, on leave, unavailable, or no usable human configuration.
|
||||||
|
|
||||||
|
Existing pending team/global pools and the periodic dispatch loop are reused. New live presence, state saves, and calendar saves may trigger another pending scan. SLA engines, a new fair queue, automatic vacation handover, and guaranteed staffing forecasts are not part of this change.
|
||||||
|
|
||||||
|
## API and permissions
|
||||||
|
|
||||||
|
All endpoints retain the shared JSON result envelope.
|
||||||
|
|
||||||
|
- GET/POST `/api/dashboard/support_availability/me`: authenticated staff, own existing profile only; GET returns null when there is no profile.
|
||||||
|
- GET `/api/dashboard/support_availability/agents`: `agent.view`, `conversation.assign`, or `conversation.transfer`. `conversationId` restricts target teams and applies conversation-view/transfer access checks; it is required when the caller lacks `agent.view`.
|
||||||
|
- POST `/api/dashboard/support_availability/agent`: `agent.update`, explicit `userId`.
|
||||||
|
- GET `/api/dashboard/support_availability/calendar?teamId=N`: `agentTeamSchedule.view` for teams; `supportConfig.view` for deployment ID 0.
|
||||||
|
- POST `/api/dashboard/support_availability/calendar`: `agentTeamSchedule.update` for teams; `supportConfig.update` for deployment ID 0.
|
||||||
|
- POST `/api/dashboard/support_availability/calendar/preview`: corresponding read permission, no persistence.
|
||||||
|
|
||||||
|
The state DTO includes both configured/effective state, return state, own/admin absence bounds, presence, eligibility reason, effective calendar, and next calendar opening. Calendar DTOs include weekly/exception structures, the explicit override, effective timezone, and deployment timezone. New enum values are generated from `internal/pkg/enums/agent.go`, not handwritten frontend duplicates.
|
||||||
|
|
||||||
|
## Rollout, schema, and validation
|
||||||
|
|
||||||
|
Startup AutoMigrate registers the new `SupportCalendar` and `AgentPresenceLease` tables and adds `absence_start_at`, `absence_end_at`, `availability_return_status`, and `assignment_version` to agent profiles. Normal SQLite/MySQL GORM mappings and indexes are used; no versioned destructive migration or seeded schedule is needed. Back up the deployment database and review the migration in staging before release. This work has not run a migration, restarted a service, or sent a real customer message on the working server.
|
||||||
|
|
||||||
|
Roll out backend/frontend/replicas together: an old binary would not enforce the new presence and vacation rules. After startup, operators must have a connected authenticated dashboard notification socket before receiving new work. Initially all teams retain dated schedules; configure the deployment timezone and review each team's preview before explicitly enabling recurring mode. Existing conversation owners are preserved. Rolling back to an old binary requires operational care because it will not honor the new eligibility semantics even if added columns/tables remain harmless.
|
||||||
|
|
||||||
|
Validation uses temporary SQLite databases, pure evaluator tests, and httptest requests, never production data. Focused tests cover split/overnight shifts, holidays, explicit opt-in, DST folds/gaps, bounded next openings, multi-tab/device aggregation, expiration/revocation/privilege removal, absence boundaries, capacity guards, channel-scoped privacy, and self/admin authorization. MySQL live concurrency and a real deployed browser/WebSocket liveness scenario still require staging validation; portable locking and SQL have been reviewed but not claimed as production-tested.
|
||||||
@@ -2,8 +2,9 @@
|
|||||||
|
|
||||||
This targeted change is based on canonical Gitea main snapshot
|
This targeted change is based on canonical Gitea main snapshot
|
||||||
`e57610a27c556e005b9b3b68115477ba1fdd3f1b` (tree
|
`e57610a27c556e005b9b3b68115477ba1fdd3f1b` (tree
|
||||||
`9cf938c2498ce6b63faaad7cf8b286c1cfe7a5ef`). It does not import the separate
|
`9cf938c2498ce6b63faaad7cf8b286c1cfe7a5ef`). That original targeted change did not import
|
||||||
hardening-review branch.
|
the separate hardening-review branch. The current integration reconciles it with that branch,
|
||||||
|
preserving both realtime recovery and scoped identity/draft safeguards.
|
||||||
|
|
||||||
## Report and source findings
|
## Report and source findings
|
||||||
|
|
||||||
@@ -61,8 +62,10 @@ socket close events, hidden/unmounted lifecycle, single-flight fallback,
|
|||||||
identity/view changes, abort deadlines, stalled previous-view fetches, history
|
identity/view changes, abort deadlines, stalled previous-view fetches, history
|
||||||
failures and late close responses.
|
failures and late close responses.
|
||||||
|
|
||||||
**The regression tests have not been executed.** Full project typecheck, lint,
|
The integrated 2026-10-16 baseline has now executed all 226 frontend Node tests,
|
||||||
build and browser/runtime validation have not been run; permission for tests,
|
including these recovery regressions, and the declared-dependency frontend
|
||||||
installation and runtime verification remains pending. No services were started,
|
typecheck. Both passed. Focused backend security/setup tests and their race run
|
||||||
real support messages sent, or deployment performed. Do not describe this source
|
also passed; see [the current validation record](../hardening/VALIDATION.md) for
|
||||||
patch as a verified production fix.
|
exact scope, fixture corrections and remaining build/lint/MySQL/browser gates.
|
||||||
|
No production services were started, real support messages sent, or deployment
|
||||||
|
performed. These checks are not a claim of production acceptance.
|
||||||
|
|||||||
109
docs/hardening/CUSTOMER_IDENTITY_UPGRADE.md
Normal file
109
docs/hardening/CUSTOMER_IDENTITY_UPGRADE.md
Normal file
@@ -0,0 +1,109 @@
|
|||||||
|
# Customer identity and live-access upgrade
|
||||||
|
|
||||||
|
These are operator instructions for a reviewed staging rollout, not commands
|
||||||
|
executed by this change. Back up data and verify the exact schema/engine before
|
||||||
|
any production upgrade. Existing customer and conversation records are retained.
|
||||||
|
|
||||||
|
## Additive schema and issuer boundaries
|
||||||
|
|
||||||
|
`CustomerIdentity` adds:
|
||||||
|
|
||||||
|
- `identity_scope`: indexed varchar(80), default empty for legacy rows.
|
||||||
|
- `scoped_key`: nullable varchar(64) with a unique index. Legacy rows remain NULL.
|
||||||
|
|
||||||
|
The normal GORM startup migration adds these definitions. No destructive index
|
||||||
|
replacement, automatic legacy merge, or data deletion is supplied. Test this
|
||||||
|
additive change on a backup with the deployment's actual SQLite/MySQL version.
|
||||||
|
|
||||||
|
A public identity scope is `v1:<jwt|hmac|guest>:SHA256(trimmed channel code)`.
|
||||||
|
The server derives it; clients cannot select an issuer or inject this scope.
|
||||||
|
The unique claim key is SHA-256 of the JSON array containing scope, external
|
||||||
|
source and trimmed external ID. Use the implementation's
|
||||||
|
`ScopedCustomerIdentityKey` helper rather than a hand-built delimiter format.
|
||||||
|
New public registrations insert the claim in the same customer transaction.
|
||||||
|
A competing claim rolls back rather than creating two authorized customers.
|
||||||
|
|
||||||
|
WebSocket routing uses canonical customer ID and channel record ID. Incoming
|
||||||
|
subscriptions and outgoing recipients are checked against current ownership.
|
||||||
|
Raw external IDs are not cross-channel or cross-trust routing keys.
|
||||||
|
|
||||||
|
## Existing sessions and history
|
||||||
|
|
||||||
|
Old customer-session JWTs without the new scope are rejected. The updated client
|
||||||
|
must exchange a fresh token. Until legacy mappings are explicitly reconciled,
|
||||||
|
a newly authenticated scoped identity can receive a separate customer record,
|
||||||
|
not the old account's history. The original records remain available to
|
||||||
|
appropriately authorized operators.
|
||||||
|
|
||||||
|
Before enabling traffic:
|
||||||
|
|
||||||
|
1. Back up data; stop exchanges/writes for the affected scope during reconciliation.
|
||||||
|
2. Run the read-only `scripts/audit-customer-identity-scopes.sql` reports against an
|
||||||
|
approved staging copy after the additive columns exist. Keep report output
|
||||||
|
private: it contains customer identifiers.
|
||||||
|
3. Establish channel and issuer ownership using trustworthy host-side evidence.
|
||||||
|
Legacy `user` rows alone cannot distinguish JWT from HMAC provenance.
|
||||||
|
4. For a proven unique mapping, review a transaction setting both its scope and
|
||||||
|
computed claim key while retaining its customer ID and conversation history.
|
||||||
|
Check all associated conversation channels before making a change.
|
||||||
|
5. Stop on duplicate, inactive, multi-channel or mixed-trust mappings. Never take
|
||||||
|
the first row or merge customers solely because external IDs match. If a new
|
||||||
|
scoped record already exists, reconcile both histories explicitly.
|
||||||
|
6. Reissue customer tokens and verify authorized history, isolation, and rollback
|
||||||
|
behavior on the staging copy before resuming traffic.
|
||||||
|
|
||||||
|
A channel reassigned to a different identity issuer needs a new channel code.
|
||||||
|
Ordinary signing-key rotation intentionally retains the same issuer scope.
|
||||||
|
Use a distinct host JWT signing secret for each independently trusted channel.
|
||||||
|
The existing host JWT contract validates the channel's secret and expiry, but
|
||||||
|
does not require a channel audience claim. Reusing a signing key across unrelated
|
||||||
|
channels lets the holder assert an identity to either channel; scoped storage
|
||||||
|
is not a defense against a shared issuer key. HMAC proofs bind the channel code
|
||||||
|
inside the signed payload. No mandatory JWT audience rollout is introduced here.
|
||||||
|
Legacy duplicate repair remains an operator-reviewed migration, not an automatic
|
||||||
|
startup side effect. The nullable unique claim allows dirty legacy rows to
|
||||||
|
remain isolated without blocking new correctly scoped registrations.
|
||||||
|
|
||||||
|
## Anonymous and authenticated-only channels
|
||||||
|
|
||||||
|
Unsigned exchange issues a new random server-owned anonymous identity. Supplying
|
||||||
|
an old guest external ID is not proof of ownership. Normal resume and refresh
|
||||||
|
use the signed customer-session token. Near-expiry, still-valid credentials are
|
||||||
|
renewed through the rate-limited `POST /api/customer/session_refresh` endpoint,
|
||||||
|
which authenticates the existing session and never creates an anonymous identity.
|
||||||
|
A refresh failure is not silently replaced with a fresh guest. Losing or expiring
|
||||||
|
that credential does not authorize reclaiming history by an external ID.
|
||||||
|
|
||||||
|
An optional boolean `requireSignedIdentity` in a web channel's `configJson`
|
||||||
|
rejects unsigned exchanges and existing guest sessions server-side. Default
|
||||||
|
false retains anonymous channels. The SDK's `requireUserToken` is not a substitute
|
||||||
|
for this policy.
|
||||||
|
|
||||||
|
Use the existing authenticated channel GET and
|
||||||
|
`POST /api/dashboard/channel/update` flow with `channel.update` permission,
|
||||||
|
preserving all unrelated configuration and required fields. No dedicated new UI
|
||||||
|
toggle is provided. Older editors which omit this property preserve a configured
|
||||||
|
true value; an explicit JSON false is needed to disable it. Null and nonboolean
|
||||||
|
values are rejected. This source change does not configure a live channel.
|
||||||
|
|
||||||
|
## Staff and customer live-session revocation
|
||||||
|
|
||||||
|
Staff sockets bind their original login-session ID and absolute expiry, without
|
||||||
|
serializing that internal metadata into API responses. Fresh session, account,
|
||||||
|
role and permission state is checked for incoming operations, event fanout,
|
||||||
|
actual queued writes and idle checks. Scope changes terminate the connection;
|
||||||
|
reconnection must obtain fresh authority. Idle checks run every five seconds;
|
||||||
|
data operations revalidate immediately rather than using a five-second cache.
|
||||||
|
|
||||||
|
Notification sockets cannot subscribe to conversation topics. Dashboard
|
||||||
|
conversation sockets require conversation-view permission. Customer connections
|
||||||
|
recheck token expiry, channel policy, customer state and exact identity mapping.
|
||||||
|
|
||||||
|
This implementation deliberately makes database reads at authorization
|
||||||
|
boundaries. Measure the cost under realistic fanout; any later caching must have
|
||||||
|
complete revocation invalidation rather than silently reintroducing stale access.
|
||||||
|
|
||||||
|
Channel configuration updates and token-secret resets compare the previously read
|
||||||
|
configuration bytes and update timestamp before writing. A stale writer receives
|
||||||
|
a conflict instead of silently overwriting a newly enabled signed-identity policy.
|
||||||
|
Reload the channel and reapply the intended change after reviewing that conflict.
|
||||||
71
docs/hardening/README.md
Normal file
71
docs/hardening/README.md
Normal file
@@ -0,0 +1,71 @@
|
|||||||
|
# Security and reliability hardening
|
||||||
|
|
||||||
|
This independent fork starts from the current source tree of
|
||||||
|
[MonoVerseNS/agent-desk-ng](https://github.com/MonoVerseNS/agent-desk-ng), revision
|
||||||
|
`b06954b0a495389cbb5194e0d388342eabe60636`. It does not import the old Git history.
|
||||||
|
The upstream Apache-2.0 license and notices remain applicable. This document
|
||||||
|
records changes made by this fork; it is not a claim of production certification.
|
||||||
|
|
||||||
|
## Integration baseline
|
||||||
|
|
||||||
|
The isolated integration reconciles public Gitea main `299ea50f` with the reviewed
|
||||||
|
hardening branch `63e04578`. It preserves main's bounded connection attempts,
|
||||||
|
abortable ongoing HTTP recovery and System setup navigation alongside the
|
||||||
|
identity/live-access/draft/setup safeguards. Only the clean public repository
|
||||||
|
history is used. See `VALIDATION.md` for executed checks and unresolved gates.
|
||||||
|
|
||||||
|
## Release gate
|
||||||
|
|
||||||
|
The hardening changes must be reviewed and validated before deployment. Source
|
||||||
|
inspection, a compiler check, a passing isolated test, and live acceptance are
|
||||||
|
separate kinds of evidence. See `VALIDATION.md` for the actual checks performed.
|
||||||
|
No production service, database, credentials, or external deployment is changed
|
||||||
|
by committing this source code.
|
||||||
|
|
||||||
|
## Changes being integrated
|
||||||
|
|
||||||
|
- Separate guest, signed-user, issuer and channel identities. Use canonical
|
||||||
|
customer/channel WebSocket topics and recheck recipients instead of treating
|
||||||
|
a topic subscription as authorization.
|
||||||
|
- Apply conversation-view permission to staff WebSockets; keep notifications
|
||||||
|
separate. Revalidate session expiry, revocation, account state and permissions
|
||||||
|
on long-lived connections. Disabled roles must no longer grant permissions.
|
||||||
|
- Keep drafts and asynchronous responses bound to their identity and dialogue.
|
||||||
|
Preserve drafts on failed sends, protect newly typed revisions, and prevent
|
||||||
|
duplicate concurrent sends. Profile refresh and delayed API errors must not
|
||||||
|
restore or expire the wrong signed-in account.
|
||||||
|
- Turn setup repair into an explicit preview/apply operation. Never resurrect
|
||||||
|
deleted configuration or silently introduce continuous working hours. Apply
|
||||||
|
reviewed writes transactionally and dispatch only after commit.
|
||||||
|
- Make empty setup, initial retry and standalone chat dismissal truthful and
|
||||||
|
recoverable; remove bearer-token-bearing WebSocket URLs from browser logs.
|
||||||
|
|
||||||
|
## Upgrade precautions
|
||||||
|
|
||||||
|
Customer identity scoping is an additive schema and token-contract change, not
|
||||||
|
only a frontend patch. Existing unscoped customer tokens will be rejected.
|
||||||
|
Legacy identities and conversations must be inventoried and reconciled with
|
||||||
|
trusted issuer/channel provenance before expecting their old history in new
|
||||||
|
customer sessions. No automatic customer merge or destructive cleanup is
|
||||||
|
appropriate. See `CUSTOMER_IDENTITY_UPGRADE.md` before any deployment.
|
||||||
|
|
||||||
|
New anonymous sessions are server-issued. Knowing an old anonymous external ID
|
||||||
|
is not sufficient to reclaim its history. Preserve the signed customer-session
|
||||||
|
credential for normal resume; loss or expiry can require a new anonymous session.
|
||||||
|
|
||||||
|
The setup quick-fix API now requires preview and explicit apply. Older callers
|
||||||
|
must not treat a successful preview response as proof that configuration changed.
|
||||||
|
See [the setup contract](SETUP_PREVIEW.md) before integrating custom callers.
|
||||||
|
|
||||||
|
## Verification priorities
|
||||||
|
|
||||||
|
1. Guest/user/channel collisions, unauthorized staff topics, revoked/expired
|
||||||
|
sockets, disabled roles and concurrent identity registration.
|
||||||
|
2. Wrong-recipient drafts, failed and duplicate sends, delayed responses after
|
||||||
|
switching conversations or accounts, and logout during profile refresh.
|
||||||
|
3. Preview/apply tampering, permission denial, rollback, deleted configuration,
|
||||||
|
off-hours schedules, empty-channel simulation and dispatch failure reporting.
|
||||||
|
4. Desktop and narrow-screen interaction checks in Russian, English and Chinese.
|
||||||
|
|
||||||
|
Use temporary, isolated data for checks. Do not run migration/repair commands
|
||||||
|
against a live database merely to validate the code.
|
||||||
62
docs/hardening/SETUP_PREVIEW.md
Normal file
62
docs/hardening/SETUP_PREVIEW.md
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
# Reviewed setup repairs
|
||||||
|
|
||||||
|
The existing authenticated `POST /api/dashboard/setup/quick_fix` endpoint now uses a two-phase contract. It does not write configuration unless the caller explicitly applies a current preview.
|
||||||
|
|
||||||
|
## Contract
|
||||||
|
|
||||||
|
1. Request a preview with `action` and, for an existing agent/channel/team, its `entity_id`. Omit `apply` or set it to `false`.
|
||||||
|
2. Review `changes`. Each entry names the entity, operation, and exact operational fields before and after. New linked entities are identified by their proposed names until IDs are assigned. Audit timestamps and acting-user metadata are maintained automatically.
|
||||||
|
3. Submit the same action and target with `apply: true` and the returned `preview_token`.
|
||||||
|
|
||||||
|
The response includes:
|
||||||
|
|
||||||
|
- `applied`: whether an explicit apply request completed. An empty `applied_actions` array means no configuration writes were needed.
|
||||||
|
- `changes`: the reviewed plan; an empty array is a valid no-op, not a claim that setup is complete.
|
||||||
|
- `preview_token`: a fingerprint of the acting user, action, target, proposed changes, and current setup configuration.
|
||||||
|
- `applied_actions`: committed operation/entity identifiers, empty on preview.
|
||||||
|
- `warning_codes`: manual follow-up requirements or post-commit failures.
|
||||||
|
- `readiness`: the refreshed diagnostic, omitted if refreshing failed.
|
||||||
|
|
||||||
|
Old callers that omit `apply` receive a read-only preview. Callers must not interpret any HTTP success as a successful mutation. There is deliberately no compatibility path that silently applies an unreviewed repair.
|
||||||
|
|
||||||
|
## Authorization and freshness
|
||||||
|
|
||||||
|
The handler authenticates every request. Setup checks the principal's resolved permission list, matching the normal authorization service. An `admin` or `super_admin` role name alone does not bypass missing permissions. Every planned create or field update also checks its specific permission.
|
||||||
|
|
||||||
|
Apply rebuilds the plan inside one transaction and verifies the fingerprint before writing. A stale preview is rejected and must be reviewed again. Transactional reads use separate GORM statements, preserving row locks without leaking a prior query's table or filters. Updates also compare the target's previous update timestamp. The fingerprint is a freshness/intent check, not an authentication credential or signed authorization grant.
|
||||||
|
|
||||||
|
## Deliberately narrow behavior
|
||||||
|
|
||||||
|
- Broad setup only creates missing defaults. It never rewrites existing configuration, moves existing operators to another team, expands an agent's team pool, or rebinds existing channel routes.
|
||||||
|
- Deleted records are not update candidates and are never restored. Disabled records and zero-rollout settings are preserved. A targeted “enable my profile” action can enable the authenticated user's non-deleted profile only when the preview explicitly shows the change and the required permissions are present.
|
||||||
|
- A targeted handoff change affects only the named eligible agent. Missing teams, route choices, disabled configurations, and rollout changes must be chosen in their existing editors.
|
||||||
|
- Quick fixes never create or modify shifts. Missing schedules and off-hours schedules are distinct diagnostics. Working hours must be entered explicitly in the existing schedule editor.
|
||||||
|
- A newly created default agent is unpublished. Setup does not publish agents. A default channel can be created only after an eligible agent has a published revision, matching the normal channel editor's publication guard. Readiness reports unpublished agents as incomplete.
|
||||||
|
|
||||||
|
Therefore a broad repair is not a promise of a production-ready routing path. Publishing, deliberate routing choices, and explicit schedules may still be required.
|
||||||
|
|
||||||
|
## Transactions and dispatch
|
||||||
|
|
||||||
|
All configuration writes in an apply operation share one transaction. A failed write rolls back the entire repair. Pending dispatch begins only after the configuration transaction commits.
|
||||||
|
|
||||||
|
A dispatch failure produces `dispatch_failed`; it does not undo committed changes or return an error implying that the configuration write should be retried. A diagnostic refresh failure similarly produces `readiness_refresh_failed`. The UI displays these warnings and requires a fresh preview for a subsequent repair.
|
||||||
|
|
||||||
|
The pending-queue query now reports database read errors and applies its existing batch limit in SQL. Its existing newest-first priority and periodic retry semantics are unchanged. This repair does not redesign queue fairness.
|
||||||
|
|
||||||
|
## Simulation
|
||||||
|
|
||||||
|
The simulator is read-only and sends no customer message. `candidate_operators` is always an array, including missing-channel responses; the client also normalizes legacy null values.
|
||||||
|
|
||||||
|
`bypass_ai: true` is explicitly rejected because the service does not implement AI bypass. AI-only paths remain blocked. AI-first/unknown service modes and partial channel rollout are reported as unverified, never as successful operator delivery. Only an eligible, published, full-channel-rollout, human-only route can produce a positive current-eligibility result. That result is a point-in-time diagnostic, not a delivery guarantee or an end-to-end AI execution test.
|
||||||
|
|
||||||
|
## Validation status
|
||||||
|
|
||||||
|
Focused regression tests cover preview-only behavior, explicit apply, stale previews, atomic rollback, deleted/disabled/zero-rollout preservation, named-target scope, off-hours versus missing schedules, role-name permission bypass, status-only permissions, empty arrays, simulation limitations, publication requirements, and post-commit failures.
|
||||||
|
|
||||||
|
The focused setup regressions and their race-enabled run passed in the isolated
|
||||||
|
2026-10-16 integration baseline. Go formatting/compilation, declared-dependency
|
||||||
|
frontend typecheck and Node regression tests were also executed. The remaining
|
||||||
|
combined-tree validation, frontend release build, actual MySQL upgrade and browser
|
||||||
|
acceptance gates are recorded in [VALIDATION.md](VALIDATION.md). No production
|
||||||
|
configuration or data was changed. Passing isolated tests does not establish
|
||||||
|
production readiness or authorize an upgrade.
|
||||||
185
docs/hardening/VALIDATION.md
Normal file
185
docs/hardening/VALIDATION.md
Normal file
@@ -0,0 +1,185 @@
|
|||||||
|
# Validation status: isolated checks, not a production release
|
||||||
|
|
||||||
|
Validated on 2026-10-16 against the integrated public-source baseline: Gitea main
|
||||||
|
`299ea50fb5bb6874c3fca96277fce187205ac20a` and hardening-review
|
||||||
|
`63e045788623e88f7fd7b44102e649e08f4c1f1c`, merged as `3868181`, with the follow-up
|
||||||
|
corrections listed below. This baseline does not include later knowledge-base
|
||||||
|
localization or operator-availability feature work. Its historical results are
|
||||||
|
retained below; the final combined-tree checks are recorded separately at the end
|
||||||
|
of this document.
|
||||||
|
|
||||||
|
## Isolation and toolchain
|
||||||
|
|
||||||
|
- Go 1.26.9, Node 24.19.0, pnpm 10.30.2, locked TypeScript 6.0.3/Next 16.2.11.
|
||||||
|
- Official Go archive checksum and downloaded Go module checksums verified.
|
||||||
|
Frontend dependencies installed with the frozen lockfile and lifecycle scripts
|
||||||
|
disabled. Dependency manifests/lockfiles were not changed.
|
||||||
|
- Tests ran with a cleared application environment, dedicated temporary/cache
|
||||||
|
directories, temporary or in-memory SQLite fixtures, mocked frontend APIs and
|
||||||
|
loopback WebSocket fixtures. No production configuration, credentials,
|
||||||
|
databases, application server, or external support messages were used.
|
||||||
|
- The service test harness rejects non-loopback HTTP requests before the
|
||||||
|
underlying transport/DNS, including redirects. Concrete Slack, Telegram,
|
||||||
|
Discord, Zalo and HTTP email clients were inspected to confirm their default
|
||||||
|
transport usage. The only test WebSocket dialer targets its own loopback server.
|
||||||
|
- Service fixtures explicitly replace the transitive AI-runtime hook with a
|
||||||
|
test-only no-op. Dedicated hook tests still install their own spy; AI-runtime
|
||||||
|
behavior is not claimed as covered by the service suite.
|
||||||
|
- `TestHandleRequest*` email/SMTP cases were excluded from the expanded service
|
||||||
|
run: raw SMTP does not use the HTTP guard. No unrestricted `go test ./...` was
|
||||||
|
run. This exclusion is an isolation limit, not a passing result.
|
||||||
|
|
||||||
|
## Historical baseline completed checks
|
||||||
|
|
||||||
|
- `gofmt` on all changed Go files and `git diff --check`.
|
||||||
|
- `go test ./internal/pkg/openidentity`: passed, including scoped issuer/channel,
|
||||||
|
signed-policy and signature-boundary tests.
|
||||||
|
- `GOMAXPROCS=2 go test -p 2 -race -tags dev ./internal/pkg/eventbus ./internal/pkg/openidentity`:
|
||||||
|
passed.
|
||||||
|
- Focused service security/setup/realtime suite with `-race -tags dev`: 46
|
||||||
|
top-level tests, 102 successful test/subtest events, no failures or skips.
|
||||||
|
Covers identity collisions/concurrent claims, live session revocation,
|
||||||
|
permission boundaries, actual WebSocket pumps, channel CAS, preview/apply,
|
||||||
|
rollback and dispatch outcomes, plus the transport guard and redirect check.
|
||||||
|
- `GOMAXPROCS=2 go test -p 2 -tags dev ./internal/services -skip '^TestHandleRequest' -count=1`:
|
||||||
|
passed, 217 top-level tests and 295 successful test/subtest events.
|
||||||
|
- `GOMAXPROCS=2 go build -p 2 -tags dev -buildvcs=false ./...`: passed. The `dev`
|
||||||
|
embedding mode is the repository CI test mode. VCS stamping was unavailable in
|
||||||
|
the isolated worktree and was disabled only for this compile check.
|
||||||
|
- `cd web && pnpm typecheck`: passed with declared locked dependencies before
|
||||||
|
the later six-file lint cleanup. The post-cleanup retry was killed with exit
|
||||||
|
137 without a TypeScript diagnostic; the final combined tree must rerun it.
|
||||||
|
- All frontend Node test files under app/components/hooks/i18n/lib:
|
||||||
|
226 tests passed, no failures or skips. This includes the SDK, draft revisions,
|
||||||
|
account/customer-session isolation, setup contract, abortable realtime recovery,
|
||||||
|
hidden/unmounted lifecycle and navigation checks.
|
||||||
|
- Four additional offline component-lifecycle regressions passed after the
|
||||||
|
six-file lint cleanup (bulk-move selection/stale responses, palette snapshots,
|
||||||
|
notification cleanup, editor/origin initialization). The earlier 226-test full
|
||||||
|
run predates these four additions.
|
||||||
|
- Full `pnpm lint`: exit 0 after localized lifecycle corrections, with zero
|
||||||
|
errors and 45 existing warnings. No lint rules were disabled.
|
||||||
|
|
||||||
|
## Corrections found by execution
|
||||||
|
|
||||||
|
- The old realtime test fixture lacked required conversation counters. It now
|
||||||
|
matches the DTO; the history/realtime merge assertion was retained unchanged.
|
||||||
|
- Async assignment notifications could outlive their test database. The eventbus
|
||||||
|
now exposes a drain for already-published handlers, and the fixture waits before
|
||||||
|
restoring global state. Nested publishes/error callbacks have a regression
|
||||||
|
test. No sleep or disabled race check is used.
|
||||||
|
- Setup background responses are fenced by effect lifetime/request generation.
|
||||||
|
The staff realtime hook captures its user ID in the effect rather than writing
|
||||||
|
a ref during render. VM test harness variable names satisfy Next ESLint rules.
|
||||||
|
- Four missing generic setup locale keys were supplied in English, Russian and
|
||||||
|
Chinese. Existing locale-integrity assertions are unchanged.
|
||||||
|
- Three stale source-test harnesses were aligned to current route groups and
|
||||||
|
component ownership while retaining realtime placement, accessible label,
|
||||||
|
trigger-style and collapsed-navigation checks.
|
||||||
|
- Seven existing lint errors across six components were corrected without rule
|
||||||
|
suppressions: browser-origin/palette hydration now uses external snapshots;
|
||||||
|
bulk-move targets reset on dialog/base changes and obsolete directory results
|
||||||
|
are ignored; initial notification requests cannot update after cleanup;
|
||||||
|
fullscreen initialization and toolbar construction no longer need the flagged
|
||||||
|
mount-state effect or mutable ref-bearing action list.
|
||||||
|
|
||||||
|
## Historical baseline remaining release gates
|
||||||
|
|
||||||
|
- Full-project lint has 45 existing warnings. The final feature integration must
|
||||||
|
rerun lint, typecheck and the complete Node suite after all source changes.
|
||||||
|
- The canonical frontend export (`pnpm build`) did not complete. An initial
|
||||||
|
cross-worktree node_modules symlink was replaced by a local offline frozen-lock
|
||||||
|
installation. The subsequent default Turbopack build reached optimized
|
||||||
|
compilation, then was killed with exit 137 and no source diagnostic while the
|
||||||
|
shared environment had little free memory. This is not a successful build; a
|
||||||
|
low-concurrency build on the final combined tree remains required. No build,
|
||||||
|
typecheck or security checks were disabled to bypass this result.
|
||||||
|
- Actual MySQL CAS/nullable-unique-index behavior and additive schema upgrade/
|
||||||
|
identity reconciliation on an approved staging backup have not been run.
|
||||||
|
- Browser acceptance at desktop/narrow widths in Russian, English and Chinese
|
||||||
|
has not been performed for this integrated baseline.
|
||||||
|
- Production migration, service startup and deployment have not been performed.
|
||||||
|
|
||||||
|
SQLite results do not establish MySQL behavior. Automated tests do not establish
|
||||||
|
visual acceptance or a safe production upgrade. Preserve the identity/token
|
||||||
|
upgrade precautions in `CUSTOMER_IDENTITY_UPGRADE.md` and preview/apply contract
|
||||||
|
in `SETUP_PREVIEW.md` before any rollout.
|
||||||
|
|
||||||
|
## Final combined source validation (2026-10-16)
|
||||||
|
|
||||||
|
The combined canonical checkout at `1ec72508cdda2dfe3b3eed3158f8ba930d76d260`
|
||||||
|
includes security/realtime integration, knowledge localization, operator
|
||||||
|
availability/calendar/presence, final locale changes and the two fixture-only
|
||||||
|
corrections described below. These results are distinct from the historical
|
||||||
|
baseline above and from the separately integrated CoverIt vendor tree.
|
||||||
|
|
||||||
|
The same sanitized toolchain, temporary SQLite fixtures and loopback-only test
|
||||||
|
transport were used. No application server, production database, credentials,
|
||||||
|
migration or external support message was used. Raw SMTP `TestHandleRequest*`
|
||||||
|
cases remain excluded, and the service-suite AI hook remains a test-only no-op;
|
||||||
|
neither scope is claimed as covered. No unrestricted `go test ./...` was run.
|
||||||
|
|
||||||
|
### Completed combined checks
|
||||||
|
|
||||||
|
- All changed Go files are `gofmt`-clean; `git diff --check` passed.
|
||||||
|
- `GOMAXPROCS=2 go test -p 2 -tags dev ./internal/services -skip '^TestHandleRequest' -count=1 -timeout=5m -json`:
|
||||||
|
passed, 240 top-level tests / 333 test-and-subtest events, no failures or skips.
|
||||||
|
The same audited scope with `-race` passed with identical counts and no race
|
||||||
|
report (181.272 seconds).
|
||||||
|
- Full race suites for `internal/pkg/eventbus`, `internal/pkg/openidentity` and
|
||||||
|
`internal/pkg/i18nx`: 48 top-level tests / 78 successful events.
|
||||||
|
- Focused dashboard availability permission/ACL race tests: 4 tests passed.
|
||||||
|
- Focused knowledge handler, builder and RAG localization race tests: 12
|
||||||
|
top-level tests / 18 successful events, with mocked provider callbacks and no
|
||||||
|
external application calls.
|
||||||
|
- `GOMAXPROCS=2 go build -p 2 -tags dev -buildvcs=false ./...`: passed. This is a
|
||||||
|
complete source compile in the repository's test embedding mode, not a binary
|
||||||
|
containing the production web export. VCS stamping was disabled only for the
|
||||||
|
local compile environment.
|
||||||
|
- `NODE_OPTIONS=--max-old-space-size=1024 pnpm typecheck`: passed.
|
||||||
|
- Every frontend `*.test.mjs` under app/components/hooks/i18n/lib, run with
|
||||||
|
`node --test --test-concurrency=1`: 262 tests in 14 suites passed; zero failures,
|
||||||
|
cancellations or skips.
|
||||||
|
- Full `pnpm lint`: exit 0, zero errors and 42 warnings. No rules were disabled.
|
||||||
|
|
||||||
|
The first combined service run identified two obsolete fixture assumptions,
|
||||||
|
not production-code failures. The realtime operator fixture now reuses the
|
||||||
|
existing `conversation.view` permission without changing its state. Only the
|
||||||
|
readiness success scenario that expects an eligible human now seeds an employee,
|
||||||
|
current permission, login session and bounded live-presence lease. Negative
|
||||||
|
permission scenarios and all original behavior assertions were retained. The
|
||||||
|
full normal and race results above were obtained after these fixture repairs.
|
||||||
|
|
||||||
|
### Asset assembly and packaging limit
|
||||||
|
|
||||||
|
- Both frontend projects used unchanged frozen lockfiles with dependency
|
||||||
|
lifecycle scripts disabled. Web dependencies totalled 978 locked packages;
|
||||||
|
Flowgram dependencies totalled 953. Official Go/module integrity checks passed.
|
||||||
|
- Flowgram's production `pnpm build` passed and generated its complete public
|
||||||
|
assets. Third-party parser warnings were reported, without build errors.
|
||||||
|
- The SDK's official `pnpm build:sdk` ran twice; both outputs were deterministic
|
||||||
|
and byte-identical to the tracked bundle. No generated SDK change is required.
|
||||||
|
- The default Next 16.2.11 Turbopack production build did not complete: optimized
|
||||||
|
compilation ended with exit 137 (`Killed`), without a source diagnostic.
|
||||||
|
- A sequential supported `next build --webpack` attempt, with a 1 GiB Node heap
|
||||||
|
and bounded workers, ended with a build-worker `SIGKILL`, also without a source
|
||||||
|
diagnostic. This was not a successful alternate export.
|
||||||
|
- One distinct experiment used the [documented memory optimization](https://nextjs.org/docs/app/guides/memory-usage)
|
||||||
|
`experimental.webpackMemoryOptimizations` option and a 640 MiB Node heap. It
|
||||||
|
ended with an explicit JavaScript heap-out-of-memory error and worker
|
||||||
|
`SIGABRT`. The temporary config was restored byte-for-byte afterward. No build
|
||||||
|
check, typecheck, security setting, font or application asset was bypassed or
|
||||||
|
mocked. Official Google font CSS and a real font asset were reachable through
|
||||||
|
the existing trusted proxy configuration.
|
||||||
|
- Dependency manifest and lockfile hashes, and the tracked SDK hash, remained
|
||||||
|
unchanged by assembly; no production source/config edit was retained. No native production-embedded binary was
|
||||||
|
assembled because a complete Next export was not available. Flowgram/SDK
|
||||||
|
success and the `-tags dev` Go compile do not satisfy that packaging gate.
|
||||||
|
|
||||||
|
The default frontend export and complete native assembly therefore still need
|
||||||
|
a suitably provisioned isolated build environment. These failures do not prove
|
||||||
|
a source defect, and the passed tests do not establish a deployable release.
|
||||||
|
Actual MySQL behavior, approved staging upgrade/identity reconciliation, real
|
||||||
|
browser desktop/narrow-width acceptance in Russian/English/Chinese and production
|
||||||
|
migration/startup/deployment remain unverified. Preserve all upgrade precautions
|
||||||
|
above. No cross-platform or LanceDB release assembly was attempted.
|
||||||
55
docs/knowledge-localization.md
Normal file
55
docs/knowledge-localization.md
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
# Knowledge retrieval localization and derived data
|
||||||
|
|
||||||
|
## Locale and request lifetime
|
||||||
|
|
||||||
|
The dashboard debug-search, debug-answer, and index-build handlers pass their HTTP request context into RAG. `i18nx.WithLocale` adds the locale already selected by `i18nx.Locale` without dropping cancellation, deadlines, or parent values. `i18nx.LocaleFromContext` falls back to the configured `DefaultLocale` for existing callers and background jobs.
|
||||||
|
|
||||||
|
This does **not** change application-wide locale detection. In particular, `ResolveRequestLocale` continues to use the configured default rather than trusting request language headers. Callers with an explicitly selected locale can carry it through the context helper.
|
||||||
|
|
||||||
|
Built-in debug-answer system/user prompts, no-answer and model-error fallbacks, answer-status names, and context wrappers use the English, Russian, and Chinese catalogs. Configured custom prompts, model output, user questions, document bodies, and FAQ source answers are not translated or rewritten. Cancellation is not converted into a completed fallback answer.
|
||||||
|
|
||||||
|
## FAQ labels and existing index data
|
||||||
|
|
||||||
|
FAQ question, similar-question, and answer labels are application-owned. The source strings are separate inputs and are preserved without trimming or substring replacement. New FAQ index content uses the configured default locale, not whichever request locale an administrator supplies. This keeps index generation consistent for a deployment.
|
||||||
|
|
||||||
|
For live retrieval only, the stored FAQ chunk is compared byte-for-byte with a complete serialization of the current authoritative FAQ record:
|
||||||
|
|
||||||
|
- The exact frozen pre-localization Chinese format is recognized.
|
||||||
|
- The generated format in each currently supported locale is recognized.
|
||||||
|
- Only a complete match permits rendering the application-owned labels in the selected context locale. This also safely handles newlines or literal `问题：`, `相似问：`, and `回答：` strings inside source content, because they are never parsed as separators.
|
||||||
|
- If the source has since changed, the chunk was edited manually, the stored format is unknown, or no exact match exists, the stored text remains unchanged. Document chunks never enter this FAQ conversion path.
|
||||||
|
|
||||||
|
Locale changes and reads do not update stored chunks, vectors, hashes, FAQ records, or historical retrieval logs. Previous answers and hit snippets are historical evidence and remain as recorded. Newly generated logs record the localized content actually used for that new request; they do not relabel old answers after the fact.
|
||||||
|
|
||||||
|
Unverifiable legacy or stale chunks may therefore still show old generated wording. Rebuilding the affected index from its current source through the existing authorized indexing action is the deliberate way to regenerate that derived data. A rebuild can change embeddings, scores, and retrieval behavior and should be validated against representative queries before a production rollout. This change contains no migration, automatic rebuild, or production data write.
|
||||||
|
|
||||||
|
## Failure responses
|
||||||
|
|
||||||
|
Immediate debug/index failures use stable localized summaries instead of exposing SQL, provider, or network diagnostics. Known catalog-backed application errors without arbitrary diagnostic arguments retain their message and code even when wrapped by a provider error. Unrecognized errors, raw code errors, and errors containing interpolation arguments are replaced with a generic localized operation error. Stored operational details are not returned by this boundary.
|
||||||
|
|
||||||
|
## Focused validation
|
||||||
|
|
||||||
|
Run the isolated tests without external model or vector service credentials:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
go test -tags dev ./internal/pkg/i18nx ./internal/ai/rag ./internal/handlers/dashboard
|
||||||
|
```
|
||||||
|
|
||||||
|
Coverage includes locale fallback and isolation; request cancellation/deadlines; localized no-hit, model-error, empty-model and successful generation branches; byte-for-byte source preservation; exact legacy matching and stale-content preservation; localized context wrappers; and safe error responses in all three locales. The model-generation tests inject a local function and the cancellation tests return before database or provider access.
|
||||||
|
|
||||||
|
## API labels, index failures, and FAQ spreadsheets
|
||||||
|
|
||||||
|
Knowledge-base, document, FAQ, directory, and retrieval-history DTO builders accept an optional locale; omitted locales use the configured default for compatibility. Dashboard handlers supply their selected locale explicitly. Stable type/status/index codes remain unchanged. The UI maps those codes with shared catalog helpers rather than trusting legacy display-name strings. Unknown values use a localized unknown label.
|
||||||
|
|
||||||
|
Document and FAQ DTOs return a safe localized indexing-failure summary, not the stored provider or SQL diagnostic. The UI applies the same safe summary when connected to an older server. This change does not rewrite stored operational diagnostics or add a public raw-error endpoint.
|
||||||
|
|
||||||
|
FAQ spreadsheet templates and export headers use the selected locale. Import accepts Russian headings and both legacy Chinese and English aliases. Export preserves stored question, answer, similar-question, and note values; import preserves authored question, answer, note, and individual nonempty similar-question text, including surrounding whitespace. Newlines remain the spreadsheet format's delimiter between similar questions. Missing optional columns no longer copy the question column accidentally. No sample-data initializer or table-reset command is needed or run.
|
||||||
|
|
||||||
|
Additional isolated checks:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
go test -tags dev ./internal/builders ./internal/services -run 'TestKnowledgeBuilders|TestKnowledgeFAQExcel|TestImportKnowledgeFAQs|TestDeleteKnowledgeBase|TestBuildKnowledgeBaseModel' -count=1
|
||||||
|
node --test web/lib/knowledge-i18n.test.mjs
|
||||||
|
```
|
||||||
|
|
||||||
|
These are logic and contract checks, not production or browser acceptance. Before rollout, validate the real KB list, content dialog, spreadsheet import/export, debug search/answer, and history in Russian and English at desktop and narrow widths. Use isolated fixtures and do not run the destructive sample-data initializer.
|
||||||
65
docs/support-availability-ui.md
Normal file
65
docs/support-availability-ui.md
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
# Support availability UI
|
||||||
|
|
||||||
|
Modified in this independent fork; see `hardening/README.md`. Source-only feature,
|
||||||
|
not a production deployment or a claim of browser acceptance.
|
||||||
|
|
||||||
|
## Interfaces
|
||||||
|
|
||||||
|
- System → Support availability: deployment-default IANA timezone and explicit
|
||||||
|
team calendar mode. A team can keep dated shifts or opt into recurring weekly
|
||||||
|
periods and date exceptions. Switching modes never deletes dated shifts.
|
||||||
|
- Recurring periods support split shifts, overnight ends and `00:00`–`24:00`.
|
||||||
|
A closed date sends no open periods; unsaved hidden period inputs are retained
|
||||||
|
while toggling the date back to open. Draft preview calls the server evaluator.
|
||||||
|
- Existing dated-shift screens explain that stored rows are inactive for teams
|
||||||
|
using recurring mode. They do not imply both schedules are combined.
|
||||||
|
- Header/workbench availability controls persist Ready, Busy, Break, Unavailable
|
||||||
|
and a half-open vacation interval. The backend captures the return status when
|
||||||
|
vacation is first scheduled. Logging in does not reset an active absence.
|
||||||
|
- Vacation and preview inputs explicitly use the browser timezone, show exact
|
||||||
|
UTC instants, reject nonexistent DST times, and expose a choice for repeated
|
||||||
|
local times. Recurring calendar results use the configured timezone. Opaque
|
||||||
|
legacy process timezone names render next-opening instants explicitly in UTC.
|
||||||
|
- Admin profile rows show live presence, effective working status and server
|
||||||
|
eligibility separately. Dedicated status changes are independent of general
|
||||||
|
profile edits. The unused offline-message flag is retained but read-only and
|
||||||
|
labeled as legacy, never as permission to assign to disconnected staff.
|
||||||
|
- Transfer candidates come from the server's conversation-scoped manual
|
||||||
|
eligibility endpoint, not a client-side `serviceStatus === Idle` guess.
|
||||||
|
- Customer chat shows technical connection separately from aggregated human
|
||||||
|
support availability. No employee identity, absence interval or private reason
|
||||||
|
is sent by the public status endpoint. Scheduled opening copy does not promise
|
||||||
|
that an operator will be connected.
|
||||||
|
|
||||||
|
## Safety and interaction coverage
|
||||||
|
|
||||||
|
The API adapter uses the existing request/session envelope and bounds background
|
||||||
|
availability reads to 10 seconds. Components discard unmounted/old-session
|
||||||
|
responses. Mutations and post-confirmation callbacks are checked against the
|
||||||
|
captured authenticated session. Saves are single-flight; failed saves retain
|
||||||
|
inputs. Read-only/preview Enter does not submit calendar changes. Closing a dirty
|
||||||
|
form, changing scope, and internal/browser navigation warn before discarding.
|
||||||
|
|
||||||
|
The calendar is a scoped configuration form rather than a paginated resource, so
|
||||||
|
it uses DashboardPage/Toolbar, react-hook-form, existing field/input/combobox and
|
||||||
|
confirmation components. The existing agent CRUD/calendar components remain in
|
||||||
|
place. All new copy is available in Russian, English and Chinese.
|
||||||
|
|
||||||
|
## Checks performed
|
||||||
|
|
||||||
|
- Full TypeScript `--noEmit --incremental false`: passed.
|
||||||
|
- Focused availability helper/API tests: 13 passed.
|
||||||
|
- Additional independent transport/locale edge tests: 10 passed, including
|
||||||
|
independent deadlines, retry recovery, EU DST and Lord Howe 30-minute overlap.
|
||||||
|
- Focused lifecycle tests: 6 passed, including StrictMode effect restart,
|
||||||
|
duplicate saves, late session changes and confirmation after unmount.
|
||||||
|
- Focused lint: no errors; existing agent avatar `<img>` warning remains.
|
||||||
|
- Git whitespace check: passed.
|
||||||
|
|
||||||
|
The lifecycle tests execute actual component handlers in an isolated hook
|
||||||
|
harness; they are not rendered-browser tests. Browser launch was blocked by the
|
||||||
|
execution environment. Desktop/narrow-width rendering, focus behavior, keyboard
|
||||||
|
interactions, native date/time controls, and real Next.js Back/Forward handling
|
||||||
|
still require browser acceptance. No live account, customer message, production
|
||||||
|
database or deployment was used. The integration owner records combined build
|
||||||
|
and broader regression results separately in `hardening/VALIDATION.md`.
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified in the independent AgentDesk fork: localized knowledge workflows and safe display errors.
|
||||||
package rag
|
package rag
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -15,6 +16,7 @@ import (
|
|||||||
"agent-desk/internal/pkg/dto/response"
|
"agent-desk/internal/pkg/dto/response"
|
||||||
"agent-desk/internal/pkg/enums"
|
"agent-desk/internal/pkg/enums"
|
||||||
"agent-desk/internal/pkg/errorsx"
|
"agent-desk/internal/pkg/errorsx"
|
||||||
|
"agent-desk/internal/pkg/i18nx"
|
||||||
"agent-desk/internal/repositories"
|
"agent-desk/internal/repositories"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -24,6 +26,9 @@ type answer struct {
|
|||||||
var Answer = &answer{}
|
var Answer = &answer{}
|
||||||
|
|
||||||
func (s *answer) DebugSearch(ctx context.Context, req request.KnowledgeSearchRequest) (*response.KnowledgeSearchResponse, error) {
|
func (s *answer) DebugSearch(ctx context.Context, req request.KnowledgeSearchRequest) (*response.KnowledgeSearchResponse, error) {
|
||||||
|
if err := ctx.Err(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
if strings.TrimSpace(req.Question) == "" {
|
if strings.TrimSpace(req.Question) == "" {
|
||||||
return nil, errorsx.InvalidParamI18n("error.e0340")
|
return nil, errorsx.InvalidParamI18n("error.e0340")
|
||||||
}
|
}
|
||||||
@@ -59,6 +64,9 @@ func (s *answer) DebugSearch(ctx context.Context, req request.KnowledgeSearchReq
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *answer) DebugAnswer(ctx context.Context, req request.KnowledgeAnswerRequest, operator *dto.AuthPrincipal) (*response.KnowledgeAnswerResponse, error) {
|
func (s *answer) DebugAnswer(ctx context.Context, req request.KnowledgeAnswerRequest, operator *dto.AuthPrincipal) (*response.KnowledgeAnswerResponse, error) {
|
||||||
|
if err := ctx.Err(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
if strings.TrimSpace(req.Question) == "" {
|
if strings.TrimSpace(req.Question) == "" {
|
||||||
return nil, errorsx.InvalidParamI18n("error.e0340")
|
return nil, errorsx.InvalidParamI18n("error.e0340")
|
||||||
}
|
}
|
||||||
@@ -77,7 +85,7 @@ func (s *answer) DebugAnswer(ctx context.Context, req request.KnowledgeAnswerReq
|
|||||||
}
|
}
|
||||||
retrieveMs := time.Since(retrieveStartedAt).Milliseconds()
|
retrieveMs := time.Since(retrieveStartedAt).Milliseconds()
|
||||||
knowledgeBase := s.resolveAnswerKnowledgeBase(req.KnowledgeBaseIDs, results)
|
knowledgeBase := s.resolveAnswerKnowledgeBase(req.KnowledgeBaseIDs, results)
|
||||||
contextResults := buildContextHits(Retrieve.SelectContextResults(results, 4000))
|
contextResults := buildContextHits(Retrieve.SelectContextResultsWithContext(ctx, results, 4000))
|
||||||
|
|
||||||
hits := make([]response.KnowledgeSearchResult, 0, len(results))
|
hits := make([]response.KnowledgeSearchResult, 0, len(results))
|
||||||
topScore := 0.0
|
topScore := 0.0
|
||||||
@@ -114,36 +122,18 @@ func (s *answer) DebugAnswer(ctx context.Context, req request.KnowledgeAnswerReq
|
|||||||
|
|
||||||
fallbackMode := enums.AIAgentFallbackModeNoAnswer
|
fallbackMode := enums.AIAgentFallbackModeNoAnswer
|
||||||
|
|
||||||
answerStatus := enums.KnowledgeAnswerStatusNormal
|
|
||||||
answer := ""
|
|
||||||
modelName := ""
|
|
||||||
promptTokens := 0
|
|
||||||
completionTokens := 0
|
|
||||||
generateStartedAt := time.Now()
|
generateStartedAt := time.Now()
|
||||||
|
generated, err := generateKnowledgeAnswer(ctx, req.Question, results, answerMode, fallbackMode, ai.LLM.Chat)
|
||||||
if len(hits) == 0 {
|
if err != nil {
|
||||||
answerStatus = enums.KnowledgeAnswerStatusNoAnswer
|
return nil, err
|
||||||
answer = buildFallbackAnswer(fallbackMode)
|
|
||||||
} else {
|
|
||||||
contextText := Retrieve.BuildContext(ctx, results, 4000)
|
|
||||||
systemPrompt := buildAnswerSystemPrompt(answerMode)
|
|
||||||
userPrompt := fmt.Sprintf("用户问题：%s\n\n参考资料：\n%s", req.Question, contextText)
|
|
||||||
llmResult, llmErr := ai.LLM.Chat(ctx, systemPrompt, userPrompt)
|
|
||||||
if llmErr != nil {
|
|
||||||
answerStatus = enums.KnowledgeAnswerStatusFallback
|
|
||||||
answer = buildFallbackAnswer(fallbackMode)
|
|
||||||
} else {
|
|
||||||
answer = llmResult.Content
|
|
||||||
modelName = llmResult.ModelName
|
|
||||||
promptTokens = llmResult.PromptTokens
|
|
||||||
completionTokens = llmResult.CompletionTokens
|
|
||||||
if strings.TrimSpace(answer) == "" {
|
|
||||||
answerStatus = enums.KnowledgeAnswerStatusFallback
|
|
||||||
answer = buildFallbackAnswer(fallbackMode)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
answerStatus := generated.Status
|
||||||
|
answer := generated.Content
|
||||||
|
modelName := generated.ModelName
|
||||||
|
promptTokens := generated.PromptTokens
|
||||||
|
completionTokens := generated.CompletionTokens
|
||||||
generateMs := time.Since(generateStartedAt).Milliseconds()
|
generateMs := time.Since(generateStartedAt).Milliseconds()
|
||||||
|
|
||||||
rerankLimit := 0
|
rerankLimit := 0
|
||||||
chunkProvider := ""
|
chunkProvider := ""
|
||||||
chunkTargetTokens := 0
|
chunkTargetTokens := 0
|
||||||
@@ -191,7 +181,7 @@ func (s *answer) DebugAnswer(ctx context.Context, req request.KnowledgeAnswerReq
|
|||||||
Question: req.Question,
|
Question: req.Question,
|
||||||
Answer: answer,
|
Answer: answer,
|
||||||
AnswerStatus: int(answerStatus),
|
AnswerStatus: int(answerStatus),
|
||||||
AnswerStatusName: getAnswerStatusName(answerStatus),
|
AnswerStatusName: getAnswerStatusName(ctx, answerStatus),
|
||||||
Citations: citations,
|
Citations: citations,
|
||||||
Hits: hits,
|
Hits: hits,
|
||||||
HitCount: len(hits),
|
HitCount: len(hits),
|
||||||
@@ -376,20 +366,20 @@ func resolveDefaultRerankLimit(items []models.KnowledgeBase) int {
|
|||||||
return limit
|
return limit
|
||||||
}
|
}
|
||||||
|
|
||||||
func buildAnswerSystemPrompt(answerMode enums.KnowledgeAnswerMode) string {
|
func buildAnswerSystemPrompt(ctx context.Context, answerMode enums.KnowledgeAnswerMode) string {
|
||||||
|
key := "knowledge.rag.system.strict"
|
||||||
if answerMode == enums.KnowledgeAnswerModeAssist {
|
if answerMode == enums.KnowledgeAnswerModeAssist {
|
||||||
return "你是客服知识库助手。请优先依据提供的知识片段回答，可以做轻度归纳，但不要编造未提供的事实。"
|
key = "knowledge.rag.system.assist"
|
||||||
}
|
}
|
||||||
return "你是严格的客服知识库助手。只能依据提供的知识片段回答；如果资料不足，请明确说明知识库暂无明确信息。"
|
return i18nx.Getf(i18nx.LocaleFromContext(ctx), key)
|
||||||
}
|
}
|
||||||
|
|
||||||
func buildFallbackAnswer(fallbackMode enums.AIAgentFallbackMode) string {
|
func buildFallbackAnswer(ctx context.Context, fallbackMode enums.AIAgentFallbackMode) string {
|
||||||
switch fallbackMode {
|
key := "knowledge.rag.fallback.noAnswer"
|
||||||
case enums.AIAgentFallbackModeSuggestRetry:
|
if fallbackMode == enums.AIAgentFallbackModeSuggestRetry {
|
||||||
return "当前知识库里没有找到足够明确的信息，你可以换个更具体的问法再试一次。"
|
key = "knowledge.rag.fallback.suggestRetry"
|
||||||
default:
|
|
||||||
return "当前知识库暂无明确信息。"
|
|
||||||
}
|
}
|
||||||
|
return i18nx.Getf(i18nx.LocaleFromContext(ctx), key)
|
||||||
}
|
}
|
||||||
|
|
||||||
func defaultRetrieveChannel(channel string) string {
|
func defaultRetrieveChannel(channel string) string {
|
||||||
@@ -406,17 +396,52 @@ func defaultRetrieveScene(scene string) string {
|
|||||||
return scene
|
return scene
|
||||||
}
|
}
|
||||||
|
|
||||||
func getAnswerStatusName(status enums.KnowledgeAnswerStatus) string {
|
func getAnswerStatusName(ctx context.Context, status enums.KnowledgeAnswerStatus) string {
|
||||||
|
key := "knowledge.labels.unknown"
|
||||||
switch status {
|
switch status {
|
||||||
case enums.KnowledgeAnswerStatusNormal:
|
case enums.KnowledgeAnswerStatusNormal, enums.KnowledgeAnswerStatusNoAnswer, enums.KnowledgeAnswerStatusFallback, enums.KnowledgeAnswerStatusBlocked:
|
||||||
return "正常"
|
key = fmt.Sprintf("knowledge.labels.answer.%d", status)
|
||||||
case enums.KnowledgeAnswerStatusNoAnswer:
|
|
||||||
return "无答案"
|
|
||||||
case enums.KnowledgeAnswerStatusFallback:
|
|
||||||
return "兜底"
|
|
||||||
case enums.KnowledgeAnswerStatusBlocked:
|
|
||||||
return "风控拦截"
|
|
||||||
default:
|
|
||||||
return "未知"
|
|
||||||
}
|
}
|
||||||
|
return i18nx.Getf(i18nx.LocaleFromContext(ctx), key)
|
||||||
|
}
|
||||||
|
|
||||||
|
type generatedKnowledgeAnswer struct {
|
||||||
|
ai.ChatCompletionResult
|
||||||
|
Status enums.KnowledgeAnswerStatus
|
||||||
|
}
|
||||||
|
|
||||||
|
type knowledgeChatFunc func(context.Context, string, string) (*ai.ChatCompletionResult, error)
|
||||||
|
|
||||||
|
// Keep generation independent of persistence so fallback and cancellation paths
|
||||||
|
// can be tested without a configured model, external service, or database.
|
||||||
|
func generateKnowledgeAnswer(ctx context.Context, question string, results []RetrieveResult, mode enums.KnowledgeAnswerMode, fallbackMode enums.AIAgentFallbackMode, chat knowledgeChatFunc) (*generatedKnowledgeAnswer, error) {
|
||||||
|
if err := ctx.Err(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
result := &generatedKnowledgeAnswer{Status: enums.KnowledgeAnswerStatusNoAnswer}
|
||||||
|
result.Content = buildFallbackAnswer(ctx, fallbackMode)
|
||||||
|
if len(results) == 0 {
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
contextText := Retrieve.BuildContext(ctx, results, 4000)
|
||||||
|
systemPrompt := buildAnswerSystemPrompt(ctx, mode)
|
||||||
|
userPrompt := i18nx.Getf(i18nx.LocaleFromContext(ctx), "knowledge.rag.userPrompt", question, contextText)
|
||||||
|
llmResult, err := chat(ctx, systemPrompt, userPrompt)
|
||||||
|
// An interrupted request is not a model failure and must not be logged as a
|
||||||
|
// completed fallback answer after the client has gone away.
|
||||||
|
if contextErr := ctx.Err(); contextErr != nil {
|
||||||
|
return nil, contextErr
|
||||||
|
}
|
||||||
|
if err != nil || llmResult == nil {
|
||||||
|
result.Status = enums.KnowledgeAnswerStatusFallback
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
result.ChatCompletionResult = *llmResult
|
||||||
|
if strings.TrimSpace(llmResult.Content) == "" {
|
||||||
|
result.Status = enums.KnowledgeAnswerStatusFallback
|
||||||
|
result.Content = buildFallbackAnswer(ctx, fallbackMode)
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
result.Status = enums.KnowledgeAnswerStatusNormal
|
||||||
|
return result, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,12 @@
|
|||||||
|
// Modified in the independent AgentDesk fork: localized knowledge workflows and safe display errors.
|
||||||
package rag
|
package rag
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"agent-desk/internal/pkg/i18nx"
|
||||||
|
|
||||||
"agent-desk/internal/models"
|
"agent-desk/internal/models"
|
||||||
"agent-desk/internal/pkg/dto/response"
|
"agent-desk/internal/pkg/dto/response"
|
||||||
"agent-desk/internal/pkg/enums"
|
"agent-desk/internal/pkg/enums"
|
||||||
@@ -27,17 +31,17 @@ func TestBuildFallbackAnswer(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, tt := range tests {
|
for _, tt := range tests {
|
||||||
if got := buildFallbackAnswer(tt.mode); got != tt.expected {
|
if got := buildFallbackAnswer(i18nx.WithLocale(context.Background(), i18nx.LocaleZhCN), tt.mode); got != tt.expected {
|
||||||
t.Fatalf("%s: expected %q, got %q", tt.name, tt.expected, got)
|
t.Fatalf("%s: expected %q, got %q", tt.name, tt.expected, got)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestGetAnswerStatusName(t *testing.T) {
|
func TestGetAnswerStatusName(t *testing.T) {
|
||||||
if got := getAnswerStatusName(enums.KnowledgeAnswerStatusNoAnswer); got != "无答案" {
|
if got := getAnswerStatusName(i18nx.WithLocale(context.Background(), i18nx.LocaleZhCN), enums.KnowledgeAnswerStatusNoAnswer); got != "无答案" {
|
||||||
t.Fatalf("expected no-answer label, got %q", got)
|
t.Fatalf("expected no-answer label, got %q", got)
|
||||||
}
|
}
|
||||||
if got := getAnswerStatusName(enums.KnowledgeAnswerStatusFallback); got != "兜底" {
|
if got := getAnswerStatusName(i18nx.WithLocale(context.Background(), i18nx.LocaleZhCN), enums.KnowledgeAnswerStatusFallback); got != i18nx.Getf(i18nx.LocaleZhCN, "knowledge.labels.answer.3") {
|
||||||
t.Fatalf("expected fallback label, got %q", got)
|
t.Fatalf("expected fallback label, got %q", got)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
82
internal/ai/rag/faq_content.go
Normal file
82
internal/ai/rag/faq_content.go
Normal file
@@ -0,0 +1,82 @@
|
|||||||
|
package rag
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"agent-desk/internal/models"
|
||||||
|
"agent-desk/internal/pkg/i18nx"
|
||||||
|
)
|
||||||
|
|
||||||
|
// faqContent keeps application-owned labels separate from source text. Never
|
||||||
|
// translate, trim, or replace substrings in the source question or answer.
|
||||||
|
type faqContent struct {
|
||||||
|
question string
|
||||||
|
similarQuestions []string
|
||||||
|
answer string
|
||||||
|
}
|
||||||
|
|
||||||
|
func sourceFAQContent(faq models.KnowledgeFAQ) faqContent {
|
||||||
|
content := faqContent{question: faq.Question, answer: faq.Answer}
|
||||||
|
if faq.SimilarQuestions != "" {
|
||||||
|
_ = json.Unmarshal([]byte(faq.SimilarQuestions), &content.similarQuestions)
|
||||||
|
}
|
||||||
|
return content
|
||||||
|
}
|
||||||
|
|
||||||
|
func (content faqContent) render(locale string) string {
|
||||||
|
parts := []string{i18nx.Getf(locale, "knowledge.rag.faq.question", content.question)}
|
||||||
|
if len(content.similarQuestions) > 0 {
|
||||||
|
similar := joinNonEmptySimilarQuestions(content.similarQuestions, i18nx.Getf(locale, "knowledge.rag.faq.separator"))
|
||||||
|
parts = append(parts, i18nx.Getf(locale, "knowledge.rag.faq.similarQuestions", similar))
|
||||||
|
}
|
||||||
|
parts = append(parts, i18nx.Getf(locale, "knowledge.rag.faq.answer", content.answer))
|
||||||
|
return strings.Join(parts, "\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Index generation deliberately uses the configured default, not the locale of
|
||||||
|
// whichever administrator requested a build. A locale read never re-embeds data.
|
||||||
|
func buildFAQChunkContent(faq models.KnowledgeFAQ) string {
|
||||||
|
return sourceFAQContent(faq).render(i18nx.DefaultLocale)
|
||||||
|
}
|
||||||
|
|
||||||
|
// legacyChinese renders the exact pre-localization serialization. This is a
|
||||||
|
// recognition format, not UI copy. Keep it frozen when catalog wording changes.
|
||||||
|
func (content faqContent) legacyChinese() string {
|
||||||
|
parts := []string{fmt.Sprintf("问题：%s", content.question)}
|
||||||
|
if len(content.similarQuestions) > 0 {
|
||||||
|
parts = append(parts, "相似问："+joinNonEmptySimilarQuestions(content.similarQuestions, "；"))
|
||||||
|
}
|
||||||
|
parts = append(parts, "回答："+content.answer)
|
||||||
|
return strings.Join(parts, "\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only a full byte-for-byte match against a generated representation of the
|
||||||
|
// current source proves which text belongs to us. Stale/manual/malformed chunks
|
||||||
|
// stay as recorded. In particular, do not infer labels by splitting on Chinese
|
||||||
|
// words: the source content may itself contain those words or arbitrary lines.
|
||||||
|
// This function is for live retrieval only, never historical log replay.
|
||||||
|
func renderVerifiedFAQChunkContent(ctx context.Context, stored string, faq models.KnowledgeFAQ) string {
|
||||||
|
content := sourceFAQContent(faq)
|
||||||
|
if stored == content.legacyChinese() {
|
||||||
|
return content.render(i18nx.LocaleFromContext(ctx))
|
||||||
|
}
|
||||||
|
for _, locale := range []string{i18nx.LocaleEnUS, i18nx.LocaleRuRU, i18nx.LocaleZhCN} {
|
||||||
|
if stored == content.render(locale) {
|
||||||
|
return content.render(i18nx.LocaleFromContext(ctx))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return stored
|
||||||
|
}
|
||||||
|
|
||||||
|
func joinNonEmptySimilarQuestions(items []string, separator string) string {
|
||||||
|
nonEmpty := make([]string, 0, len(items))
|
||||||
|
for _, item := range items {
|
||||||
|
if item != "" {
|
||||||
|
nonEmpty = append(nonEmpty, item)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return strings.Join(nonEmpty, separator)
|
||||||
|
}
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
|
// Modified in the independent AgentDesk fork: localized knowledge workflows and safe display errors.
|
||||||
package rag
|
package rag
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"crypto/sha256"
|
"crypto/sha256"
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"time"
|
"time"
|
||||||
@@ -47,6 +47,9 @@ var Index = &index{
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *index) IndexDocumentByID(ctx context.Context, documentID int64) error {
|
func (s *index) IndexDocumentByID(ctx context.Context, documentID int64) error {
|
||||||
|
if err := ctx.Err(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
document, err := s.loadDocumentByID(documentID)
|
document, err := s.loadDocumentByID(documentID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -55,6 +58,9 @@ func (s *index) IndexDocumentByID(ctx context.Context, documentID int64) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *index) IndexDocument(ctx context.Context, document models.KnowledgeDocument) error {
|
func (s *index) IndexDocument(ctx context.Context, document models.KnowledgeDocument) error {
|
||||||
|
if err := ctx.Err(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
if err := s.markDocumentIndexPending(document.ID); err != nil {
|
if err := s.markDocumentIndexPending(document.ID); err != nil {
|
||||||
slog.Error("Failed to mark knowledge document index as pending", "document_id", document.ID, "error", err)
|
slog.Error("Failed to mark knowledge document index as pending", "document_id", document.ID, "error", err)
|
||||||
@@ -92,6 +98,9 @@ func (s *index) IndexDocument(ctx context.Context, document models.KnowledgeDocu
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *index) IndexFAQByID(ctx context.Context, faqID int64) error {
|
func (s *index) IndexFAQByID(ctx context.Context, faqID int64) error {
|
||||||
|
if err := ctx.Err(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
faq, err := s.loadFAQByID(faqID)
|
faq, err := s.loadFAQByID(faqID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -288,43 +297,6 @@ func (s *index) RebuildKnowledgeBaseIndex(ctx context.Context, knowledgeBaseID i
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func buildFAQChunkContent(faq models.KnowledgeFAQ) string {
|
|
||||||
parts := []string{fmt.Sprintf("问题：%s", faq.Question)}
|
|
||||||
var similarQuestions []string
|
|
||||||
if faq.SimilarQuestions != "" {
|
|
||||||
_ = json.Unmarshal([]byte(faq.SimilarQuestions), &similarQuestions)
|
|
||||||
}
|
|
||||||
if len(similarQuestions) > 0 {
|
|
||||||
parts = append(parts, fmt.Sprintf("相似问：%s", joinSimilarQuestions(similarQuestions)))
|
|
||||||
}
|
|
||||||
parts = append(parts, fmt.Sprintf("回答：%s", faq.Answer))
|
|
||||||
content := ""
|
|
||||||
for _, part := range parts {
|
|
||||||
if part == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if content != "" {
|
|
||||||
content += "\n"
|
|
||||||
}
|
|
||||||
content += part
|
|
||||||
}
|
|
||||||
return content
|
|
||||||
}
|
|
||||||
|
|
||||||
func joinSimilarQuestions(items []string) string {
|
|
||||||
result := ""
|
|
||||||
for _, item := range items {
|
|
||||||
if item == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if result != "" {
|
|
||||||
result += "；"
|
|
||||||
}
|
|
||||||
result += item
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *index) resetKnowledgeBaseIndexStorage(ctx context.Context, knowledgeBaseID int64) error {
|
func (s *index) resetKnowledgeBaseIndexStorage(ctx context.Context, knowledgeBaseID int64) error {
|
||||||
chunks := repositories.KnowledgeChunkRepository.FindByKnowledgeBaseID(sqls.DB(), knowledgeBaseID)
|
chunks := repositories.KnowledgeChunkRepository.FindByKnowledgeBaseID(sqls.DB(), knowledgeBaseID)
|
||||||
return s.cleanupKnowledgeBaseChunks(ctx, knowledgeBaseID, chunks)
|
return s.cleanupKnowledgeBaseChunks(ctx, knowledgeBaseID, chunks)
|
||||||
|
|||||||
@@ -1,9 +1,13 @@
|
|||||||
|
// Modified in the independent AgentDesk fork: localized knowledge workflows and safe display errors.
|
||||||
package rag
|
package rag
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"agent-desk/internal/pkg/i18nx"
|
||||||
|
|
||||||
"agent-desk/internal/models"
|
"agent-desk/internal/models"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -14,7 +18,7 @@ func TestBuildFAQChunkContent(t *testing.T) {
|
|||||||
Answer: "在订单页发起退款。",
|
Answer: "在订单页发起退款。",
|
||||||
}
|
}
|
||||||
|
|
||||||
content := buildFAQChunkContent(faq)
|
content := sourceFAQContent(faq).render(i18nx.LocaleZhCN)
|
||||||
if !strings.Contains(content, "问题：如何退款") {
|
if !strings.Contains(content, "问题：如何退款") {
|
||||||
t.Fatalf("expected question in content, got %q", content)
|
t.Fatalf("expected question in content, got %q", content)
|
||||||
}
|
}
|
||||||
@@ -70,7 +74,7 @@ func TestNormalizeContextResultsMergesAndDedupes(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestBuildContextChunkText(t *testing.T) {
|
func TestBuildContextChunkText(t *testing.T) {
|
||||||
faqText := buildContextChunkText(RetrieveResult{
|
faqText := buildContextChunkText(i18nx.WithLocale(context.Background(), i18nx.LocaleZhCN), RetrieveResult{
|
||||||
FaqID: 1,
|
FaqID: 1,
|
||||||
FaqQuestion: "如何退款",
|
FaqQuestion: "如何退款",
|
||||||
Content: "在订单页发起退款。",
|
Content: "在订单页发起退款。",
|
||||||
@@ -79,7 +83,7 @@ func TestBuildContextChunkText(t *testing.T) {
|
|||||||
t.Fatalf("unexpected faq context text: %q", faqText)
|
t.Fatalf("unexpected faq context text: %q", faqText)
|
||||||
}
|
}
|
||||||
|
|
||||||
docText := buildContextChunkText(RetrieveResult{
|
docText := buildContextChunkText(i18nx.WithLocale(context.Background(), i18nx.LocaleZhCN), RetrieveResult{
|
||||||
DocumentID: 2,
|
DocumentID: 2,
|
||||||
DocumentTitle: "退款文档",
|
DocumentTitle: "退款文档",
|
||||||
SectionPath: "售后/退款",
|
SectionPath: "售后/退款",
|
||||||
|
|||||||
175
internal/ai/rag/localization_test.go
Normal file
175
internal/ai/rag/localization_test.go
Normal file
@@ -0,0 +1,175 @@
|
|||||||
|
package rag
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"agent-desk/internal/ai"
|
||||||
|
"agent-desk/internal/models"
|
||||||
|
"agent-desk/internal/pkg/dto/request"
|
||||||
|
"agent-desk/internal/pkg/enums"
|
||||||
|
"agent-desk/internal/pkg/i18nx"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestKnowledgeAnswerLocalizedFallbackPaths(t *testing.T) {
|
||||||
|
tests := []struct{ locale, fallback, retry, noAnswerStatus string }{
|
||||||
|
{i18nx.LocaleEnUS, "The knowledge base currently has no clear information.", "The knowledge base did not contain enough clear information. Try asking a more specific question.", "No answer"},
|
||||||
|
{i18nx.LocaleRuRU, "В базе знаний пока нет однозначной информации.", "В базе знаний недостаточно однозначной информации. Попробуйте задать более конкретный вопрос.", "Нет ответа"},
|
||||||
|
{i18nx.LocaleZhCN, "当前知识库暂无明确信息。", "当前知识库里没有找到足够明确的信息，你可以换个更具体的问法再试一次。", "无答案"},
|
||||||
|
}
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.locale, func(t *testing.T) {
|
||||||
|
ctx := i18nx.WithLocale(context.Background(), tt.locale)
|
||||||
|
called := false
|
||||||
|
failedChat := func(context.Context, string, string) (*ai.ChatCompletionResult, error) {
|
||||||
|
called = true
|
||||||
|
return nil, errors.New("provider failed")
|
||||||
|
}
|
||||||
|
noHits, err := generateKnowledgeAnswer(ctx, "问题 не переводить", nil, enums.KnowledgeAnswerModeStrict, enums.AIAgentFallbackModeNoAnswer, failedChat)
|
||||||
|
if err != nil || called || noHits.Status != enums.KnowledgeAnswerStatusNoAnswer || noHits.Content != tt.fallback {
|
||||||
|
t.Fatalf("no-hit result = %#v, %v; model called = %v", noHits, err, called)
|
||||||
|
}
|
||||||
|
if got := getAnswerStatusName(ctx, noHits.Status); got != tt.noAnswerStatus {
|
||||||
|
t.Fatalf("status = %q", got)
|
||||||
|
}
|
||||||
|
hits := []RetrieveResult{{DocumentID: 1, Content: "Reference content"}}
|
||||||
|
failed, err := generateKnowledgeAnswer(ctx, "Q", hits, enums.KnowledgeAnswerModeAssist, enums.AIAgentFallbackModeNoAnswer, failedChat)
|
||||||
|
if err != nil || !called || failed.Status != enums.KnowledgeAnswerStatusFallback || failed.Content != tt.fallback {
|
||||||
|
t.Fatalf("failed model result = %#v, %v", failed, err)
|
||||||
|
}
|
||||||
|
for _, empty := range []*ai.ChatCompletionResult{nil, {}, {Content: " \n\t"}} {
|
||||||
|
got, err := generateKnowledgeAnswer(ctx, "Q", hits, enums.KnowledgeAnswerModeStrict, enums.AIAgentFallbackModeSuggestRetry, func(context.Context, string, string) (*ai.ChatCompletionResult, error) { return empty, nil })
|
||||||
|
if err != nil || got.Status != enums.KnowledgeAnswerStatusFallback || got.Content != tt.retry {
|
||||||
|
t.Fatalf("empty result fallback = %#v, %v", got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestKnowledgeGenerationPreservesUserAndModelContent(t *testing.T) {
|
||||||
|
for _, locale := range []string{i18nx.LocaleEnUS, i18nx.LocaleRuRU, i18nx.LocaleZhCN} {
|
||||||
|
ctx := i18nx.WithLocale(context.Background(), locale)
|
||||||
|
question := " 问题：User's question\n回答：not a wrapper "
|
||||||
|
body := " 回答：body\n相似问：literal user text\n "
|
||||||
|
output := &ai.ChatCompletionResult{Content: " 模型回答\n", ModelName: "test-model", PromptTokens: 4, CompletionTokens: 2}
|
||||||
|
got, err := generateKnowledgeAnswer(ctx, question, []RetrieveResult{{DocumentID: 1, DocumentTitle: "用户标题", Content: body}}, enums.KnowledgeAnswerModeStrict, enums.AIAgentFallbackModeNoAnswer, func(modelCtx context.Context, systemPrompt, userPrompt string) (*ai.ChatCompletionResult, error) {
|
||||||
|
if i18nx.LocaleFromContext(modelCtx) != locale {
|
||||||
|
t.Fatal("locale not forwarded to model")
|
||||||
|
}
|
||||||
|
if systemPrompt != i18nx.Getf(locale, "knowledge.rag.system.strict") || !strings.Contains(userPrompt, question) || !strings.Contains(userPrompt, body) {
|
||||||
|
t.Fatalf("incorrect prompts: %q, %q", systemPrompt, userPrompt)
|
||||||
|
}
|
||||||
|
return output, nil
|
||||||
|
})
|
||||||
|
if err != nil || got.Status != enums.KnowledgeAnswerStatusNormal || got.ChatCompletionResult != *output {
|
||||||
|
t.Fatalf("model output was changed: %#v, %v", got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestKnowledgeCancellationBeforePersistenceOrProviderCalls(t *testing.T) {
|
||||||
|
ctx, cancel := context.WithCancel(i18nx.WithLocale(context.Background(), i18nx.LocaleRuRU))
|
||||||
|
cancel()
|
||||||
|
if _, err := Answer.DebugSearch(ctx, request.KnowledgeSearchRequest{Question: "Q"}); !errors.Is(err, context.Canceled) {
|
||||||
|
t.Fatalf("debug search ignored cancellation: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := Answer.DebugAnswer(ctx, request.KnowledgeAnswerRequest{Question: "Q"}, nil); !errors.Is(err, context.Canceled) {
|
||||||
|
t.Fatalf("debug answer ignored cancellation: %v", err)
|
||||||
|
}
|
||||||
|
if err := Index.IndexDocumentByID(ctx, 1); !errors.Is(err, context.Canceled) {
|
||||||
|
t.Fatalf("document build ignored cancellation: %v", err)
|
||||||
|
}
|
||||||
|
if err := Index.IndexFAQByID(ctx, 1); !errors.Is(err, context.Canceled) {
|
||||||
|
t.Fatalf("FAQ build ignored cancellation: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := Retrieve.Retrieve(ctx, RetrieveRequest{Query: "Q"}); !errors.Is(err, context.Canceled) {
|
||||||
|
t.Fatalf("retrieval ignored cancellation: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestKnowledgeGenerationCancellationIsNotFallback(t *testing.T) {
|
||||||
|
ctx, cancel := context.WithCancel(i18nx.WithLocale(context.Background(), i18nx.LocaleRuRU))
|
||||||
|
defer cancel()
|
||||||
|
got, err := generateKnowledgeAnswer(ctx, "Q", []RetrieveResult{{DocumentID: 1, Content: "source"}}, enums.KnowledgeAnswerModeStrict, enums.AIAgentFallbackModeNoAnswer, func(modelCtx context.Context, _, _ string) (*ai.ChatCompletionResult, error) {
|
||||||
|
cancel()
|
||||||
|
return nil, modelCtx.Err()
|
||||||
|
})
|
||||||
|
if got != nil || !errors.Is(err, context.Canceled) {
|
||||||
|
t.Fatalf("cancelled model should not become a saved fallback: %#v, %v", got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFAQGeneratedWrappersPreserveSourceContent(t *testing.T) {
|
||||||
|
faq := models.KnowledgeFAQ{
|
||||||
|
Question: " 问题：What?\n回答：part of question ",
|
||||||
|
SimilarQuestions: `["相似问：literal; text", "", " another\n问题：line "]`,
|
||||||
|
Answer: " 回答：user answer\n相似问：inside answer\n问题：last line ",
|
||||||
|
}
|
||||||
|
original := faq
|
||||||
|
source := sourceFAQContent(faq)
|
||||||
|
for _, locale := range []string{i18nx.LocaleEnUS, i18nx.LocaleRuRU, i18nx.LocaleZhCN} {
|
||||||
|
ctx := i18nx.WithLocale(context.Background(), locale)
|
||||||
|
expected := source.render(locale)
|
||||||
|
for _, stored := range []string{source.legacyChinese(), source.render(i18nx.LocaleEnUS), source.render(i18nx.LocaleRuRU), source.render(i18nx.LocaleZhCN)} {
|
||||||
|
got := renderVerifiedFAQChunkContent(ctx, stored, faq)
|
||||||
|
if got != expected || !strings.Contains(got, faq.Question) || !strings.Contains(got, faq.Answer) || !strings.Contains(got, " another\n问题：line ") {
|
||||||
|
t.Fatalf("%s changed source text: %q", locale, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if faq != original {
|
||||||
|
t.Fatal("source model mutated")
|
||||||
|
}
|
||||||
|
if got := buildFAQChunkContent(faq); got != source.render(i18nx.DefaultLocale) {
|
||||||
|
t.Fatalf("index did not use configured locale: %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFAQUnknownAndStaleDerivedContentStaysRecorded(t *testing.T) {
|
||||||
|
faq := models.KnowledgeFAQ{Question: "Current Q", Answer: "Current A"}
|
||||||
|
ctx := i18nx.WithLocale(context.Background(), i18nx.LocaleRuRU)
|
||||||
|
for _, stored := range []string{
|
||||||
|
"问题：Old Q\n回答：Historical A",
|
||||||
|
"问题：Current Q\n回答：Current A\n",
|
||||||
|
"问题：Current Q\n回答：User-authored custom answer",
|
||||||
|
"相似问：not a generated chunk",
|
||||||
|
"{malformed:derived}",
|
||||||
|
"",
|
||||||
|
} {
|
||||||
|
if got := renderVerifiedFAQChunkContent(ctx, stored, faq); got != stored {
|
||||||
|
t.Fatalf("unverified stored content was rewritten: %q => %q", stored, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestContextWrappersAreLocalizedWithoutChangingSource(t *testing.T) {
|
||||||
|
content := " 原始文档\n回答：literal\n "
|
||||||
|
tests := []struct{ locale, label string }{
|
||||||
|
{i18nx.LocaleEnUS, "[Document: Document#7 | Section: 用户章节]"},
|
||||||
|
{i18nx.LocaleRuRU, "[Документ: Документ №7 | Раздел: 用户章节]"},
|
||||||
|
{i18nx.LocaleZhCN, "【文档：文档#7｜章节：用户章节】"},
|
||||||
|
}
|
||||||
|
for _, tt := range tests {
|
||||||
|
ctx := i18nx.WithLocale(context.Background(), tt.locale)
|
||||||
|
got := Retrieve.BuildContext(ctx, []RetrieveResult{{DocumentID: 7, SectionPath: "用户章节", Content: content}}, 4000)
|
||||||
|
if got != tt.label+"\n"+content+"\n\n" {
|
||||||
|
t.Fatalf("%s unexpected context: %q", tt.locale, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestKnowledgeGenerationDefaultLocaleAndEmptyResponseMetrics(t *testing.T) {
|
||||||
|
ctx := context.Background()
|
||||||
|
noHits, err := generateKnowledgeAnswer(ctx, "Q", nil, enums.KnowledgeAnswerModeStrict, enums.AIAgentFallbackModeNoAnswer, nil)
|
||||||
|
if err != nil || noHits.Content != i18nx.Get("knowledge.rag.fallback.noAnswer") {
|
||||||
|
t.Fatalf("default-locale caller changed behavior: %#v, %v", noHits, err)
|
||||||
|
}
|
||||||
|
empty := &ai.ChatCompletionResult{Content: " \n", ModelName: "local-test-model", PromptTokens: 12, CompletionTokens: 3}
|
||||||
|
got, err := generateKnowledgeAnswer(ctx, "Q", []RetrieveResult{{DocumentID: 1, Content: "reference"}}, enums.KnowledgeAnswerModeStrict, enums.AIAgentFallbackModeNoAnswer, func(context.Context, string, string) (*ai.ChatCompletionResult, error) { return empty, nil })
|
||||||
|
if err != nil || got.Status != enums.KnowledgeAnswerStatusFallback || got.Content != noHits.Content || got.ModelName != empty.ModelName || got.PromptTokens != empty.PromptTokens || got.CompletionTokens != empty.CompletionTokens {
|
||||||
|
t.Fatalf("empty completion must retain usage metrics: %#v, %v", got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified in the independent AgentDesk fork: localized knowledge workflows and safe display errors.
|
||||||
package rag
|
package rag
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -32,6 +33,9 @@ type RetrieveTrace struct {
|
|||||||
|
|
||||||
func (s *retrieve) RetrieveWithTrace(ctx context.Context, req RetrieveRequest) ([]RetrieveResult, *RetrieveTrace, error) {
|
func (s *retrieve) RetrieveWithTrace(ctx context.Context, req RetrieveRequest) ([]RetrieveResult, *RetrieveTrace, error) {
|
||||||
trace := newRetrieveTrace()
|
trace := newRetrieveTrace()
|
||||||
|
if err := ctx.Err(); err != nil {
|
||||||
|
return nil, trace, err
|
||||||
|
}
|
||||||
retrievableKnowledgeBases, _, ok := s.prepareRetrievableKnowledgeBases(req, trace)
|
retrievableKnowledgeBases, _, ok := s.prepareRetrievableKnowledgeBases(req, trace)
|
||||||
if !ok {
|
if !ok {
|
||||||
return nil, trace, nil
|
return nil, trace, nil
|
||||||
@@ -47,7 +51,7 @@ func (s *retrieve) RetrieveWithTrace(ctx context.Context, req RetrieveRequest) (
|
|||||||
if len(searchResults) == 0 {
|
if len(searchResults) == 0 {
|
||||||
return nil, trace, nil
|
return nil, trace, nil
|
||||||
}
|
}
|
||||||
results, hydrateMs := s.hydrateRetrieveResults(searchResults)
|
results, hydrateMs := s.hydrateRetrieveResults(ctx, searchResults)
|
||||||
trace.HydrateMs = hydrateMs
|
trace.HydrateMs = hydrateMs
|
||||||
|
|
||||||
return results, trace, nil
|
return results, trace, nil
|
||||||
|
|||||||
@@ -1,12 +1,19 @@
|
|||||||
|
// Modified in the independent AgentDesk fork: localized knowledge workflows and safe display errors.
|
||||||
package rag
|
package rag
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"agent-desk/internal/pkg/i18nx"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (s *retrieve) SelectContextResults(results []RetrieveResult, maxTokens int) []RetrieveResult {
|
func (s *retrieve) SelectContextResults(results []RetrieveResult, maxTokens int) []RetrieveResult {
|
||||||
|
return s.SelectContextResultsWithContext(context.Background(), results, maxTokens)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *retrieve) SelectContextResultsWithContext(ctx context.Context, results []RetrieveResult, maxTokens int) []RetrieveResult {
|
||||||
if len(results) == 0 {
|
if len(results) == 0 {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -20,7 +27,7 @@ func (s *retrieve) SelectContextResults(results []RetrieveResult, maxTokens int)
|
|||||||
if documentUsage[item.DocumentID] >= 2 {
|
if documentUsage[item.DocumentID] >= 2 {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
chunkText := buildContextChunkText(item)
|
chunkText := buildContextChunkText(ctx, item)
|
||||||
estimatedTokens := len(chunkText) / 2
|
estimatedTokens := len(chunkText) / 2
|
||||||
if totalTokens+estimatedTokens > maxTokens {
|
if totalTokens+estimatedTokens > maxTokens {
|
||||||
break
|
break
|
||||||
@@ -32,15 +39,15 @@ func (s *retrieve) SelectContextResults(results []RetrieveResult, maxTokens int)
|
|||||||
return selected
|
return selected
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *retrieve) BuildContext(_ context.Context, results []RetrieveResult, maxTokens int) string {
|
func (s *retrieve) BuildContext(ctx context.Context, results []RetrieveResult, maxTokens int) string {
|
||||||
if len(results) == 0 {
|
if len(results) == 0 {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
normalizedResults := s.SelectContextResults(results, maxTokens)
|
normalizedResults := s.SelectContextResultsWithContext(ctx, results, maxTokens)
|
||||||
var builder strings.Builder
|
var builder strings.Builder
|
||||||
for _, r := range normalizedResults {
|
for _, r := range normalizedResults {
|
||||||
builder.WriteString(buildContextChunkText(r))
|
builder.WriteString(buildContextChunkText(ctx, r))
|
||||||
}
|
}
|
||||||
|
|
||||||
return builder.String()
|
return builder.String()
|
||||||
@@ -125,26 +132,27 @@ func buildSectionKey(item RetrieveResult) string {
|
|||||||
return fmt.Sprintf("%d|chunk:%d", item.DocumentID, item.ChunkNo)
|
return fmt.Sprintf("%d|chunk:%d", item.DocumentID, item.ChunkNo)
|
||||||
}
|
}
|
||||||
|
|
||||||
func buildContextChunkText(item RetrieveResult) string {
|
func buildContextChunkText(ctx context.Context, item RetrieveResult) string {
|
||||||
|
locale := i18nx.LocaleFromContext(ctx)
|
||||||
if item.FaqID > 0 {
|
if item.FaqID > 0 {
|
||||||
title := strings.TrimSpace(item.FaqQuestion)
|
title := strings.TrimSpace(item.FaqQuestion)
|
||||||
if title == "" {
|
if title == "" {
|
||||||
title = strings.TrimSpace(item.Title)
|
title = strings.TrimSpace(item.Title)
|
||||||
}
|
}
|
||||||
if title == "" {
|
if title == "" {
|
||||||
title = fmt.Sprintf("FAQ#%d", item.FaqID)
|
title = i18nx.Getf(locale, "knowledge.rag.context.faqTitle", item.FaqID)
|
||||||
}
|
}
|
||||||
return fmt.Sprintf("【FAQ：%s】\n%s\n\n", title, item.Content)
|
return i18nx.Getf(locale, "knowledge.rag.context.faq", title, item.Content)
|
||||||
}
|
}
|
||||||
title := strings.TrimSpace(item.DocumentTitle)
|
title := strings.TrimSpace(item.DocumentTitle)
|
||||||
if title == "" {
|
if title == "" {
|
||||||
title = fmt.Sprintf("文档#%d", item.DocumentID)
|
title = i18nx.Getf(locale, "knowledge.rag.context.documentTitle", item.DocumentID)
|
||||||
}
|
}
|
||||||
if item.SectionPath != "" {
|
if item.SectionPath != "" {
|
||||||
return fmt.Sprintf("【文档：%s｜章节：%s】\n%s\n\n", title, item.SectionPath, item.Content)
|
return i18nx.Getf(locale, "knowledge.rag.context.documentSection", title, item.SectionPath, item.Content)
|
||||||
}
|
}
|
||||||
if item.Title != "" {
|
if item.Title != "" {
|
||||||
return fmt.Sprintf("【文档：%s｜标题：%s】\n%s\n\n", title, item.Title, item.Content)
|
return i18nx.Getf(locale, "knowledge.rag.context.documentHeading", title, item.Title, item.Content)
|
||||||
}
|
}
|
||||||
return fmt.Sprintf("【文档：%s】\n%s\n\n", title, item.Content)
|
return i18nx.Getf(locale, "knowledge.rag.context.document", title, item.Content)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified in the independent AgentDesk fork: localized knowledge workflows and safe display errors.
|
||||||
package rag
|
package rag
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -72,7 +73,7 @@ func (s *retrieve) searchKnowledgeBaseVectors(ctx context.Context, req RetrieveR
|
|||||||
return searchResults, trace, nil
|
return searchResults, trace, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *retrieve) hydrateRetrieveResults(searchResults []vectordb.SearchResult) ([]RetrieveResult, int64) {
|
func (s *retrieve) hydrateRetrieveResults(ctx context.Context, searchResults []vectordb.SearchResult) ([]RetrieveResult, int64) {
|
||||||
if len(searchResults) == 0 {
|
if len(searchResults) == 0 {
|
||||||
return nil, 0
|
return nil, 0
|
||||||
}
|
}
|
||||||
@@ -128,6 +129,7 @@ func (s *retrieve) hydrateRetrieveResults(searchResults []vectordb.SearchResult)
|
|||||||
|
|
||||||
documentTitle := ""
|
documentTitle := ""
|
||||||
faqQuestion := ""
|
faqQuestion := ""
|
||||||
|
content := chunk.Content
|
||||||
if chunk.DocumentID > 0 {
|
if chunk.DocumentID > 0 {
|
||||||
document := documentByID[chunk.DocumentID]
|
document := documentByID[chunk.DocumentID]
|
||||||
if document == nil || document.Status != enums.StatusOk {
|
if document == nil || document.Status != enums.StatusOk {
|
||||||
@@ -141,6 +143,7 @@ func (s *retrieve) hydrateRetrieveResults(searchResults []vectordb.SearchResult)
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
faqQuestion = faq.Question
|
faqQuestion = faq.Question
|
||||||
|
content = renderVerifiedFAQChunkContent(ctx, chunk.Content, *faq)
|
||||||
}
|
}
|
||||||
|
|
||||||
results = append(results, RetrieveResult{
|
results = append(results, RetrieveResult{
|
||||||
@@ -153,7 +156,7 @@ func (s *retrieve) hydrateRetrieveResults(searchResults []vectordb.SearchResult)
|
|||||||
ChunkNo: chunk.ChunkNo,
|
ChunkNo: chunk.ChunkNo,
|
||||||
Title: chunk.Title,
|
Title: chunk.Title,
|
||||||
SectionPath: chunk.SectionPath,
|
SectionPath: chunk.SectionPath,
|
||||||
Content: chunk.Content,
|
Content: content,
|
||||||
Score: sr.Score,
|
Score: sr.Score,
|
||||||
ChunkType: extractChunkType(sr.Payload),
|
ChunkType: extractChunkType(sr.Payload),
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
// Modified in AgentDeskNext: authenticated support availability and calendars.
|
||||||
|
// Modified in the independent hardening fork; see docs/hardening.
|
||||||
|
|
||||||
package bootstrap
|
package bootstrap
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -26,6 +29,7 @@ import (
|
|||||||
type publicRateLimits struct {
|
type publicRateLimits struct {
|
||||||
login *ratelimit.Limiter
|
login *ratelimit.Limiter
|
||||||
supportRegister *ratelimit.Limiter
|
supportRegister *ratelimit.Limiter
|
||||||
|
supportStatus *ratelimit.Limiter
|
||||||
sessionExchange *ratelimit.Limiter
|
sessionExchange *ratelimit.Limiter
|
||||||
upload *ratelimit.Limiter
|
upload *ratelimit.Limiter
|
||||||
docFeedback *ratelimit.Limiter
|
docFeedback *ratelimit.Limiter
|
||||||
@@ -39,6 +43,7 @@ type publicRateLimits struct {
|
|||||||
const (
|
const (
|
||||||
limitLogin = 20
|
limitLogin = 20
|
||||||
limitSupportRegister = 10
|
limitSupportRegister = 10
|
||||||
|
limitSupportStatus = 120
|
||||||
limitSessionExchange = 120
|
limitSessionExchange = 120
|
||||||
limitUpload = 30
|
limitUpload = 30
|
||||||
limitDocFeedback = 20
|
limitDocFeedback = 20
|
||||||
@@ -57,6 +62,7 @@ func newPublicRateLimits(cfg config.RateLimitConfig) publicRateLimits {
|
|||||||
return publicRateLimits{
|
return publicRateLimits{
|
||||||
login: ratelimit.New(limitLogin, window),
|
login: ratelimit.New(limitLogin, window),
|
||||||
supportRegister: ratelimit.New(limitSupportRegister, window),
|
supportRegister: ratelimit.New(limitSupportRegister, window),
|
||||||
|
supportStatus: ratelimit.New(limitSupportStatus, window),
|
||||||
sessionExchange: ratelimit.New(limitSessionExchange, window),
|
sessionExchange: ratelimit.New(limitSessionExchange, window),
|
||||||
upload: ratelimit.New(limitUpload, window),
|
upload: ratelimit.New(limitUpload, window),
|
||||||
docFeedback: ratelimit.New(limitDocFeedback, window),
|
docFeedback: ratelimit.New(limitDocFeedback, window),
|
||||||
@@ -87,6 +93,7 @@ func registerApiWebhookRoutes(group *gin.RouterGroup) {
|
|||||||
|
|
||||||
func registerApiCustomerRoutes(group *gin.RouterGroup, limits publicRateLimits) {
|
func registerApiCustomerRoutes(group *gin.RouterGroup, limits publicRateLimits) {
|
||||||
group.POST("/session_exchange", middleware.RateLimit(limits.sessionExchange), api.CustomerPostSession_exchange)
|
group.POST("/session_exchange", middleware.RateLimit(limits.sessionExchange), api.CustomerPostSession_exchange)
|
||||||
|
group.POST("/session_refresh", middleware.RateLimit(limits.sessionExchange), api.CustomerPostSession_refresh)
|
||||||
}
|
}
|
||||||
|
|
||||||
func registerApiConversationRoutes(group *gin.RouterGroup) {
|
func registerApiConversationRoutes(group *gin.RouterGroup) {
|
||||||
@@ -112,6 +119,7 @@ func registerApiMessageRoutes(group *gin.RouterGroup, limits publicRateLimits) {
|
|||||||
|
|
||||||
func registerApiSupportRoutes(group *gin.RouterGroup, limits publicRateLimits) {
|
func registerApiSupportRoutes(group *gin.RouterGroup, limits publicRateLimits) {
|
||||||
group.GET("/config", api.SupportConfigGetConfig)
|
group.GET("/config", api.SupportConfigGetConfig)
|
||||||
|
group.GET("/status", middleware.RateLimit(limits.supportStatus), api.SupportGetStatus)
|
||||||
group.POST("/auth/register", middleware.RateLimit(limits.supportRegister), api.SupportAuthPostRegister)
|
group.POST("/auth/register", middleware.RateLimit(limits.supportRegister), api.SupportAuthPostRegister)
|
||||||
group.GET("/me", api.SupportGetMe)
|
group.GET("/me", api.SupportGetMe)
|
||||||
group.Any("/doc-page/list", api.DocPageAnyList)
|
group.Any("/doc-page/list", api.DocPageAnyList)
|
||||||
@@ -522,3 +530,13 @@ func registerThirdEmailRoutes(group *gin.RouterGroup, limits publicRateLimits) {
|
|||||||
group.POST("/request", middleware.RateLimit(limits.emailRequest), third.EmailPostRequest)
|
group.POST("/request", middleware.RateLimit(limits.emailRequest), third.EmailPostRequest)
|
||||||
group.POST("/request/:channel_id", middleware.RateLimit(limits.emailRequest), third.EmailPostRequest)
|
group.POST("/request/:channel_id", middleware.RateLimit(limits.emailRequest), third.EmailPostRequest)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func registerDashboardSupportAvailabilityRoutes(group *gin.RouterGroup) {
|
||||||
|
group.GET("/me", dashboard.SupportAvailabilityGetMe)
|
||||||
|
group.POST("/me", dashboard.SupportAvailabilityPostMe)
|
||||||
|
group.GET("/agents", dashboard.SupportAvailabilityGetAgents)
|
||||||
|
group.POST("/agent", dashboard.SupportAvailabilityPostAgent)
|
||||||
|
group.GET("/calendar", dashboard.SupportAvailabilityGetCalendar)
|
||||||
|
group.POST("/calendar", dashboard.SupportAvailabilityPostCalendar)
|
||||||
|
group.POST("/calendar/preview", dashboard.SupportAvailabilityPostCalendarPreview)
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified in AgentDeskNext: authenticated support availability and calendars.
|
||||||
package bootstrap
|
package bootstrap
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -192,6 +193,7 @@ func addRouter(app *gin.Engine) {
|
|||||||
dashboardGroup := app.Group("/api/dashboard", middleware.AuthMiddleware)
|
dashboardGroup := app.Group("/api/dashboard", middleware.AuthMiddleware)
|
||||||
registerDashboardDashboardRoutes(dashboardGroup.Group("/dashboard"))
|
registerDashboardDashboardRoutes(dashboardGroup.Group("/dashboard"))
|
||||||
registerDashboardSetupRoutes(dashboardGroup.Group("/setup"))
|
registerDashboardSetupRoutes(dashboardGroup.Group("/setup"))
|
||||||
|
registerDashboardSupportAvailabilityRoutes(dashboardGroup.Group("/support_availability"))
|
||||||
registerDashboardUserRoutes(dashboardGroup.Group("/user"))
|
registerDashboardUserRoutes(dashboardGroup.Group("/user"))
|
||||||
registerDashboardOrganizationRoutes(dashboardGroup.Group("/organization"))
|
registerDashboardOrganizationRoutes(dashboardGroup.Group("/organization"))
|
||||||
registerDashboardCompanyRoutes(dashboardGroup.Group("/company"))
|
registerDashboardCompanyRoutes(dashboardGroup.Group("/company"))
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
// Modified in the independent hardening fork; see docs/hardening.
|
||||||
|
|
||||||
package builders
|
package builders
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -45,9 +47,7 @@ func BuildConversationWithLocale(item *models.Conversation, locale string) respo
|
|||||||
ClosedBy: item.ClosedBy,
|
ClosedBy: item.ClosedBy,
|
||||||
CloseReason: item.CloseReason,
|
CloseReason: item.CloseReason,
|
||||||
}
|
}
|
||||||
if identity := services.ConversationService.GetConversationExternalIdentity(item); identity != nil {
|
ret.CustomerOnline = services.WsService.IsCustomerOnline(item.CustomerID, item.ChannelID)
|
||||||
ret.CustomerOnline = services.WsService.IsGuestOnline(identity.ExternalID)
|
|
||||||
}
|
|
||||||
if item.CurrentAssigneeID > 0 {
|
if item.CurrentAssigneeID > 0 {
|
||||||
if user := services.UserService.Get(item.CurrentAssigneeID); user != nil {
|
if user := services.UserService.Get(item.CurrentAssigneeID); user != nil {
|
||||||
ret.CurrentAssigneeName = user.Nickname
|
ret.CurrentAssigneeName = user.Nickname
|
||||||
|
|||||||
@@ -1,21 +1,23 @@
|
|||||||
|
// Modified in the independent AgentDesk fork: localized knowledge workflows and safe display errors.
|
||||||
package builders
|
package builders
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"agent-desk/internal/models"
|
"agent-desk/internal/models"
|
||||||
"agent-desk/internal/pkg/dto/response"
|
"agent-desk/internal/pkg/dto/response"
|
||||||
"agent-desk/internal/pkg/enums"
|
"agent-desk/internal/pkg/i18nx"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
)
|
)
|
||||||
|
|
||||||
func BuildKnowledgeBase(item *models.KnowledgeBase) response.KnowledgeBaseResponse {
|
func BuildKnowledgeBase(item *models.KnowledgeBase, locales ...string) response.KnowledgeBaseResponse {
|
||||||
return response.KnowledgeBaseResponse{
|
return response.KnowledgeBaseResponse{
|
||||||
ID: item.ID,
|
ID: item.ID,
|
||||||
Name: item.Name,
|
Name: item.Name,
|
||||||
Description: item.Description,
|
Description: item.Description,
|
||||||
KnowledgeType: item.KnowledgeType,
|
KnowledgeType: item.KnowledgeType,
|
||||||
KnowledgeTypeName: enums.GetKnowledgeBaseTypeLabel(enums.KnowledgeBaseType(item.KnowledgeType)),
|
KnowledgeTypeName: knowledgeLabel(locales, "type", item.KnowledgeType),
|
||||||
Status: item.Status,
|
Status: item.Status,
|
||||||
StatusName: enums.GetStatusLabel(item.Status),
|
StatusName: knowledgeLabel(locales, "status", item.Status),
|
||||||
DefaultTopK: item.DefaultTopK,
|
DefaultTopK: item.DefaultTopK,
|
||||||
DefaultScoreThreshold: item.DefaultScoreThreshold,
|
DefaultScoreThreshold: item.DefaultScoreThreshold,
|
||||||
DefaultRerankLimit: item.DefaultRerankLimit,
|
DefaultRerankLimit: item.DefaultRerankLimit,
|
||||||
@@ -24,7 +26,7 @@ func BuildKnowledgeBase(item *models.KnowledgeBase) response.KnowledgeBaseRespon
|
|||||||
ChunkMaxTokens: item.ChunkMaxTokens,
|
ChunkMaxTokens: item.ChunkMaxTokens,
|
||||||
ChunkOverlapTokens: item.ChunkOverlapTokens,
|
ChunkOverlapTokens: item.ChunkOverlapTokens,
|
||||||
AnswerMode: item.AnswerMode,
|
AnswerMode: item.AnswerMode,
|
||||||
AnswerModeName: enums.GetKnowledgeAnswerModeLabel(enums.KnowledgeAnswerMode(item.AnswerMode)),
|
AnswerModeName: knowledgeLabel(locales, "mode", item.AnswerMode),
|
||||||
Remark: item.Remark,
|
Remark: item.Remark,
|
||||||
CreatedAt: item.CreatedAt,
|
CreatedAt: item.CreatedAt,
|
||||||
UpdatedAt: item.UpdatedAt,
|
UpdatedAt: item.UpdatedAt,
|
||||||
@@ -33,18 +35,18 @@ func BuildKnowledgeBase(item *models.KnowledgeBase) response.KnowledgeBaseRespon
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func BuildKnowledgeDocument(item *models.KnowledgeDocument) response.KnowledgeDocumentResponse {
|
func BuildKnowledgeDocument(item *models.KnowledgeDocument, locales ...string) response.KnowledgeDocumentResponse {
|
||||||
return response.KnowledgeDocumentResponse{
|
return response.KnowledgeDocumentResponse{
|
||||||
ID: item.ID,
|
ID: item.ID,
|
||||||
KnowledgeBaseID: item.KnowledgeBaseID,
|
KnowledgeBaseID: item.KnowledgeBaseID,
|
||||||
DirectoryID: item.DirectoryID,
|
DirectoryID: item.DirectoryID,
|
||||||
Title: item.Title,
|
Title: item.Title,
|
||||||
Status: item.Status,
|
Status: item.Status,
|
||||||
StatusName: enums.GetStatusLabel(item.Status),
|
StatusName: knowledgeLabel(locales, "status", item.Status),
|
||||||
IndexStatus: item.IndexStatus,
|
IndexStatus: item.IndexStatus,
|
||||||
IndexStatusName: enums.GetKnowledgeDocumentIndexStatusLabel(item.IndexStatus),
|
IndexStatusName: knowledgeLabel(locales, "index", item.IndexStatus),
|
||||||
IndexedAt: item.IndexedAt,
|
IndexedAt: item.IndexedAt,
|
||||||
IndexError: item.IndexError,
|
IndexError: knowledgeIndexError(locales, item.IndexError),
|
||||||
ContentHash: item.ContentHash,
|
ContentHash: item.ContentHash,
|
||||||
ContentType: item.ContentType,
|
ContentType: item.ContentType,
|
||||||
Content: item.Content,
|
Content: item.Content,
|
||||||
@@ -55,18 +57,18 @@ func BuildKnowledgeDocument(item *models.KnowledgeDocument) response.KnowledgeDo
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func BuildKnowledgeDocumentList(item *models.KnowledgeDocument) response.KnowledgeDocumentListResponse {
|
func BuildKnowledgeDocumentList(item *models.KnowledgeDocument, locales ...string) response.KnowledgeDocumentListResponse {
|
||||||
return response.KnowledgeDocumentListResponse{
|
return response.KnowledgeDocumentListResponse{
|
||||||
ID: item.ID,
|
ID: item.ID,
|
||||||
KnowledgeBaseID: item.KnowledgeBaseID,
|
KnowledgeBaseID: item.KnowledgeBaseID,
|
||||||
DirectoryID: item.DirectoryID,
|
DirectoryID: item.DirectoryID,
|
||||||
Title: item.Title,
|
Title: item.Title,
|
||||||
Status: item.Status,
|
Status: item.Status,
|
||||||
StatusName: enums.GetStatusLabel(item.Status),
|
StatusName: knowledgeLabel(locales, "status", item.Status),
|
||||||
IndexStatus: item.IndexStatus,
|
IndexStatus: item.IndexStatus,
|
||||||
IndexStatusName: enums.GetKnowledgeDocumentIndexStatusLabel(item.IndexStatus),
|
IndexStatusName: knowledgeLabel(locales, "index", item.IndexStatus),
|
||||||
IndexedAt: item.IndexedAt,
|
IndexedAt: item.IndexedAt,
|
||||||
IndexError: item.IndexError,
|
IndexError: knowledgeIndexError(locales, item.IndexError),
|
||||||
ContentHash: item.ContentHash,
|
ContentHash: item.ContentHash,
|
||||||
ContentType: item.ContentType,
|
ContentType: item.ContentType,
|
||||||
CreatedAt: item.CreatedAt,
|
CreatedAt: item.CreatedAt,
|
||||||
@@ -76,7 +78,7 @@ func BuildKnowledgeDocumentList(item *models.KnowledgeDocument) response.Knowled
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func BuildKnowledgeFAQ(item *models.KnowledgeFAQ) response.KnowledgeFAQResponse {
|
func BuildKnowledgeFAQ(item *models.KnowledgeFAQ, locales ...string) response.KnowledgeFAQResponse {
|
||||||
return response.KnowledgeFAQResponse{
|
return response.KnowledgeFAQResponse{
|
||||||
ID: item.ID,
|
ID: item.ID,
|
||||||
KnowledgeBaseID: item.KnowledgeBaseID,
|
KnowledgeBaseID: item.KnowledgeBaseID,
|
||||||
@@ -85,11 +87,11 @@ func BuildKnowledgeFAQ(item *models.KnowledgeFAQ) response.KnowledgeFAQResponse
|
|||||||
Answer: item.Answer,
|
Answer: item.Answer,
|
||||||
SimilarQuestions: parseSimilarQuestions(item.SimilarQuestions),
|
SimilarQuestions: parseSimilarQuestions(item.SimilarQuestions),
|
||||||
Status: item.Status,
|
Status: item.Status,
|
||||||
StatusName: enums.GetStatusLabel(item.Status),
|
StatusName: knowledgeLabel(locales, "status", item.Status),
|
||||||
IndexStatus: item.IndexStatus,
|
IndexStatus: item.IndexStatus,
|
||||||
IndexStatusName: enums.GetKnowledgeDocumentIndexStatusLabel(item.IndexStatus),
|
IndexStatusName: knowledgeLabel(locales, "index", item.IndexStatus),
|
||||||
IndexedAt: item.IndexedAt,
|
IndexedAt: item.IndexedAt,
|
||||||
IndexError: item.IndexError,
|
IndexError: knowledgeIndexError(locales, item.IndexError),
|
||||||
Remark: item.Remark,
|
Remark: item.Remark,
|
||||||
CreatedAt: item.CreatedAt,
|
CreatedAt: item.CreatedAt,
|
||||||
UpdatedAt: item.UpdatedAt,
|
UpdatedAt: item.UpdatedAt,
|
||||||
@@ -98,7 +100,7 @@ func BuildKnowledgeFAQ(item *models.KnowledgeFAQ) response.KnowledgeFAQResponse
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func BuildKnowledgeDirectory(item *models.KnowledgeDirectory) response.KnowledgeDirectoryResponse {
|
func BuildKnowledgeDirectory(item *models.KnowledgeDirectory, locales ...string) response.KnowledgeDirectoryResponse {
|
||||||
return response.KnowledgeDirectoryResponse{
|
return response.KnowledgeDirectoryResponse{
|
||||||
ID: item.ID,
|
ID: item.ID,
|
||||||
KnowledgeBaseID: item.KnowledgeBaseID,
|
KnowledgeBaseID: item.KnowledgeBaseID,
|
||||||
@@ -106,7 +108,7 @@ func BuildKnowledgeDirectory(item *models.KnowledgeDirectory) response.Knowledge
|
|||||||
Name: item.Name,
|
Name: item.Name,
|
||||||
SortNo: item.SortNo,
|
SortNo: item.SortNo,
|
||||||
Status: item.Status,
|
Status: item.Status,
|
||||||
StatusName: enums.GetStatusLabel(item.Status),
|
StatusName: knowledgeLabel(locales, "status", item.Status),
|
||||||
Remark: item.Remark,
|
Remark: item.Remark,
|
||||||
CreatedAt: item.CreatedAt,
|
CreatedAt: item.CreatedAt,
|
||||||
UpdatedAt: item.UpdatedAt,
|
UpdatedAt: item.UpdatedAt,
|
||||||
@@ -116,14 +118,14 @@ func BuildKnowledgeDirectory(item *models.KnowledgeDirectory) response.Knowledge
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func BuildKnowledgeRetrieveLog(item *models.KnowledgeRetrieveLog) response.KnowledgeRetrieveLogResponse {
|
func BuildKnowledgeRetrieveLog(item *models.KnowledgeRetrieveLog, locales ...string) response.KnowledgeRetrieveLogResponse {
|
||||||
return response.KnowledgeRetrieveLogResponse{
|
return response.KnowledgeRetrieveLogResponse{
|
||||||
ID: item.ID,
|
ID: item.ID,
|
||||||
KnowledgeBaseID: item.KnowledgeBaseID,
|
KnowledgeBaseID: item.KnowledgeBaseID,
|
||||||
Channel: item.Channel,
|
Channel: item.Channel,
|
||||||
ChannelName: enums.GetKnowledgeRetrieveChannelLabel(enums.KnowledgeRetrieveChannel(item.Channel)),
|
ChannelName: knowledgeLabel(locales, "channel", item.Channel),
|
||||||
Scene: item.Scene,
|
Scene: item.Scene,
|
||||||
SceneName: enums.GetKnowledgeRetrieveSceneLabel(enums.KnowledgeRetrieveScene(item.Scene)),
|
SceneName: knowledgeLabel(locales, "scene", item.Scene),
|
||||||
SessionID: item.SessionID,
|
SessionID: item.SessionID,
|
||||||
ConversationID: item.ConversationID,
|
ConversationID: item.ConversationID,
|
||||||
RequestID: item.RequestID,
|
RequestID: item.RequestID,
|
||||||
@@ -131,7 +133,7 @@ func BuildKnowledgeRetrieveLog(item *models.KnowledgeRetrieveLog) response.Knowl
|
|||||||
RewriteQuestion: item.RewriteQuestion,
|
RewriteQuestion: item.RewriteQuestion,
|
||||||
Answer: item.Answer,
|
Answer: item.Answer,
|
||||||
AnswerStatus: item.AnswerStatus,
|
AnswerStatus: item.AnswerStatus,
|
||||||
AnswerStatusName: enums.GetKnowledgeAnswerStatusLabel(enums.KnowledgeAnswerStatus(item.AnswerStatus)),
|
AnswerStatusName: knowledgeLabel(locales, "answer", item.AnswerStatus),
|
||||||
HitCount: item.HitCount,
|
HitCount: item.HitCount,
|
||||||
TopScore: item.TopScore,
|
TopScore: item.TopScore,
|
||||||
ChunkProvider: item.ChunkProvider,
|
ChunkProvider: item.ChunkProvider,
|
||||||
@@ -153,7 +155,7 @@ func BuildKnowledgeRetrieveLog(item *models.KnowledgeRetrieveLog) response.Knowl
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func BuildKnowledgeRetrieveHitResponse(item *models.KnowledgeRetrieveHit) response.KnowledgeRetrieveHitResponse {
|
func BuildKnowledgeRetrieveHitResponse(item *models.KnowledgeRetrieveHit, locales ...string) response.KnowledgeRetrieveHitResponse {
|
||||||
return response.KnowledgeRetrieveHitResponse{
|
return response.KnowledgeRetrieveHitResponse{
|
||||||
ID: item.ID,
|
ID: item.ID,
|
||||||
RetrieveLogID: item.RetrieveLogID,
|
RetrieveLogID: item.RetrieveLogID,
|
||||||
@@ -167,7 +169,7 @@ func BuildKnowledgeRetrieveHitResponse(item *models.KnowledgeRetrieveHit) respon
|
|||||||
Title: item.Title,
|
Title: item.Title,
|
||||||
SectionPath: item.SectionPath,
|
SectionPath: item.SectionPath,
|
||||||
ChunkType: item.ChunkType,
|
ChunkType: item.ChunkType,
|
||||||
ChunkTypeName: enums.GetKnowledgeChunkTypeLabel(enums.KnowledgeChunkType(item.ChunkType)),
|
ChunkTypeName: knowledgeLabel(locales, "chunk", item.ChunkType),
|
||||||
Provider: item.Provider,
|
Provider: item.Provider,
|
||||||
RankNo: item.RankNo,
|
RankNo: item.RankNo,
|
||||||
Score: item.Score,
|
Score: item.Score,
|
||||||
@@ -189,3 +191,41 @@ func parseSimilarQuestions(raw string) []string {
|
|||||||
}
|
}
|
||||||
return items
|
return items
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var knowledgeLabelCodes = map[string]map[string]bool{
|
||||||
|
"type": {"document": true, "faq": true},
|
||||||
|
"status": {"0": true, "1": true, "2": true},
|
||||||
|
"index": {"pending": true, "indexed": true, "failed": true},
|
||||||
|
"mode": {"1": true, "2": true},
|
||||||
|
"channel": {"im": true, "agent_assist": true, "api": true, "debug": true},
|
||||||
|
"scene": {"first_response": true, "assist": true, "qa": true},
|
||||||
|
"answer": {"1": true, "2": true, "3": true, "4": true},
|
||||||
|
"chunk": {"text": true, "faq": true, "table": true, "code": true},
|
||||||
|
}
|
||||||
|
|
||||||
|
// Labels are application-owned; titles, content, snippets and historical answers are not.
|
||||||
|
func knowledgeLabel(locales []string, group string, value any) string {
|
||||||
|
code := fmt.Sprint(value)
|
||||||
|
|
||||||
|
key := "knowledge.labels.unknown"
|
||||||
|
if knowledgeLabelCodes[group][code] {
|
||||||
|
key = "knowledge.labels." + group + "." + code
|
||||||
|
}
|
||||||
|
return i18nx.Getf(knowledgeLocale(locales), key)
|
||||||
|
}
|
||||||
|
|
||||||
|
func knowledgeLocale(locales []string) string {
|
||||||
|
if len(locales) > 0 {
|
||||||
|
return i18nx.NormalizeLocale(locales[0])
|
||||||
|
}
|
||||||
|
return i18nx.DefaultLocale
|
||||||
|
}
|
||||||
|
|
||||||
|
// Legacy index_error values can contain SQL, credentials or provider response bodies.
|
||||||
|
// Keep those values out of the public DTO; this does not rewrite persisted diagnostics.
|
||||||
|
func knowledgeIndexError(locales []string, stored string) string {
|
||||||
|
if stored == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return i18nx.Getf(knowledgeLocale(locales), "error.knowledge.indexFailed")
|
||||||
|
}
|
||||||
|
|||||||
47
internal/builders/knowledge_builder_i18n_test.go
Normal file
47
internal/builders/knowledge_builder_i18n_test.go
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
package builders
|
||||||
|
|
||||||
|
import (
|
||||||
|
"agent-desk/internal/models"
|
||||||
|
"agent-desk/internal/pkg/enums"
|
||||||
|
"agent-desk/internal/pkg/i18nx"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestKnowledgeBuildersLocalizeLabelsWithoutChangingContent(t *testing.T) {
|
||||||
|
for _, locale := range []string{"en-US", "ru-RU", "zh-CN"} {
|
||||||
|
t.Run(locale, func(t *testing.T) {
|
||||||
|
kb := BuildKnowledgeBase(&models.KnowledgeBase{Name: "用户 название", KnowledgeType: "faq", Status: enums.StatusOk, AnswerMode: 1}, locale)
|
||||||
|
if kb.Name != "用户 название" || kb.KnowledgeTypeName != i18nx.Getf(locale, "knowledge.labels.type.faq") || kb.StatusName != i18nx.Getf(locale, "knowledge.labels.status.0") {
|
||||||
|
t.Fatalf("unexpected labels/content: %+v", kb)
|
||||||
|
}
|
||||||
|
raw := " 原文 answer\n回答： keep this "
|
||||||
|
faq := BuildKnowledgeFAQ(&models.KnowledgeFAQ{Question: raw, Answer: raw, Status: enums.StatusDisabled, IndexStatus: enums.KnowledgeDocumentIndexStatusFailed, IndexError: "SQL failed password=fixture-only"}, locale)
|
||||||
|
if faq.Question != raw || faq.Answer != raw {
|
||||||
|
t.Fatal("authored content changed")
|
||||||
|
}
|
||||||
|
if faq.IndexStatusName != i18nx.Getf(locale, "knowledge.labels.index.failed") || faq.StatusName != i18nx.Getf(locale, "knowledge.labels.status.1") {
|
||||||
|
t.Fatalf("unexpected labels: %+v", faq)
|
||||||
|
}
|
||||||
|
if faq.IndexError != i18nx.Getf(locale, "error.knowledge.indexFailed") || strings.Contains(faq.IndexError, "fixture-only") {
|
||||||
|
t.Fatalf("unsafe index error %q", faq.IndexError)
|
||||||
|
}
|
||||||
|
doc := BuildKnowledgeDocument(&models.KnowledgeDocument{Content: raw, IndexError: "provider raw error"}, locale)
|
||||||
|
list := BuildKnowledgeDocumentList(&models.KnowledgeDocument{IndexError: "provider raw error"}, locale)
|
||||||
|
if doc.Content != raw || doc.IndexError != faq.IndexError || list.IndexError != faq.IndexError {
|
||||||
|
t.Fatal("document content or safe error mismatch")
|
||||||
|
}
|
||||||
|
log := BuildKnowledgeRetrieveLog(&models.KnowledgeRetrieveLog{Answer: raw, Question: raw, AnswerStatus: 2, TraceData: raw}, locale)
|
||||||
|
hit := BuildKnowledgeRetrieveHitResponse(&models.KnowledgeRetrieveHit{Snippet: raw, ChunkType: "faq"}, locale)
|
||||||
|
if log.Answer != raw || log.Question != raw || log.TraceData != raw || hit.Snippet != raw {
|
||||||
|
t.Fatal("historical data was rewritten")
|
||||||
|
}
|
||||||
|
if log.AnswerStatusName != i18nx.Getf(locale, "knowledge.labels.answer.2") {
|
||||||
|
t.Fatalf("answer label = %q", log.AnswerStatusName)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
if BuildKnowledgeFAQ(&models.KnowledgeFAQ{}, "en-US").IndexError != "" {
|
||||||
|
t.Fatal("empty error should remain empty")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,13 @@
|
|||||||
|
// Modified in the independent hardening fork; see docs/hardening.
|
||||||
|
|
||||||
package api
|
package api
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"time"
|
||||||
|
|
||||||
"agent-desk/internal/pkg/config"
|
"agent-desk/internal/pkg/config"
|
||||||
|
"agent-desk/internal/pkg/dto/response"
|
||||||
|
"agent-desk/internal/pkg/enums"
|
||||||
"agent-desk/internal/pkg/httpx"
|
"agent-desk/internal/pkg/httpx"
|
||||||
"agent-desk/internal/pkg/openidentity"
|
"agent-desk/internal/pkg/openidentity"
|
||||||
"agent-desk/internal/services"
|
"agent-desk/internal/services"
|
||||||
@@ -21,6 +27,7 @@ func CustomerPostSession_exchange(ctx *gin.Context) {
|
|||||||
IdentityHMAC: identity.Secret,
|
IdentityHMAC: identity.Secret,
|
||||||
IdentityMaxAge: identity.MaxAge(),
|
IdentityMaxAge: identity.MaxAge(),
|
||||||
ChannelID: channel.ChannelID,
|
ChannelID: channel.ChannelID,
|
||||||
|
RequireSignedIdentity: services.ChannelService.RequiresSignedIdentity(channel),
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
httpx.WriteJSON(ctx, err)
|
httpx.WriteJSON(ctx, err)
|
||||||
@@ -33,3 +40,29 @@ func CustomerPostSession_exchange(ctx *gin.Context) {
|
|||||||
}
|
}
|
||||||
httpx.WriteJSON(ctx, resp)
|
httpx.WriteJSON(ctx, resp)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Refresh requires possession of the still-valid customer credential; unlike
|
||||||
|
// unsigned session exchange it never creates or changes an anonymous identity.
|
||||||
|
func CustomerPostSession_refresh(ctx *gin.Context) {
|
||||||
|
channel := services.ChannelService.GetEnabledChannel(ctx)
|
||||||
|
if channel == nil {
|
||||||
|
httpx.WriteJSON(ctx, httpx.JsonErrorMsg(ctx, "error.e0209"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
result, err := services.CustomerSessionService.VerifyRequest(ctx, channel)
|
||||||
|
if err != nil {
|
||||||
|
httpx.WriteJSON(ctx, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
services.CustomerSessionService.SetRefreshHeaders(ctx, result)
|
||||||
|
source := "guest:"
|
||||||
|
if result.ExternalUser.ExternalSource == enums.ExternalSourceUser {
|
||||||
|
source = "user:"
|
||||||
|
}
|
||||||
|
httpx.WriteJSON(ctx, &response.CustomerSessionExchangeResponse{
|
||||||
|
CustomerSessionToken: result.Token,
|
||||||
|
ExpiresAt: result.ExpiresAt.UTC().Format(time.RFC3339),
|
||||||
|
IdentityKey: source + result.ExternalUser.ExternalID,
|
||||||
|
Customer: response.CustomerSessionCustomerResponse{ID: result.CustomerID, Name: result.ExternalUser.ExternalName},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|||||||
22
internal/handlers/api/support_status_handler.go
Normal file
22
internal/handlers/api/support_status_handler.go
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
package api
|
||||||
|
|
||||||
|
import (
|
||||||
|
"agent-desk/internal/pkg/httpx"
|
||||||
|
"agent-desk/internal/services"
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
)
|
||||||
|
|
||||||
|
func SupportGetStatus(ctx *gin.Context) {
|
||||||
|
channel := services.ChannelService.GetEnabledChannel(ctx)
|
||||||
|
if channel == nil {
|
||||||
|
httpx.WriteJSON(ctx, httpx.JsonErrorMsg(ctx, "error.e0209"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
result, err := services.SupportAvailabilityService.PublicStatus(channel)
|
||||||
|
if err != nil {
|
||||||
|
httpx.WriteJSON(ctx, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.Header("Cache-Control", "no-store")
|
||||||
|
httpx.WriteJSON(ctx, result)
|
||||||
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified in AgentDeskNext: authenticated support availability and calendars.
|
||||||
package dashboard
|
package dashboard
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -18,13 +19,18 @@ func AgentAnyList(ctx *gin.Context) {
|
|||||||
httpx.WriteJSON(ctx, err)
|
httpx.WriteJSON(ctx, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
list, paging := services.AgentProfileService.FindPageByCnd(params.NewPagedSqlCnd(ctx,
|
cnd := params.NewPagedSqlCnd(ctx,
|
||||||
params.QueryFilter{ParamName: "userId"},
|
params.QueryFilter{ParamName: "userId"},
|
||||||
params.QueryFilter{ParamName: "teamId"},
|
params.QueryFilter{ParamName: "teamId"},
|
||||||
params.QueryFilter{ParamName: "serviceStatus"},
|
|
||||||
params.QueryFilter{ParamName: "agentCode", Op: params.Like},
|
params.QueryFilter{ParamName: "agentCode", Op: params.Like},
|
||||||
params.QueryFilter{ParamName: "displayName", Op: params.Like},
|
params.QueryFilter{ParamName: "displayName", Op: params.Like},
|
||||||
).Desc("id"))
|
).Desc("id")
|
||||||
|
status, _ := params.Get(ctx, "serviceStatus")
|
||||||
|
if err := services.AgentProfileService.FilterEffectiveServiceStatus(cnd, status); err != nil {
|
||||||
|
httpx.WriteJSON(ctx, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
list, paging := services.AgentProfileService.FindPageByCnd(cnd)
|
||||||
results := builders.BuildAgentProfileList(list)
|
results := builders.BuildAgentProfileList(list)
|
||||||
httpx.WriteJSON(ctx, &web.PageResult{Results: results, Page: paging})
|
httpx.WriteJSON(ctx, &web.PageResult{Results: results, Page: paging})
|
||||||
}
|
}
|
||||||
@@ -34,12 +40,17 @@ func AgentGetList_all(ctx *gin.Context) {
|
|||||||
httpx.WriteJSON(ctx, err)
|
httpx.WriteJSON(ctx, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
list := services.AgentProfileService.Find(params.NewPagedSqlCnd(ctx,
|
cnd := params.NewPagedSqlCnd(ctx,
|
||||||
params.QueryFilter{ParamName: "userId"},
|
params.QueryFilter{ParamName: "userId"},
|
||||||
params.QueryFilter{ParamName: "teamId"},
|
params.QueryFilter{ParamName: "teamId"},
|
||||||
params.QueryFilter{ParamName: "serviceStatus"},
|
|
||||||
params.QueryFilter{ParamName: "agentCode", Op: params.Like},
|
params.QueryFilter{ParamName: "agentCode", Op: params.Like},
|
||||||
).Desc("id"))
|
).Desc("id")
|
||||||
|
status, _ := params.Get(ctx, "serviceStatus")
|
||||||
|
if err := services.AgentProfileService.FilterEffectiveServiceStatus(cnd, status); err != nil {
|
||||||
|
httpx.WriteJSON(ctx, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
list := services.AgentProfileService.Find(cnd)
|
||||||
|
|
||||||
httpx.WriteJSON(ctx, builders.BuildAgentProfileList(list))
|
httpx.WriteJSON(ctx, builders.BuildAgentProfileList(list))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
|
// Modified in the independent AgentDesk fork: localized knowledge workflows and safe display errors.
|
||||||
package dashboard
|
package dashboard
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"agent-desk/internal/pkg/httpx"
|
"agent-desk/internal/pkg/httpx"
|
||||||
|
"agent-desk/internal/pkg/i18nx"
|
||||||
"context"
|
"context"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
|
|
||||||
@@ -35,7 +37,7 @@ func KnowledgeBaseAnyList(ctx *gin.Context) {
|
|||||||
for _, item := range list {
|
for _, item := range list {
|
||||||
docCount := repositories.KnowledgeDocumentRepository.CountByKnowledgeBaseID(sqls.DB(), item.ID)
|
docCount := repositories.KnowledgeDocumentRepository.CountByKnowledgeBaseID(sqls.DB(), item.ID)
|
||||||
faqCount := repositories.KnowledgeFAQRepository.CountByKnowledgeBaseID(sqls.DB(), item.ID)
|
faqCount := repositories.KnowledgeFAQRepository.CountByKnowledgeBaseID(sqls.DB(), item.ID)
|
||||||
resp := builders.BuildKnowledgeBase(&item)
|
resp := builders.BuildKnowledgeBase(&item, i18nx.Locale(ctx))
|
||||||
resp.DocumentCount = docCount
|
resp.DocumentCount = docCount
|
||||||
resp.FAQCount = faqCount
|
resp.FAQCount = faqCount
|
||||||
results = append(results, resp)
|
results = append(results, resp)
|
||||||
@@ -54,7 +56,7 @@ func KnowledgeBaseAnyList_all(ctx *gin.Context) {
|
|||||||
).Asc("sort_no").Desc("id"))
|
).Asc("sort_no").Desc("id"))
|
||||||
results := make([]response.KnowledgeBaseResponse, 0, len(list))
|
results := make([]response.KnowledgeBaseResponse, 0, len(list))
|
||||||
for _, item := range list {
|
for _, item := range list {
|
||||||
resp := builders.BuildKnowledgeBase(&item)
|
resp := builders.BuildKnowledgeBase(&item, i18nx.Locale(ctx))
|
||||||
results = append(results, resp)
|
results = append(results, resp)
|
||||||
}
|
}
|
||||||
httpx.WriteJSON(ctx, results)
|
httpx.WriteJSON(ctx, results)
|
||||||
@@ -75,7 +77,7 @@ func KnowledgeBaseGetBy(ctx *gin.Context) {
|
|||||||
httpx.WriteJSON(ctx, httpx.JsonErrorMsg(ctx, "error.e0283"))
|
httpx.WriteJSON(ctx, httpx.JsonErrorMsg(ctx, "error.e0283"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
resp := builders.BuildKnowledgeBase(item)
|
resp := builders.BuildKnowledgeBase(item, i18nx.Locale(ctx))
|
||||||
resp.DocumentCount = repositories.KnowledgeDocumentRepository.CountByKnowledgeBaseID(sqls.DB(), item.ID)
|
resp.DocumentCount = repositories.KnowledgeDocumentRepository.CountByKnowledgeBaseID(sqls.DB(), item.ID)
|
||||||
resp.FAQCount = repositories.KnowledgeFAQRepository.CountByKnowledgeBaseID(sqls.DB(), item.ID)
|
resp.FAQCount = repositories.KnowledgeFAQRepository.CountByKnowledgeBaseID(sqls.DB(), item.ID)
|
||||||
httpx.WriteJSON(ctx, resp)
|
httpx.WriteJSON(ctx, resp)
|
||||||
@@ -98,7 +100,7 @@ func KnowledgeBasePostCreate(ctx *gin.Context) {
|
|||||||
httpx.WriteJSON(ctx, err)
|
httpx.WriteJSON(ctx, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
httpx.WriteJSON(ctx, builders.BuildKnowledgeBase(item))
|
httpx.WriteJSON(ctx, builders.BuildKnowledgeBase(item, i18nx.Locale(ctx)))
|
||||||
}
|
}
|
||||||
|
|
||||||
func KnowledgeBasePostUpdate(ctx *gin.Context) {
|
func KnowledgeBasePostUpdate(ctx *gin.Context) {
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified in the independent AgentDesk fork: localized knowledge workflows and safe display errors.
|
||||||
package dashboard
|
package dashboard
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -9,6 +10,7 @@ import (
|
|||||||
"agent-desk/internal/pkg/errorsx"
|
"agent-desk/internal/pkg/errorsx"
|
||||||
"agent-desk/internal/pkg/httpx"
|
"agent-desk/internal/pkg/httpx"
|
||||||
"agent-desk/internal/pkg/httpx/params"
|
"agent-desk/internal/pkg/httpx/params"
|
||||||
|
"agent-desk/internal/pkg/i18nx"
|
||||||
"agent-desk/internal/services"
|
"agent-desk/internal/services"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
@@ -25,7 +27,7 @@ func KnowledgeDirectoryGetList_all(ctx *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
list := services.KnowledgeDirectoryService.FindAllByKnowledgeBaseID(knowledgeBaseID)
|
list := services.KnowledgeDirectoryService.FindAllByKnowledgeBaseID(knowledgeBaseID)
|
||||||
httpx.WriteJSON(ctx, buildKnowledgeDirectoryTreeResponses(list))
|
httpx.WriteJSON(ctx, buildKnowledgeDirectoryTreeResponses(list, i18nx.Locale(ctx)))
|
||||||
}
|
}
|
||||||
|
|
||||||
func KnowledgeDirectoryPostCreate(ctx *gin.Context) {
|
func KnowledgeDirectoryPostCreate(ctx *gin.Context) {
|
||||||
@@ -44,7 +46,7 @@ func KnowledgeDirectoryPostCreate(ctx *gin.Context) {
|
|||||||
httpx.WriteJSON(ctx, err)
|
httpx.WriteJSON(ctx, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
resp := builders.BuildKnowledgeDirectory(item)
|
resp := builders.BuildKnowledgeDirectory(item, i18nx.Locale(ctx))
|
||||||
httpx.WriteJSON(ctx, &resp)
|
httpx.WriteJSON(ctx, &resp)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -104,7 +106,7 @@ func KnowledgeDirectoryPostUpdate_sort(ctx *gin.Context) {
|
|||||||
httpx.WriteJSON(ctx, nil)
|
httpx.WriteJSON(ctx, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
func buildKnowledgeDirectoryTreeResponses(list []models.KnowledgeDirectory) []response.KnowledgeDirectoryResponse {
|
func buildKnowledgeDirectoryTreeResponses(list []models.KnowledgeDirectory, locales ...string) []response.KnowledgeDirectoryResponse {
|
||||||
childrenByParent := make(map[int64][]models.KnowledgeDirectory, len(list))
|
childrenByParent := make(map[int64][]models.KnowledgeDirectory, len(list))
|
||||||
for _, item := range list {
|
for _, item := range list {
|
||||||
childrenByParent[item.ParentID] = append(childrenByParent[item.ParentID], item)
|
childrenByParent[item.ParentID] = append(childrenByParent[item.ParentID], item)
|
||||||
@@ -114,7 +116,7 @@ func buildKnowledgeDirectoryTreeResponses(list []models.KnowledgeDirectory) []re
|
|||||||
items := childrenByParent[parentID]
|
items := childrenByParent[parentID]
|
||||||
ret := make([]response.KnowledgeDirectoryResponse, 0, len(items))
|
ret := make([]response.KnowledgeDirectoryResponse, 0, len(items))
|
||||||
for _, item := range items {
|
for _, item := range items {
|
||||||
resp := builders.BuildKnowledgeDirectory(&item)
|
resp := builders.BuildKnowledgeDirectory(&item, knowledgeDirectoryLocale(locales))
|
||||||
resp.Children = build(item.ID)
|
resp.Children = build(item.ID)
|
||||||
ret = append(ret, resp)
|
ret = append(ret, resp)
|
||||||
}
|
}
|
||||||
@@ -122,3 +124,10 @@ func buildKnowledgeDirectoryTreeResponses(list []models.KnowledgeDirectory) []re
|
|||||||
}
|
}
|
||||||
return build(0)
|
return build(0)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func knowledgeDirectoryLocale(locales []string) string {
|
||||||
|
if len(locales) > 0 {
|
||||||
|
return locales[0]
|
||||||
|
}
|
||||||
|
return i18nx.DefaultLocale
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified in the independent AgentDesk fork: localized knowledge workflows and safe display errors.
|
||||||
package dashboard
|
package dashboard
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -7,6 +8,7 @@ import (
|
|||||||
"agent-desk/internal/pkg/dto/response"
|
"agent-desk/internal/pkg/dto/response"
|
||||||
"agent-desk/internal/pkg/enums"
|
"agent-desk/internal/pkg/enums"
|
||||||
"agent-desk/internal/pkg/httpx"
|
"agent-desk/internal/pkg/httpx"
|
||||||
|
"agent-desk/internal/pkg/i18nx"
|
||||||
"agent-desk/internal/services"
|
"agent-desk/internal/services"
|
||||||
|
|
||||||
"agent-desk/internal/pkg/httpx/params"
|
"agent-desk/internal/pkg/httpx/params"
|
||||||
@@ -47,7 +49,7 @@ func KnowledgeDocumentAnyList(ctx *gin.Context) {
|
|||||||
directoryPaths := services.KnowledgeDirectoryService.PathMap(knowledgeBaseID)
|
directoryPaths := services.KnowledgeDirectoryService.PathMap(knowledgeBaseID)
|
||||||
results := make([]response.KnowledgeDocumentListResponse, 0, len(list))
|
results := make([]response.KnowledgeDocumentListResponse, 0, len(list))
|
||||||
for _, item := range list {
|
for _, item := range list {
|
||||||
resp := builders.BuildKnowledgeDocumentList(&item)
|
resp := builders.BuildKnowledgeDocumentList(&item, i18nx.Locale(ctx))
|
||||||
fillKnowledgeDocumentDirectory(&resp, directoryPaths)
|
fillKnowledgeDocumentDirectory(&resp, directoryPaths)
|
||||||
results = append(results, resp)
|
results = append(results, resp)
|
||||||
}
|
}
|
||||||
@@ -69,7 +71,7 @@ func KnowledgeDocumentGetBy(ctx *gin.Context) {
|
|||||||
httpx.WriteJSON(ctx, httpx.JsonErrorMsg(ctx, "error.e0218"))
|
httpx.WriteJSON(ctx, httpx.JsonErrorMsg(ctx, "error.e0218"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
resp := builders.BuildKnowledgeDocument(item)
|
resp := builders.BuildKnowledgeDocument(item, i18nx.Locale(ctx))
|
||||||
fillKnowledgeDocumentDirectory(&resp, services.KnowledgeDirectoryService.PathMap(item.KnowledgeBaseID))
|
fillKnowledgeDocumentDirectory(&resp, services.KnowledgeDirectoryService.PathMap(item.KnowledgeBaseID))
|
||||||
httpx.WriteJSON(ctx, resp)
|
httpx.WriteJSON(ctx, resp)
|
||||||
}
|
}
|
||||||
@@ -102,7 +104,7 @@ func KnowledgeDocumentPostCreate(ctx *gin.Context) {
|
|||||||
httpx.WriteJSON(ctx, err)
|
httpx.WriteJSON(ctx, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
httpx.WriteJSON(ctx, builders.BuildKnowledgeDocument(item))
|
httpx.WriteJSON(ctx, builders.BuildKnowledgeDocument(item, i18nx.Locale(ctx)))
|
||||||
}
|
}
|
||||||
|
|
||||||
func KnowledgeDocumentPostUpdate(ctx *gin.Context) {
|
func KnowledgeDocumentPostUpdate(ctx *gin.Context) {
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified in the independent AgentDesk fork: localized knowledge workflows and safe display errors.
|
||||||
package dashboard
|
package dashboard
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -23,7 +24,7 @@ func KnowledgeFAQGetImport_template(ctx *gin.Context) {
|
|||||||
httpx.WriteJSON(ctx, err)
|
httpx.WriteJSON(ctx, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
file, err := services.KnowledgeFAQService.BuildKnowledgeFAQImportTemplate()
|
file, err := services.KnowledgeFAQService.BuildKnowledgeFAQImportTemplate(i18nx.Locale(ctx))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
httpx.WriteJSON(ctx, err)
|
httpx.WriteJSON(ctx, err)
|
||||||
return
|
return
|
||||||
@@ -41,7 +42,7 @@ func KnowledgeFAQGetExport(ctx *gin.Context) {
|
|||||||
httpx.WriteJSON(ctx, errorsx.InvalidParamI18n("error.e0283"))
|
httpx.WriteJSON(ctx, errorsx.InvalidParamI18n("error.e0283"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
file, err := services.KnowledgeFAQService.ExportKnowledgeFAQs(knowledgeBaseID)
|
file, err := services.KnowledgeFAQService.ExportKnowledgeFAQs(knowledgeBaseID, i18nx.Locale(ctx))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
httpx.WriteJSON(ctx, err)
|
httpx.WriteJSON(ctx, err)
|
||||||
return
|
return
|
||||||
@@ -111,7 +112,7 @@ func KnowledgeFAQAnyList(ctx *gin.Context) {
|
|||||||
directoryPaths := services.KnowledgeDirectoryService.PathMap(knowledgeBaseID)
|
directoryPaths := services.KnowledgeDirectoryService.PathMap(knowledgeBaseID)
|
||||||
results := make([]response.KnowledgeFAQResponse, 0, len(list))
|
results := make([]response.KnowledgeFAQResponse, 0, len(list))
|
||||||
for _, item := range list {
|
for _, item := range list {
|
||||||
resp := builders.BuildKnowledgeFAQ(&item)
|
resp := builders.BuildKnowledgeFAQ(&item, i18nx.Locale(ctx))
|
||||||
fillKnowledgeFAQDirectory(&resp, directoryPaths)
|
fillKnowledgeFAQDirectory(&resp, directoryPaths)
|
||||||
results = append(results, resp)
|
results = append(results, resp)
|
||||||
}
|
}
|
||||||
@@ -133,7 +134,7 @@ func KnowledgeFAQGetBy(ctx *gin.Context) {
|
|||||||
httpx.WriteJSON(ctx, httpx.JsonErrorMsg(ctx, "error.e0025"))
|
httpx.WriteJSON(ctx, httpx.JsonErrorMsg(ctx, "error.e0025"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
resp := builders.BuildKnowledgeFAQ(item)
|
resp := builders.BuildKnowledgeFAQ(item, i18nx.Locale(ctx))
|
||||||
fillKnowledgeFAQDirectory(&resp, services.KnowledgeDirectoryService.PathMap(item.KnowledgeBaseID))
|
fillKnowledgeFAQDirectory(&resp, services.KnowledgeDirectoryService.PathMap(item.KnowledgeBaseID))
|
||||||
httpx.WriteJSON(ctx, resp)
|
httpx.WriteJSON(ctx, resp)
|
||||||
}
|
}
|
||||||
@@ -154,7 +155,7 @@ func KnowledgeFAQPostCreate(ctx *gin.Context) {
|
|||||||
httpx.WriteJSON(ctx, err)
|
httpx.WriteJSON(ctx, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
httpx.WriteJSON(ctx, builders.BuildKnowledgeFAQ(item))
|
httpx.WriteJSON(ctx, builders.BuildKnowledgeFAQ(item, i18nx.Locale(ctx)))
|
||||||
}
|
}
|
||||||
|
|
||||||
func KnowledgeFAQPostUpdate(ctx *gin.Context) {
|
func KnowledgeFAQPostUpdate(ctx *gin.Context) {
|
||||||
|
|||||||
@@ -1,15 +1,18 @@
|
|||||||
|
// Modified in the independent AgentDesk fork: localized knowledge workflows and safe display errors.
|
||||||
package dashboard
|
package dashboard
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"agent-desk/internal/pkg/httpx"
|
|
||||||
"context"
|
"context"
|
||||||
|
"errors"
|
||||||
|
|
||||||
"agent-desk/internal/ai/rag"
|
"agent-desk/internal/ai/rag"
|
||||||
"agent-desk/internal/pkg/constants"
|
"agent-desk/internal/pkg/constants"
|
||||||
"agent-desk/internal/pkg/dto/request"
|
"agent-desk/internal/pkg/dto/request"
|
||||||
"agent-desk/internal/services"
|
"agent-desk/internal/pkg/errorsx"
|
||||||
|
"agent-desk/internal/pkg/httpx"
|
||||||
"agent-desk/internal/pkg/httpx/params"
|
"agent-desk/internal/pkg/httpx/params"
|
||||||
|
"agent-desk/internal/pkg/i18nx"
|
||||||
|
"agent-desk/internal/services"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
)
|
)
|
||||||
@@ -26,9 +29,9 @@ func KnowledgeRetrievePostDebugSearch(ctx *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
resp, err := rag.Answer.DebugSearch(context.Background(), req)
|
resp, err := rag.Answer.DebugSearch(knowledgeRequestContext(ctx), req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
httpx.WriteJSON(ctx, err)
|
httpx.WriteJSON(ctx, safeKnowledgeOperationError(err, "error.knowledge.retrieveFailed"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
httpx.WriteJSON(ctx, resp)
|
httpx.WriteJSON(ctx, resp)
|
||||||
@@ -47,9 +50,9 @@ func KnowledgeRetrievePostDebugAnswer(ctx *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
resp, err := rag.Answer.DebugAnswer(context.Background(), req, operator)
|
resp, err := rag.Answer.DebugAnswer(knowledgeRequestContext(ctx), req, operator)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
httpx.WriteJSON(ctx, err)
|
httpx.WriteJSON(ctx, safeKnowledgeOperationError(err, "error.knowledge.retrieveFailed"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
httpx.WriteJSON(ctx, resp)
|
httpx.WriteJSON(ctx, resp)
|
||||||
@@ -70,8 +73,8 @@ func KnowledgeRetrievePostBuild(ctx *gin.Context) {
|
|||||||
httpx.WriteJSON(ctx, err)
|
httpx.WriteJSON(ctx, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if err := rag.Answer.BuildDocumentIndex(context.Background(), req.DocumentID); err != nil {
|
if err := rag.Answer.BuildDocumentIndex(knowledgeRequestContext(ctx), req.DocumentID); err != nil {
|
||||||
httpx.WriteJSON(ctx, err)
|
httpx.WriteJSON(ctx, safeKnowledgeOperationError(err, "error.knowledge.indexFailed"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
httpx.WriteJSON(ctx, nil)
|
httpx.WriteJSON(ctx, nil)
|
||||||
@@ -83,8 +86,8 @@ func KnowledgeRetrievePostBuild(ctx *gin.Context) {
|
|||||||
httpx.WriteJSON(ctx, err)
|
httpx.WriteJSON(ctx, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if err := rag.Index.IndexFAQByID(context.Background(), req.FAQID); err != nil {
|
if err := rag.Index.IndexFAQByID(knowledgeRequestContext(ctx), req.FAQID); err != nil {
|
||||||
httpx.WriteJSON(ctx, err)
|
httpx.WriteJSON(ctx, safeKnowledgeOperationError(err, "error.knowledge.indexFailed"))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
httpx.WriteJSON(ctx, nil)
|
httpx.WriteJSON(ctx, nil)
|
||||||
@@ -93,3 +96,29 @@ func KnowledgeRetrievePostBuild(ctx *gin.Context) {
|
|||||||
|
|
||||||
httpx.WriteJSON(ctx, httpx.JsonErrorMsg(ctx, "error.e0066"))
|
httpx.WriteJSON(ctx, httpx.JsonErrorMsg(ctx, "error.e0066"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func knowledgeRequestContext(ctx *gin.Context) context.Context {
|
||||||
|
parent := context.Background()
|
||||||
|
if ctx != nil && ctx.Request != nil {
|
||||||
|
parent = ctx.Request.Context()
|
||||||
|
}
|
||||||
|
return i18nx.WithLocale(parent, i18nx.Locale(ctx))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only catalog-owned errors without arbitrary diagnostic arguments are safe to
|
||||||
|
// return from index/embedding/vector providers. Unwrap the application error so
|
||||||
|
// a surrounding SQL/provider message never reaches the response.
|
||||||
|
func safeKnowledgeOperationError(err error, fallbackKey string) error {
|
||||||
|
if err == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
var appErr *errorsx.I18nError
|
||||||
|
if errors.As(err, &appErr) && appErr != nil && len(appErr.Args) == 0 && i18nx.Get(appErr.Key) != appErr.Key {
|
||||||
|
return appErr
|
||||||
|
}
|
||||||
|
var localizedErr *i18nx.Error
|
||||||
|
if errors.As(err, &localizedErr) && localizedErr != nil && len(localizedErr.Args) == 0 && i18nx.Get(localizedErr.Key) != localizedErr.Key {
|
||||||
|
return i18nx.Errorf(localizedErr.Key)
|
||||||
|
}
|
||||||
|
return errorsx.BusinessErrorI18n(0, fallbackKey)
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,77 @@
|
|||||||
|
package dashboard
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"agent-desk/internal/pkg/errorsx"
|
||||||
|
"agent-desk/internal/pkg/httpx"
|
||||||
|
"agent-desk/internal/pkg/i18nx"
|
||||||
|
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/mlogclub/simple/web"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestKnowledgeRequestContextPreservesLocaleAndCancellation(t *testing.T) {
|
||||||
|
parent, cancel := context.WithTimeout(context.Background(), time.Minute)
|
||||||
|
defer cancel()
|
||||||
|
ctx, _ := gin.CreateTestContext(httptest.NewRecorder())
|
||||||
|
ctx.Request = httptest.NewRequest("POST", "/knowledge_retrieve/debug_answer", nil).WithContext(parent)
|
||||||
|
ctx.Request.Header.Set("X-Locale", i18nx.LocaleZhCN)
|
||||||
|
ctx.Request.Header.Set("Accept-Language", i18nx.LocaleZhCN)
|
||||||
|
i18nx.SetLocale(ctx, i18nx.LocaleRuRU)
|
||||||
|
derived := knowledgeRequestContext(ctx)
|
||||||
|
if i18nx.LocaleFromContext(derived) != i18nx.LocaleRuRU {
|
||||||
|
t.Fatal("request locale was lost")
|
||||||
|
}
|
||||||
|
parentDeadline, _ := parent.Deadline()
|
||||||
|
if deadline, ok := derived.Deadline(); !ok || !deadline.Equal(parentDeadline) {
|
||||||
|
t.Fatal("request deadline was lost")
|
||||||
|
}
|
||||||
|
cancel()
|
||||||
|
if !errors.Is(derived.Err(), context.Canceled) {
|
||||||
|
t.Fatal("request cancellation was lost")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestKnowledgeOperationErrorsHideProviderDiagnostics(t *testing.T) {
|
||||||
|
const diagnostic = "synthetic-private-diagnostic"
|
||||||
|
for _, key := range []string{"error.knowledge.indexFailed", "error.knowledge.retrieveFailed"} {
|
||||||
|
for _, cause := range []error{
|
||||||
|
errors.New("SQL failed: " + diagnostic),
|
||||||
|
fmt.Errorf("provider request failed: %w", errors.New(diagnostic)),
|
||||||
|
web.NewError(2000, diagnostic),
|
||||||
|
errorsx.BusinessErrorI18n(0, "error.e0340", diagnostic),
|
||||||
|
errorsx.BusinessErrorI18n(0, "unknown.translation."+diagnostic),
|
||||||
|
} {
|
||||||
|
for _, locale := range []string{i18nx.LocaleEnUS, i18nx.LocaleRuRU, i18nx.LocaleZhCN} {
|
||||||
|
recorder := httptest.NewRecorder()
|
||||||
|
ctx, _ := gin.CreateTestContext(recorder)
|
||||||
|
i18nx.SetLocale(ctx, locale)
|
||||||
|
httpx.WriteJSON(ctx, safeKnowledgeOperationError(cause, key))
|
||||||
|
body := recorder.Body.String()
|
||||||
|
if strings.Contains(body, diagnostic) || !strings.Contains(body, i18nx.Getf(locale, key)) {
|
||||||
|
t.Fatalf("unsafe/unlocalized %s response: %s", key, body)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestKnowledgeOperationErrorPreservesCatalogApplicationError(t *testing.T) {
|
||||||
|
original := errorsx.InvalidParamI18n("error.e0340")
|
||||||
|
wrapped := fmt.Errorf("private provider details: %w", original)
|
||||||
|
if got := safeKnowledgeOperationError(wrapped, "error.knowledge.retrieveFailed"); got != original {
|
||||||
|
t.Fatalf("application error lost: %v", got)
|
||||||
|
}
|
||||||
|
localized := i18nx.Errorf("error.embeddingModel.noneEnabled")
|
||||||
|
got := safeKnowledgeOperationError(fmt.Errorf("private: %w", localized), "error.knowledge.indexFailed")
|
||||||
|
if got.Error() != localized.Error() || strings.Contains(got.Error(), "private") {
|
||||||
|
t.Fatalf("localized application error changed/leaked: %v", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified in the independent AgentDesk fork: localized knowledge workflows and safe display errors.
|
||||||
package dashboard
|
package dashboard
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -5,6 +6,7 @@ import (
|
|||||||
"agent-desk/internal/pkg/constants"
|
"agent-desk/internal/pkg/constants"
|
||||||
"agent-desk/internal/pkg/dto/response"
|
"agent-desk/internal/pkg/dto/response"
|
||||||
"agent-desk/internal/pkg/httpx"
|
"agent-desk/internal/pkg/httpx"
|
||||||
|
"agent-desk/internal/pkg/i18nx"
|
||||||
"agent-desk/internal/services"
|
"agent-desk/internal/services"
|
||||||
|
|
||||||
"agent-desk/internal/pkg/httpx/params"
|
"agent-desk/internal/pkg/httpx/params"
|
||||||
@@ -39,7 +41,7 @@ func KnowledgeRetrieveLogAnyList(ctx *gin.Context) {
|
|||||||
list, paging := services.KnowledgeRetrieveLogService.FindPageByParams(queryParams)
|
list, paging := services.KnowledgeRetrieveLogService.FindPageByParams(queryParams)
|
||||||
results := make([]response.KnowledgeRetrieveLogResponse, 0, len(list))
|
results := make([]response.KnowledgeRetrieveLogResponse, 0, len(list))
|
||||||
for _, item := range list {
|
for _, item := range list {
|
||||||
resp := builders.BuildKnowledgeRetrieveLog(&item)
|
resp := builders.BuildKnowledgeRetrieveLog(&item, i18nx.Locale(ctx))
|
||||||
if knowledgeBase := services.KnowledgeBaseService.Get(item.KnowledgeBaseID); knowledgeBase != nil {
|
if knowledgeBase := services.KnowledgeBaseService.Get(item.KnowledgeBaseID); knowledgeBase != nil {
|
||||||
resp.KnowledgeBaseName = knowledgeBase.Name
|
resp.KnowledgeBaseName = knowledgeBase.Name
|
||||||
}
|
}
|
||||||
@@ -64,7 +66,7 @@ func KnowledgeRetrieveLogGetBy(ctx *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
logResp := builders.BuildKnowledgeRetrieveLog(logItem)
|
logResp := builders.BuildKnowledgeRetrieveLog(logItem, i18nx.Locale(ctx))
|
||||||
if knowledgeBase := services.KnowledgeBaseService.Get(logItem.KnowledgeBaseID); knowledgeBase != nil {
|
if knowledgeBase := services.KnowledgeBaseService.Get(logItem.KnowledgeBaseID); knowledgeBase != nil {
|
||||||
logResp.KnowledgeBaseName = knowledgeBase.Name
|
logResp.KnowledgeBaseName = knowledgeBase.Name
|
||||||
}
|
}
|
||||||
@@ -72,7 +74,7 @@ func KnowledgeRetrieveLogGetBy(ctx *gin.Context) {
|
|||||||
hits := services.KnowledgeRetrieveLogService.FindHitsByRetrieveLogID(id)
|
hits := services.KnowledgeRetrieveLogService.FindHitsByRetrieveLogID(id)
|
||||||
hitResults := make([]response.KnowledgeRetrieveHitResponse, 0, len(hits))
|
hitResults := make([]response.KnowledgeRetrieveHitResponse, 0, len(hits))
|
||||||
for _, item := range hits {
|
for _, item := range hits {
|
||||||
hitResults = append(hitResults, builders.BuildKnowledgeRetrieveHitResponse(&item))
|
hitResults = append(hitResults, builders.BuildKnowledgeRetrieveHitResponse(&item, i18nx.Locale(ctx)))
|
||||||
}
|
}
|
||||||
|
|
||||||
httpx.WriteJSON(ctx, response.KnowledgeRetrieveLogDetailResponse{
|
httpx.WriteJSON(ctx, response.KnowledgeRetrieveLogDetailResponse{
|
||||||
|
|||||||
152
internal/handlers/dashboard/support_availability_handler.go
Normal file
152
internal/handlers/dashboard/support_availability_handler.go
Normal file
@@ -0,0 +1,152 @@
|
|||||||
|
package dashboard
|
||||||
|
|
||||||
|
import (
|
||||||
|
"agent-desk/internal/pkg/constants"
|
||||||
|
"agent-desk/internal/pkg/dto"
|
||||||
|
"agent-desk/internal/pkg/dto/request"
|
||||||
|
"agent-desk/internal/pkg/errorsx"
|
||||||
|
"agent-desk/internal/pkg/httpx"
|
||||||
|
"agent-desk/internal/pkg/httpx/params"
|
||||||
|
"agent-desk/internal/services"
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"slices"
|
||||||
|
"strconv"
|
||||||
|
)
|
||||||
|
|
||||||
|
func SupportAvailabilityGetMe(ctx *gin.Context) {
|
||||||
|
ctx.Header("Cache-Control", "no-store")
|
||||||
|
principal := services.AuthService.GetAuthPrincipal(ctx)
|
||||||
|
if principal == nil {
|
||||||
|
httpx.WriteJSON(ctx, errorsx.UnauthorizedI18n("error.auth.expired"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
item, err := services.SupportAvailabilityService.ForUser(principal.UserID, true)
|
||||||
|
if err != nil {
|
||||||
|
httpx.WriteJSON(ctx, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
httpx.WriteJSON(ctx, item)
|
||||||
|
}
|
||||||
|
func SupportAvailabilityPostMe(ctx *gin.Context) {
|
||||||
|
principal := services.AuthService.GetAuthPrincipal(ctx)
|
||||||
|
if principal == nil {
|
||||||
|
httpx.WriteJSON(ctx, errorsx.UnauthorizedI18n("error.auth.expired"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
req := request.SupportAvailabilityRequest{}
|
||||||
|
if err := params.ReadJSON(ctx, &req); err != nil {
|
||||||
|
httpx.WriteJSON(ctx, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Never accept a target from a self-service request.
|
||||||
|
item, err := services.SupportAvailabilityService.Update(principal.UserID, req, principal)
|
||||||
|
if err != nil {
|
||||||
|
httpx.WriteJSON(ctx, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
httpx.WriteJSON(ctx, item)
|
||||||
|
}
|
||||||
|
func SupportAvailabilityGetAgents(ctx *gin.Context) {
|
||||||
|
ctx.Header("Cache-Control", "no-store")
|
||||||
|
principal := services.AuthService.GetAuthPrincipal(ctx)
|
||||||
|
if principal == nil {
|
||||||
|
httpx.WriteJSON(ctx, errorsx.UnauthorizedI18n("error.auth.expired"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !slices.Contains(principal.Permissions, constants.PermissionAgentView.Code) && !slices.Contains(principal.Permissions, constants.PermissionConversationAssign.Code) && !slices.Contains(principal.Permissions, constants.PermissionConversationTransfer.Code) {
|
||||||
|
httpx.WriteJSON(ctx, errorsx.ForbiddenI18n("error.e0225"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
id, _ := strconv.ParseInt(ctx.Query("conversationId"), 10, 64)
|
||||||
|
if id <= 0 && !slices.Contains(principal.Permissions, constants.PermissionAgentView.Code) {
|
||||||
|
httpx.WriteJSON(ctx, errorsx.ForbiddenI18n("error.e0225"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
items, err := services.SupportAvailabilityService.List(id, principal)
|
||||||
|
if err != nil {
|
||||||
|
httpx.WriteJSON(ctx, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
httpx.WriteJSON(ctx, items)
|
||||||
|
}
|
||||||
|
func SupportAvailabilityPostAgent(ctx *gin.Context) {
|
||||||
|
principal, err := services.AuthService.RequirePermission(ctx, constants.PermissionAgentUpdate)
|
||||||
|
if err != nil {
|
||||||
|
httpx.WriteJSON(ctx, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
req := request.SupportAvailabilityRequest{}
|
||||||
|
if err := params.ReadJSON(ctx, &req); err != nil {
|
||||||
|
httpx.WriteJSON(ctx, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
item, err := services.SupportAvailabilityService.Update(req.UserID, req, principal)
|
||||||
|
if err != nil {
|
||||||
|
httpx.WriteJSON(ctx, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
httpx.WriteJSON(ctx, item)
|
||||||
|
}
|
||||||
|
func supportCalendarPermission(ctx *gin.Context, teamID int64, write bool) (*dto.AuthPrincipal, error) {
|
||||||
|
if teamID == 0 {
|
||||||
|
if write {
|
||||||
|
return services.AuthService.RequirePermission(ctx, constants.PermissionSupportConfigUpdate)
|
||||||
|
}
|
||||||
|
return services.AuthService.RequirePermission(ctx, constants.PermissionSupportConfigView)
|
||||||
|
}
|
||||||
|
if write {
|
||||||
|
return services.AuthService.RequirePermission(ctx, constants.PermissionAgentTeamScheduleUpdate)
|
||||||
|
}
|
||||||
|
return services.AuthService.RequirePermission(ctx, constants.PermissionAgentTeamScheduleView)
|
||||||
|
}
|
||||||
|
func SupportAvailabilityGetCalendar(ctx *gin.Context) {
|
||||||
|
teamID, err := strconv.ParseInt(ctx.DefaultQuery("teamId", "0"), 10, 64)
|
||||||
|
if err != nil || teamID < 0 {
|
||||||
|
httpx.WriteJSON(ctx, errorsx.InvalidParamI18n("error.supportAvailability.invalidCalendar"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if _, err := supportCalendarPermission(ctx, teamID, false); err != nil {
|
||||||
|
httpx.WriteJSON(ctx, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
item, err := services.SupportCalendarService.Get(teamID)
|
||||||
|
if err != nil {
|
||||||
|
httpx.WriteJSON(ctx, errorsx.InvalidParamI18n("error.supportAvailability.persistence"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
httpx.WriteJSON(ctx, item)
|
||||||
|
}
|
||||||
|
func SupportAvailabilityPostCalendar(ctx *gin.Context) {
|
||||||
|
req := request.SupportCalendarRequest{}
|
||||||
|
if err := params.ReadJSON(ctx, &req); err != nil {
|
||||||
|
httpx.WriteJSON(ctx, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if _, err := supportCalendarPermission(ctx, req.TeamID, true); err != nil {
|
||||||
|
httpx.WriteJSON(ctx, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
item, err := services.SupportCalendarService.Save(req)
|
||||||
|
if err != nil {
|
||||||
|
httpx.WriteJSON(ctx, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
httpx.WriteJSON(ctx, item)
|
||||||
|
}
|
||||||
|
func SupportAvailabilityPostCalendarPreview(ctx *gin.Context) {
|
||||||
|
req := request.SupportCalendarPreviewRequest{}
|
||||||
|
if err := params.ReadJSON(ctx, &req); err != nil {
|
||||||
|
httpx.WriteJSON(ctx, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if _, err := supportCalendarPermission(ctx, req.Calendar.TeamID, false); err != nil {
|
||||||
|
httpx.WriteJSON(ctx, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
item, err := services.SupportCalendarService.Preview(req)
|
||||||
|
if err != nil {
|
||||||
|
httpx.WriteJSON(ctx, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
httpx.WriteJSON(ctx, item)
|
||||||
|
}
|
||||||
121
internal/handlers/dashboard/support_availability_handler_test.go
Normal file
121
internal/handlers/dashboard/support_availability_handler_test.go
Normal file
@@ -0,0 +1,121 @@
|
|||||||
|
package dashboard
|
||||||
|
|
||||||
|
import (
|
||||||
|
"agent-desk/internal/models"
|
||||||
|
"agent-desk/internal/pkg/constants"
|
||||||
|
"agent-desk/internal/pkg/dto"
|
||||||
|
"agent-desk/internal/pkg/enums"
|
||||||
|
"encoding/json"
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/glebarez/sqlite"
|
||||||
|
"github.com/mlogclub/simple/sqls"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
"net/http/httptest"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func availabilityHandlerDB(t *testing.T) *gorm.DB {
|
||||||
|
t.Helper()
|
||||||
|
db, err := gorm.Open(sqlite.Open(filepath.Join(t.TempDir(), "availability.db")), &gorm.Config{})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := db.AutoMigrate(&models.User{}, &models.AgentProfile{}, &models.AgentTeam{}, &models.AgentTeamSchedule{}, &models.SupportCalendar{}, &models.AgentPresenceLease{}, &models.Conversation{}); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
previous := sqls.DB()
|
||||||
|
sqls.SetDB(db)
|
||||||
|
t.Cleanup(func() { sqls.SetDB(previous); conn, _ := db.DB(); conn.Close() })
|
||||||
|
for _, row := range []any{&models.User{ID: 1, Username: "one", UserType: enums.UserTypeEmployee}, &models.User{ID: 2, Username: "two", UserType: enums.UserTypeEmployee}, &models.AgentTeam{ID: 1, Name: "Support"}, &models.AgentProfile{ID: 1, UserID: 1, TeamID: 1, AgentCode: "one"}, &models.AgentProfile{ID: 2, UserID: 2, TeamID: 1, AgentCode: "two"}} {
|
||||||
|
if err := db.Create(row).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return db
|
||||||
|
}
|
||||||
|
func callAvailabilityHandler(t *testing.T, handler gin.HandlerFunc, principal *dto.AuthPrincipal, body string) map[string]any {
|
||||||
|
t.Helper()
|
||||||
|
gin.SetMode(gin.TestMode)
|
||||||
|
router := gin.New()
|
||||||
|
router.Use(func(c *gin.Context) {
|
||||||
|
if principal != nil {
|
||||||
|
c.Set("authPrincipal", principal)
|
||||||
|
}
|
||||||
|
c.Next()
|
||||||
|
})
|
||||||
|
router.POST("/test", handler)
|
||||||
|
req := httptest.NewRequest("POST", "/test", strings.NewReader(body))
|
||||||
|
req.Header.Set("Content-Type", "application/json")
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
router.ServeHTTP(rec, req)
|
||||||
|
var result map[string]any
|
||||||
|
if err := json.Unmarshal(rec.Body.Bytes(), &result); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
func TestSupportAvailabilitySelfCannotTargetAnotherUser(t *testing.T) {
|
||||||
|
db := availabilityHandlerDB(t)
|
||||||
|
principal := &dto.AuthPrincipal{UserID: 1, Username: "one", UserType: enums.UserTypeEmployee}
|
||||||
|
got := callAvailabilityHandler(t, SupportAvailabilityPostMe, principal, `{"userId":2,"serviceStatus":2}`)
|
||||||
|
if got["success"] != true {
|
||||||
|
t.Fatalf("self update: %v", got)
|
||||||
|
}
|
||||||
|
var own, other models.AgentProfile
|
||||||
|
db.First(&own, 1)
|
||||||
|
db.First(&other, 2)
|
||||||
|
if own.ServiceStatus != enums.ServiceStatusBreak || other.ServiceStatus != enums.ServiceStatusIdle {
|
||||||
|
t.Fatal("self endpoint changed another profile")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
func TestSupportAvailabilitySelfDoesNotProvisionMissingProfile(t *testing.T) {
|
||||||
|
db := availabilityHandlerDB(t)
|
||||||
|
principal := &dto.AuthPrincipal{UserID: 99, Username: "missing", UserType: enums.UserTypeEmployee}
|
||||||
|
got := callAvailabilityHandler(t, SupportAvailabilityPostMe, principal, `{"serviceStatus":0}`)
|
||||||
|
if got["success"] == true {
|
||||||
|
t.Fatal("missing operator gained profile")
|
||||||
|
}
|
||||||
|
var count int64
|
||||||
|
db.Model(&models.AgentProfile{}).Count(&count)
|
||||||
|
if count != 2 {
|
||||||
|
t.Fatalf("profile count %d", count)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
func TestSupportAvailabilityAdminRequiresExactPermission(t *testing.T) {
|
||||||
|
db := availabilityHandlerDB(t)
|
||||||
|
principal := &dto.AuthPrincipal{UserID: 1, Username: "one", Permissions: []string{constants.PermissionAgentView.Code}}
|
||||||
|
got := callAvailabilityHandler(t, SupportAvailabilityPostAgent, principal, `{"userId":2,"serviceStatus":3}`)
|
||||||
|
if got["success"] == true {
|
||||||
|
t.Fatal("read permission changed another operator")
|
||||||
|
}
|
||||||
|
var other models.AgentProfile
|
||||||
|
db.First(&other, 2)
|
||||||
|
if other.ServiceStatus != enums.ServiceStatusIdle {
|
||||||
|
t.Fatal("unauthorized mutation")
|
||||||
|
}
|
||||||
|
principal.Permissions = []string{constants.PermissionAgentUpdate.Code}
|
||||||
|
got = callAvailabilityHandler(t, SupportAvailabilityPostAgent, principal, `{"userId":2,"serviceStatus":3}`)
|
||||||
|
if got["success"] != true {
|
||||||
|
t.Fatalf("authorized update: %v", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
func TestSupportCalendarDeploymentAndTeamPermissionsDoNotOverlap(t *testing.T) {
|
||||||
|
db := availabilityHandlerDB(t)
|
||||||
|
principal := &dto.AuthPrincipal{UserID: 1, Username: "one", Permissions: []string{constants.PermissionAgentTeamScheduleUpdate.Code}}
|
||||||
|
got := callAvailabilityHandler(t, SupportAvailabilityPostCalendar, principal, `{"teamId":0,"mode":"recurring","timezone":"Europe/Berlin","weekly":[],"exceptions":[]}`)
|
||||||
|
if got["success"] == true {
|
||||||
|
t.Fatal("team editor changed deployment default")
|
||||||
|
}
|
||||||
|
principal.Permissions = []string{constants.PermissionSupportConfigUpdate.Code}
|
||||||
|
got = callAvailabilityHandler(t, SupportAvailabilityPostCalendar, principal, `{"teamId":1,"mode":"recurring","timezone":"Europe/Berlin","weekly":[],"exceptions":[]}`)
|
||||||
|
if got["success"] == true {
|
||||||
|
t.Fatal("deployment editor changed team schedule")
|
||||||
|
}
|
||||||
|
var count int64
|
||||||
|
db.Model(&models.SupportCalendar{}).Count(&count)
|
||||||
|
if count != 0 {
|
||||||
|
t.Fatal("denied mutations persisted")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,3 +1,6 @@
|
|||||||
|
// Modified in AgentDeskNext: authenticated support availability and calendars.
|
||||||
|
// Modified in the independent hardening fork; see docs/hardening.
|
||||||
|
|
||||||
package models
|
package models
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -45,6 +48,8 @@ var Models = []any{
|
|||||||
&AgentProfile{},
|
&AgentProfile{},
|
||||||
&AgentTeam{},
|
&AgentTeam{},
|
||||||
&AgentTeamSchedule{},
|
&AgentTeamSchedule{},
|
||||||
|
&SupportCalendar{},
|
||||||
|
&AgentPresenceLease{},
|
||||||
&AIConfig{},
|
&AIConfig{},
|
||||||
&KnowledgeBase{},
|
&KnowledgeBase{},
|
||||||
&KnowledgeDirectory{},
|
&KnowledgeDirectory{},
|
||||||
@@ -250,6 +255,10 @@ type Customer struct {
|
|||||||
|
|
||||||
// CustomerIdentity 客户第三方身份映射表。
|
// CustomerIdentity 客户第三方身份映射表。
|
||||||
type CustomerIdentity struct {
|
type CustomerIdentity struct {
|
||||||
|
// Empty scope is legacy/internal integration data; public sessions never fall back to it.
|
||||||
|
IdentityScope string `gorm:"type:varchar(80);not null;default:'';index:idx_customer_identity_scope"`
|
||||||
|
// Nullable for legacy rows; all new public scoped identities claim a unique digest.
|
||||||
|
ScopedKey *string `gorm:"type:varchar(64);uniqueIndex:uk_customer_scoped_key"`
|
||||||
ID int64 `gorm:"primaryKey;autoIncrement"`
|
ID int64 `gorm:"primaryKey;autoIncrement"`
|
||||||
CustomerID int64 `gorm:"type:bigint;not null;uniqueIndex:uk_customer_external"` // 为所属客户ID。
|
CustomerID int64 `gorm:"type:bigint;not null;uniqueIndex:uk_customer_external"` // 为所属客户ID。
|
||||||
ExternalSource enums.ExternalSource `gorm:"type:varchar(30);uniqueIndex:uk_customer_external"` // 为外部身份来源
|
ExternalSource enums.ExternalSource `gorm:"type:varchar(30);uniqueIndex:uk_customer_external"` // 为外部身份来源
|
||||||
@@ -783,12 +792,16 @@ type AgentProfile struct {
|
|||||||
AgentCode string `gorm:"type:varchar(64);not null;default:'';uniqueIndex"` // AgentCode 为客服工号，用于业务侧识别客服。
|
AgentCode string `gorm:"type:varchar(64);not null;default:'';uniqueIndex"` // AgentCode 为客服工号，用于业务侧识别客服。
|
||||||
DisplayName string `gorm:"type:varchar(100);not null;default:'';index"` // DisplayName 为客服展示名，可区别于后台昵称。
|
DisplayName string `gorm:"type:varchar(100);not null;default:'';index"` // DisplayName 为客服展示名，可区别于后台昵称。
|
||||||
Avatar string `gorm:"type:varchar(1024);not null;default:''"` // Avatar 为客服头像 URL。
|
Avatar string `gorm:"type:varchar(1024);not null;default:''"` // Avatar 为客服头像 URL。
|
||||||
ServiceStatus enums.ServiceStatus `gorm:"type:int;not null;default:0;index"` // ServiceStatus 表示客服服务状态：0空闲 1忙碌。
|
AvailabilityReturnStatus enums.ServiceStatus `gorm:"not null;default:0"`
|
||||||
MaxConcurrentCount int `gorm:"type:int;not null;default:0"` // MaxConcurrentCount 表示客服最大并发接待数。
|
AbsenceStartAt *time.Time `gorm:"index"`
|
||||||
|
AbsenceEndAt *time.Time `gorm:"index"`
|
||||||
|
AssignmentVersion int64 `gorm:"not null;default:0"`
|
||||||
|
ServiceStatus enums.ServiceStatus `gorm:"type:int;not null;default:0;index"` // ServiceStatus stores working state; effective vacation state is evaluated from its dated interval.
|
||||||
|
MaxConcurrentCount int `gorm:"type:int;not null;default:0"` // MaxConcurrentCount limits active conversations; zero is unlimited.
|
||||||
PriorityLevel int `gorm:"type:int;not null;default:0;index"` // PriorityLevel 表示自动分配优先级，值越大越优先。
|
PriorityLevel int `gorm:"type:int;not null;default:0;index"` // PriorityLevel 表示自动分配优先级，值越大越优先。
|
||||||
AutoAssignEnabled bool `gorm:"not null;default:true;index"` // AutoAssignEnabled 表示是否参与自动分配。
|
AutoAssignEnabled bool `gorm:"not null;default:true;index"` // AutoAssignEnabled 表示是否参与自动分配。
|
||||||
ReceiveOfflineMessage bool `gorm:"not null;default:false"` // ReceiveOfflineMessage 表示离线时是否仍接收离线消息或转接消息。
|
ReceiveOfflineMessage bool `gorm:"not null;default:false"` // ReceiveOfflineMessage is deprecated compatibility data; it never bypasses live eligibility.
|
||||||
LastOnlineAt *time.Time `gorm:"index"` // LastOnlineAt 记录最近一次在线时间。
|
LastOnlineAt *time.Time `gorm:"index"` // LastOnlineAt is historical metadata, not the source of live platform presence.
|
||||||
LastStatusAt *time.Time `gorm:"index"` // LastStatusAt 记录最近一次状态变更时间。
|
LastStatusAt *time.Time `gorm:"index"` // LastStatusAt 记录最近一次状态变更时间。
|
||||||
Status enums.Status `gorm:"type:int;not null;default:0;index"` // Status 表示客服档案状态
|
Status enums.Status `gorm:"type:int;not null;default:0;index"` // Status 表示客服档案状态
|
||||||
Remark string `gorm:"type:text"` // Remark 记录客服备注信息。
|
Remark string `gorm:"type:text"` // Remark 记录客服备注信息。
|
||||||
|
|||||||
24
internal/models/support_availability.go
Normal file
24
internal/models/support_availability.go
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
package models
|
||||||
|
|
||||||
|
import "time"
|
||||||
|
|
||||||
|
// SupportCalendar is opt-in. Absence of a team row preserves dated schedules.
|
||||||
|
// TeamID zero stores the deployment-wide timezone, not another organization.
|
||||||
|
type SupportCalendar struct {
|
||||||
|
ID int64 `gorm:"primaryKey;autoIncrement"`
|
||||||
|
TeamID int64 `gorm:"not null;uniqueIndex"`
|
||||||
|
Mode string `gorm:"type:varchar(20);not null;default:'legacy'"`
|
||||||
|
Timezone string `gorm:"type:varchar(100);not null;default:''"`
|
||||||
|
WeeklyJSON string `gorm:"type:text;not null"`
|
||||||
|
ExceptionsJSON string `gorm:"type:text;not null"`
|
||||||
|
UpdatedAt time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
// AgentPresenceLease contains no bearer credential or client address. Multiple
|
||||||
|
// independent connections may lease presence for the same authenticated user.
|
||||||
|
type AgentPresenceLease struct {
|
||||||
|
ID string `gorm:"type:varchar(64);primaryKey"`
|
||||||
|
UserID int64 `gorm:"not null;index"`
|
||||||
|
LoginSessionID int64 `gorm:"not null;index"`
|
||||||
|
ExpiresAt time.Time `gorm:"not null;index"`
|
||||||
|
}
|
||||||
@@ -1,6 +1,11 @@
|
|||||||
|
// Modified in the independent hardening fork; see docs/hardening.
|
||||||
|
|
||||||
package dto
|
package dto
|
||||||
|
|
||||||
import "agent-desk/internal/pkg/enums"
|
import (
|
||||||
|
"agent-desk/internal/pkg/enums"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
type AuthPrincipal struct {
|
type AuthPrincipal struct {
|
||||||
UserID int64
|
UserID int64
|
||||||
@@ -11,6 +16,11 @@ type AuthPrincipal struct {
|
|||||||
Status enums.Status
|
Status enums.Status
|
||||||
Roles []string
|
Roles []string
|
||||||
Permissions []string
|
Permissions []string
|
||||||
|
|
||||||
|
// Session metadata stays internal and binds long-lived connections to the
|
||||||
|
// original login session and its absolute deadline.
|
||||||
|
LoginSessionID int64 `json:"-"`
|
||||||
|
ExpiresAt time.Time `json:"-"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type WebChannelConfig struct {
|
type WebChannelConfig struct {
|
||||||
@@ -20,6 +30,7 @@ type WebChannelConfig struct {
|
|||||||
Position string `json:"position"`
|
Position string `json:"position"`
|
||||||
Width string `json:"width"`
|
Width string `json:"width"`
|
||||||
UserTokenSecret string `json:"userTokenSecret,omitempty"`
|
UserTokenSecret string `json:"userTokenSecret,omitempty"`
|
||||||
|
RequireSignedIdentity bool `json:"requireSignedIdentity,omitempty"`
|
||||||
PromptStarters []string `json:"promptStarters,omitempty"`
|
PromptStarters []string `json:"promptStarters,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified in AgentDeskFixes: safe, reviewed setup repairs and honest routing diagnostics.
|
||||||
package request
|
package request
|
||||||
|
|
||||||
type SetupSimulateRouteRequest struct {
|
type SetupSimulateRouteRequest struct {
|
||||||
@@ -8,4 +9,6 @@ type SetupSimulateRouteRequest struct {
|
|||||||
type SetupQuickFixRequest struct {
|
type SetupQuickFixRequest struct {
|
||||||
Action string `json:"action" form:"action"`
|
Action string `json:"action" form:"action"`
|
||||||
EntityID int64 `json:"entity_id" form:"entity_id"`
|
EntityID int64 `json:"entity_id" form:"entity_id"`
|
||||||
|
Apply bool `json:"apply" form:"apply"`
|
||||||
|
PreviewToken string `json:"preview_token" form:"preview_token"`
|
||||||
}
|
}
|
||||||
|
|||||||
34
internal/pkg/dto/request/support_availability_req.go
Normal file
34
internal/pkg/dto/request/support_availability_req.go
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
package request
|
||||||
|
|
||||||
|
import "agent-desk/internal/pkg/enums"
|
||||||
|
|
||||||
|
type SupportCalendarPeriod struct {
|
||||||
|
Start string `json:"start"`
|
||||||
|
End string `json:"end"`
|
||||||
|
}
|
||||||
|
type SupportCalendarWeeklyPeriod struct {
|
||||||
|
Weekday int `json:"weekday"`
|
||||||
|
SupportCalendarPeriod
|
||||||
|
}
|
||||||
|
type SupportCalendarException struct {
|
||||||
|
Date string `json:"date"`
|
||||||
|
Closed bool `json:"closed"`
|
||||||
|
Periods []SupportCalendarPeriod `json:"periods"`
|
||||||
|
}
|
||||||
|
type SupportCalendarRequest struct {
|
||||||
|
TeamID int64 `json:"teamId"`
|
||||||
|
Mode string `json:"mode"`
|
||||||
|
Timezone string `json:"timezone"`
|
||||||
|
Weekly []SupportCalendarWeeklyPeriod `json:"weekly"`
|
||||||
|
Exceptions []SupportCalendarException `json:"exceptions"`
|
||||||
|
}
|
||||||
|
type SupportCalendarPreviewRequest struct {
|
||||||
|
Calendar SupportCalendarRequest `json:"calendar"`
|
||||||
|
At string `json:"at"`
|
||||||
|
}
|
||||||
|
type SupportAvailabilityRequest struct {
|
||||||
|
UserID int64 `json:"userId"`
|
||||||
|
ServiceStatus enums.ServiceStatus `json:"serviceStatus"`
|
||||||
|
AbsenceStartAt string `json:"absenceStartAt"`
|
||||||
|
AbsenceEndAt string `json:"absenceEndAt"`
|
||||||
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified in AgentDeskFixes: safe, reviewed setup repairs and honest routing diagnostics.
|
||||||
package response
|
package response
|
||||||
|
|
||||||
type SetupIssueItem struct {
|
type SetupIssueItem struct {
|
||||||
@@ -92,7 +93,20 @@ type SetupSimulateRouteResponse struct {
|
|||||||
CandidateOperators []SimulatedOperatorCandidate `json:"candidate_operators"`
|
CandidateOperators []SimulatedOperatorCandidate `json:"candidate_operators"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type SetupQuickFixResponse struct {
|
type SetupQuickFixChange struct {
|
||||||
AppliedActions []string `json:"applied_actions"`
|
EntityType string `json:"entity_type"`
|
||||||
Readiness SetupReadinessResponse `json:"readiness"`
|
EntityID int64 `json:"entity_id"`
|
||||||
|
EntityName string `json:"entity_name"`
|
||||||
|
Operation string `json:"operation"`
|
||||||
|
Before map[string]any `json:"before"`
|
||||||
|
After map[string]any `json:"after"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type SetupQuickFixResponse struct {
|
||||||
|
Applied bool `json:"applied"`
|
||||||
|
PreviewToken string `json:"preview_token"`
|
||||||
|
Changes []SetupQuickFixChange `json:"changes"`
|
||||||
|
WarningCodes []string `json:"warning_codes"`
|
||||||
|
AppliedActions []string `json:"applied_actions"`
|
||||||
|
Readiness *SetupReadinessResponse `json:"readiness,omitempty"`
|
||||||
}
|
}
|
||||||
|
|||||||
41
internal/pkg/dto/response/support_availability_resp.go
Normal file
41
internal/pkg/dto/response/support_availability_resp.go
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
package response
|
||||||
|
|
||||||
|
import (
|
||||||
|
"agent-desk/internal/pkg/dto/request"
|
||||||
|
"agent-desk/internal/pkg/enums"
|
||||||
|
)
|
||||||
|
|
||||||
|
type SupportCalendarResponse struct {
|
||||||
|
request.SupportCalendarRequest
|
||||||
|
EffectiveTimezone string `json:"effectiveTimezone"`
|
||||||
|
DeploymentTimezone string `json:"deploymentTimezone"`
|
||||||
|
}
|
||||||
|
type SupportCalendarPreviewResponse struct {
|
||||||
|
Open bool `json:"open"`
|
||||||
|
Timezone string `json:"timezone"`
|
||||||
|
Mode string `json:"mode"`
|
||||||
|
NextOpeningAt string `json:"nextOpeningAt,omitempty"`
|
||||||
|
}
|
||||||
|
type SupportAvailabilityResponse struct {
|
||||||
|
UserID int64 `json:"userId"`
|
||||||
|
ProfileID int64 `json:"profileId"`
|
||||||
|
TeamID int64 `json:"teamId"`
|
||||||
|
DisplayName string `json:"displayName"`
|
||||||
|
ServiceStatus enums.ServiceStatus `json:"serviceStatus"`
|
||||||
|
ReturnServiceStatus enums.ServiceStatus `json:"returnServiceStatus"`
|
||||||
|
EffectiveServiceStatus enums.ServiceStatus `json:"effectiveServiceStatus"`
|
||||||
|
AbsenceStartAt string `json:"absenceStartAt,omitempty"`
|
||||||
|
AbsenceEndAt string `json:"absenceEndAt,omitempty"`
|
||||||
|
Online bool `json:"online"`
|
||||||
|
Eligible bool `json:"eligible"`
|
||||||
|
Reason string `json:"reason"`
|
||||||
|
Calendar SupportCalendarResponse `json:"calendar"`
|
||||||
|
CalendarOpen bool `json:"calendarOpen"`
|
||||||
|
NextOpeningAt string `json:"nextOpeningAt,omitempty"`
|
||||||
|
}
|
||||||
|
type PublicSupportStatusResponse struct {
|
||||||
|
Available bool `json:"available"`
|
||||||
|
Reason string `json:"reason"`
|
||||||
|
Timezone string `json:"timezone"`
|
||||||
|
NextOpeningAt string `json:"nextOpeningAt,omitempty"`
|
||||||
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified in AgentDeskNext: authenticated support availability and calendars.
|
||||||
package enums
|
package enums
|
||||||
|
|
||||||
type AgentRunResolutionStatus string
|
type AgentRunResolutionStatus string
|
||||||
@@ -33,16 +34,25 @@ type ServiceStatus int
|
|||||||
const (
|
const (
|
||||||
ServiceStatusIdle ServiceStatus = 0
|
ServiceStatusIdle ServiceStatus = 0
|
||||||
ServiceStatusBusy ServiceStatus = 1
|
ServiceStatusBusy ServiceStatus = 1
|
||||||
|
ServiceStatusBreak ServiceStatus = 2
|
||||||
|
ServiceStatusUnavailable ServiceStatus = 3
|
||||||
|
ServiceStatusVacation ServiceStatus = 4
|
||||||
)
|
)
|
||||||
|
|
||||||
var ServiceStatusValues = []ServiceStatus{
|
var ServiceStatusValues = []ServiceStatus{
|
||||||
ServiceStatusIdle,
|
ServiceStatusIdle,
|
||||||
ServiceStatusBusy,
|
ServiceStatusBusy,
|
||||||
|
ServiceStatusBreak,
|
||||||
|
ServiceStatusUnavailable,
|
||||||
|
ServiceStatusVacation,
|
||||||
}
|
}
|
||||||
|
|
||||||
var serviceStatusLabelMap = map[ServiceStatus]string{
|
var serviceStatusLabelMap = map[ServiceStatus]string{
|
||||||
ServiceStatusIdle: "空闲",
|
ServiceStatusIdle: "空闲",
|
||||||
ServiceStatusBusy: "忙碌",
|
ServiceStatusBusy: "忙碌",
|
||||||
|
ServiceStatusBreak: "休息",
|
||||||
|
ServiceStatusUnavailable: "不可用",
|
||||||
|
ServiceStatusVacation: "休假",
|
||||||
}
|
}
|
||||||
|
|
||||||
func IsValidServiceStatus(status ServiceStatus) bool {
|
func IsValidServiceStatus(status ServiceStatus) bool {
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified by the independent AgentDesk fork for support reliability and availability.
|
||||||
package eventbus
|
package eventbus
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -28,6 +29,7 @@ type Bus[T any] struct {
|
|||||||
|
|
||||||
// 用于限制 PublishAsync 的 goroutine 并发数；nil 表示不限制
|
// 用于限制 PublishAsync 的 goroutine 并发数；nil 表示不限制
|
||||||
asyncSem chan struct{}
|
asyncSem chan struct{}
|
||||||
|
asyncWG sync.WaitGroup
|
||||||
}
|
}
|
||||||
|
|
||||||
func New[T any](opts ...Option[T]) *Bus[T] {
|
func New[T any](opts ...Option[T]) *Bus[T] {
|
||||||
@@ -130,10 +132,21 @@ func (b *Bus[T]) Publish(ctx context.Context, event T) error {
|
|||||||
func (b *Bus[T]) PublishAsync(ctx context.Context, event T) {
|
func (b *Bus[T]) PublishAsync(ctx context.Context, event T) {
|
||||||
handlers := b.snapshotHandlers()
|
handlers := b.snapshotHandlers()
|
||||||
for _, h := range handlers {
|
for _, h := range handlers {
|
||||||
go b.callHandlerAsync(ctx, h, event)
|
b.asyncWG.Add(1)
|
||||||
|
go func() {
|
||||||
|
defer b.asyncWG.Done()
|
||||||
|
b.callHandlerAsync(ctx, h, event)
|
||||||
|
}()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Wait blocks until already-published asynchronous handlers and their error
|
||||||
|
// callbacks finish. Stop external publishers before calling Wait; a handler
|
||||||
|
// may still publish nested work while its own invocation is pending.
|
||||||
|
func (b *Bus[T]) Wait() {
|
||||||
|
b.asyncWG.Wait()
|
||||||
|
}
|
||||||
|
|
||||||
func (b *Bus[T]) HandlerCount() int {
|
func (b *Bus[T]) HandlerCount() int {
|
||||||
b.mu.RLock()
|
b.mu.RLock()
|
||||||
defer b.mu.RUnlock()
|
defer b.mu.RUnlock()
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified by the independent AgentDesk fork for support reliability and availability.
|
||||||
package eventbus
|
package eventbus
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -197,3 +198,21 @@ func TestPublishAsyncAllowsReentrantPublishWithConcurrencyLimit(t *testing.T) {
|
|||||||
t.Fatalf("expected reentrant async publish to complete")
|
t.Fatalf("expected reentrant async publish to complete")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestWaitJoinsNestedAsyncHandlersAndErrorCallbacks(t *testing.T) {
|
||||||
|
var handled atomic.Int64
|
||||||
|
bus := New[testEvent](WithAsyncConcurrency[testEvent](1), WithErrorHandler[testEvent](func(context.Context, error) {
|
||||||
|
handled.Add(1)
|
||||||
|
}))
|
||||||
|
bus.Subscribe(func(ctx context.Context, event testEvent) error {
|
||||||
|
if event.ID == 1 {
|
||||||
|
bus.PublishAsync(ctx, testEvent{ID: 2})
|
||||||
|
}
|
||||||
|
return errors.New("expected fixture error")
|
||||||
|
})
|
||||||
|
bus.PublishAsync(context.Background(), testEvent{ID: 1})
|
||||||
|
bus.Wait()
|
||||||
|
if handled.Load() != 2 {
|
||||||
|
t.Fatalf("Wait returned before nested work: %d error callbacks", handled.Load())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,6 +1,11 @@
|
|||||||
|
// Modified in the independent AgentDesk fork: localized knowledge workflows and safe display errors.
|
||||||
package i18nx
|
package i18nx
|
||||||
|
|
||||||
import "github.com/gin-gonic/gin"
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
)
|
||||||
|
|
||||||
const contextLocaleKey = "i18nx.locale"
|
const contextLocaleKey = "i18nx.locale"
|
||||||
|
|
||||||
@@ -25,3 +30,27 @@ func SetLocale(ctx *gin.Context, locale string) {
|
|||||||
}
|
}
|
||||||
ctx.Set(contextLocaleKey, NormalizeLocale(locale))
|
ctx.Set(contextLocaleKey, NormalizeLocale(locale))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// localeContextKey is deliberately distinct from Gin's string key.
|
||||||
|
type localeContextKey struct{}
|
||||||
|
|
||||||
|
// WithLocale carries an explicitly selected application locale without losing
|
||||||
|
// the parent's cancellation, deadline, or values. It does not detect a locale
|
||||||
|
// from HTTP headers or change the configured default locale.
|
||||||
|
func WithLocale(ctx context.Context, locale string) context.Context {
|
||||||
|
if ctx == nil {
|
||||||
|
ctx = context.Background()
|
||||||
|
}
|
||||||
|
return context.WithValue(ctx, localeContextKey{}, NormalizeLocale(locale))
|
||||||
|
}
|
||||||
|
|
||||||
|
// LocaleFromContext preserves the configured-default behavior of callers that
|
||||||
|
// do not provide an explicit locale (including background jobs).
|
||||||
|
func LocaleFromContext(ctx context.Context) string {
|
||||||
|
if ctx != nil {
|
||||||
|
if locale, ok := ctx.Value(localeContextKey{}).(string); ok {
|
||||||
|
return NormalizeLocale(locale)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return DefaultLocale
|
||||||
|
}
|
||||||
|
|||||||
45
internal/pkg/i18nx/context_test.go
Normal file
45
internal/pkg/i18nx/context_test.go
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
package i18nx
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestWithLocalePreservesContext(t *testing.T) {
|
||||||
|
type testKey struct{}
|
||||||
|
deadline := time.Now().Add(time.Minute)
|
||||||
|
parent, cancel := context.WithDeadline(context.WithValue(context.Background(), testKey{}, "request-value"), deadline)
|
||||||
|
defer cancel()
|
||||||
|
localized := WithLocale(parent, "ru")
|
||||||
|
if got := LocaleFromContext(localized); got != LocaleRuRU {
|
||||||
|
t.Fatalf("locale = %q", got)
|
||||||
|
}
|
||||||
|
if got := localized.Value(testKey{}); got != "request-value" {
|
||||||
|
t.Fatalf("parent value lost: %v", got)
|
||||||
|
}
|
||||||
|
if got, ok := localized.Deadline(); !ok || !got.Equal(deadline) {
|
||||||
|
t.Fatalf("deadline lost: %v, %v", got, ok)
|
||||||
|
}
|
||||||
|
cancel()
|
||||||
|
if !errors.Is(localized.Err(), context.Canceled) {
|
||||||
|
t.Fatalf("cancellation lost: %v", localized.Err())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLocaleFromContextDefaultsAndIsolation(t *testing.T) {
|
||||||
|
for _, ctx := range []context.Context{nil, context.Background(), context.WithValue(context.Background(), "i18nx.locale", LocaleZhCN)} {
|
||||||
|
if got := LocaleFromContext(ctx); got != DefaultLocale {
|
||||||
|
t.Fatalf("missing explicit locale = %q, want default %q", got, DefaultLocale)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
english := WithLocale(context.Background(), LocaleEnUS)
|
||||||
|
russian := WithLocale(english, LocaleRuRU)
|
||||||
|
if LocaleFromContext(english) != LocaleEnUS || LocaleFromContext(russian) != LocaleRuRU {
|
||||||
|
t.Fatal("child locale changed parent locale")
|
||||||
|
}
|
||||||
|
if got := LocaleFromContext(WithLocale(nil, "unsupported")); got != DefaultLocale {
|
||||||
|
t.Fatalf("invalid locale = %q", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
# Modified in the independent hardening fork; upstream notices retained.
|
||||||
error.e0001: "AI Agent not found"
|
error.e0001: "AI Agent not found"
|
||||||
error.e0002: "AI Agent not found."
|
error.e0002: "AI Agent not found."
|
||||||
error.e0003: "AI Agent not found or disabled."
|
error.e0003: "AI Agent not found or disabled."
|
||||||
@@ -567,3 +568,77 @@ tool.graph.prepareTicketDraft.param.expectedOutcome: "The user's expected outcom
|
|||||||
tool.graph.prepareTicketDraft.param.currentAttempt: "Current attempted troubleshooting steps. Optional."
|
tool.graph.prepareTicketDraft.param.currentAttempt: "Current attempted troubleshooting steps. Optional."
|
||||||
error.setup.invalidQuickFixAction: "Unsupported setup quick-fix action: %v"
|
error.setup.invalidQuickFixAction: "Unsupported setup quick-fix action: %v"
|
||||||
error.setup.authRequired: "Sign in to run setup diagnostics or quick fixes"
|
error.setup.authRequired: "Sign in to run setup diagnostics or quick fixes"
|
||||||
|
|
||||||
|
error.setup.previewRequired: "Review a setup preview and explicitly confirm its token before applying changes."
|
||||||
|
error.setup.previewChanged: "Configuration changed since the preview. Review a new preview before applying."
|
||||||
|
error.setup.targetRequired: "Select a specific existing record, or use its settings to choose the intended configuration."
|
||||||
|
error.setup.targetUnavailable: "The selected record is unavailable, deleted or ineligible. It was not restored."
|
||||||
|
error.setup.persistenceFailed: "Setup configuration could not be read or saved. No incomplete repair was committed."
|
||||||
|
error.setup.bypassUnsupported: "Bypassing AI is not supported by this diagnostic. Run a human-only route check or test AI separately."
|
||||||
|
error.channel.configChanged: "The channel configuration changed. Reload it and review your changes before saving again."
|
||||||
|
error.channel.configUpdateFailed: "The channel configuration could not be saved. Please try again."
|
||||||
|
|
||||||
|
# Knowledge-base display labels and safe application-owned messages.
|
||||||
|
knowledge.labels.unknown: "Unknown"
|
||||||
|
knowledge.labels.type.document: "Document knowledge base"
|
||||||
|
knowledge.labels.type.faq: "FAQ knowledge base"
|
||||||
|
knowledge.labels.status.0: "Enabled"
|
||||||
|
knowledge.labels.status.1: "Disabled"
|
||||||
|
knowledge.labels.status.2: "Deleted"
|
||||||
|
knowledge.labels.index.pending: "Pending"
|
||||||
|
knowledge.labels.index.indexed: "Indexed"
|
||||||
|
knowledge.labels.index.failed: "Index failed"
|
||||||
|
knowledge.labels.mode.1: "Strict mode"
|
||||||
|
knowledge.labels.mode.2: "Assist mode"
|
||||||
|
knowledge.labels.channel.im: "Conversations"
|
||||||
|
knowledge.labels.channel.agent_assist: "Agent assist"
|
||||||
|
knowledge.labels.channel.api: "API"
|
||||||
|
knowledge.labels.channel.debug: "Debug"
|
||||||
|
knowledge.labels.scene.first_response: "First response"
|
||||||
|
knowledge.labels.scene.assist: "Assisted reply"
|
||||||
|
knowledge.labels.scene.qa: "Q&A"
|
||||||
|
knowledge.labels.answer.1: "Answered"
|
||||||
|
knowledge.labels.answer.2: "No answer"
|
||||||
|
knowledge.labels.answer.3: "Fallback"
|
||||||
|
knowledge.labels.answer.4: "Blocked"
|
||||||
|
knowledge.labels.chunk.text: "Text"
|
||||||
|
knowledge.labels.chunk.faq: "Q&A"
|
||||||
|
knowledge.labels.chunk.table: "Table"
|
||||||
|
knowledge.labels.chunk.code: "Code"
|
||||||
|
error.knowledge.indexFailed: "Indexing failed. Check the indexing configuration and try again."
|
||||||
|
error.knowledge.retrieveFailed: "Knowledge retrieval failed. Check the retrieval configuration and try again."
|
||||||
|
error.knowledge.workflowReference: "This knowledge base is used by workflow “%s”. Remove it from the knowledge retrieval node first."
|
||||||
|
error.knowledge.workflowReferences: "This knowledge base is used by %d workflows. Remove it from their knowledge retrieval nodes first."
|
||||||
|
knowledge.rag.fallback.noAnswer: "The knowledge base currently has no clear information."
|
||||||
|
knowledge.rag.fallback.suggestRetry: "The knowledge base did not contain enough clear information. Try asking a more specific question."
|
||||||
|
knowledge.rag.system.assist: "You are a customer support knowledge base assistant. Prioritize the supplied knowledge excerpts. You may summarize them, but do not invent facts that were not provided. Respond in English."
|
||||||
|
knowledge.rag.system.strict: "You are a strict customer support knowledge base assistant. Answer only from the supplied knowledge excerpts. If they are insufficient, explicitly state that the knowledge base has no clear information. Respond in English."
|
||||||
|
knowledge.rag.userPrompt: "User question: %s\n\nReference material:\n%s"
|
||||||
|
|
||||||
|
knowledge.excel.question: "Primary question"
|
||||||
|
knowledge.excel.answer: "Answer"
|
||||||
|
knowledge.excel.similarQuestions: "Similar questions"
|
||||||
|
knowledge.excel.remark: "Notes"
|
||||||
|
knowledge.excel.exampleQuestion: "How do I reset my password?"
|
||||||
|
knowledge.excel.exampleAnswer: "Open your profile settings and select Reset password."
|
||||||
|
knowledge.excel.exampleSimilar: "I forgot my password\nWhere can I reset my password?"
|
||||||
|
knowledge.excel.exampleRemark: "Account"
|
||||||
|
knowledge.rag.context.faq: "[FAQ: %s]\n%s\n\n"
|
||||||
|
knowledge.rag.context.faqTitle: "FAQ#%d"
|
||||||
|
knowledge.rag.context.documentTitle: "Document#%d"
|
||||||
|
knowledge.rag.context.documentSection: "[Document: %s | Section: %s]\n%s\n\n"
|
||||||
|
knowledge.rag.context.documentHeading: "[Document: %s | Title: %s]\n%s\n\n"
|
||||||
|
knowledge.rag.context.document: "[Document: %s]\n%s\n\n"
|
||||||
|
knowledge.rag.faq.question: "Question: %s"
|
||||||
|
knowledge.rag.faq.similarQuestions: "Similar questions: %s"
|
||||||
|
knowledge.rag.faq.answer: "Answer: %s"
|
||||||
|
knowledge.rag.faq.separator: "; "
|
||||||
|
|
||||||
|
# Support availability validation.
|
||||||
|
error.supportAvailability.invalidCalendar: "Enter a valid timezone, weekly hours, and date exceptions."
|
||||||
|
error.supportAvailability.invalidAbsence: "Vacation requires a start and end with an explicit timezone; the end must be after the start."
|
||||||
|
error.supportAvailability.unavailable: "This operator is not currently eligible for new conversations. Refresh availability and try again."
|
||||||
|
error.supportAvailability.persistence: "Support availability could not be loaded or saved. Please try again."
|
||||||
|
error.supportAvailability.noProfile: "An enabled support operator profile is required."
|
||||||
|
error.supportAvailability.invalidStatus: "Choose a valid working availability status."
|
||||||
|
error.supportAvailability.invalidTime: "Enter a timestamp including its timezone offset."
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
# Modified in the independent hardening fork; upstream notices retained.
|
||||||
error.e0001: "ИИ-агент не найден"
|
error.e0001: "ИИ-агент не найден"
|
||||||
error.e0002: "ИИ-агент не найден."
|
error.e0002: "ИИ-агент не найден."
|
||||||
error.e0003: "ИИ-агент не найден или отключён."
|
error.e0003: "ИИ-агент не найден или отключён."
|
||||||
@@ -567,3 +568,76 @@ tool.graph.prepareTicketDraft.param.expectedOutcome: "Ожидаемый рез
|
|||||||
tool.graph.prepareTicketDraft.param.currentAttempt: "Предпринятые шаги по устранению. Необязательно."
|
tool.graph.prepareTicketDraft.param.currentAttempt: "Предпринятые шаги по устранению. Необязательно."
|
||||||
error.setup.invalidQuickFixAction: "Неподдерживаемое действие быстрой настройки: %v"
|
error.setup.invalidQuickFixAction: "Неподдерживаемое действие быстрой настройки: %v"
|
||||||
error.setup.authRequired: "Войдите в систему для запуска диагностики или быстрой настройки"
|
error.setup.authRequired: "Войдите в систему для запуска диагностики или быстрой настройки"
|
||||||
|
error.setup.previewRequired: "Перед применением изменений просмотрите план и явно подтвердите его токен."
|
||||||
|
error.setup.previewChanged: "После предварительного просмотра настройки изменились. Просмотрите новый план."
|
||||||
|
error.setup.targetRequired: "Выберите конкретную запись или задайте нужную конфигурацию в её настройках."
|
||||||
|
error.setup.targetUnavailable: "Выбранная запись недоступна, удалена или не подходит. Она не была восстановлена."
|
||||||
|
error.setup.persistenceFailed: "Не удалось прочитать или сохранить настройки. Неполное исправление не было сохранено."
|
||||||
|
error.setup.bypassUnsupported: "Эта диагностика не поддерживает обход ИИ. Проверьте маршрут только с оператором или протестируйте ИИ отдельно."
|
||||||
|
error.channel.configChanged: "Настройки канала изменились. Перезагрузите их и проверьте изменения перед повторным сохранением."
|
||||||
|
error.channel.configUpdateFailed: "Не удалось сохранить настройки канала. Попробуйте ещё раз."
|
||||||
|
|
||||||
|
# Knowledge-base display labels and safe application-owned messages.
|
||||||
|
knowledge.labels.unknown: "Неизвестно"
|
||||||
|
knowledge.labels.type.document: "База знаний документов"
|
||||||
|
knowledge.labels.type.faq: "База знаний FAQ"
|
||||||
|
knowledge.labels.status.0: "Включено"
|
||||||
|
knowledge.labels.status.1: "Отключено"
|
||||||
|
knowledge.labels.status.2: "Удалено"
|
||||||
|
knowledge.labels.index.pending: "Ожидает индексации"
|
||||||
|
knowledge.labels.index.indexed: "Проиндексировано"
|
||||||
|
knowledge.labels.index.failed: "Ошибка индексации"
|
||||||
|
knowledge.labels.mode.1: "Строгий режим"
|
||||||
|
knowledge.labels.mode.2: "Вспомогательный режим"
|
||||||
|
knowledge.labels.channel.im: "Диалоги"
|
||||||
|
knowledge.labels.channel.agent_assist: "Помощник оператора"
|
||||||
|
knowledge.labels.channel.api: "API"
|
||||||
|
knowledge.labels.channel.debug: "Отладка"
|
||||||
|
knowledge.labels.scene.first_response: "Первый ответ"
|
||||||
|
knowledge.labels.scene.assist: "Подсказка ответа"
|
||||||
|
knowledge.labels.scene.qa: "Вопросы и ответы"
|
||||||
|
knowledge.labels.answer.1: "Ответ получен"
|
||||||
|
knowledge.labels.answer.2: "Нет ответа"
|
||||||
|
knowledge.labels.answer.3: "Резервный ответ"
|
||||||
|
knowledge.labels.answer.4: "Заблокирован"
|
||||||
|
knowledge.labels.chunk.text: "Текст"
|
||||||
|
knowledge.labels.chunk.faq: "Вопросы и ответы"
|
||||||
|
knowledge.labels.chunk.table: "Таблица"
|
||||||
|
knowledge.labels.chunk.code: "Код"
|
||||||
|
error.knowledge.indexFailed: "Не удалось выполнить индексацию. Проверьте настройки индексации и повторите попытку."
|
||||||
|
error.knowledge.retrieveFailed: "Не удалось выполнить поиск по базе знаний. Проверьте настройки поиска и повторите попытку."
|
||||||
|
error.knowledge.workflowReference: "Эта база знаний используется в процессе «%s». Сначала удалите её из узла поиска по базе знаний."
|
||||||
|
error.knowledge.workflowReferences: "Эта база знаний используется в %d процессах. Сначала удалите её из узлов поиска по базе знаний."
|
||||||
|
knowledge.rag.fallback.noAnswer: "В базе знаний пока нет однозначной информации."
|
||||||
|
knowledge.rag.fallback.suggestRetry: "В базе знаний недостаточно однозначной информации. Попробуйте задать более конкретный вопрос."
|
||||||
|
knowledge.rag.system.assist: "Вы помощник службы поддержки по базе знаний. Отвечайте прежде всего на основе предоставленных фрагментов. Можно обобщать их, но нельзя придумывать отсутствующие факты. Отвечайте на русском языке."
|
||||||
|
knowledge.rag.system.strict: "Вы помощник службы поддержки, строго использующий базу знаний. Отвечайте только на основе предоставленных фрагментов. Если их недостаточно, прямо сообщите, что в базе знаний нет однозначной информации. Отвечайте на русском языке."
|
||||||
|
knowledge.rag.userPrompt: "Вопрос пользователя: %s\n\nСправочные материалы:\n%s"
|
||||||
|
|
||||||
|
knowledge.excel.question: "Основной вопрос"
|
||||||
|
knowledge.excel.answer: "Ответ"
|
||||||
|
knowledge.excel.similarQuestions: "Похожие вопросы"
|
||||||
|
knowledge.excel.remark: "Примечания"
|
||||||
|
knowledge.excel.exampleQuestion: "Как сбросить пароль?"
|
||||||
|
knowledge.excel.exampleAnswer: "Откройте настройки профиля и выберите «Сбросить пароль»."
|
||||||
|
knowledge.excel.exampleSimilar: "Я забыл пароль\nГде можно сбросить пароль?"
|
||||||
|
knowledge.excel.exampleRemark: "Учётная запись"
|
||||||
|
knowledge.rag.context.faq: "[FAQ: %s]\n%s\n\n"
|
||||||
|
knowledge.rag.context.faqTitle: "FAQ#%d"
|
||||||
|
knowledge.rag.context.documentTitle: "Документ №%d"
|
||||||
|
knowledge.rag.context.documentSection: "[Документ: %s | Раздел: %s]\n%s\n\n"
|
||||||
|
knowledge.rag.context.documentHeading: "[Документ: %s | Заголовок: %s]\n%s\n\n"
|
||||||
|
knowledge.rag.context.document: "[Документ: %s]\n%s\n\n"
|
||||||
|
knowledge.rag.faq.question: "Вопрос: %s"
|
||||||
|
knowledge.rag.faq.similarQuestions: "Похожие вопросы: %s"
|
||||||
|
knowledge.rag.faq.answer: "Ответ: %s"
|
||||||
|
knowledge.rag.faq.separator: "; "
|
||||||
|
|
||||||
|
# Support availability validation.
|
||||||
|
error.supportAvailability.invalidCalendar: "Укажите корректный часовой пояс, часы работы по дням недели и исключения по датам."
|
||||||
|
error.supportAvailability.invalidAbsence: "Для отпуска укажите начало и окончание с часовым поясом. Окончание должно быть позже начала."
|
||||||
|
error.supportAvailability.unavailable: "Этот оператор сейчас не может принимать новые обращения. Обновите данные о доступности и повторите попытку."
|
||||||
|
error.supportAvailability.persistence: "Не удалось загрузить или сохранить настройки доступности поддержки. Повторите попытку."
|
||||||
|
error.supportAvailability.noProfile: "Требуется активный профиль оператора поддержки."
|
||||||
|
error.supportAvailability.invalidStatus: "Выберите корректный рабочий статус доступности."
|
||||||
|
error.supportAvailability.invalidTime: "Укажите дату и время со смещением часового пояса."
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
# Modified in the independent hardening fork; upstream notices retained.
|
||||||
error.e0001: "AI Agent not found"
|
error.e0001: "AI Agent not found"
|
||||||
error.e0002: "AI Agent 不存在"
|
error.e0002: "AI Agent 不存在"
|
||||||
error.e0003: "AI Agent 不存在或已停用"
|
error.e0003: "AI Agent 不存在或已停用"
|
||||||
@@ -567,3 +568,77 @@ tool.graph.prepareTicketDraft.param.expectedOutcome: "用户期望的处理结
|
|||||||
tool.graph.prepareTicketDraft.param.currentAttempt: "当前已尝试过的处理步骤，可选。"
|
tool.graph.prepareTicketDraft.param.currentAttempt: "当前已尝试过的处理步骤，可选。"
|
||||||
error.setup.invalidQuickFixAction: "不支持的一键修复操作：%v"
|
error.setup.invalidQuickFixAction: "不支持的一键修复操作：%v"
|
||||||
error.setup.authRequired: "请先登录以执行配置诊断或一键修复"
|
error.setup.authRequired: "请先登录以执行配置诊断或一键修复"
|
||||||
|
|
||||||
|
error.setup.previewRequired: "应用更改前，请先预览设置并明确确认预览令牌。"
|
||||||
|
error.setup.previewChanged: "预览后配置已更改。请重新预览后再应用。"
|
||||||
|
error.setup.targetRequired: "请选择具体记录，或在对应设置中选择所需配置。"
|
||||||
|
error.setup.targetUnavailable: "所选记录不可用、已删除或不符合条件，未进行恢复。"
|
||||||
|
error.setup.persistenceFailed: "无法读取或保存设置配置，未提交不完整的修复。"
|
||||||
|
error.setup.bypassUnsupported: "此诊断不支持绕过 AI。请检查仅人工路由，或单独测试 AI。"
|
||||||
|
error.channel.configChanged: "渠道配置已更改。请重新加载并检查更改后再保存。"
|
||||||
|
error.channel.configUpdateFailed: "无法保存渠道配置，请重试。"
|
||||||
|
|
||||||
|
# Knowledge-base display labels and safe application-owned messages.
|
||||||
|
knowledge.labels.unknown: "未知"
|
||||||
|
knowledge.labels.type.document: "文档知识库"
|
||||||
|
knowledge.labels.type.faq: "FAQ知识库"
|
||||||
|
knowledge.labels.status.0: "启用"
|
||||||
|
knowledge.labels.status.1: "禁用"
|
||||||
|
knowledge.labels.status.2: "已删除"
|
||||||
|
knowledge.labels.index.pending: "待索引"
|
||||||
|
knowledge.labels.index.indexed: "已索引"
|
||||||
|
knowledge.labels.index.failed: "索引失败"
|
||||||
|
knowledge.labels.mode.1: "严格模式"
|
||||||
|
knowledge.labels.mode.2: "辅助模式"
|
||||||
|
knowledge.labels.channel.im: "客服会话"
|
||||||
|
knowledge.labels.channel.agent_assist: "客服助手"
|
||||||
|
knowledge.labels.channel.api: "API接口"
|
||||||
|
knowledge.labels.channel.debug: "调试"
|
||||||
|
knowledge.labels.scene.first_response: "首次回复"
|
||||||
|
knowledge.labels.scene.assist: "辅助回复"
|
||||||
|
knowledge.labels.scene.qa: "问答"
|
||||||
|
knowledge.labels.answer.1: "正常"
|
||||||
|
knowledge.labels.answer.2: "无答案"
|
||||||
|
knowledge.labels.answer.3: "兜底回复"
|
||||||
|
knowledge.labels.answer.4: "已屏蔽"
|
||||||
|
knowledge.labels.chunk.text: "文本"
|
||||||
|
knowledge.labels.chunk.faq: "问答"
|
||||||
|
knowledge.labels.chunk.table: "表格"
|
||||||
|
knowledge.labels.chunk.code: "代码"
|
||||||
|
error.knowledge.indexFailed: "索引失败。请检查索引配置后重试。"
|
||||||
|
error.knowledge.retrieveFailed: "知识检索失败。请检查检索配置后重试。"
|
||||||
|
error.knowledge.workflowReference: "知识库正在被流程「%s」使用，请先从知识检索节点中移除"
|
||||||
|
error.knowledge.workflowReferences: "知识库正在被 %d 个流程使用，请先从知识检索节点中移除"
|
||||||
|
knowledge.rag.fallback.noAnswer: "当前知识库暂无明确信息。"
|
||||||
|
knowledge.rag.fallback.suggestRetry: "当前知识库里没有找到足够明确的信息，你可以换个更具体的问法再试一次。"
|
||||||
|
knowledge.rag.system.assist: "你是客服知识库助手。请优先依据提供的知识片段回答，可以做轻度归纳，但不要编造未提供的事实。请使用中文回答。"
|
||||||
|
knowledge.rag.system.strict: "你是严格的客服知识库助手。只能依据提供的知识片段回答；如果资料不足，请明确说明知识库暂无明确信息。请使用中文回答。"
|
||||||
|
knowledge.rag.userPrompt: "用户问题：%s\n\n参考资料：\n%s"
|
||||||
|
|
||||||
|
knowledge.excel.question: "标准问题"
|
||||||
|
knowledge.excel.answer: "答案"
|
||||||
|
knowledge.excel.similarQuestions: "相似问"
|
||||||
|
knowledge.excel.remark: "备注"
|
||||||
|
knowledge.excel.exampleQuestion: "如何重置密码？"
|
||||||
|
knowledge.excel.exampleAnswer: "进入个人设置后点击重置密码。"
|
||||||
|
knowledge.excel.exampleSimilar: "忘记密码怎么办\n重置密码在哪里"
|
||||||
|
knowledge.excel.exampleRemark: "账号"
|
||||||
|
knowledge.rag.context.faq: "【FAQ：%s】\n%s\n\n"
|
||||||
|
knowledge.rag.context.faqTitle: "FAQ#%d"
|
||||||
|
knowledge.rag.context.documentTitle: "文档#%d"
|
||||||
|
knowledge.rag.context.documentSection: "【文档：%s｜章节：%s】\n%s\n\n"
|
||||||
|
knowledge.rag.context.documentHeading: "【文档：%s｜标题：%s】\n%s\n\n"
|
||||||
|
knowledge.rag.context.document: "【文档：%s】\n%s\n\n"
|
||||||
|
knowledge.rag.faq.question: "问题：%s"
|
||||||
|
knowledge.rag.faq.similarQuestions: "相似问：%s"
|
||||||
|
knowledge.rag.faq.answer: "回答：%s"
|
||||||
|
knowledge.rag.faq.separator: "；"
|
||||||
|
|
||||||
|
# Support availability validation.
|
||||||
|
error.supportAvailability.invalidCalendar: "请输入有效的时区、每周工作时间和特殊日期规则。"
|
||||||
|
error.supportAvailability.invalidAbsence: "休假需要包含明确时区的开始和结束时间，结束时间必须晚于开始时间。"
|
||||||
|
error.supportAvailability.unavailable: "该客服当前无法接收新会话。请刷新可用状态后重试。"
|
||||||
|
error.supportAvailability.persistence: "无法加载或保存客服可用状态。请重试。"
|
||||||
|
error.supportAvailability.noProfile: "需要已启用的客服资料。"
|
||||||
|
error.supportAvailability.invalidStatus: "请选择有效的工作状态。"
|
||||||
|
error.supportAvailability.invalidTime: "请输入包含时区偏移的日期和时间。"
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
// Modified in the independent hardening fork; see docs/hardening.
|
||||||
|
|
||||||
package openidentity
|
package openidentity
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -269,3 +271,33 @@ func flipLastChar(signature string) string {
|
|||||||
func itoa(value int64) string {
|
func itoa(value int64) string {
|
||||||
return strconv.FormatInt(value, 10)
|
return strconv.FormatInt(value, 10)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestRequireSignedIdentityRejectsUnsignedAndInvalidSignatures(t *testing.T) {
|
||||||
|
for _, signature := range []string{"", "invalid"} {
|
||||||
|
ctx, _ := newIdentityContext(map[string]string{"X-External-Id": testUserID, "X-External-Id-Signature": signature})
|
||||||
|
if _, err := GetExternalUser(ctx, Secrets{ChannelID: testChannelID, IdentityHMAC: testSecret, RequireSignedIdentity: true}); err == nil {
|
||||||
|
t.Fatal("signed-only policy accepted an unsigned or invalid identity")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ctx, _ := newIdentityContext(signedIdentityHeaders(testSecret, testChannelID, testUserID, time.Now()))
|
||||||
|
user, err := GetExternalUser(ctx, Secrets{ChannelID: testChannelID, IdentityHMAC: testSecret, RequireSignedIdentity: true})
|
||||||
|
if err != nil || user.IdentityScope != IdentityScope(testChannelID, "hmac") {
|
||||||
|
t.Fatal("valid signed identity did not retain its HMAC scope")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIdentityScopeSeparatesIssuersAndChannels(t *testing.T) {
|
||||||
|
seen := map[string]bool{}
|
||||||
|
for _, channel := range []string{"channel-one", "channel-two"} {
|
||||||
|
for _, issuer := range []string{"guest", "hmac", "jwt"} {
|
||||||
|
scope := IdentityScope(channel, issuer)
|
||||||
|
if scope == "" || seen[scope] {
|
||||||
|
t.Fatal("identity scopes collided")
|
||||||
|
}
|
||||||
|
seen[scope] = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if IdentityScope("", "hmac") != "" || IdentityScope("channel", "unknown") != "" {
|
||||||
|
t.Fatal("invalid scope inputs accepted")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
// Modified in the independent hardening fork; see docs/hardening.
|
||||||
|
|
||||||
package openidentity
|
package openidentity
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -24,6 +26,9 @@ type ExternalUser struct {
|
|||||||
ExternalSource enums.ExternalSource `json:"externalSource"`
|
ExternalSource enums.ExternalSource `json:"externalSource"`
|
||||||
ExternalID string `json:"externalId"`
|
ExternalID string `json:"externalId"`
|
||||||
ExternalName string `json:"externalName"`
|
ExternalName string `json:"externalName"`
|
||||||
|
// IdentityScope and ChannelID are server-established authorization context, never request fields.
|
||||||
|
IdentityScope string `json:"-"`
|
||||||
|
ChannelID int64 `json:"-"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type UserTokenClaims struct {
|
type UserTokenClaims struct {
|
||||||
@@ -47,6 +52,7 @@ type Secrets struct {
|
|||||||
// ChannelID is bound into the signed payload so a signature obtained for one
|
// ChannelID is bound into the signed payload so a signature obtained for one
|
||||||
// channel cannot be replayed on another.
|
// channel cannot be replayed on another.
|
||||||
ChannelID string
|
ChannelID string
|
||||||
|
RequireSignedIdentity bool
|
||||||
}
|
}
|
||||||
|
|
||||||
// DefaultIdentityMaxAge is how long a signed visitor identity stays acceptable
|
// DefaultIdentityMaxAge is how long a signed visitor identity stays acceptable
|
||||||
@@ -65,9 +71,8 @@ const identityFutureSkewTolerance = 5 * time.Minute
|
|||||||
//
|
//
|
||||||
// issuedAt is unix seconds. Lower-case hex output. Three details are deliberate:
|
// issuedAt is unix seconds. Lower-case hex output. Three details are deliberate:
|
||||||
//
|
//
|
||||||
// - The channel id is included because CustomerIdentity is keyed by
|
// - The channel id is included so signatures cannot be replayed on a
|
||||||
// (source, externalId) globally, so without it a signature minted for one
|
// different channel, even when a deployment shares an HMAC signing key.
|
||||||
// channel would assert the same identity on every other channel.
|
|
||||||
// - The timestamp is inside the signed bytes even though it also travels as its
|
// - The timestamp is inside the signed bytes even though it also travels as its
|
||||||
// own field, so it cannot be re-dated without breaking the signature. This
|
// own field, so it cannot be re-dated without breaking the signature. This
|
||||||
// bounds how long a leaked pair stays usable; it is not a defence against key
|
// bounds how long a leaked pair stays usable; it is not a defence against key
|
||||||
@@ -126,6 +131,7 @@ func GetExternalUser(ctx *gin.Context, secrets Secrets) (*ExternalUser, error) {
|
|||||||
ExternalSource: enums.ExternalSourceUser,
|
ExternalSource: enums.ExternalSourceUser,
|
||||||
ExternalID: claims.UserID,
|
ExternalID: claims.UserID,
|
||||||
ExternalName: claims.Name,
|
ExternalName: claims.Name,
|
||||||
|
IdentityScope: IdentityScope(secrets.ChannelID, "jwt"),
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
return getExternalIDUser(ctx, secrets)
|
return getExternalIDUser(ctx, secrets)
|
||||||
@@ -201,13 +207,18 @@ func getExternalIDUser(ctx *gin.Context, secrets Secrets) (*ExternalUser, error)
|
|||||||
ExternalSource: enums.ExternalSourceUser,
|
ExternalSource: enums.ExternalSourceUser,
|
||||||
ExternalID: externalID,
|
ExternalID: externalID,
|
||||||
ExternalName: externalName,
|
ExternalName: externalName,
|
||||||
|
IdentityScope: IdentityScope(secrets.ChannelID, "hmac"),
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if secrets.RequireSignedIdentity {
|
||||||
|
return nil, errorsx.UnauthorizedI18n("error.e0161")
|
||||||
|
}
|
||||||
return &ExternalUser{
|
return &ExternalUser{
|
||||||
ExternalSource: enums.ExternalSourceGuest,
|
ExternalSource: enums.ExternalSourceGuest,
|
||||||
ExternalID: externalID,
|
ExternalID: externalID,
|
||||||
ExternalName: externalName,
|
ExternalName: externalName,
|
||||||
|
IdentityScope: IdentityScope(secrets.ChannelID, "guest"),
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -267,3 +278,30 @@ func decodeExternalDisplayName(s string) string {
|
|||||||
}
|
}
|
||||||
return strings.TrimSpace(dec)
|
return strings.TrimSpace(dec)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// IdentityScope separates independent identity issuers, trust levels and channels.
|
||||||
|
// It deliberately does not depend on a secret so ordinary key rotation preserves
|
||||||
|
// the issuer's history. Reassigning a channel to a different issuer requires a new
|
||||||
|
// channel, not silently reusing that issuer's namespace.
|
||||||
|
func IdentityScope(channelCode, issuer string) string {
|
||||||
|
if strings.TrimSpace(channelCode) == "" {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
switch issuer {
|
||||||
|
case "jwt", "hmac", "guest":
|
||||||
|
default:
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
digest := sha256.Sum256([]byte(strings.TrimSpace(channelCode)))
|
||||||
|
return "v1:" + issuer + ":" + hex.EncodeToString(digest[:])
|
||||||
|
}
|
||||||
|
|
||||||
|
func ValidIdentityScope(channelCode string, external ExternalUser) bool {
|
||||||
|
if external.ExternalSource == enums.ExternalSourceGuest {
|
||||||
|
return external.IdentityScope != "" && external.IdentityScope == IdentityScope(channelCode, "guest")
|
||||||
|
}
|
||||||
|
if external.ExternalSource == enums.ExternalSourceUser {
|
||||||
|
return external.IdentityScope != "" && (external.IdentityScope == IdentityScope(channelCode, "jwt") || external.IdentityScope == IdentityScope(channelCode, "hmac"))
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|||||||
68
internal/repositories/auth_scope_repository.go
Normal file
68
internal/repositories/auth_scope_repository.go
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
package repositories
|
||||||
|
|
||||||
|
import (
|
||||||
|
"agent-desk/internal/models"
|
||||||
|
"agent-desk/internal/pkg/enums"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"gorm.io/gorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
// These handwritten queries supplement the generated CRUD repositories.
|
||||||
|
func (r *roleRepository) FindEnabledByUser(db *gorm.DB, userID int64) ([]models.Role, error) {
|
||||||
|
roles := make([]models.Role, 0)
|
||||||
|
err := db.Table("t_role AS r").
|
||||||
|
Select("r.*").
|
||||||
|
Joins("JOIN t_user_role AS ur ON ur.role_id = r.id").
|
||||||
|
Where("ur.user_id = ? AND r.status = ?", userID, enums.StatusOk).
|
||||||
|
Order("r.sort_no ASC, r.id ASC").
|
||||||
|
Scan(&roles).Error
|
||||||
|
return roles, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *permissionRepository) FindEnabledCodesByUserRoles(db *gorm.DB, userID int64) ([]string, error) {
|
||||||
|
codes := make([]string, 0)
|
||||||
|
err := db.Table("t_permission AS p").
|
||||||
|
Joins("JOIN t_role_permission AS rp ON rp.permission_id = p.id").
|
||||||
|
Joins("JOIN t_role AS r ON r.id = rp.role_id").
|
||||||
|
Joins("JOIN t_user_role AS ur ON ur.role_id = r.id").
|
||||||
|
Where("ur.user_id = ? AND r.status = ? AND p.status = ?", userID, enums.StatusOk, enums.StatusOk).
|
||||||
|
Distinct().Pluck("p.code", &codes).Error
|
||||||
|
return codes, err
|
||||||
|
}
|
||||||
|
|
||||||
|
type UserPermissionOverride struct {
|
||||||
|
Code string
|
||||||
|
Effect int
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *userPermissionRepository) FindActiveEnabledOverrides(db *gorm.DB, userID int64, now time.Time) ([]UserPermissionOverride, error) {
|
||||||
|
overrides := make([]UserPermissionOverride, 0)
|
||||||
|
err := db.Table("t_user_permission AS up").
|
||||||
|
Select("p.code, up.effect").
|
||||||
|
Joins("JOIN t_permission AS p ON p.id = up.permission_id").
|
||||||
|
Where("up.user_id = ? AND p.status = ?", userID, enums.StatusOk).
|
||||||
|
Where("up.expired_at IS NULL OR up.expired_at > ?", now).
|
||||||
|
Scan(&overrides).Error
|
||||||
|
return overrides, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetAuthState deliberately excludes the bearer token; revalidation only needs
|
||||||
|
// the identity binding, revocation status, and absolute expiry.
|
||||||
|
func (r *loginSessionRepository) GetAuthState(db *gorm.DB, sessionID, userID int64) (*models.LoginSession, error) {
|
||||||
|
session := &models.LoginSession{}
|
||||||
|
if err := db.Select("id", "user_id", "expired_at", "revoked_at").
|
||||||
|
Take(session, "id = ? AND user_id = ?", sessionID, userID).Error; err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return session, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *userRepository) GetAuthState(db *gorm.DB, userID int64) (*models.User, error) {
|
||||||
|
user := &models.User{}
|
||||||
|
if err := db.Select("id", "username", "nickname", "avatar", "user_type", "status", "deleted_at").
|
||||||
|
Take(user, "id = ?", userID).Error; err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return user, nil
|
||||||
|
}
|
||||||
22
internal/repositories/channel_config_repository.go
Normal file
22
internal/repositories/channel_config_repository.go
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
package repositories
|
||||||
|
|
||||||
|
import (
|
||||||
|
"agent-desk/internal/models"
|
||||||
|
"agent-desk/internal/pkg/enums"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
// UpdatesConfigIfUnchanged prevents a stale read/modify/write from replacing a
|
||||||
|
// concurrently tightened authentication policy or rotated channel secret. HEX is
|
||||||
|
// available in SQLite and MySQL and compares exact bytes even when MySQL's text
|
||||||
|
// column uses a case-insensitive or trailing-space-insensitive collation.
|
||||||
|
func (r *channelRepository) UpdatesConfigIfUnchanged(db *gorm.DB, expected *models.Channel, columns map[string]any) (bool, error) {
|
||||||
|
if expected == nil || expected.ID <= 0 {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
result := db.Model(&models.Channel{}).
|
||||||
|
Where("id = ? AND status <> ? AND updated_at = ?", expected.ID, enums.StatusDeleted, expected.UpdatedAt).
|
||||||
|
Where("HEX(COALESCE(config_json, '')) = HEX(?)", expected.ConfigJSON).
|
||||||
|
Updates(columns)
|
||||||
|
return result.RowsAffected == 1, result.Error
|
||||||
|
}
|
||||||
17
internal/repositories/conversation_dispatch_queries.go
Normal file
17
internal/repositories/conversation_dispatch_queries.go
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
package repositories
|
||||||
|
|
||||||
|
import (
|
||||||
|
"agent-desk/internal/models"
|
||||||
|
"agent-desk/internal/pkg/enums"
|
||||||
|
|
||||||
|
"gorm.io/gorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
// FindPendingDispatchBatch returns a bounded, checked page. A failed read must
|
||||||
|
// not be mistaken for an empty queue by setup or the periodic dispatcher.
|
||||||
|
func (r *conversationRepository) FindPendingDispatchBatch(db *gorm.DB, limit int) ([]models.Conversation, error) {
|
||||||
|
conversations := make([]models.Conversation, 0)
|
||||||
|
err := db.Where("status = ? AND current_assignee_id = ?", enums.IMConversationStatusPending, 0).
|
||||||
|
Order("id DESC").Limit(limit).Find(&conversations).Error
|
||||||
|
return conversations, err
|
||||||
|
}
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
|
// Modified in the independent hardening fork; see docs/hardening.
|
||||||
|
|
||||||
package repositories
|
package repositories
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -6,7 +8,6 @@ import (
|
|||||||
|
|
||||||
"agent-desk/internal/pkg/httpx/params"
|
"agent-desk/internal/pkg/httpx/params"
|
||||||
|
|
||||||
"github.com/mlogclub/simple/common/strs"
|
|
||||||
"github.com/mlogclub/simple/sqls"
|
"github.com/mlogclub/simple/sqls"
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
)
|
)
|
||||||
@@ -36,14 +37,13 @@ func (r *customerIdentityRepository) Take(db *gorm.DB, where ...interface{}) *mo
|
|||||||
return ret
|
return ret
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetBy 按外部来源 + 外部用户标识查询身份映射（与 uk_customer_external 一致）。
|
// GetBy is the legacy/internal-integration lookup. Ambiguous mappings fail closed.
|
||||||
func (r *customerIdentityRepository) GetBy(db *gorm.DB, externalSource enums.ExternalSource, externalID string) *models.CustomerIdentity {
|
func (r *customerIdentityRepository) GetBy(db *gorm.DB, externalSource enums.ExternalSource, externalID string) *models.CustomerIdentity {
|
||||||
if strs.IsAnyBlank(string(externalSource), externalID) {
|
identity, err := r.GetUniqueBy(db, "", externalSource, externalID)
|
||||||
|
if err != nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return r.FindOne(db, sqls.NewCnd().
|
return identity
|
||||||
Eq("external_source", externalSource).
|
|
||||||
Eq("external_id", externalID))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *customerIdentityRepository) FindByCustomerID(db *gorm.DB, customerID int64) []models.CustomerIdentity {
|
func (r *customerIdentityRepository) FindByCustomerID(db *gorm.DB, customerID int64) []models.CustomerIdentity {
|
||||||
|
|||||||
63
internal/repositories/customer_identity_scope.go
Normal file
63
internal/repositories/customer_identity_scope.go
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
package repositories
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/sha256"
|
||||||
|
"encoding/hex"
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"agent-desk/internal/models"
|
||||||
|
"agent-desk/internal/pkg/enums"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ErrAmbiguousCustomerIdentity requires deliberate operator reconciliation. Never
|
||||||
|
// choose the first row: the historical unique index also includes customer_id.
|
||||||
|
var ErrAmbiguousCustomerIdentity = errors.New("ambiguous customer identity")
|
||||||
|
|
||||||
|
// GetUniqueBy includes disabled rows when detecting conflicts. A disabled mapping
|
||||||
|
// must not let a caller create a replacement customer and reacquire the identity.
|
||||||
|
func (r *customerIdentityRepository) GetUniqueBy(db *gorm.DB, scope string, source enums.ExternalSource, externalID string) (*models.CustomerIdentity, error) {
|
||||||
|
if strings.TrimSpace(string(source)) == "" || strings.TrimSpace(externalID) == "" {
|
||||||
|
return nil, errors.New("invalid customer identity")
|
||||||
|
}
|
||||||
|
var identities []models.CustomerIdentity
|
||||||
|
query := db.Where("identity_scope = ? AND external_source = ? AND external_id = ?", scope, source, strings.TrimSpace(externalID))
|
||||||
|
if key := ScopedCustomerIdentityKey(scope, source, externalID); key != nil {
|
||||||
|
// Digest comparison is independent of MySQL's external_id collation. The
|
||||||
|
// NULL branch also detects manually migrated/inconsistent scoped mappings.
|
||||||
|
query = db.Where("scoped_key = ? OR (scoped_key IS NULL AND identity_scope = ? AND external_source = ? AND external_id = ?)", *key, scope, source, strings.TrimSpace(externalID))
|
||||||
|
}
|
||||||
|
err := query.Limit(2).Find(&identities).Error
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if len(identities) > 1 {
|
||||||
|
return nil, ErrAmbiguousCustomerIdentity
|
||||||
|
}
|
||||||
|
if len(identities) == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
if identities[0].IdentityScope != scope || identities[0].ExternalSource != source || identities[0].ExternalID != strings.TrimSpace(externalID) {
|
||||||
|
return nil, ErrAmbiguousCustomerIdentity
|
||||||
|
}
|
||||||
|
if identities[0].Status != enums.StatusOk {
|
||||||
|
return nil, errors.New("inactive customer identity")
|
||||||
|
}
|
||||||
|
return &identities[0], nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// ScopedCustomerIdentityKey gives new scoped registrations a database-enforced
|
||||||
|
// claim without imposing a new unique constraint on dirty legacy data. Both
|
||||||
|
// SQLite and MySQL permit multiple NULL values in a unique index. Encoding an
|
||||||
|
// array avoids delimiter collisions and hashing avoids collation ambiguity.
|
||||||
|
func ScopedCustomerIdentityKey(scope string, source enums.ExternalSource, externalID string) *string {
|
||||||
|
if scope == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
encoded, _ := json.Marshal([]string{scope, string(source), strings.TrimSpace(externalID)})
|
||||||
|
digest := sha256.Sum256(encoded)
|
||||||
|
key := hex.EncodeToString(digest[:])
|
||||||
|
return &key
|
||||||
|
}
|
||||||
153
internal/repositories/support_availability_repository.go
Normal file
153
internal/repositories/support_availability_repository.go
Normal file
@@ -0,0 +1,153 @@
|
|||||||
|
package repositories
|
||||||
|
|
||||||
|
import (
|
||||||
|
"agent-desk/internal/models"
|
||||||
|
"agent-desk/internal/pkg/enums"
|
||||||
|
"errors"
|
||||||
|
"github.com/mlogclub/simple/sqls"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
"gorm.io/gorm/clause"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
var SupportAvailabilityRepository = &supportAvailabilityRepository{}
|
||||||
|
|
||||||
|
type supportAvailabilityRepository struct{}
|
||||||
|
|
||||||
|
func (r *supportAvailabilityRepository) Calendar(db *gorm.DB, teamID int64) (*models.SupportCalendar, error) {
|
||||||
|
var item models.SupportCalendar
|
||||||
|
err := db.Where("team_id = ?", teamID).Take(&item).Error
|
||||||
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
return &item, err
|
||||||
|
}
|
||||||
|
func (r *supportAvailabilityRepository) SaveCalendar(db *gorm.DB, item *models.SupportCalendar) error {
|
||||||
|
return db.Clauses(clause.OnConflict{Columns: []clause.Column{{Name: "team_id"}}, DoUpdates: clause.AssignmentColumns([]string{"mode", "timezone", "weekly_json", "exceptions_json", "updated_at"})}).Create(item).Error
|
||||||
|
}
|
||||||
|
func (r *supportAvailabilityRepository) RenewPresence(db *gorm.DB, item *models.AgentPresenceLease) error {
|
||||||
|
return db.Clauses(clause.OnConflict{Columns: []clause.Column{{Name: "id"}}, DoUpdates: clause.AssignmentColumns([]string{"expires_at"})}).Create(item).Error
|
||||||
|
}
|
||||||
|
func (r *supportAvailabilityRepository) EndPresence(db *gorm.DB, id string, at time.Time) error {
|
||||||
|
return db.Model(&models.AgentPresenceLease{}).Where("id = ? AND expires_at > ?", id, at).Update("expires_at", at).Error
|
||||||
|
}
|
||||||
|
func (r *supportAvailabilityRepository) PrunePresence(db *gorm.DB, now time.Time) error {
|
||||||
|
return db.Where("expires_at <= ?", now).Delete(&models.AgentPresenceLease{}).Error
|
||||||
|
}
|
||||||
|
func (r *supportAvailabilityRepository) OnlineUsers(db *gorm.DB, userIDs []int64, now time.Time) (map[int64]bool, error) {
|
||||||
|
result := map[int64]bool{}
|
||||||
|
if len(userIDs) == 0 {
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
var leases []models.AgentPresenceLease
|
||||||
|
if err := db.Where("user_id IN ? AND expires_at > ?", userIDs, now).Find(&leases).Error; err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
sessionIDs := make([]int64, 0, len(leases))
|
||||||
|
for _, lease := range leases {
|
||||||
|
sessionIDs = append(sessionIDs, lease.LoginSessionID)
|
||||||
|
}
|
||||||
|
if len(sessionIDs) == 0 {
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
var sessions []models.LoginSession
|
||||||
|
if err := db.Select("id", "user_id", "expired_at", "revoked_at").Where("id IN ? AND expired_at > ? AND revoked_at IS NULL", sessionIDs, now).Find(&sessions).Error; err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
valid := map[int64]int64{}
|
||||||
|
for _, session := range sessions {
|
||||||
|
valid[session.ID] = session.UserID
|
||||||
|
}
|
||||||
|
for _, lease := range leases {
|
||||||
|
if valid[lease.LoginSessionID] == lease.UserID {
|
||||||
|
result[lease.UserID] = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// A portable write acquires the profile row's write lock on MySQL and the
|
||||||
|
// transaction write lock on SQLite. All assignment paths take this before count.
|
||||||
|
func (r *supportAvailabilityRepository) LockProfile(db *gorm.DB, userID int64) (*models.AgentProfile, error) {
|
||||||
|
result := db.Model(&models.AgentProfile{}).Where("user_id = ?", userID).UpdateColumn("assignment_version", gorm.Expr("assignment_version + 1"))
|
||||||
|
if result.Error != nil {
|
||||||
|
return nil, result.Error
|
||||||
|
}
|
||||||
|
if result.RowsAffected == 0 {
|
||||||
|
return nil, gorm.ErrRecordNotFound
|
||||||
|
}
|
||||||
|
var item models.AgentProfile
|
||||||
|
err := db.Where("user_id = ?", userID).Take(&item).Error
|
||||||
|
return &item, err
|
||||||
|
}
|
||||||
|
func (r *supportAvailabilityRepository) ActiveCount(db *gorm.DB, userID, excludeConversationID int64) (int, error) {
|
||||||
|
var count int64
|
||||||
|
q := db.Model(&models.Conversation{}).Where("current_assignee_id = ? AND status = ?", userID, enums.IMConversationStatusActive)
|
||||||
|
if excludeConversationID > 0 {
|
||||||
|
q = q.Where("id <> ?", excludeConversationID)
|
||||||
|
}
|
||||||
|
err := q.Count(&count).Error
|
||||||
|
return int(count), err
|
||||||
|
}
|
||||||
|
func (r *supportAvailabilityRepository) LegacySchedules(db *gorm.DB, teamID int64, now time.Time) ([]models.AgentTeamSchedule, error) {
|
||||||
|
var items []models.AgentTeamSchedule
|
||||||
|
err := db.Where("team_id = ? AND status = ? AND end_at > ?", teamID, enums.StatusOk, now).Order("start_at ASC").Find(&items).Error
|
||||||
|
return items, err
|
||||||
|
}
|
||||||
|
func (r *supportAvailabilityRepository) Profiles(db *gorm.DB, teamIDs []int64) ([]models.AgentProfile, error) {
|
||||||
|
var items []models.AgentProfile
|
||||||
|
q := db.Where("status <> ?", enums.StatusDeleted)
|
||||||
|
if teamIDs != nil {
|
||||||
|
if len(teamIDs) == 0 {
|
||||||
|
return []models.AgentProfile{}, nil
|
||||||
|
}
|
||||||
|
q = q.Where("team_id IN ?", teamIDs)
|
||||||
|
}
|
||||||
|
err := q.Order("id ASC").Find(&items).Error
|
||||||
|
return items, err
|
||||||
|
}
|
||||||
|
func (r *supportAvailabilityRepository) User(db *gorm.DB, id int64) (*models.User, error) {
|
||||||
|
var item models.User
|
||||||
|
err := db.First(&item, id).Error
|
||||||
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
return &item, err
|
||||||
|
}
|
||||||
|
func (r *supportAvailabilityRepository) Team(db *gorm.DB, id int64) (*models.AgentTeam, error) {
|
||||||
|
var item models.AgentTeam
|
||||||
|
err := db.First(&item, id).Error
|
||||||
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
return &item, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *supportAvailabilityRepository) AssignConversation(db *gorm.DB, previous *models.Conversation, values map[string]any) error {
|
||||||
|
result := db.Model(&models.Conversation{}).Where("id = ? AND status = ? AND current_assignee_id = ?", previous.ID, previous.Status, previous.CurrentAssigneeID).Updates(values)
|
||||||
|
if result.Error != nil {
|
||||||
|
return result.Error
|
||||||
|
}
|
||||||
|
if result.RowsAffected != 1 {
|
||||||
|
return gorm.ErrInvalidTransaction
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *supportAvailabilityRepository) ProfileByUser(db *gorm.DB, userID int64) (*models.AgentProfile, error) {
|
||||||
|
var item models.AgentProfile
|
||||||
|
err := db.Where("user_id = ?", userID).Take(&item).Error
|
||||||
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
return &item, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// EffectiveStatusCondition mirrors the vacation-boundary policy for paginated
|
||||||
|
// list filters. Filtering the stored Vacation value would contradict the badge.
|
||||||
|
func (r *supportAvailabilityRepository) EffectiveStatusCondition(cnd *sqls.Cnd, status enums.ServiceStatus, now time.Time) {
|
||||||
|
cnd.Where(`(CASE WHEN service_status <> ? THEN service_status
|
||||||
|
WHEN absence_start_at IS NOT NULL AND absence_end_at IS NOT NULL AND absence_start_at <= ? AND absence_end_at > ? THEN ?
|
||||||
|
WHEN availability_return_status >= ? AND availability_return_status <= ? THEN availability_return_status
|
||||||
|
ELSE ? END) = ?`, enums.ServiceStatusVacation, now, now, enums.ServiceStatusVacation, enums.ServiceStatusIdle, enums.ServiceStatusUnavailable, enums.ServiceStatusUnavailable, status)
|
||||||
|
}
|
||||||
77
internal/services/agent_presence_service.go
Normal file
77
internal/services/agent_presence_service.go
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
package services
|
||||||
|
|
||||||
|
import (
|
||||||
|
"agent-desk/internal/models"
|
||||||
|
"agent-desk/internal/pkg/constants"
|
||||||
|
"agent-desk/internal/pkg/enums"
|
||||||
|
"agent-desk/internal/repositories"
|
||||||
|
"github.com/mlogclub/simple/sqls"
|
||||||
|
"log/slog"
|
||||||
|
"slices"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
const agentPresenceLeaseTTL = 90 * time.Second
|
||||||
|
const agentPresenceDisconnectGrace = 15 * time.Second
|
||||||
|
const agentPresenceRenewInterval = 15 * time.Second
|
||||||
|
|
||||||
|
func (s *wsService) renewAgentPresence(session *ClientSession) {
|
||||||
|
if session == nil || session.Closed.Load() || session.Principal == nil || (session.Role != realtimeRoleAdmin && session.Role != realtimeRoleNotification) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
session.presenceMu.Lock()
|
||||||
|
dispatchPending := false
|
||||||
|
defer func() {
|
||||||
|
session.presenceMu.Unlock()
|
||||||
|
// Finish the presence write before dispatching, and keep ownership in
|
||||||
|
// this call rather than launching an untracked database goroutine.
|
||||||
|
if dispatchPending {
|
||||||
|
_, _ = ConversationDispatchService.DispatchPendingConversations(0)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
if session.PresenceEnded {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
principal := session.Principal
|
||||||
|
if principal.UserType != enums.UserTypeEmployee || !slices.Contains(principal.Permissions, constants.PermissionConversationView.Code) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
now := time.Now()
|
||||||
|
last := session.PresenceRenewedAt.Load()
|
||||||
|
if now.Unix()-last < int64(agentPresenceRenewInterval/time.Second) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !session.PresenceRenewedAt.CompareAndSwap(last, now.Unix()) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// The internal ID is generated independently per connection, across processes.
|
||||||
|
expires := now.Add(agentPresenceLeaseTTL)
|
||||||
|
if principal.ExpiresAt.Before(expires) {
|
||||||
|
expires = principal.ExpiresAt
|
||||||
|
}
|
||||||
|
lease := models.AgentPresenceLease{ID: session.PresenceLeaseID, UserID: principal.UserID, LoginSessionID: principal.LoginSessionID, ExpiresAt: expires}
|
||||||
|
if lease.ID == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := repositories.SupportAvailabilityRepository.RenewPresence(sqls.DB(), &lease); err != nil {
|
||||||
|
slog.Warn("support presence renewal failed")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if last == 0 {
|
||||||
|
dispatchPending = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
func (s *wsService) endAgentPresence(session *ClientSession) {
|
||||||
|
if session == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
session.presenceMu.Lock()
|
||||||
|
defer session.presenceMu.Unlock()
|
||||||
|
session.PresenceEnded = true
|
||||||
|
if session.PresenceLeaseID == "" || session.PresenceRenewedAt.Load() == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := repositories.SupportAvailabilityRepository.EndPresence(sqls.DB(), session.PresenceLeaseID, time.Now().Add(agentPresenceDisconnectGrace)); err != nil {
|
||||||
|
slog.Warn("support presence disconnect update failed")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified in AgentDeskNext: authenticated support availability and calendars.
|
||||||
package services
|
package services
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -8,6 +9,7 @@ import (
|
|||||||
"agent-desk/internal/pkg/errorsx"
|
"agent-desk/internal/pkg/errorsx"
|
||||||
"agent-desk/internal/pkg/utils"
|
"agent-desk/internal/pkg/utils"
|
||||||
"agent-desk/internal/repositories"
|
"agent-desk/internal/repositories"
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@@ -79,11 +81,18 @@ func (s *agentProfileService) GetUserIDsByTeamID(teamID int64) []int64 {
|
|||||||
|
|
||||||
// GetDispatchAgents 获取可用于分配会话的客服
|
// GetDispatchAgents 获取可用于分配会话的客服
|
||||||
func (s *agentProfileService) GetDispatchAgents(teamIds []int64) []models.AgentProfile {
|
func (s *agentProfileService) GetDispatchAgents(teamIds []int64) []models.AgentProfile {
|
||||||
return AgentProfileService.Find(sqls.NewCnd().
|
profiles, err := repositories.SupportAvailabilityRepository.Profiles(sqls.DB(), teamIds)
|
||||||
In("team_id", teamIds).
|
if err != nil {
|
||||||
Eq("status", enums.StatusOk).
|
return nil
|
||||||
Eq("auto_assign_enabled", true).
|
}
|
||||||
Eq("service_status", enums.ServiceStatusIdle))
|
result := make([]models.AgentProfile, 0, len(profiles))
|
||||||
|
for _, profile := range profiles {
|
||||||
|
eligibility, err := SupportAvailabilityService.Evaluate(sqls.DB(), profile, true, time.Now(), 0)
|
||||||
|
if err == nil && eligibility.Eligible {
|
||||||
|
result = append(result, profile)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *agentProfileService) CreateAgentProfile(req request.CreateAgentProfileRequest, operator *dto.AuthPrincipal) (*models.AgentProfile, error) {
|
func (s *agentProfileService) CreateAgentProfile(req request.CreateAgentProfileRequest, operator *dto.AuthPrincipal) (*models.AgentProfile, error) {
|
||||||
@@ -120,7 +129,7 @@ func (s *agentProfileService) UpdateAgentProfile(req request.UpdateAgentProfileR
|
|||||||
"agent_code": item.AgentCode,
|
"agent_code": item.AgentCode,
|
||||||
"display_name": item.DisplayName,
|
"display_name": item.DisplayName,
|
||||||
"avatar": item.Avatar,
|
"avatar": item.Avatar,
|
||||||
"service_status": item.ServiceStatus,
|
// Availability is managed only through the dedicated guarded endpoint.
|
||||||
"max_concurrent_count": item.MaxConcurrentCount,
|
"max_concurrent_count": item.MaxConcurrentCount,
|
||||||
"priority_level": item.PriorityLevel,
|
"priority_level": item.PriorityLevel,
|
||||||
"auto_assign_enabled": item.AutoAssignEnabled,
|
"auto_assign_enabled": item.AutoAssignEnabled,
|
||||||
@@ -169,7 +178,7 @@ func (s *agentProfileService) buildProfileModel(id int64, req request.CreateAgen
|
|||||||
if exists := s.Take("agent_code = ? AND id <> ?", req.AgentCode, id); exists != nil {
|
if exists := s.Take("agent_code = ? AND id <> ?", req.AgentCode, id); exists != nil {
|
||||||
return nil, errorsx.InvalidParamI18n("error.e0163")
|
return nil, errorsx.InvalidParamI18n("error.e0163")
|
||||||
}
|
}
|
||||||
if !enums.IsValidServiceStatus(req.ServiceStatus) {
|
if !enums.IsValidServiceStatus(req.ServiceStatus) || (id == 0 && req.ServiceStatus == enums.ServiceStatusVacation) {
|
||||||
return nil, errorsx.InvalidParamI18n("error.e0165")
|
return nil, errorsx.InvalidParamI18n("error.e0165")
|
||||||
}
|
}
|
||||||
if req.MaxConcurrentCount < 0 {
|
if req.MaxConcurrentCount < 0 {
|
||||||
@@ -197,11 +206,23 @@ func (s *agentProfileService) dispatchPendingConversationsIfEligible(item *model
|
|||||||
if item.Status != enums.StatusOk {
|
if item.Status != enums.StatusOk {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if !item.AutoAssignEnabled || item.MaxConcurrentCount <= 0 {
|
if !item.AutoAssignEnabled {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if item.ServiceStatus != enums.ServiceStatusIdle {
|
if effectiveSupportStatus(*item, time.Now()) != enums.ServiceStatusIdle {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
_, _ = ConversationDispatchService.DispatchPendingConversations(0)
|
_, _ = ConversationDispatchService.DispatchPendingConversations(0)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *agentProfileService) FilterEffectiveServiceStatus(cnd *sqls.Cnd, value string) error {
|
||||||
|
if strings.TrimSpace(value) == "" {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
number, err := strconv.Atoi(value)
|
||||||
|
if err != nil || !enums.IsValidServiceStatus(enums.ServiceStatus(number)) {
|
||||||
|
return errorsx.InvalidParamI18n("error.supportAvailability.invalidStatus")
|
||||||
|
}
|
||||||
|
repositories.SupportAvailabilityRepository.EffectiveStatusCondition(cnd, enums.ServiceStatus(number), time.Now())
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
// Modified in the independent hardening fork; see docs/hardening.
|
||||||
|
|
||||||
package services
|
package services
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -50,19 +52,25 @@ func (s *authService) GetAuthPrincipal(ctx *gin.Context) *dto.AuthPrincipal {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *authService) setAuthPrincipal(ctx *gin.Context, user *models.User, roles, permissions []string) *dto.AuthPrincipal {
|
func (s *authService) setAuthPrincipal(ctx *gin.Context, user *models.User, session *models.LoginSession, roles, permissions []string) *dto.AuthPrincipal {
|
||||||
principal := &dto.AuthPrincipal{
|
principal := buildAuthPrincipal(user, session, roles, permissions)
|
||||||
|
ctx.Set(authPrincipalContextKey, principal)
|
||||||
|
return principal
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildAuthPrincipal(user *models.User, session *models.LoginSession, roles, permissions []string) *dto.AuthPrincipal {
|
||||||
|
return &dto.AuthPrincipal{
|
||||||
UserID: user.ID,
|
UserID: user.ID,
|
||||||
Username: user.Username,
|
Username: user.Username,
|
||||||
Nickname: user.Nickname,
|
Nickname: user.Nickname,
|
||||||
Avatar: user.Avatar,
|
Avatar: user.Avatar,
|
||||||
UserType: user.UserType,
|
UserType: user.UserType,
|
||||||
Status: user.Status,
|
Status: user.Status,
|
||||||
Roles: roles,
|
Roles: slices.Clone(roles),
|
||||||
Permissions: permissions,
|
Permissions: slices.Clone(permissions),
|
||||||
|
LoginSessionID: session.ID,
|
||||||
|
ExpiresAt: session.ExpiredAt,
|
||||||
}
|
}
|
||||||
ctx.Set(authPrincipalContextKey, principal)
|
|
||||||
return principal
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *authService) RequirePermission(ctx *gin.Context, permission constants.Permission) (principal *dto.AuthPrincipal, err error) {
|
func (s *authService) RequirePermission(ctx *gin.Context, permission constants.Permission) (principal *dto.AuthPrincipal, err error) {
|
||||||
@@ -96,7 +104,7 @@ func (s *authService) Login(req request.LoginRequest, authCfg config.AuthConfig,
|
|||||||
}
|
}
|
||||||
|
|
||||||
user := UserService.GetByUsername(username)
|
user := UserService.GetByUsername(username)
|
||||||
if user == nil || user.Status != enums.StatusOk {
|
if user == nil || user.DeletedAt != nil || user.Status != enums.StatusOk {
|
||||||
_ = s.createLoginCredentialLog(principal, 0, false, clientIP, userAgent, "user not found")
|
_ = s.createLoginCredentialLog(principal, 0, false, clientIP, userAgent, "user not found")
|
||||||
return nil, errorsx.InvalidAccountI18n("error.e0260")
|
return nil, errorsx.InvalidAccountI18n("error.e0260")
|
||||||
}
|
}
|
||||||
@@ -165,7 +173,7 @@ func (s *authService) Authenticate(ctx *gin.Context) (*dto.AuthPrincipal, error)
|
|||||||
}
|
}
|
||||||
|
|
||||||
user := UserService.Get(session.UserID)
|
user := UserService.Get(session.UserID)
|
||||||
if user == nil || user.Status != enums.StatusOk {
|
if user == nil || user.DeletedAt != nil || user.Status != enums.StatusOk {
|
||||||
return nil, errorsx.UnauthorizedI18n("error.e0256")
|
return nil, errorsx.UnauthorizedI18n("error.e0256")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -173,7 +181,7 @@ func (s *authService) Authenticate(ctx *gin.Context) (*dto.AuthPrincipal, error)
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
principal := s.setAuthPrincipal(ctx, user, roles, permissions)
|
principal := s.setAuthPrincipal(ctx, user, session, roles, permissions)
|
||||||
|
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
_ = LoginSessionService.Updates(session.ID, map[string]any{
|
_ = LoginSessionService.Updates(session.ID, map[string]any{
|
||||||
@@ -184,6 +192,39 @@ func (s *authService) Authenticate(ctx *gin.Context) (*dto.AuthPrincipal, error)
|
|||||||
return principal, nil
|
return principal, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RevalidatePrincipal refreshes a long-lived connection's authorization without
|
||||||
|
// keeping the bearer token. The original snapshot is never mutated and its
|
||||||
|
// absolute deadline cannot be extended by revalidation.
|
||||||
|
func (s *authService) RevalidatePrincipal(principal *dto.AuthPrincipal) (*dto.AuthPrincipal, error) {
|
||||||
|
return s.revalidatePrincipal(sqls.DB(), principal, time.Now())
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *authService) revalidatePrincipal(db *gorm.DB, principal *dto.AuthPrincipal, now time.Time) (*dto.AuthPrincipal, error) {
|
||||||
|
if principal == nil || principal.UserID <= 0 || principal.LoginSessionID <= 0 || !now.Before(principal.ExpiresAt) {
|
||||||
|
return nil, errorsx.UnauthorizedI18n("error.auth.expired")
|
||||||
|
}
|
||||||
|
|
||||||
|
session, err := repositories.LoginSessionRepository.GetAuthState(db, principal.LoginSessionID, principal.UserID)
|
||||||
|
if err != nil || session == nil || session.RevokedAt != nil || !now.Before(session.ExpiredAt) {
|
||||||
|
return nil, errorsx.UnauthorizedI18n("error.auth.expired")
|
||||||
|
}
|
||||||
|
user, err := repositories.UserRepository.GetAuthState(db, principal.UserID)
|
||||||
|
if err != nil || user == nil || user.DeletedAt != nil || user.Status != enums.StatusOk {
|
||||||
|
return nil, errorsx.UnauthorizedI18n("error.e0256")
|
||||||
|
}
|
||||||
|
roles, permissions, err := s.loadUserAuthScope(db, user.ID)
|
||||||
|
if err != nil {
|
||||||
|
// Database failures must close the connection, not retain its old scope or
|
||||||
|
// expose persistence details through a transport error.
|
||||||
|
return nil, errorsx.UnauthorizedI18n("error.auth.expired")
|
||||||
|
}
|
||||||
|
fresh := buildAuthPrincipal(user, session, roles, permissions)
|
||||||
|
if principal.ExpiresAt.Before(fresh.ExpiresAt) {
|
||||||
|
fresh.ExpiresAt = principal.ExpiresAt
|
||||||
|
}
|
||||||
|
return fresh, nil
|
||||||
|
}
|
||||||
|
|
||||||
func (s *authService) HasPermission(ctx *gin.Context, permissionCode string) bool {
|
func (s *authService) HasPermission(ctx *gin.Context, permissionCode string) bool {
|
||||||
principal := s.GetAuthPrincipal(ctx)
|
principal := s.GetAuthPrincipal(ctx)
|
||||||
if principal == nil {
|
if principal == nil {
|
||||||
@@ -341,7 +382,7 @@ func (s *authService) validateSessionToken(token string) (*models.LoginSession,
|
|||||||
if session.RevokedAt != nil {
|
if session.RevokedAt != nil {
|
||||||
return nil, errorsx.InvalidTokenI18n("error.e0267")
|
return nil, errorsx.InvalidTokenI18n("error.e0267")
|
||||||
}
|
}
|
||||||
if time.Now().After(session.ExpiredAt) {
|
if !time.Now().Before(session.ExpiredAt) {
|
||||||
return nil, errorsx.InvalidTokenI18n("error.e0268")
|
return nil, errorsx.InvalidTokenI18n("error.e0268")
|
||||||
}
|
}
|
||||||
return session, nil
|
return session, nil
|
||||||
@@ -372,49 +413,16 @@ func (s *authService) loadUserRoleCodes(tx *gorm.DB, userID int64) ([]string, er
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *authService) loadUserRoles(tx *gorm.DB, userID int64) ([]models.Role, error) {
|
func (s *authService) loadUserRoles(tx *gorm.DB, userID int64) ([]models.Role, error) {
|
||||||
roles := make([]models.Role, 0)
|
return repositories.RoleRepository.FindEnabledByUser(tx, userID)
|
||||||
if err := tx.
|
|
||||||
Table("t_role AS r").
|
|
||||||
Select("r.*").
|
|
||||||
Joins("JOIN t_user_role AS ur ON ur.role_id = r.id").
|
|
||||||
Where("ur.user_id = ? AND r.status = ?", userID, enums.StatusOk).
|
|
||||||
Order("r.sort_no ASC, r.id ASC").
|
|
||||||
Scan(&roles).Error; err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return roles, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *authService) loadUserPermissionCodes(tx *gorm.DB, userID int64) ([]string, error) {
|
func (s *authService) loadUserPermissionCodes(tx *gorm.DB, userID int64) ([]string, error) {
|
||||||
permissionRows := make([]struct {
|
permissionCodes, err := repositories.PermissionRepository.FindEnabledCodesByUserRoles(tx, userID)
|
||||||
Code string
|
if err != nil {
|
||||||
}, 0)
|
|
||||||
db := tx.Table("t_permission AS p").
|
|
||||||
Select("DISTINCT p.code").
|
|
||||||
Joins("JOIN t_role_permission AS rp ON rp.permission_id = p.id").
|
|
||||||
Joins("JOIN t_user_role AS ur ON ur.role_id = rp.role_id").
|
|
||||||
Where("ur.user_id = ?", userID).
|
|
||||||
Where("p.status = ?", enums.StatusOk)
|
|
||||||
if err := db.Scan(&permissionRows).Error; err != nil {
|
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
overrideRows, err := repositories.UserPermissionRepository.FindActiveEnabledOverrides(tx, userID, time.Now())
|
||||||
permissionCodes := make([]string, 0, len(permissionRows))
|
if err != nil {
|
||||||
for _, permission := range permissionRows {
|
|
||||||
permissionCodes = append(permissionCodes, permission.Code)
|
|
||||||
}
|
|
||||||
|
|
||||||
overrideRows := make([]struct {
|
|
||||||
Code string
|
|
||||||
Effect int
|
|
||||||
}, 0)
|
|
||||||
if err := tx.
|
|
||||||
Table("t_user_permission AS up").
|
|
||||||
Select("p.code, up.effect").
|
|
||||||
Joins("JOIN t_permission AS p ON p.id = up.permission_id").
|
|
||||||
Where("up.user_id = ? AND (up.expired_at IS NULL OR up.expired_at > ?)", userID, time.Now()).
|
|
||||||
Scan(&overrideRows).Error; err != nil {
|
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
260
internal/services/auth_session_security_test.go
Normal file
260
internal/services/auth_session_security_test.go
Normal file
@@ -0,0 +1,260 @@
|
|||||||
|
package services
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"net/http/httptest"
|
||||||
|
"path/filepath"
|
||||||
|
"slices"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"agent-desk/internal/models"
|
||||||
|
"agent-desk/internal/pkg/dto"
|
||||||
|
"agent-desk/internal/pkg/enums"
|
||||||
|
"agent-desk/internal/pkg/errorsx"
|
||||||
|
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/glebarez/sqlite"
|
||||||
|
"github.com/mlogclub/simple/sqls"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
"gorm.io/gorm/logger"
|
||||||
|
"gorm.io/gorm/schema"
|
||||||
|
)
|
||||||
|
|
||||||
|
type authSessionFixture struct {
|
||||||
|
db *gorm.DB
|
||||||
|
now time.Time
|
||||||
|
user models.User
|
||||||
|
session models.LoginSession
|
||||||
|
role models.Role
|
||||||
|
permission models.Permission
|
||||||
|
principal *dto.AuthPrincipal
|
||||||
|
}
|
||||||
|
|
||||||
|
func newAuthSessionFixture(t *testing.T) *authSessionFixture {
|
||||||
|
t.Helper()
|
||||||
|
db, err := gorm.Open(sqlite.Open(filepath.Join(t.TempDir(), "auth.db")), &gorm.Config{
|
||||||
|
NamingStrategy: schema.NamingStrategy{TablePrefix: "t_", SingularTable: true},
|
||||||
|
Logger: logger.Default.LogMode(logger.Silent),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("open isolated auth database: %v", err)
|
||||||
|
}
|
||||||
|
sqlDB, err := db.DB()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { _ = sqlDB.Close() })
|
||||||
|
if err := db.AutoMigrate(&models.User{}, &models.LoginSession{}, &models.Role{}, &models.Permission{}, &models.UserRole{}, &models.RolePermission{}, &models.UserPermission{}); err != nil {
|
||||||
|
t.Fatalf("migrate isolated auth database: %v", err)
|
||||||
|
}
|
||||||
|
f := &authSessionFixture{db: db, now: time.Now().UTC().Truncate(time.Microsecond)}
|
||||||
|
f.user = models.User{Username: "staff", UserType: enums.UserTypeEmployee, Status: enums.StatusOk}
|
||||||
|
f.role = models.Role{Code: "support", Status: enums.StatusOk}
|
||||||
|
f.permission = models.Permission{Code: "conversation.read", Status: enums.StatusOk}
|
||||||
|
for _, item := range []any{&f.user, &f.role, &f.permission} {
|
||||||
|
if err := db.Create(item).Error; err != nil {
|
||||||
|
t.Fatalf("seed auth fixture: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
f.session = models.LoginSession{UserID: f.user.ID, Token: "ak_test_only_session", ExpiredAt: f.now.Add(time.Hour)}
|
||||||
|
for _, item := range []any{
|
||||||
|
&f.session,
|
||||||
|
&models.UserRole{UserID: f.user.ID, RoleID: f.role.ID},
|
||||||
|
&models.RolePermission{RoleID: f.role.ID, PermissionID: f.permission.ID},
|
||||||
|
} {
|
||||||
|
if err := db.Create(item).Error; err != nil {
|
||||||
|
t.Fatalf("seed auth fixture: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
f.principal = buildAuthPrincipal(&f.user, &f.session, []string{f.role.Code}, []string{f.permission.Code})
|
||||||
|
return f
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAuthScopeExcludesDisabledRolesAndPermissionOverrides(t *testing.T) {
|
||||||
|
f := newAuthSessionFixture(t)
|
||||||
|
disabledRole := models.Role{Code: "disabled", Status: enums.StatusDisabled}
|
||||||
|
if err := f.db.Create(&disabledRole).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := f.db.Create(&models.UserRole{UserID: f.user.ID, RoleID: disabledRole.ID}).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
permissions := []models.Permission{
|
||||||
|
{Code: "disabled-role-only", Status: enums.StatusOk},
|
||||||
|
{Code: "disabled-permission", Status: enums.StatusDisabled},
|
||||||
|
{Code: "direct-allow", Status: enums.StatusOk},
|
||||||
|
{Code: "expired-allow", Status: enums.StatusOk},
|
||||||
|
}
|
||||||
|
if err := f.db.Create(&permissions).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
for _, item := range []any{
|
||||||
|
&models.RolePermission{RoleID: disabledRole.ID, PermissionID: permissions[0].ID},
|
||||||
|
&models.RolePermission{RoleID: f.role.ID, PermissionID: permissions[1].ID},
|
||||||
|
&models.UserPermission{UserID: f.user.ID, PermissionID: permissions[1].ID, Effect: 1},
|
||||||
|
&models.UserPermission{UserID: f.user.ID, PermissionID: permissions[2].ID, Effect: 1},
|
||||||
|
&models.UserPermission{UserID: f.user.ID, PermissionID: permissions[3].ID, Effect: 1, ExpiredAt: &f.now},
|
||||||
|
&models.UserPermission{UserID: f.user.ID, PermissionID: f.permission.ID, Effect: -1},
|
||||||
|
} {
|
||||||
|
if err := f.db.Create(item).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
roles, codes, err := newAuthService().loadUserAuthScope(f.db, f.user.ID)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if !slices.Equal(roles, []string{"support"}) || !slices.Equal(codes, []string{"direct-allow"}) {
|
||||||
|
t.Fatalf("unexpected enabled authorization scope: roles=%v permissions=%v", roles, codes)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRevalidatePrincipalRejectsRevokedExpiredOrUnboundIdentity(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
change func(*authSessionFixture) error
|
||||||
|
}{
|
||||||
|
{"nil principal", func(f *authSessionFixture) error { f.principal = nil; return nil }},
|
||||||
|
{"missing session binding", func(f *authSessionFixture) error { f.principal.LoginSessionID = 0; return nil }},
|
||||||
|
{"missing user binding", func(f *authSessionFixture) error { f.principal.UserID = 0; return nil }},
|
||||||
|
{"missing expiry", func(f *authSessionFixture) error { f.principal.ExpiresAt = time.Time{}; return nil }},
|
||||||
|
{"original deadline reached", func(f *authSessionFixture) error { f.principal.ExpiresAt = f.now; return nil }},
|
||||||
|
{"original deadline passed", func(f *authSessionFixture) error { f.principal.ExpiresAt = f.now.Add(-time.Second); return nil }},
|
||||||
|
{"revoked session", func(f *authSessionFixture) error { return f.db.Model(&f.session).Update("revoked_at", f.now).Error }},
|
||||||
|
{"session deadline reached", func(f *authSessionFixture) error { return f.db.Model(&f.session).Update("expired_at", f.now).Error }},
|
||||||
|
{"session deadline passed", func(f *authSessionFixture) error {
|
||||||
|
return f.db.Model(&f.session).Update("expired_at", f.now.Add(-time.Second)).Error
|
||||||
|
}},
|
||||||
|
{"deleted session", func(f *authSessionFixture) error { return f.db.Delete(&f.session).Error }},
|
||||||
|
{"different session owner", func(f *authSessionFixture) error { return f.db.Model(&f.session).Update("user_id", f.user.ID+1).Error }},
|
||||||
|
{"disabled user", func(f *authSessionFixture) error {
|
||||||
|
return f.db.Model(&f.user).Update("status", enums.StatusDisabled).Error
|
||||||
|
}},
|
||||||
|
{"soft-deleted user", func(f *authSessionFixture) error { return f.db.Model(&f.user).Update("deleted_at", f.now).Error }},
|
||||||
|
{"deleted user", func(f *authSessionFixture) error { return f.db.Delete(&f.user).Error }},
|
||||||
|
{"failed session query", func(f *authSessionFixture) error { return f.db.Migrator().DropTable(&models.LoginSession{}) }},
|
||||||
|
{"failed scope query", func(f *authSessionFixture) error { return f.db.Migrator().DropTable(&models.Permission{}) }},
|
||||||
|
}
|
||||||
|
for _, tc := range cases {
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
f := newAuthSessionFixture(t)
|
||||||
|
if err := tc.change(f); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
fresh, err := newAuthService().revalidatePrincipal(f.db, f.principal, f.now)
|
||||||
|
if fresh != nil || !hasCode(err, errorsx.CodeAuthUnauthorized) {
|
||||||
|
t.Fatalf("expected fail-closed unauthorized result, got principal=%v err=%v", fresh != nil, err)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRevalidatePrincipalRefreshesScopeWithoutMutatingSnapshot(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
change func(*authSessionFixture) error
|
||||||
|
wantRoles []string
|
||||||
|
}{
|
||||||
|
{"disabled role", func(f *authSessionFixture) error {
|
||||||
|
return f.db.Model(&f.role).Update("status", enums.StatusDisabled).Error
|
||||||
|
}, nil},
|
||||||
|
{"removed role", func(f *authSessionFixture) error {
|
||||||
|
return f.db.Where("user_id = ?", f.user.ID).Delete(&models.UserRole{}).Error
|
||||||
|
}, nil},
|
||||||
|
{"removed role permission", func(f *authSessionFixture) error {
|
||||||
|
return f.db.Where("role_id = ?", f.role.ID).Delete(&models.RolePermission{}).Error
|
||||||
|
}, []string{"support"}},
|
||||||
|
{"disabled permission", func(f *authSessionFixture) error {
|
||||||
|
return f.db.Model(&f.permission).Update("status", enums.StatusDisabled).Error
|
||||||
|
}, []string{"support"}},
|
||||||
|
{"direct deny", func(f *authSessionFixture) error {
|
||||||
|
return f.db.Create(&models.UserPermission{UserID: f.user.ID, PermissionID: f.permission.ID, Effect: -1}).Error
|
||||||
|
}, []string{"support"}},
|
||||||
|
}
|
||||||
|
for _, tc := range cases {
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
f := newAuthSessionFixture(t)
|
||||||
|
if err := tc.change(f); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
fresh, err := newAuthService().revalidatePrincipal(f.db, f.principal, f.now)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if fresh == f.principal || len(fresh.Permissions) != 0 || !slices.Equal(fresh.Roles, tc.wantRoles) {
|
||||||
|
t.Fatalf("expected a fresh reduced scope: roles=%v permissions=%v", fresh.Roles, fresh.Permissions)
|
||||||
|
}
|
||||||
|
if !slices.Equal(f.principal.Roles, []string{"support"}) || !slices.Equal(f.principal.Permissions, []string{"conversation.read"}) {
|
||||||
|
t.Fatal("revalidation mutated the original snapshot")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRevalidatePrincipalCannotExtendAbsoluteExpiry(t *testing.T) {
|
||||||
|
for _, delta := range []time.Duration{-time.Minute, time.Minute} {
|
||||||
|
t.Run(delta.String(), func(t *testing.T) {
|
||||||
|
f := newAuthSessionFixture(t)
|
||||||
|
storedExpiry := f.session.ExpiredAt.Add(delta)
|
||||||
|
if err := f.db.Model(&f.session).Update("expired_at", storedExpiry).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
fresh, err := newAuthService().revalidatePrincipal(f.db, f.principal, f.now)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
want := f.principal.ExpiresAt
|
||||||
|
if storedExpiry.Before(want) {
|
||||||
|
want = storedExpiry
|
||||||
|
}
|
||||||
|
if !fresh.ExpiresAt.Equal(want) {
|
||||||
|
t.Fatal("revalidation did not preserve the earliest absolute deadline")
|
||||||
|
}
|
||||||
|
fresh.Roles[0] = "changed"
|
||||||
|
fresh.Permissions[0] = "changed"
|
||||||
|
if f.principal.Roles[0] != "support" || f.principal.Permissions[0] != "conversation.read" {
|
||||||
|
t.Fatal("fresh authorization slices alias the original snapshot")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAuthenticateBindsPrincipalToSessionWithoutExposingMetadata(t *testing.T) {
|
||||||
|
f := newAuthSessionFixture(t)
|
||||||
|
previousDB := sqls.DB()
|
||||||
|
sqls.SetDB(f.db)
|
||||||
|
t.Cleanup(func() { sqls.SetDB(previousDB) })
|
||||||
|
ctx, _ := gin.CreateTestContext(httptest.NewRecorder())
|
||||||
|
ctx.Request = httptest.NewRequest("GET", "/", nil)
|
||||||
|
ctx.Request.Header.Set("Authorization", "Bearer "+f.session.Token)
|
||||||
|
principal, err := newAuthService().Authenticate(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if principal.LoginSessionID != f.session.ID || !principal.ExpiresAt.Equal(f.session.ExpiredAt) {
|
||||||
|
t.Fatal("authenticated principal is not bound to its original session")
|
||||||
|
}
|
||||||
|
if _, err := newAuthService().RevalidatePrincipal(principal); err != nil {
|
||||||
|
t.Fatalf("valid session failed public revalidation API: %v", err)
|
||||||
|
}
|
||||||
|
encoded, err := json.Marshal(principal)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var publicFields map[string]json.RawMessage
|
||||||
|
if err := json.Unmarshal(encoded, &publicFields); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
for _, name := range []string{"LoginSessionID", "ExpiresAt", "Token"} {
|
||||||
|
if _, ok := publicFields[name]; ok {
|
||||||
|
t.Fatalf("internal auth metadata leaked into JSON: %s", name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := newAuthService().Logout("Bearer " + f.session.Token); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if fresh, err := newAuthService().RevalidatePrincipal(principal); fresh != nil || !hasCode(err, errorsx.CodeAuthUnauthorized) {
|
||||||
|
t.Fatalf("logout left the authenticated snapshot valid: principal=%v err=%v", fresh != nil, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
118
internal/services/channel_policy_concurrency_test.go
Normal file
118
internal/services/channel_policy_concurrency_test.go
Normal file
@@ -0,0 +1,118 @@
|
|||||||
|
package services
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"sync/atomic"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"agent-desk/internal/models"
|
||||||
|
"agent-desk/internal/pkg/dto/request"
|
||||||
|
"agent-desk/internal/pkg/enums"
|
||||||
|
"agent-desk/internal/repositories"
|
||||||
|
|
||||||
|
"github.com/mlogclub/simple/sqls"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestChannelConfigCompareAndSwapRejectsStalePolicyAndSecretWrites(t *testing.T) {
|
||||||
|
for _, action := range []string{"editor", "secret-reset"} {
|
||||||
|
t.Run(action, func(t *testing.T) {
|
||||||
|
previousDB := sqls.DB()
|
||||||
|
db := setupChannelServiceTestDB(t)
|
||||||
|
t.Cleanup(func() { sqls.SetDB(previousDB) })
|
||||||
|
agent := createChannelServiceTestAgent(t, db, 1001)
|
||||||
|
channel, err := ChannelService.CreateChannel(request.CreateChannelRequest{ChannelType: enums.ChannelTypeWeb, AIAgentID: agent.ID, Name: "Policy channel", Status: int(enums.StatusOk), ConfigJSON: `{"requireSignedIdentity":false,"userTokenSecret":"test-old-secret"}`}, channelServiceTestOperator())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var injected atomic.Bool
|
||||||
|
callbackName := "test:concurrent_channel_policy"
|
||||||
|
// Commit another writer after the stale service read, just before its SQL.
|
||||||
|
// Preserve updated_at deliberately: bytewise JSON CAS must also catch this.
|
||||||
|
if err := db.Callback().Update().Before("gorm:update").Register(callbackName, func(tx *gorm.DB) {
|
||||||
|
if tx.Statement.Schema == nil || tx.Statement.Schema.Table != "t_channel" || !injected.CompareAndSwap(false, true) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
cfg, parseErr := ChannelService.ParseWebChannelConfig(channel.ConfigJSON)
|
||||||
|
if parseErr != nil {
|
||||||
|
tx.AddError(parseErr)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
cfg.RequireSignedIdentity = true
|
||||||
|
cfg.UserTokenSecret = "test-new-secret"
|
||||||
|
encoded, encodeErr := json.Marshal(cfg)
|
||||||
|
if encodeErr != nil {
|
||||||
|
tx.AddError(encodeErr)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if writeErr := db.Session(&gorm.Session{NewDB: true}).Model(&models.Channel{}).Where("id = ?", channel.ID).Updates(map[string]any{"config_json": string(encoded), "updated_at": channel.UpdatedAt}).Error; writeErr != nil {
|
||||||
|
tx.AddError(writeErr)
|
||||||
|
}
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { _ = db.Callback().Update().Remove(callbackName) })
|
||||||
|
switch action {
|
||||||
|
case "editor":
|
||||||
|
err = ChannelService.UpdateChannel(request.UpdateChannelRequest{ID: channel.ID, CreateChannelRequest: request.CreateChannelRequest{ChannelType: enums.ChannelTypeWeb, AIAgentID: agent.ID, Name: "Old editor title", Status: int(enums.StatusOk), ConfigJSON: `{"title":"old editor"}`}}, channelServiceTestOperator())
|
||||||
|
case "secret-reset":
|
||||||
|
var secret string
|
||||||
|
secret, err = ChannelService.ResetUserTokenSecret(channel.ID, channelServiceTestOperator())
|
||||||
|
if secret != "" {
|
||||||
|
t.Fatal("failed reset returned an uncommitted secret")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !injected.Load() || err == nil {
|
||||||
|
t.Fatal("stale writer was not rejected")
|
||||||
|
}
|
||||||
|
current := ChannelService.Get(channel.ID)
|
||||||
|
cfg, parseErr := ChannelService.ParseWebChannelConfig(current.ConfigJSON)
|
||||||
|
if parseErr != nil || !cfg.RequireSignedIdentity || cfg.UserTokenSecret != "test-new-secret" {
|
||||||
|
t.Fatal("stale writer replaced the concurrent policy/secret")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestChannelConfigCompareAndSwapUsesExactBytes(t *testing.T) {
|
||||||
|
db, channel := setupIdentitySecurityDB(t)
|
||||||
|
channel.ConfigJSON = `{"userTokenSecret":"CaseSensitive"}`
|
||||||
|
if err := db.Model(channel).Updates(map[string]any{"config_json": channel.ConfigJSON, "updated_at": time.Now()}).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
expected := *channel
|
||||||
|
if err := db.Model(channel).UpdateColumn("config_json", `{"userTokenSecret":"casesensitive"}`).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
updated, err := repositories.ChannelRepository.UpdatesConfigIfUnchanged(db, &expected, map[string]any{"config_json": `{"requireSignedIdentity":false}`})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if updated {
|
||||||
|
t.Fatal("case-sensitive secret change was not treated as a conflict")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestChannelConfigCompareAndSwapAllowsCurrentEditorAndReset(t *testing.T) {
|
||||||
|
previousDB := sqls.DB()
|
||||||
|
db := setupChannelServiceTestDB(t)
|
||||||
|
t.Cleanup(func() { sqls.SetDB(previousDB) })
|
||||||
|
agent := createChannelServiceTestAgent(t, db, 1001)
|
||||||
|
channel, err := ChannelService.CreateChannel(request.CreateChannelRequest{ChannelType: enums.ChannelTypeWeb, AIAgentID: agent.ID, Name: "Current policy", Status: int(enums.StatusOk), ConfigJSON: `{"requireSignedIdentity":true}`}, channelServiceTestOperator())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
err = ChannelService.UpdateChannel(request.UpdateChannelRequest{ID: channel.ID, CreateChannelRequest: request.CreateChannelRequest{ChannelType: enums.ChannelTypeWeb, AIAgentID: agent.ID, Name: "Current policy edited", Status: int(enums.StatusOk), ConfigJSON: `{"title":"Updated title"}`}}, channelServiceTestOperator())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
secret, err := ChannelService.ResetUserTokenSecret(channel.ID, channelServiceTestOperator())
|
||||||
|
if err != nil || secret == "" {
|
||||||
|
t.Fatal("current secret reset failed")
|
||||||
|
}
|
||||||
|
cfg, err := ChannelService.ParseWebChannelConfig(ChannelService.Get(channel.ID).ConfigJSON)
|
||||||
|
if err != nil || !cfg.RequireSignedIdentity || cfg.UserTokenSecret != secret {
|
||||||
|
t.Fatal("current update/reset lost policy or returned unsaved secret")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
|
// Modified in the independent hardening fork; see docs/hardening.
|
||||||
|
|
||||||
package services
|
package services
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -98,6 +100,15 @@ func (s *channelService) UpdateChannel(req request.UpdateChannelRequest, operato
|
|||||||
if current == nil || current.Status == enums.StatusDeleted {
|
if current == nil || current.Status == enums.StatusDeleted {
|
||||||
return errorsx.InvalidParamI18n("error.e0208")
|
return errorsx.InvalidParamI18n("error.e0208")
|
||||||
}
|
}
|
||||||
|
if current.ChannelType == enums.ChannelTypeWeb && strings.TrimSpace(req.ChannelType) == enums.ChannelTypeWeb {
|
||||||
|
// Older dashboard clients do not expose this policy yet. Omitting the field
|
||||||
|
// during an unrelated edit must not silently turn authenticated-only off.
|
||||||
|
merged, err := s.preserveWebIdentityPolicy(req.ConfigJSON, current.ConfigJSON)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
req.ConfigJSON = merged
|
||||||
|
}
|
||||||
item, err := s.buildChannelModel(req.ID, req.CreateChannelRequest)
|
item, err := s.buildChannelModel(req.ID, req.CreateChannelRequest)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -118,7 +129,7 @@ func (s *channelService) UpdateChannel(req request.UpdateChannelRequest, operato
|
|||||||
if item.AIAgentRolloutPercent != current.AIAgentRolloutPercent {
|
if item.AIAgentRolloutPercent != current.AIAgentRolloutPercent {
|
||||||
columns["previous_ai_agent_rollout_percent"] = current.AIAgentRolloutPercent
|
columns["previous_ai_agent_rollout_percent"] = current.AIAgentRolloutPercent
|
||||||
}
|
}
|
||||||
return repositories.ChannelRepository.Updates(sqls.DB(), req.ID, columns)
|
return s.updateConfigIfUnchanged(current, columns)
|
||||||
}
|
}
|
||||||
|
|
||||||
// RollbackChannelAIAgentRollout restores the last channel-level rollout value
|
// RollbackChannelAIAgentRollout restores the last channel-level rollout value
|
||||||
@@ -196,6 +207,13 @@ func (s *channelService) ParseWebChannelConfig(raw string) (*dto.WebChannelConfi
|
|||||||
if err := json.Unmarshal([]byte(raw), cfg); err != nil {
|
if err := json.Unmarshal([]byte(raw), cfg); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
var fields map[string]json.RawMessage
|
||||||
|
if err := json.Unmarshal([]byte(raw), &fields); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if policy, ok := fields["requireSignedIdentity"]; ok && string(policy) != "true" && string(policy) != "false" {
|
||||||
|
return nil, errorsx.InvalidParamI18n("error.e0060")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
cfg.Title = strings.TrimSpace(cfg.Title)
|
cfg.Title = strings.TrimSpace(cfg.Title)
|
||||||
if cfg.Title == "" {
|
if cfg.Title == "" {
|
||||||
@@ -459,7 +477,7 @@ func (s *channelService) ResetUserTokenSecret(channelID int64, operator *dto.Aut
|
|||||||
}
|
}
|
||||||
configJSON = string(raw)
|
configJSON = string(raw)
|
||||||
}
|
}
|
||||||
if err := repositories.ChannelRepository.Updates(sqls.DB(), channelID, map[string]any{
|
if err := s.updateConfigIfUnchanged(channel, map[string]any{
|
||||||
"config_json": configJSON,
|
"config_json": configJSON,
|
||||||
"update_user_id": operator.UserID,
|
"update_user_id": operator.UserID,
|
||||||
"update_user_name": operator.Username,
|
"update_user_name": operator.Username,
|
||||||
@@ -683,3 +701,54 @@ func (s *channelService) buildChannelModel(id int64, req request.CreateChannelRe
|
|||||||
Remark: strings.TrimSpace(req.Remark),
|
Remark: strings.TrimSpace(req.Remark),
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RequiresSignedIdentity enforces the channel policy on the server, not only in
|
||||||
|
// the embedding SDK. Invalid web configuration fails closed.
|
||||||
|
func (s *channelService) RequiresSignedIdentity(channel *models.Channel) bool {
|
||||||
|
if channel == nil {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if channel.ChannelType != enums.ChannelTypeWeb {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
cfg, err := s.ParseWebChannelConfig(channel.ConfigJSON)
|
||||||
|
return err != nil || cfg.RequireSignedIdentity
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *channelService) preserveWebIdentityPolicy(raw, previousRaw string) (string, error) {
|
||||||
|
fields := map[string]json.RawMessage{}
|
||||||
|
if strings.TrimSpace(raw) != "" {
|
||||||
|
if err := json.Unmarshal([]byte(raw), &fields); err != nil {
|
||||||
|
return "", errorsx.InvalidParamI18n("error.e0060")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if _, present := fields["requireSignedIdentity"]; present {
|
||||||
|
return raw, nil
|
||||||
|
}
|
||||||
|
previous, err := s.ParseWebChannelConfig(previousRaw)
|
||||||
|
if err != nil {
|
||||||
|
return "", errorsx.InvalidParamI18n("error.e0060")
|
||||||
|
}
|
||||||
|
if !previous.RequireSignedIdentity {
|
||||||
|
return raw, nil
|
||||||
|
}
|
||||||
|
if fields == nil {
|
||||||
|
fields = map[string]json.RawMessage{}
|
||||||
|
}
|
||||||
|
fields["requireSignedIdentity"] = json.RawMessage("true")
|
||||||
|
encoded, err := json.Marshal(fields)
|
||||||
|
return string(encoded), err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reject rather than retry a stale complete config document: retrying could turn
|
||||||
|
// an old explicit field into authority to overwrite the new policy/secret.
|
||||||
|
func (s *channelService) updateConfigIfUnchanged(expected *models.Channel, columns map[string]any) error {
|
||||||
|
updated, err := repositories.ChannelRepository.UpdatesConfigIfUnchanged(sqls.DB(), expected, columns)
|
||||||
|
if err != nil {
|
||||||
|
return errorsx.BusinessErrorI18n(0, "error.channel.configUpdateFailed")
|
||||||
|
}
|
||||||
|
if !updated {
|
||||||
|
return errorsx.InvalidParamI18n("error.channel.configChanged")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
// Modified in AgentDeskNext: authenticated support availability and calendars.
|
||||||
|
// Modified in AgentDeskFixes: safe, reviewed setup repairs and honest routing diagnostics.
|
||||||
package services
|
package services
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -151,10 +153,12 @@ func (s *conversationDispatchService) DispatchPendingConversations(limit int) (i
|
|||||||
if limit <= 0 {
|
if limit <= 0 {
|
||||||
limit = pendingDispatchBatchLimit
|
limit = pendingDispatchBatchLimit
|
||||||
}
|
}
|
||||||
conversations := ConversationService.Find(sqls.NewCnd().
|
// Preserve the existing newest-first batch/periodic retry policy, but
|
||||||
Eq("status", enums.IMConversationStatusPending).
|
// bound the SQL read and distinguish failure from an empty queue.
|
||||||
Eq("current_assignee_id", 0).
|
conversations, err := repositories.ConversationRepository.FindPendingDispatchBatch(sqls.DB(), limit)
|
||||||
Desc("id"))
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
if len(conversations) == 0 {
|
if len(conversations) == 0 {
|
||||||
return 0, nil
|
return 0, nil
|
||||||
}
|
}
|
||||||
@@ -197,6 +201,7 @@ func (s *conversationDispatchService) RunPendingDispatchLoop(interval time.Durat
|
|||||||
)
|
)
|
||||||
|
|
||||||
for {
|
for {
|
||||||
|
_ = repositories.SupportAvailabilityRepository.PrunePresence(sqls.DB(), time.Now())
|
||||||
if _, err := s.DispatchPendingConversations(0); err != nil {
|
if _, err := s.DispatchPendingConversations(0); err != nil {
|
||||||
slog.Warn("dispatch pending conversations loop failed", "error", err)
|
slog.Warn("dispatch pending conversations loop failed", "error", err)
|
||||||
}
|
}
|
||||||
@@ -211,50 +216,29 @@ func (s *conversationDispatchService) pickDispatchCandidates(teamIDs []int64, no
|
|||||||
RequestedTeamIDs: append([]int64(nil), teamIDs...),
|
RequestedTeamIDs: append([]int64(nil), teamIDs...),
|
||||||
}
|
}
|
||||||
|
|
||||||
// 1. filter teams with active schedule
|
profiles, err := repositories.SupportAvailabilityRepository.Profiles(sqls.DB(), teamIDs)
|
||||||
activeTeamIDs := s.findActiveScheduleTeamIDs(teamIDs, now)
|
|
||||||
report.ActiveScheduleTeams = activeTeamIDs
|
|
||||||
if len(activeTeamIDs) == 0 {
|
|
||||||
report.Reason = "no_active_schedule_team"
|
|
||||||
return nil, report, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// 2. find agent profiles for the active teams
|
|
||||||
profiles := AgentProfileService.GetDispatchAgents(activeTeamIDs)
|
|
||||||
report.MatchedProfiles = len(profiles)
|
|
||||||
if len(profiles) == 0 {
|
|
||||||
report.Reason = "no_matched_profile"
|
|
||||||
return nil, report, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
enabledProfiles, enabledUserIDs, reason := s.filterEnabledDispatchProfiles(profiles)
|
|
||||||
if reason != "" {
|
|
||||||
report.Reason = reason
|
|
||||||
return nil, report, nil
|
|
||||||
}
|
|
||||||
report.EligibleProfiles = len(enabledProfiles)
|
|
||||||
|
|
||||||
activeCounts, err := s.findActiveConversationCountMap(enabledUserIDs)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, report, err
|
return nil, report, err
|
||||||
}
|
}
|
||||||
|
report.MatchedProfiles = len(profiles)
|
||||||
candidates := make([]dispatchCandidate, 0, len(enabledProfiles))
|
report.ActiveScheduleTeams = s.findActiveScheduleTeamIDs(teamIDs, now)
|
||||||
for _, profile := range enabledProfiles {
|
candidates := make([]dispatchCandidate, 0, len(profiles))
|
||||||
activeCount := activeCounts[profile.UserID]
|
report.Reason = "no_eligible_operator"
|
||||||
if profile.MaxConcurrentCount > 0 && activeCount >= profile.MaxConcurrentCount {
|
for _, profile := range profiles {
|
||||||
|
eligibility, err := SupportAvailabilityService.Evaluate(sqls.DB(), profile, true, now, 0)
|
||||||
|
if err != nil {
|
||||||
|
return nil, report, err
|
||||||
|
}
|
||||||
|
if !eligibility.Eligible {
|
||||||
|
report.Reason = eligibility.Reason
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
loadRate := float64(activeCount) / math.Max(float64(profile.MaxConcurrentCount), 1)
|
report.EligibleProfiles++
|
||||||
candidates = append(candidates, dispatchCandidate{
|
loadRate := float64(eligibility.ActiveCount) / math.Max(float64(profile.MaxConcurrentCount), 1)
|
||||||
profile: profile,
|
candidates = append(candidates, dispatchCandidate{profile: profile, activeCount: eligibility.ActiveCount, loadRate: loadRate})
|
||||||
activeCount: activeCount,
|
|
||||||
loadRate: loadRate,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
report.CandidateCount = len(candidates)
|
report.CandidateCount = len(candidates)
|
||||||
if len(candidates) == 0 {
|
if len(candidates) == 0 {
|
||||||
report.Reason = "all_candidates_at_capacity"
|
|
||||||
return nil, report, nil
|
return nil, report, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -298,86 +282,20 @@ func (s *conversationDispatchService) pickDispatchCandidates(teamIDs []int64, no
|
|||||||
return candidates, report, nil
|
return candidates, report, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *conversationDispatchService) filterEnabledDispatchProfiles(profiles []models.AgentProfile) ([]models.AgentProfile, []int64, string) {
|
|
||||||
userIDs := make([]int64, 0, len(profiles))
|
|
||||||
for _, profile := range profiles {
|
|
||||||
if profile.UserID > 0 {
|
|
||||||
userIDs = append(userIDs, profile.UserID)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if len(userIDs) == 0 {
|
|
||||||
return nil, nil, "no_profile_with_capacity_config"
|
|
||||||
}
|
|
||||||
|
|
||||||
enabledUsers := UserService.Find(sqls.NewCnd().
|
|
||||||
In("id", userIDs).
|
|
||||||
Eq("status", enums.StatusOk))
|
|
||||||
if len(enabledUsers) == 0 {
|
|
||||||
return nil, nil, "no_enabled_user"
|
|
||||||
}
|
|
||||||
|
|
||||||
enabledUserSet := make(map[int64]struct{}, len(enabledUsers))
|
|
||||||
for _, user := range enabledUsers {
|
|
||||||
enabledUserSet[user.ID] = struct{}{}
|
|
||||||
}
|
|
||||||
|
|
||||||
enabledProfiles := make([]models.AgentProfile, 0, len(profiles))
|
|
||||||
enabledUserIDs := make([]int64, 0, len(profiles))
|
|
||||||
for _, profile := range profiles {
|
|
||||||
if _, exists := enabledUserSet[profile.UserID]; !exists {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
enabledProfiles = append(enabledProfiles, profile)
|
|
||||||
enabledUserIDs = append(enabledUserIDs, profile.UserID)
|
|
||||||
}
|
|
||||||
if len(enabledProfiles) == 0 {
|
|
||||||
return nil, nil, "no_profile_for_enabled_user"
|
|
||||||
}
|
|
||||||
return enabledProfiles, enabledUserIDs, ""
|
|
||||||
}
|
|
||||||
|
|
||||||
// findActiveScheduleTeamIDs returns the subset of teamIDs that have active schedule at the given time.
|
// findActiveScheduleTeamIDs returns the subset of teamIDs that have active schedule at the given time.
|
||||||
func (s *conversationDispatchService) findActiveScheduleTeamIDs(teamIDs []int64, now time.Time) []int64 {
|
func (s *conversationDispatchService) findActiveScheduleTeamIDs(teamIDs []int64, now time.Time) []int64 {
|
||||||
if len(teamIDs) == 0 {
|
result := make([]int64, 0, len(teamIDs))
|
||||||
return nil
|
for _, teamID := range uniquePositiveInt64s(teamIDs) {
|
||||||
}
|
team, err := repositories.SupportAvailabilityRepository.Team(sqls.DB(), teamID)
|
||||||
|
if err != nil || team == nil || team.Status != enums.StatusOk {
|
||||||
teams := AgentTeamService.Find(sqls.NewCnd().
|
|
||||||
In("id", teamIDs).
|
|
||||||
Eq("status", enums.StatusOk))
|
|
||||||
if len(teams) == 0 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
enabledTeamIDs := make([]int64, 0, len(teams))
|
|
||||||
for _, team := range teams {
|
|
||||||
enabledTeamIDs = append(enabledTeamIDs, team.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
schedules := AgentTeamScheduleService.Find(sqls.NewCnd().
|
|
||||||
In("team_id", enabledTeamIDs).
|
|
||||||
Eq("status", enums.StatusOk).
|
|
||||||
Lte("start_at", now).
|
|
||||||
Gt("end_at", now))
|
|
||||||
|
|
||||||
activeSet := make(map[int64]struct{}, len(schedules))
|
|
||||||
for _, schedule := range schedules {
|
|
||||||
activeSet[schedule.TeamID] = struct{}{}
|
|
||||||
}
|
|
||||||
|
|
||||||
ret := make([]int64, 0, len(teamIDs))
|
|
||||||
seen := make(map[int64]struct{})
|
|
||||||
for _, teamID := range teamIDs {
|
|
||||||
if _, active := activeSet[teamID]; !active {
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if _, exists := seen[teamID]; exists {
|
calendar, err := SupportCalendarService.Evaluate(sqls.DB(), teamID, now)
|
||||||
continue
|
if err == nil && calendar.Open {
|
||||||
|
result = append(result, teamID)
|
||||||
}
|
}
|
||||||
seen[teamID] = struct{}{}
|
|
||||||
ret = append(ret, teamID)
|
|
||||||
}
|
}
|
||||||
return ret
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *conversationDispatchService) findActiveConversationCountMap(userIDs []int64) (map[int64]int, error) {
|
func (s *conversationDispatchService) findActiveConversationCountMap(userIDs []int64) (map[int64]int, error) {
|
||||||
@@ -409,6 +327,10 @@ func (s *conversationDispatchService) tryAssignConversation(conversationID int64
|
|||||||
operator := systemDispatchPrincipal()
|
operator := systemDispatchPrincipal()
|
||||||
|
|
||||||
err := sqls.WithTransaction(func(ctx *sqls.TxContext) error {
|
err := sqls.WithTransaction(func(ctx *sqls.TxContext) error {
|
||||||
|
if _, err := repositories.SupportAvailabilityRepository.LockProfile(ctx.Tx, candidate.UserID); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
conversation := repositories.ConversationRepository.Get(ctx.Tx, conversationID)
|
conversation := repositories.ConversationRepository.Get(ctx.Tx, conversationID)
|
||||||
if conversation == nil {
|
if conversation == nil {
|
||||||
return errConversationDispatchConflict
|
return errConversationDispatchConflict
|
||||||
@@ -417,6 +339,12 @@ func (s *conversationDispatchService) tryAssignConversation(conversationID int64
|
|||||||
return errConversationDispatchConflict
|
return errConversationDispatchConflict
|
||||||
}
|
}
|
||||||
|
|
||||||
|
guarded, guardErr := SupportAvailabilityService.GuardAssignment(ctx.Tx, candidate.UserID, true, conversation, time.Now())
|
||||||
|
if guardErr != nil {
|
||||||
|
return guardErr
|
||||||
|
}
|
||||||
|
candidate = *guarded
|
||||||
|
|
||||||
if err := ConversationAssignmentService.FinishActiveAssignments(ctx, conversationID, now); err != nil {
|
if err := ConversationAssignmentService.FinishActiveAssignments(ctx, conversationID, now); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -443,6 +371,9 @@ func (s *conversationDispatchService) tryAssignConversation(conversationID int64
|
|||||||
|
|
||||||
return ConversationEventLogService.CreateEvent(ctx, conversationID, enums.IMEventTypeAssign, enums.IMSenderTypeSystem, operator.UserID, "会话已自动分配", buildDispatchEventPayload(conversation.CurrentAssigneeID, candidate.UserID, candidate.TeamID, reason))
|
return ConversationEventLogService.CreateEvent(ctx, conversationID, enums.IMEventTypeAssign, enums.IMSenderTypeSystem, operator.UserID, "会话已自动分配", buildDispatchEventPayload(conversation.CurrentAssigneeID, candidate.UserID, candidate.TeamID, reason))
|
||||||
})
|
})
|
||||||
|
if errors.Is(err, errSupportAssignmentIneligible) {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
// Modified in AgentDeskNext: authenticated support availability and calendars.
|
||||||
|
// Modified in the independent hardening fork; see docs/hardening.
|
||||||
|
|
||||||
package services
|
package services
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -6,8 +9,11 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"agent-desk/internal/events"
|
||||||
"agent-desk/internal/models"
|
"agent-desk/internal/models"
|
||||||
|
"agent-desk/internal/pkg/constants"
|
||||||
"agent-desk/internal/pkg/enums"
|
"agent-desk/internal/pkg/enums"
|
||||||
|
"agent-desk/internal/pkg/eventbus"
|
||||||
|
|
||||||
"github.com/glebarez/sqlite"
|
"github.com/glebarez/sqlite"
|
||||||
"github.com/mlogclub/simple/sqls"
|
"github.com/mlogclub/simple/sqls"
|
||||||
@@ -112,9 +118,11 @@ func findHumanDispatchRealtimeEvent(t *testing.T, session *ClientSession, eventT
|
|||||||
|
|
||||||
func captureHumanDispatchRealtimeSession(t *testing.T, topics ...string) *ClientSession {
|
func captureHumanDispatchRealtimeSession(t *testing.T, topics ...string) *ClientSession {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
|
principal := seedRealtimeStaffPrincipal(t, sqls.DB())
|
||||||
session := &ClientSession{
|
session := &ClientSession{
|
||||||
ID: "test-session",
|
ID: "test-session",
|
||||||
Role: realtimeRoleAdmin,
|
Role: realtimeRoleAdmin,
|
||||||
|
Principal: principal,
|
||||||
Topics: map[string]struct{}{},
|
Topics: map[string]struct{}{},
|
||||||
Send: make(chan []byte, 32),
|
Send: make(chan []byte, 32),
|
||||||
}
|
}
|
||||||
@@ -124,6 +132,7 @@ func captureHumanDispatchRealtimeSession(t *testing.T, topics ...string) *Client
|
|||||||
|
|
||||||
func setupHumanDispatchRealtimeTestDB(t *testing.T) *gorm.DB {
|
func setupHumanDispatchRealtimeTestDB(t *testing.T) *gorm.DB {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
|
previousDB, previousWs := sqls.DB(), WsService
|
||||||
dbName := strings.NewReplacer("/", "_", " ", "_").Replace(t.Name())
|
dbName := strings.NewReplacer("/", "_", " ", "_").Replace(t.Name())
|
||||||
db, err := gorm.Open(sqlite.Open("file:"+dbName+"?mode=memory&cache=shared"), &gorm.Config{
|
db, err := gorm.Open(sqlite.Open("file:"+dbName+"?mode=memory&cache=shared"), &gorm.Config{
|
||||||
NamingStrategy: schema.NamingStrategy{
|
NamingStrategy: schema.NamingStrategy{
|
||||||
@@ -150,6 +159,7 @@ func setupHumanDispatchRealtimeTestDB(t *testing.T) *gorm.DB {
|
|||||||
&models.AgentTeam{},
|
&models.AgentTeam{},
|
||||||
&models.AgentTeamSchedule{},
|
&models.AgentTeamSchedule{},
|
||||||
&models.AgentProfile{},
|
&models.AgentProfile{},
|
||||||
|
&models.SupportCalendar{}, &models.AgentPresenceLease{}, &models.LoginSession{}, &models.Role{}, &models.Permission{}, &models.UserRole{}, &models.RolePermission{}, &models.UserPermission{},
|
||||||
&models.Conversation{},
|
&models.Conversation{},
|
||||||
&models.ConversationParticipant{},
|
&models.ConversationParticipant{},
|
||||||
&models.ConversationAssignment{},
|
&models.ConversationAssignment{},
|
||||||
@@ -161,6 +171,13 @@ func setupHumanDispatchRealtimeTestDB(t *testing.T) *gorm.DB {
|
|||||||
t.Fatalf("auto migrate error = %v", err)
|
t.Fatalf("auto migrate error = %v", err)
|
||||||
}
|
}
|
||||||
sqls.SetDB(db)
|
sqls.SetDB(db)
|
||||||
|
t.Cleanup(func() {
|
||||||
|
// Assignment notifications run asynchronously. Join them before replacing
|
||||||
|
// the global fixture DB/service or closing its SQLite connection.
|
||||||
|
eventbus.Get[events.ConversationAssignedEvent]().Wait()
|
||||||
|
sqls.SetDB(previousDB)
|
||||||
|
WsService = previousWs
|
||||||
|
})
|
||||||
return db
|
return db
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -205,6 +222,7 @@ func createHumanDispatchRealtimeAgentProfile(t *testing.T, db *gorm.DB, userID,
|
|||||||
Username: "agent",
|
Username: "agent",
|
||||||
Nickname: "客服",
|
Nickname: "客服",
|
||||||
Status: enums.StatusOk,
|
Status: enums.StatusOk,
|
||||||
|
UserType: enums.UserTypeEmployee,
|
||||||
}).Error; err != nil {
|
}).Error; err != nil {
|
||||||
t.Fatalf("create user error = %v", err)
|
t.Fatalf("create user error = %v", err)
|
||||||
}
|
}
|
||||||
@@ -220,6 +238,25 @@ func createHumanDispatchRealtimeAgentProfile(t *testing.T, db *gorm.DB, userID,
|
|||||||
}).Error; err != nil {
|
}).Error; err != nil {
|
||||||
t.Fatalf("create profile error = %v", err)
|
t.Fatalf("create profile error = %v", err)
|
||||||
}
|
}
|
||||||
|
role := models.Role{Code: "test-live-agent", Status: enums.StatusOk}
|
||||||
|
permission := models.Permission{Code: constants.PermissionConversationView.Code, Status: enums.StatusOk}
|
||||||
|
session := models.LoginSession{UserID: userID, Token: "ak_isolated_routing_fixture", ExpiredAt: time.Now().Add(time.Hour)}
|
||||||
|
// The observing WebSocket already seeds this shared permission. Reuse it
|
||||||
|
// without changing its state, while the assigned operator gets its own role.
|
||||||
|
if err := db.Where("code = ?", permission.Code).FirstOrCreate(&permission).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
for _, item := range []any{&role, &session} {
|
||||||
|
if err := db.Create(item).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, item := range []any{&models.UserRole{UserID: userID, RoleID: role.ID}, &models.RolePermission{RoleID: role.ID, PermissionID: permission.ID}, &models.AgentPresenceLease{ID: "isolated-routing-presence", UserID: userID, LoginSessionID: session.ID, ExpiresAt: time.Now().Add(time.Minute)}} {
|
||||||
|
if err := db.Create(item).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func createHumanDispatchRealtimeConversation(t *testing.T, db *gorm.DB, aiAgentID int64) models.Conversation {
|
func createHumanDispatchRealtimeConversation(t *testing.T, db *gorm.DB, aiAgentID int64) models.Conversation {
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified in AgentDeskNext: authenticated support availability and calendars.
|
||||||
package services_test
|
package services_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -6,6 +7,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"agent-desk/internal/models"
|
"agent-desk/internal/models"
|
||||||
|
"agent-desk/internal/pkg/constants"
|
||||||
"agent-desk/internal/pkg/dto"
|
"agent-desk/internal/pkg/dto"
|
||||||
"agent-desk/internal/pkg/enums"
|
"agent-desk/internal/pkg/enums"
|
||||||
"agent-desk/internal/pkg/openidentity"
|
"agent-desk/internal/pkg/openidentity"
|
||||||
@@ -260,6 +262,7 @@ func setupConversationHumanDispatchTestDB(t *testing.T) *gorm.DB {
|
|||||||
&models.AgentTeam{},
|
&models.AgentTeam{},
|
||||||
&models.AgentTeamSchedule{},
|
&models.AgentTeamSchedule{},
|
||||||
&models.AgentProfile{},
|
&models.AgentProfile{},
|
||||||
|
&models.SupportCalendar{}, &models.AgentPresenceLease{}, &models.LoginSession{}, &models.Role{}, &models.Permission{}, &models.UserRole{}, &models.RolePermission{}, &models.UserPermission{},
|
||||||
&models.Conversation{},
|
&models.Conversation{},
|
||||||
&models.ConversationParticipant{},
|
&models.ConversationParticipant{},
|
||||||
&models.ConversationAssignment{},
|
&models.ConversationAssignment{},
|
||||||
@@ -315,6 +318,7 @@ func createHumanDispatchAgentProfile(t *testing.T, db *gorm.DB, userID, teamID i
|
|||||||
Username: "agent",
|
Username: "agent",
|
||||||
Nickname: "客服",
|
Nickname: "客服",
|
||||||
Status: enums.StatusOk,
|
Status: enums.StatusOk,
|
||||||
|
UserType: enums.UserTypeEmployee,
|
||||||
}).Error; err != nil {
|
}).Error; err != nil {
|
||||||
t.Fatalf("create user error = %v", err)
|
t.Fatalf("create user error = %v", err)
|
||||||
}
|
}
|
||||||
@@ -330,6 +334,20 @@ func createHumanDispatchAgentProfile(t *testing.T, db *gorm.DB, userID, teamID i
|
|||||||
}).Error; err != nil {
|
}).Error; err != nil {
|
||||||
t.Fatalf("create profile error = %v", err)
|
t.Fatalf("create profile error = %v", err)
|
||||||
}
|
}
|
||||||
|
role := models.Role{Code: "test-live-agent", Status: enums.StatusOk}
|
||||||
|
permission := models.Permission{Code: constants.PermissionConversationView.Code, Status: enums.StatusOk}
|
||||||
|
session := models.LoginSession{UserID: userID, Token: "ak_isolated_routing_fixture", ExpiredAt: time.Now().Add(time.Hour)}
|
||||||
|
for _, item := range []any{&role, &permission, &session} {
|
||||||
|
if err := db.Create(item).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, item := range []any{&models.UserRole{UserID: userID, RoleID: role.ID}, &models.RolePermission{RoleID: role.ID, PermissionID: permission.ID}, &models.AgentPresenceLease{ID: "isolated-routing-presence", UserID: userID, LoginSessionID: session.ID, ExpiresAt: time.Now().Add(time.Minute)}} {
|
||||||
|
if err := db.Create(item).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func createHumanDispatchConversation(t *testing.T, db *gorm.DB, aiAgentID int64, status enums.IMConversationStatus) models.Conversation {
|
func createHumanDispatchConversation(t *testing.T, db *gorm.DB, aiAgentID int64, status enums.IMConversationStatus) models.Conversation {
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
// Modified in AgentDeskNext: authenticated support availability and calendars.
|
||||||
|
// Modified in the independent hardening fork; see docs/hardening.
|
||||||
|
|
||||||
package services
|
package services
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -317,17 +320,16 @@ func (s *conversationService) CreateNew(externalUser openidentity.ExternalUser,
|
|||||||
// activity first, so the widget can offer a request list. A visitor who has not
|
// activity first, so the widget can offer a request list. A visitor who has not
|
||||||
// talked to us yet has no identity row and therefore an empty list, not an error.
|
// talked to us yet has no identity row and therefore an empty list, not an error.
|
||||||
//
|
//
|
||||||
// Scoping is by customer, not by channel: a CustomerIdentity is keyed by
|
// Public identities are scoped to a server-verified issuer and channel. Legacy
|
||||||
// (external_source, external_id) globally, so one signed visitor reaching us
|
// internal integrations may still use their explicitly unscoped identity mapping.
|
||||||
// through two channels is one person with one request history. For a guest the
|
|
||||||
// external id is issued per channel, so their identities cannot collide across
|
|
||||||
// channels anyway. Narrowing this to the current channel would silently hide the
|
|
||||||
// visitor's earlier requests.
|
|
||||||
func (s *conversationService) ListCustomerConversations(externalUser openidentity.ExternalUser, cnd *sqls.Cnd) ([]models.Conversation, *sqls.Paging, error) {
|
func (s *conversationService) ListCustomerConversations(externalUser openidentity.ExternalUser, cnd *sqls.Cnd) ([]models.Conversation, *sqls.Paging, error) {
|
||||||
if cnd == nil {
|
if cnd == nil {
|
||||||
cnd = sqls.NewCnd()
|
cnd = sqls.NewCnd()
|
||||||
}
|
}
|
||||||
identity := repositories.CustomerIdentityRepository.GetBy(sqls.DB(), externalUser.ExternalSource, strings.TrimSpace(externalUser.ExternalID))
|
identity, err := repositories.CustomerIdentityRepository.GetUniqueBy(sqls.DB(), externalUser.IdentityScope, externalUser.ExternalSource, strings.TrimSpace(externalUser.ExternalID))
|
||||||
|
if err != nil {
|
||||||
|
return nil, nil, errorsx.UnauthorizedI18n("error.e0161")
|
||||||
|
}
|
||||||
if identity == nil {
|
if identity == nil {
|
||||||
paging := &sqls.Paging{}
|
paging := &sqls.Paging{}
|
||||||
if cnd.Paging != nil {
|
if cnd.Paging != nil {
|
||||||
@@ -336,6 +338,9 @@ func (s *conversationService) ListCustomerConversations(externalUser openidentit
|
|||||||
return []models.Conversation{}, paging, nil
|
return []models.Conversation{}, paging, nil
|
||||||
}
|
}
|
||||||
cnd.Eq("customer_id", identity.CustomerID).Desc("last_active_at").Desc("id")
|
cnd.Eq("customer_id", identity.CustomerID).Desc("last_active_at").Desc("id")
|
||||||
|
if externalUser.ChannelID > 0 {
|
||||||
|
cnd.Eq("channel_id", externalUser.ChannelID)
|
||||||
|
}
|
||||||
list, paging := repositories.ConversationRepository.FindPageByCnd(sqls.DB(), cnd)
|
list, paging := repositories.ConversationRepository.FindPageByCnd(sqls.DB(), cnd)
|
||||||
if list == nil {
|
if list == nil {
|
||||||
list = []models.Conversation{}
|
list = []models.Conversation{}
|
||||||
@@ -353,6 +358,10 @@ func (s *conversationService) AssignConversation(req request.AssignConversationR
|
|||||||
}
|
}
|
||||||
var assignedEvent events.ConversationAssignedEvent
|
var assignedEvent events.ConversationAssignedEvent
|
||||||
if err := sqls.WithTransaction(func(ctx *sqls.TxContext) error {
|
if err := sqls.WithTransaction(func(ctx *sqls.TxContext) error {
|
||||||
|
if _, err := repositories.SupportAvailabilityRepository.LockProfile(ctx.Tx, req.AssigneeID); err != nil {
|
||||||
|
return errorsx.InvalidParamI18n("error.supportAvailability.unavailable")
|
||||||
|
}
|
||||||
|
|
||||||
conversation := repositories.ConversationRepository.Get(ctx.Tx, req.ConversationID)
|
conversation := repositories.ConversationRepository.Get(ctx.Tx, req.ConversationID)
|
||||||
if conversation == nil {
|
if conversation == nil {
|
||||||
return errorsx.InvalidParamI18n("error.e0116")
|
return errorsx.InvalidParamI18n("error.e0116")
|
||||||
@@ -361,14 +370,23 @@ func (s *conversationService) AssignConversation(req request.AssignConversationR
|
|||||||
return errorsx.InvalidParamI18n("error.e0135")
|
return errorsx.InvalidParamI18n("error.e0135")
|
||||||
}
|
}
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
|
targetProfile, err := SupportAvailabilityService.GuardAssignment(ctx.Tx, req.AssigneeID, false, conversation, now)
|
||||||
|
if err != nil {
|
||||||
|
if err == errSupportAssignmentIneligible {
|
||||||
|
return errorsx.InvalidParamI18n("error.supportAvailability.unavailable")
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
if err := ConversationAssignmentService.FinishActiveAssignments(ctx, req.ConversationID, now); err != nil {
|
if err := ConversationAssignmentService.FinishActiveAssignments(ctx, req.ConversationID, now); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := ConversationAssignmentService.CreateAssignment(ctx, req.ConversationID, conversation.CurrentAssigneeID, req.AssigneeID, enums.IMAssignmentTypeAssign, req.Reason, operator, now); err != nil {
|
if err := ConversationAssignmentService.CreateAssignment(ctx, req.ConversationID, conversation.CurrentAssigneeID, req.AssigneeID, enums.IMAssignmentTypeAssign, req.Reason, operator, now); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := repositories.ConversationRepository.Updates(ctx.Tx, req.ConversationID, map[string]any{
|
if err := repositories.SupportAvailabilityRepository.AssignConversation(ctx.Tx, conversation, map[string]any{
|
||||||
"current_assignee_id": req.AssigneeID,
|
"current_assignee_id": req.AssigneeID,
|
||||||
|
"current_team_id": targetProfile.TeamID,
|
||||||
"status": enums.IMConversationStatusActive,
|
"status": enums.IMConversationStatusActive,
|
||||||
"update_user_id": operator.UserID,
|
"update_user_id": operator.UserID,
|
||||||
"update_user_name": operator.Username,
|
"update_user_name": operator.Username,
|
||||||
@@ -447,6 +465,10 @@ func (s *conversationService) TransferConversation(conversationID, toUserID int6
|
|||||||
}
|
}
|
||||||
var assignedEvent events.ConversationAssignedEvent
|
var assignedEvent events.ConversationAssignedEvent
|
||||||
if err := sqls.WithTransaction(func(ctx *sqls.TxContext) error {
|
if err := sqls.WithTransaction(func(ctx *sqls.TxContext) error {
|
||||||
|
if _, err := repositories.SupportAvailabilityRepository.LockProfile(ctx.Tx, toUserID); err != nil {
|
||||||
|
return errorsx.InvalidParamI18n("error.supportAvailability.unavailable")
|
||||||
|
}
|
||||||
|
|
||||||
conversation := repositories.ConversationRepository.Get(ctx.Tx, conversationID)
|
conversation := repositories.ConversationRepository.Get(ctx.Tx, conversationID)
|
||||||
if conversation == nil {
|
if conversation == nil {
|
||||||
return errorsx.InvalidParamI18n("error.e0116")
|
return errorsx.InvalidParamI18n("error.e0116")
|
||||||
@@ -464,14 +486,23 @@ func (s *conversationService) TransferConversation(conversationID, toUserID int6
|
|||||||
return errorsx.InvalidParamI18n("error.e0277")
|
return errorsx.InvalidParamI18n("error.e0277")
|
||||||
}
|
}
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
|
targetProfile, err := SupportAvailabilityService.GuardAssignment(ctx.Tx, toUserID, false, conversation, now)
|
||||||
|
if err != nil {
|
||||||
|
if err == errSupportAssignmentIneligible {
|
||||||
|
return errorsx.InvalidParamI18n("error.supportAvailability.unavailable")
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
if err := ConversationAssignmentService.FinishActiveAssignments(ctx, conversationID, now); err != nil {
|
if err := ConversationAssignmentService.FinishActiveAssignments(ctx, conversationID, now); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := ConversationAssignmentService.CreateAssignment(ctx, conversationID, conversation.CurrentAssigneeID, toUserID, enums.IMAssignmentTypeTransfer, reason, operator, now); err != nil {
|
if err := ConversationAssignmentService.CreateAssignment(ctx, conversationID, conversation.CurrentAssigneeID, toUserID, enums.IMAssignmentTypeTransfer, reason, operator, now); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := repositories.ConversationRepository.Updates(ctx.Tx, conversationID, map[string]any{
|
if err := repositories.SupportAvailabilityRepository.AssignConversation(ctx.Tx, conversation, map[string]any{
|
||||||
"current_assignee_id": toUserID,
|
"current_assignee_id": toUserID,
|
||||||
|
"current_team_id": targetProfile.TeamID,
|
||||||
"status": enums.IMConversationStatusActive,
|
"status": enums.IMConversationStatusActive,
|
||||||
"update_user_id": operator.UserID,
|
"update_user_id": operator.UserID,
|
||||||
"update_user_name": operator.Username,
|
"update_user_name": operator.Username,
|
||||||
@@ -832,8 +863,11 @@ func (s *conversationService) IsCustomerConversationOwner(conversation *models.C
|
|||||||
if extID == "" || strings.TrimSpace(string(externalUser.ExternalSource)) == "" || conversation.CustomerID <= 0 {
|
if extID == "" || strings.TrimSpace(string(externalUser.ExternalSource)) == "" || conversation.CustomerID <= 0 {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
identity := repositories.CustomerIdentityRepository.GetBy(sqls.DB(), externalUser.ExternalSource, extID)
|
if externalUser.ChannelID > 0 && externalUser.ChannelID != conversation.ChannelID {
|
||||||
if identity == nil {
|
return false
|
||||||
|
}
|
||||||
|
identity, err := repositories.CustomerIdentityRepository.GetUniqueBy(sqls.DB(), externalUser.IdentityScope, externalUser.ExternalSource, extID)
|
||||||
|
if err != nil || identity == nil {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
return identity.CustomerID == conversation.CustomerID
|
return identity.CustomerID == conversation.CustomerID
|
||||||
|
|||||||
450
internal/services/customer_identity_security_test.go
Normal file
450
internal/services/customer_identity_security_test.go
Normal file
@@ -0,0 +1,450 @@
|
|||||||
|
package services
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http/httptest"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
"sync/atomic"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"agent-desk/internal/models"
|
||||||
|
"agent-desk/internal/pkg/config"
|
||||||
|
"agent-desk/internal/pkg/dto/response"
|
||||||
|
"agent-desk/internal/pkg/enums"
|
||||||
|
"agent-desk/internal/pkg/openidentity"
|
||||||
|
"agent-desk/internal/repositories"
|
||||||
|
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"github.com/glebarez/sqlite"
|
||||||
|
"github.com/golang-jwt/jwt/v5"
|
||||||
|
"github.com/mlogclub/simple/sqls"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
"gorm.io/gorm/logger"
|
||||||
|
"gorm.io/gorm/schema"
|
||||||
|
)
|
||||||
|
|
||||||
|
func setupIdentitySecurityDB(t *testing.T) (*gorm.DB, *models.Channel) {
|
||||||
|
t.Helper()
|
||||||
|
db, err := gorm.Open(sqlite.Open(filepath.Join(t.TempDir(), "identity.db")), &gorm.Config{
|
||||||
|
NamingStrategy: schema.NamingStrategy{TablePrefix: "t_", SingularTable: true},
|
||||||
|
Logger: logger.Default.LogMode(logger.Silent),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := db.AutoMigrate(&models.Customer{}, &models.CustomerIdentity{}, &models.Channel{}, &models.Conversation{}); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
previousDB, previousConfig := sqls.DB(), config.GetCurrent()
|
||||||
|
sqls.SetDB(db)
|
||||||
|
config.SetCurrent(&config.Config{CustomerSession: config.CustomerSessionConfig{Secret: "test-only-customer-session-key", TTLMinutes: 120}})
|
||||||
|
t.Cleanup(func() {
|
||||||
|
sqls.SetDB(previousDB)
|
||||||
|
config.SetCurrent(previousConfig)
|
||||||
|
sqlDB, _ := db.DB()
|
||||||
|
_ = sqlDB.Close()
|
||||||
|
})
|
||||||
|
channel := &models.Channel{ChannelID: "channel-a", ChannelType: enums.ChannelTypeWeb, Status: enums.StatusOk, ConfigJSON: "{}"}
|
||||||
|
if err := db.Create(channel).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
return db, channel
|
||||||
|
}
|
||||||
|
|
||||||
|
func scopedTestExternal(channel *models.Channel, issuer, id string) openidentity.ExternalUser {
|
||||||
|
source := enums.ExternalSourceUser
|
||||||
|
if issuer == "guest" {
|
||||||
|
source = enums.ExternalSourceGuest
|
||||||
|
}
|
||||||
|
return openidentity.ExternalUser{ExternalSource: source, ExternalID: id, IdentityScope: openidentity.IdentityScope(channel.ChannelID, issuer), ChannelID: channel.ID}
|
||||||
|
}
|
||||||
|
|
||||||
|
func verifySecurityCustomerSession(t *testing.T, channel *models.Channel, token string) *CustomerSessionVerifyResult {
|
||||||
|
t.Helper()
|
||||||
|
ctx, _ := gin.CreateTestContext(httptest.NewRecorder())
|
||||||
|
ctx.Request = httptest.NewRequest("GET", "/api/ws/open", nil)
|
||||||
|
ctx.Request.Header.Set("Authorization", "Bearer "+token)
|
||||||
|
result, err := CustomerSessionService.VerifyRequest(ctx, channel)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("verify customer credential: %v", err)
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCustomerIdentitySeparatesTrustIssuerAndChannel(t *testing.T) {
|
||||||
|
db, channel := setupIdentitySecurityDB(t)
|
||||||
|
otherChannel := &models.Channel{ChannelID: "channel-b", ChannelType: enums.ChannelTypeWeb, Status: enums.StatusOk, ConfigJSON: "{}"}
|
||||||
|
if err := db.Create(otherChannel).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
customerIDs := map[int64]bool{}
|
||||||
|
for _, input := range []struct {
|
||||||
|
channel *models.Channel
|
||||||
|
issuer string
|
||||||
|
}{{channel, "hmac"}, {channel, "jwt"}, {channel, "guest"}, {otherChannel, "hmac"}} {
|
||||||
|
exchanged, err := CustomerSessionService.Exchange(input.channel, scopedTestExternal(input.channel, input.issuer, "same-id"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if customerIDs[exchanged.Customer.ID] {
|
||||||
|
t.Fatal("independent identity scopes were merged")
|
||||||
|
}
|
||||||
|
customerIDs[exchanged.Customer.ID] = true
|
||||||
|
result := verifySecurityCustomerSession(t, input.channel, exchanged.CustomerSessionToken)
|
||||||
|
if !CustomerSessionService.VerifyConnection(result) {
|
||||||
|
t.Fatal("fresh scoped connection rejected")
|
||||||
|
}
|
||||||
|
wrongChannel := &models.Conversation{CustomerID: result.CustomerID, ChannelID: otherChannel.ID}
|
||||||
|
if input.channel.ID != otherChannel.ID && ConversationService.IsCustomerConversationOwner(wrongChannel, *result.ExternalUser) {
|
||||||
|
t.Fatal("customer acquired a different channel's conversation")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGuestBootstrapCannotReclaimKnownAnonymousIdentity(t *testing.T) {
|
||||||
|
_, channel := setupIdentitySecurityDB(t)
|
||||||
|
first, err := CustomerSessionService.Exchange(channel, scopedTestExternal(channel, "guest", "caller-chosen-id"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
stolenID := strings.TrimPrefix(first.IdentityKey, "guest:")
|
||||||
|
if len(stolenID) != 64 || stolenID == "caller-chosen-id" {
|
||||||
|
t.Fatal("guest identity was not server-generated")
|
||||||
|
}
|
||||||
|
second, err := CustomerSessionService.Exchange(channel, scopedTestExternal(channel, "guest", stolenID))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if first.Customer.ID == second.Customer.ID || first.IdentityKey == second.IdentityKey {
|
||||||
|
t.Fatal("public guest bootstrap reclaimed another guest identity")
|
||||||
|
}
|
||||||
|
original := verifySecurityCustomerSession(t, channel, first.CustomerSessionToken)
|
||||||
|
if original.CustomerID != first.Customer.ID {
|
||||||
|
t.Fatal("signed guest credential did not retain its owner")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCustomerIdentityDuplicatesFailClosedWithoutCreatingAnotherCustomer(t *testing.T) {
|
||||||
|
db, channel := setupIdentitySecurityDB(t)
|
||||||
|
external := scopedTestExternal(channel, "hmac", "duplicate")
|
||||||
|
for i := 0; i < 2; i++ {
|
||||||
|
customer := &models.Customer{Status: enums.StatusOk}
|
||||||
|
if err := db.Create(customer).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
identity := &models.CustomerIdentity{CustomerID: customer.ID, IdentityScope: external.IdentityScope, ExternalSource: external.ExternalSource, ExternalID: external.ExternalID, Status: enums.StatusOk}
|
||||||
|
if err := db.Create(identity).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if _, err := CustomerSessionService.Exchange(channel, external); err == nil {
|
||||||
|
t.Fatal("ambiguous identity was accepted")
|
||||||
|
}
|
||||||
|
var count int64
|
||||||
|
if err := db.Model(&models.Customer{}).Count(&count).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if count != 2 {
|
||||||
|
t.Fatalf("ambiguous mapping created another customer: %d", count)
|
||||||
|
}
|
||||||
|
identity, err := repositories.CustomerIdentityRepository.GetUniqueBy(db, external.IdentityScope, external.ExternalSource, external.ExternalID)
|
||||||
|
if err == nil || identity != nil {
|
||||||
|
t.Fatal("duplicate lookup did not fail closed")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCustomerSessionsRejectLegacyScopeAndLivePolicyChanges(t *testing.T) {
|
||||||
|
db, channel := setupIdentitySecurityDB(t)
|
||||||
|
exchanged, err := CustomerSessionService.Exchange(channel, scopedTestExternal(channel, "guest", "guest"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
current := verifySecurityCustomerSession(t, channel, exchanged.CustomerSessionToken)
|
||||||
|
claims, err := CustomerSessionService.verifyToken(exchanged.CustomerSessionToken)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
claims.IdentityScope = ""
|
||||||
|
legacy, err := jwt.NewWithClaims(jwt.SigningMethodHS256, claims).SignedString([]byte(config.Current().CustomerSession.Secret))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, err := CustomerSessionService.verifyToken(legacy); err == nil {
|
||||||
|
t.Fatal("unscoped legacy credential accepted")
|
||||||
|
}
|
||||||
|
if err := db.Model(channel).Update("config_json", `{"requireSignedIdentity":true}`).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if CustomerSessionService.VerifyConnection(current) {
|
||||||
|
t.Fatal("existing guest retained access after signed-only policy change")
|
||||||
|
}
|
||||||
|
channel.ConfigJSON = `{"requireSignedIdentity":true}`
|
||||||
|
if _, err := CustomerSessionService.Exchange(channel, scopedTestExternal(channel, "guest", "guest")); err == nil {
|
||||||
|
t.Fatal("signed-only channel accepted guest exchange")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCustomerConnectionRejectsExpiryDisabledCustomerAndIdentityChanges(t *testing.T) {
|
||||||
|
for _, scenario := range []string{"expiry", "disabled-customer", "disabled-channel", "disabled-identity", "rebound-identity", "duplicate-identity"} {
|
||||||
|
t.Run(scenario, func(t *testing.T) {
|
||||||
|
db, channel := setupIdentitySecurityDB(t)
|
||||||
|
exchanged, err := CustomerSessionService.Exchange(channel, scopedTestExternal(channel, "hmac", "signed"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
current := verifySecurityCustomerSession(t, channel, exchanged.CustomerSessionToken)
|
||||||
|
switch scenario {
|
||||||
|
case "expiry":
|
||||||
|
current.ExpiresAt = time.Now()
|
||||||
|
case "disabled-customer":
|
||||||
|
err = db.Model(&models.Customer{}).Where("id = ?", current.CustomerID).Update("status", enums.StatusDisabled).Error
|
||||||
|
case "disabled-channel":
|
||||||
|
err = db.Model(channel).Update("status", enums.StatusDisabled).Error
|
||||||
|
case "disabled-identity":
|
||||||
|
err = db.Model(&models.CustomerIdentity{}).Where("customer_id = ?", current.CustomerID).Update("status", enums.StatusDisabled).Error
|
||||||
|
case "rebound-identity":
|
||||||
|
err = db.Model(&models.CustomerIdentity{}).Where("customer_id = ?", current.CustomerID).Update("customer_id", current.CustomerID+100).Error
|
||||||
|
case "duplicate-identity":
|
||||||
|
err = db.Create(&models.CustomerIdentity{CustomerID: current.CustomerID + 100, ExternalSource: current.ExternalUser.ExternalSource, ExternalID: current.ExternalUser.ExternalID, IdentityScope: current.ExternalUser.IdentityScope, Status: enums.StatusOk}).Error
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if CustomerSessionService.VerifyConnection(current) {
|
||||||
|
t.Fatal("invalidated customer connection retained authority")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCustomerRealtimeTopicsAndDeliveryRejectCrossScopeCollisions(t *testing.T) {
|
||||||
|
db, channel := setupIdentitySecurityDB(t)
|
||||||
|
ws := newWsService()
|
||||||
|
signed, err := CustomerSessionService.Exchange(channel, scopedTestExternal(channel, "hmac", "known-id"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
guest, err := CustomerSessionService.Exchange(channel, scopedTestExternal(channel, "guest", "known-id"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
signedAuth := verifySecurityCustomerSession(t, channel, signed.CustomerSessionToken)
|
||||||
|
guestAuth := verifySecurityCustomerSession(t, channel, guest.CustomerSessionToken)
|
||||||
|
conversation := &models.Conversation{CustomerID: signed.Customer.ID, ChannelID: channel.ID}
|
||||||
|
if err := db.Create(conversation).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
owner := &ClientSession{ID: "owner", Role: realtimeRoleUser, External: signedAuth.ExternalUser, CustomerSession: signedAuth, Topics: map[string]struct{}{}, Send: make(chan []byte, 4)}
|
||||||
|
attacker := &ClientSession{ID: "guest", Role: realtimeRoleUser, External: guestAuth.ExternalUser, CustomerSession: guestAuth, Topics: map[string]struct{}{}, Send: make(chan []byte, 4)}
|
||||||
|
if ws.customerTopic(signed.Customer.ID, channel.ID) == ws.customerTopic(guest.Customer.ID, channel.ID) {
|
||||||
|
t.Fatal("trust namespaces collided")
|
||||||
|
}
|
||||||
|
if ws.customerTopic(signed.Customer.ID, channel.ID) == ws.customerTopic(signed.Customer.ID, channel.ID+1) {
|
||||||
|
t.Fatal("channel namespaces collided")
|
||||||
|
}
|
||||||
|
ws.manager.Register(owner, ws.defaultTopics(owner))
|
||||||
|
// Defense in depth: even an accidentally stale/wrong topic registration may
|
||||||
|
// not grant the guest authorization to the signed customer's conversation.
|
||||||
|
ws.manager.Register(attacker, ws.routeConversationTopics(conversation))
|
||||||
|
ws.PublishAgentActivity(conversation, "step", "", "running")
|
||||||
|
select {
|
||||||
|
case <-owner.Send:
|
||||||
|
default:
|
||||||
|
t.Fatal("owner did not receive its event")
|
||||||
|
}
|
||||||
|
select {
|
||||||
|
case <-attacker.Send:
|
||||||
|
t.Fatal("guest received another customer's event")
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
if ws.canSubscribeConversation(attacker, conversation.ID) {
|
||||||
|
t.Fatal("explicit foreign conversation subscription allowed")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestScopedIdentityUniqueClaimPreservesLegacyRows(t *testing.T) {
|
||||||
|
db, channel := setupIdentitySecurityDB(t)
|
||||||
|
source := enums.ExternalSourceUser
|
||||||
|
// Dirty legacy mappings remain migratable because their unique claim is NULL.
|
||||||
|
for _, customerID := range []int64{100, 101} {
|
||||||
|
if err := db.Create(&models.CustomerIdentity{CustomerID: customerID, ExternalSource: source, ExternalID: "same", Status: enums.StatusOk}).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
scope := openidentity.IdentityScope(channel.ChannelID, "hmac")
|
||||||
|
first := &models.CustomerIdentity{CustomerID: 102, IdentityScope: scope, ScopedKey: repositories.ScopedCustomerIdentityKey(scope, source, "same"), ExternalSource: source, ExternalID: "same", Status: enums.StatusOk}
|
||||||
|
if err := db.Create(first).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
competing := &models.CustomerIdentity{CustomerID: 103, IdentityScope: scope, ScopedKey: repositories.ScopedCustomerIdentityKey(scope, source, "same"), ExternalSource: source, ExternalID: "same", Status: enums.StatusOk}
|
||||||
|
if err := db.Create(competing).Error; err == nil {
|
||||||
|
t.Fatal("database allowed a competing scoped identity claim")
|
||||||
|
}
|
||||||
|
otherScope := openidentity.IdentityScope(channel.ChannelID, "jwt")
|
||||||
|
if err := db.Create(&models.CustomerIdentity{CustomerID: 104, IdentityScope: otherScope, ScopedKey: repositories.ScopedCustomerIdentityKey(otherScope, source, "same"), ExternalSource: source, ExternalID: "same", Status: enums.StatusOk}).Error; err != nil {
|
||||||
|
t.Fatal("different issuer's claim was conflated")
|
||||||
|
}
|
||||||
|
found, err := repositories.CustomerIdentityRepository.GetUniqueBy(db, scope, source, "same")
|
||||||
|
if err != nil || found == nil || found.CustomerID != 102 {
|
||||||
|
t.Fatal("legacy mappings interfered with scoped identity")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestWebIdentityPolicySurvivesOlderClientEdits(t *testing.T) {
|
||||||
|
svc := newChannelService()
|
||||||
|
raw, err := svc.preserveWebIdentityPolicy(`{"title":"New title"}`, `{"requireSignedIdentity":true}`)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
cfg, err := svc.ParseWebChannelConfig(raw)
|
||||||
|
if err != nil || !cfg.RequireSignedIdentity {
|
||||||
|
t.Fatal("older client edit silently disabled signed-only policy")
|
||||||
|
}
|
||||||
|
raw, err = svc.preserveWebIdentityPolicy(`{"requireSignedIdentity":false}`, `{"requireSignedIdentity":true}`)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
cfg, err = svc.ParseWebChannelConfig(raw)
|
||||||
|
if err != nil || cfg.RequireSignedIdentity {
|
||||||
|
t.Fatal("explicit policy change was not honored")
|
||||||
|
}
|
||||||
|
for _, raw := range []string{`{"requireSignedIdentity":null}`, `{"requireSignedIdentity":"false"}`, `{"requireSignedIdentity":0}`} {
|
||||||
|
if _, err := svc.ParseWebChannelConfig(raw); err == nil {
|
||||||
|
t.Fatal("non-boolean authentication policy accepted")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCustomerSessionNearExpiryRefreshPreservesIdentity(t *testing.T) {
|
||||||
|
db, channel := setupIdentitySecurityDB(t)
|
||||||
|
exchanged, err := CustomerSessionService.Exchange(channel, scopedTestExternal(channel, "guest", "local-context"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
claims, err := CustomerSessionService.verifyToken(exchanged.CustomerSessionToken)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
originalKey, originalScope, originalCustomer := claims.IdentityKey, claims.IdentityScope, claims.CustomerID
|
||||||
|
claims.ExpiresAt = jwt.NewNumericDate(time.Now().Add(20 * time.Second))
|
||||||
|
nearExpiry, err := jwt.NewWithClaims(jwt.SigningMethodHS256, claims).SignedString([]byte(config.Current().CustomerSession.Secret))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
refreshed := verifySecurityCustomerSession(t, channel, nearExpiry)
|
||||||
|
if !refreshed.Refreshed || !refreshed.ExpiresAt.After(claims.ExpiresAt.Time) || refreshed.Token == nearExpiry {
|
||||||
|
t.Fatal("near-expiry credential was not refreshed")
|
||||||
|
}
|
||||||
|
refreshedClaims, err := CustomerSessionService.verifyToken(refreshed.Token)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if refreshedClaims.IdentityKey != originalKey || refreshedClaims.IdentityScope != originalScope || refreshedClaims.CustomerID != originalCustomer {
|
||||||
|
t.Fatal("refresh changed anonymous identity")
|
||||||
|
}
|
||||||
|
var customers int64
|
||||||
|
if err := db.Model(&models.Customer{}).Count(&customers).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if customers != 1 {
|
||||||
|
t.Fatal("refresh allocated another customer")
|
||||||
|
}
|
||||||
|
claims.ExpiresAt = jwt.NewNumericDate(time.Now().Add(-time.Second))
|
||||||
|
expired, err := jwt.NewWithClaims(jwt.SigningMethodHS256, claims).SignedString([]byte(config.Current().CustomerSession.Secret))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
ctx, _ := gin.CreateTestContext(httptest.NewRecorder())
|
||||||
|
ctx.Request = httptest.NewRequest("POST", "/api/customer/session_refresh", nil)
|
||||||
|
ctx.Request.Header.Set("Authorization", "Bearer "+expired)
|
||||||
|
if _, err := CustomerSessionService.VerifyRequest(ctx, channel); err == nil {
|
||||||
|
t.Fatal("expired anonymous credential was silently renewed")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestConcurrentCustomerSessionExchangesKeepOneScopedOwner(t *testing.T) {
|
||||||
|
db, channel := setupIdentitySecurityDB(t)
|
||||||
|
if err := db.Exec("PRAGMA journal_mode=WAL").Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
pool, err := db.DB()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
pool.SetMaxOpenConns(4)
|
||||||
|
external := scopedTestExternal(channel, "hmac", "concurrent-id")
|
||||||
|
var queries atomic.Int32
|
||||||
|
arrived := make(chan struct{}, 2)
|
||||||
|
release := make(chan struct{})
|
||||||
|
var releaseOnce sync.Once
|
||||||
|
releaseBoth := func() { releaseOnce.Do(func() { close(release) }) }
|
||||||
|
var exchanges sync.WaitGroup
|
||||||
|
defer func() { releaseBoth(); exchanges.Wait() }()
|
||||||
|
callbackName := "test:concurrent_scoped_lookup"
|
||||||
|
if err := db.Callback().Query().After("gorm:query").Register(callbackName, func(tx *gorm.DB) {
|
||||||
|
if tx.Statement.Table != "t_customer_identity" || tx.Error != nil || tx.RowsAffected != 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if queries.Add(1) <= 2 {
|
||||||
|
arrived <- struct{}{}
|
||||||
|
<-release
|
||||||
|
}
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { _ = db.Callback().Query().Remove(callbackName) })
|
||||||
|
type result struct {
|
||||||
|
value *response.CustomerSessionExchangeResponse
|
||||||
|
err error
|
||||||
|
}
|
||||||
|
results := make(chan result, 2)
|
||||||
|
exchanges.Add(2)
|
||||||
|
for i := 0; i < 2; i++ {
|
||||||
|
go func() {
|
||||||
|
defer exchanges.Done()
|
||||||
|
value, err := CustomerSessionService.Exchange(channel, external)
|
||||||
|
results <- result{value, err}
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
for i := 0; i < 2; i++ {
|
||||||
|
select {
|
||||||
|
case <-arrived:
|
||||||
|
case <-time.After(2 * time.Second):
|
||||||
|
releaseBoth()
|
||||||
|
t.Fatal("concurrent transactions did not both reach initial identity lookup")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
releaseBoth()
|
||||||
|
successes := 0
|
||||||
|
var owner int64
|
||||||
|
for i := 0; i < 2; i++ {
|
||||||
|
select {
|
||||||
|
case result := <-results:
|
||||||
|
if result.err == nil {
|
||||||
|
successes++
|
||||||
|
owner = result.value.Customer.ID
|
||||||
|
}
|
||||||
|
case <-time.After(2 * time.Second):
|
||||||
|
t.Fatal("concurrent exchange did not finish")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if successes != 1 {
|
||||||
|
t.Fatalf("expected one transaction winner, got %d", successes)
|
||||||
|
}
|
||||||
|
var customers, identities int64
|
||||||
|
if err := db.Model(&models.Customer{}).Count(&customers).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := db.Model(&models.CustomerIdentity{}).Count(&identities).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if customers != 1 || identities != 1 {
|
||||||
|
t.Fatal("losing transaction left an orphan or competing customer mapping")
|
||||||
|
}
|
||||||
|
retry, err := CustomerSessionService.Exchange(channel, external)
|
||||||
|
if err != nil || retry.Customer.ID != owner {
|
||||||
|
t.Fatal("retry did not resolve the unique winning owner")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
|
// Modified in the independent hardening fork; see docs/hardening.
|
||||||
|
|
||||||
package services
|
package services
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -124,7 +126,15 @@ func (s *customerService) EnsureExternalCustomer(ctx *sqls.TxContext, externalUs
|
|||||||
return 0, errorsx.UnauthorizedI18n("error.e0149")
|
return 0, errorsx.UnauthorizedI18n("error.e0149")
|
||||||
}
|
}
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
if identity := repositories.CustomerIdentityRepository.GetBy(ctx.Tx, externalSource, externalID); identity != nil {
|
identity, err := repositories.CustomerIdentityRepository.GetUniqueBy(ctx.Tx, externalUser.IdentityScope, externalSource, externalID)
|
||||||
|
if err != nil {
|
||||||
|
return 0, errorsx.UnauthorizedI18n("error.e0161")
|
||||||
|
}
|
||||||
|
if identity != nil {
|
||||||
|
customer := repositories.CustomerRepository.Get(ctx.Tx, identity.CustomerID)
|
||||||
|
if customer == nil || customer.Status != enums.StatusOk {
|
||||||
|
return 0, errorsx.UnauthorizedI18n("error.e0161")
|
||||||
|
}
|
||||||
updates := map[string]any{
|
updates := map[string]any{
|
||||||
"last_active_at": now,
|
"last_active_at": now,
|
||||||
"updated_at": now,
|
"updated_at": now,
|
||||||
@@ -161,12 +171,16 @@ func (s *customerService) EnsureExternalCustomer(ctx *sqls.TxContext, externalUs
|
|||||||
}
|
}
|
||||||
if err := repositories.CustomerIdentityRepository.Create(ctx.Tx, &models.CustomerIdentity{
|
if err := repositories.CustomerIdentityRepository.Create(ctx.Tx, &models.CustomerIdentity{
|
||||||
CustomerID: customer.ID,
|
CustomerID: customer.ID,
|
||||||
|
IdentityScope: externalUser.IdentityScope,
|
||||||
|
ScopedKey: repositories.ScopedCustomerIdentityKey(externalUser.IdentityScope, externalSource, externalID),
|
||||||
ExternalSource: externalSource,
|
ExternalSource: externalSource,
|
||||||
ExternalID: externalID,
|
ExternalID: externalID,
|
||||||
Status: enums.StatusOk,
|
Status: enums.StatusOk,
|
||||||
AuditFields: utils.BuildAuditFields(nil),
|
AuditFields: utils.BuildAuditFields(nil),
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
return 0, err
|
// A concurrent scoped claim rolls the transaction back; retrying the
|
||||||
|
// exchange resolves the winning mapping. Do not expose SQL/key data.
|
||||||
|
return 0, errorsx.UnauthorizedI18n("error.e0161")
|
||||||
}
|
}
|
||||||
return customer.ID, nil
|
return customer.ID, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,10 @@
|
|||||||
|
// Modified in the independent hardening fork; see docs/hardening.
|
||||||
|
|
||||||
package services
|
package services
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"crypto/rand"
|
||||||
|
"encoding/hex"
|
||||||
"errors"
|
"errors"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
@@ -42,10 +46,13 @@ type customerSessionClaims struct {
|
|||||||
CustomerID int64 `json:"customerId"`
|
CustomerID int64 `json:"customerId"`
|
||||||
CustomerName string `json:"customerName"`
|
CustomerName string `json:"customerName"`
|
||||||
IdentityKey string `json:"identityKey"`
|
IdentityKey string `json:"identityKey"`
|
||||||
|
IdentityScope string `json:"identityScope"`
|
||||||
jwt.RegisteredClaims
|
jwt.RegisteredClaims
|
||||||
}
|
}
|
||||||
|
|
||||||
type CustomerSessionVerifyResult struct {
|
type CustomerSessionVerifyResult struct {
|
||||||
|
CustomerID int64
|
||||||
|
ChannelID int64
|
||||||
ExternalUser *openidentity.ExternalUser
|
ExternalUser *openidentity.ExternalUser
|
||||||
Token string
|
Token string
|
||||||
ExpiresAt time.Time
|
ExpiresAt time.Time
|
||||||
@@ -56,6 +63,19 @@ func (s *customerSessionService) Exchange(channel *models.Channel, externalUser
|
|||||||
if channel == nil || channel.Status != enums.StatusOk {
|
if channel == nil || channel.Status != enums.StatusOk {
|
||||||
return nil, errorsx.InvalidParamI18n("error.e0209")
|
return nil, errorsx.InvalidParamI18n("error.e0209")
|
||||||
}
|
}
|
||||||
|
if !openidentity.ValidIdentityScope(channel.ChannelID, externalUser) || (ChannelService.RequiresSignedIdentity(channel) && externalUser.ExternalSource != enums.ExternalSourceUser) {
|
||||||
|
return nil, errorsx.UnauthorizedI18n("error.e0161")
|
||||||
|
}
|
||||||
|
externalUser.ChannelID = channel.ID
|
||||||
|
if externalUser.ExternalSource == enums.ExternalSourceGuest {
|
||||||
|
// A public caller's guest ID is not proof of possession. Only the signed
|
||||||
|
// customer session can resume this server-issued anonymous identity.
|
||||||
|
var id [32]byte
|
||||||
|
if _, err := rand.Read(id[:]); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
externalUser.ExternalID = hex.EncodeToString(id[:])
|
||||||
|
}
|
||||||
var customerID int64
|
var customerID int64
|
||||||
if err := sqls.WithTransaction(func(ctx *sqls.TxContext) error {
|
if err := sqls.WithTransaction(func(ctx *sqls.TxContext) error {
|
||||||
id, err := CustomerService.EnsureExternalCustomer(ctx, externalUser)
|
id, err := CustomerService.EnsureExternalCustomer(ctx, externalUser)
|
||||||
@@ -68,9 +88,13 @@ func (s *customerSessionService) Exchange(channel *models.Channel, externalUser
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
customer := CustomerService.Get(customerID)
|
customer := CustomerService.Get(customerID)
|
||||||
if customer == nil || customer.Status == enums.StatusDeleted {
|
if customer == nil || customer.Status != enums.StatusOk {
|
||||||
return nil, errorsx.InvalidParamI18n("error.e0155")
|
return nil, errorsx.InvalidParamI18n("error.e0155")
|
||||||
}
|
}
|
||||||
|
identity, identityErr := repositories.CustomerIdentityRepository.GetUniqueBy(sqls.DB(), externalUser.IdentityScope, externalUser.ExternalSource, externalUser.ExternalID)
|
||||||
|
if identityErr != nil || identity == nil || identity.CustomerID != customer.ID {
|
||||||
|
return nil, errorsx.UnauthorizedI18n("error.e0161")
|
||||||
|
}
|
||||||
token, expiresAt, err := s.Sign(channel, customer, externalUser)
|
token, expiresAt, err := s.Sign(channel, customer, externalUser)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -92,7 +116,7 @@ func (s *customerSessionService) Sign(channel *models.Channel, customer *models.
|
|||||||
if secret == "" {
|
if secret == "" {
|
||||||
return "", time.Time{}, errorsx.BusinessErrorI18n(1, "error.customerSession.secretMissing")
|
return "", time.Time{}, errorsx.BusinessErrorI18n(1, "error.customerSession.secretMissing")
|
||||||
}
|
}
|
||||||
if channel == nil || customer == nil {
|
if channel == nil || customer == nil || !openidentity.ValidIdentityScope(channel.ChannelID, externalUser) {
|
||||||
return "", time.Time{}, errorsx.InvalidParamI18n("error.e0158")
|
return "", time.Time{}, errorsx.InvalidParamI18n("error.e0158")
|
||||||
}
|
}
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
@@ -104,6 +128,7 @@ func (s *customerSessionService) Sign(channel *models.Channel, customer *models.
|
|||||||
CustomerID: customer.ID,
|
CustomerID: customer.ID,
|
||||||
CustomerName: strings.TrimSpace(customer.Name),
|
CustomerName: strings.TrimSpace(customer.Name),
|
||||||
IdentityKey: s.identityKey(externalUser),
|
IdentityKey: s.identityKey(externalUser),
|
||||||
|
IdentityScope: externalUser.IdentityScope,
|
||||||
RegisteredClaims: jwt.RegisteredClaims{
|
RegisteredClaims: jwt.RegisteredClaims{
|
||||||
IssuedAt: jwt.NewNumericDate(now),
|
IssuedAt: jwt.NewNumericDate(now),
|
||||||
ExpiresAt: jwt.NewNumericDate(expiresAt),
|
ExpiresAt: jwt.NewNumericDate(expiresAt),
|
||||||
@@ -125,27 +150,13 @@ func (s *customerSessionService) VerifyRequest(ctx *gin.Context, channel *models
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if channel == nil || channel.Status != enums.StatusOk {
|
result, err := s.verifyClaims(claims, channel)
|
||||||
return nil, errorsx.InvalidParamI18n("error.e0209")
|
|
||||||
}
|
|
||||||
if claims.ChannelID != channel.ID || strings.TrimSpace(claims.ChannelCode) != strings.TrimSpace(channel.ChannelID) {
|
|
||||||
return nil, errorsx.UnauthorizedI18n("error.e0161")
|
|
||||||
}
|
|
||||||
customer := CustomerService.Get(claims.CustomerID)
|
|
||||||
if customer == nil || customer.Status == enums.StatusDeleted {
|
|
||||||
return nil, errorsx.UnauthorizedI18n("error.e0161")
|
|
||||||
}
|
|
||||||
external, err := s.externalUserFromClaims(claims, customer)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &CustomerSessionVerifyResult{
|
result.Token = token
|
||||||
ExternalUser: external,
|
|
||||||
Token: token,
|
|
||||||
ExpiresAt: claims.ExpiresAt.Time,
|
|
||||||
}
|
|
||||||
if s.shouldRefresh(claims.ExpiresAt.Time) {
|
if s.shouldRefresh(claims.ExpiresAt.Time) {
|
||||||
newToken, expiresAt, err := s.Sign(channel, customer, *external)
|
newToken, expiresAt, err := s.Sign(channel, CustomerService.Get(result.CustomerID), *result.ExternalUser)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -190,7 +201,7 @@ func (s *customerSessionService) verifyToken(rawToken string) (*customerSessionC
|
|||||||
if token == nil || !token.Valid || claims.TokenType != customerSessionTokenType || claims.ExpiresAt == nil {
|
if token == nil || !token.Valid || claims.TokenType != customerSessionTokenType || claims.ExpiresAt == nil {
|
||||||
return nil, errorsx.UnauthorizedI18n("error.e0161")
|
return nil, errorsx.UnauthorizedI18n("error.e0161")
|
||||||
}
|
}
|
||||||
if claims.ChannelID <= 0 || strings.TrimSpace(claims.ChannelCode) == "" || claims.CustomerID <= 0 || strings.TrimSpace(claims.IdentityKey) == "" {
|
if claims.ChannelID <= 0 || strings.TrimSpace(claims.ChannelCode) == "" || claims.CustomerID <= 0 || strings.TrimSpace(claims.IdentityKey) == "" || strings.TrimSpace(claims.IdentityScope) == "" {
|
||||||
return nil, errorsx.UnauthorizedI18n("error.e0161")
|
return nil, errorsx.UnauthorizedI18n("error.e0161")
|
||||||
}
|
}
|
||||||
return claims, nil
|
return claims, nil
|
||||||
@@ -211,8 +222,8 @@ func (s *customerSessionService) externalUserFromClaims(claims *customerSessionC
|
|||||||
default:
|
default:
|
||||||
return nil, errorsx.UnauthorizedI18n("error.e0161")
|
return nil, errorsx.UnauthorizedI18n("error.e0161")
|
||||||
}
|
}
|
||||||
identity := repositories.CustomerIdentityRepository.GetBy(sqls.DB(), source, parts[1])
|
identity, err := repositories.CustomerIdentityRepository.GetUniqueBy(sqls.DB(), claims.IdentityScope, source, parts[1])
|
||||||
if identity == nil || identity.CustomerID != claims.CustomerID {
|
if err != nil || identity == nil || identity.CustomerID != claims.CustomerID {
|
||||||
return nil, errorsx.UnauthorizedI18n("error.e0161")
|
return nil, errorsx.UnauthorizedI18n("error.e0161")
|
||||||
}
|
}
|
||||||
name := strings.TrimSpace(claims.CustomerName)
|
name := strings.TrimSpace(claims.CustomerName)
|
||||||
@@ -223,6 +234,8 @@ func (s *customerSessionService) externalUserFromClaims(claims *customerSessionC
|
|||||||
ExternalSource: source,
|
ExternalSource: source,
|
||||||
ExternalID: parts[1],
|
ExternalID: parts[1],
|
||||||
ExternalName: name,
|
ExternalName: name,
|
||||||
|
IdentityScope: claims.IdentityScope,
|
||||||
|
ChannelID: claims.ChannelID,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -250,3 +263,38 @@ func (s *customerSessionService) getCustomerSessionToken(ctx *gin.Context) strin
|
|||||||
token, _ := params.Get(ctx, "customerSessionToken")
|
token, _ := params.Get(ctx, "customerSessionToken")
|
||||||
return strings.TrimSpace(token)
|
return strings.TrimSpace(token)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// VerifyConnection rechecks the signed credential, expiry, channel policy and
|
||||||
|
// current identity mapping. It never refreshes an idle connection indefinitely.
|
||||||
|
func (s *customerSessionService) VerifyConnection(result *CustomerSessionVerifyResult) bool {
|
||||||
|
if result == nil || !time.Now().Before(result.ExpiresAt) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
claims, err := s.verifyToken(result.Token)
|
||||||
|
if err != nil || claims.CustomerID != result.CustomerID || claims.ChannelID != result.ChannelID {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
verified, err := s.verifyClaims(claims, ChannelService.Get(claims.ChannelID))
|
||||||
|
return err == nil && verified.ExternalUser != nil && result.ExternalUser != nil &&
|
||||||
|
verified.ExternalUser.IdentityScope == result.ExternalUser.IdentityScope &&
|
||||||
|
verified.ExternalUser.ExternalSource == result.ExternalUser.ExternalSource &&
|
||||||
|
verified.ExternalUser.ExternalID == result.ExternalUser.ExternalID
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *customerSessionService) verifyClaims(claims *customerSessionClaims, channel *models.Channel) (*CustomerSessionVerifyResult, error) {
|
||||||
|
if channel == nil || channel.Status != enums.StatusOk || claims.ChannelID != channel.ID || strings.TrimSpace(claims.ChannelCode) != strings.TrimSpace(channel.ChannelID) {
|
||||||
|
return nil, errorsx.UnauthorizedI18n("error.e0161")
|
||||||
|
}
|
||||||
|
customer := CustomerService.Get(claims.CustomerID)
|
||||||
|
if customer == nil || customer.Status != enums.StatusOk {
|
||||||
|
return nil, errorsx.UnauthorizedI18n("error.e0161")
|
||||||
|
}
|
||||||
|
external, err := s.externalUserFromClaims(claims, customer)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if !openidentity.ValidIdentityScope(channel.ChannelID, *external) || (ChannelService.RequiresSignedIdentity(channel) && external.ExternalSource != enums.ExternalSourceUser) {
|
||||||
|
return nil, errorsx.UnauthorizedI18n("error.e0161")
|
||||||
|
}
|
||||||
|
return &CustomerSessionVerifyResult{CustomerID: customer.ID, ChannelID: channel.ID, ExternalUser: external, ExpiresAt: claims.ExpiresAt.Time}, nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified in AgentDeskNext: authenticated support availability and calendars.
|
||||||
package services
|
package services
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -117,11 +118,18 @@ func (s *dashboardService) GetOverview(rangeValue string, locale string) respons
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *dashboardService) buildAgentStats(now time.Time, teams []models.AgentTeam, profiles []models.AgentProfile, schedules []models.AgentTeamSchedule, conversations []models.Conversation) (int64, int64, int64, []response.DashboardTeamLoadResponse) {
|
func (s *dashboardService) buildAgentStats(now time.Time, teams []models.AgentTeam, profiles []models.AgentProfile, schedules []models.AgentTeamSchedule, conversations []models.Conversation) (int64, int64, int64, []response.DashboardTeamLoadResponse) {
|
||||||
const onlineWindow = 15 * time.Minute
|
userIDs := make([]int64, 0, len(profiles))
|
||||||
|
for _, profile := range profiles {
|
||||||
|
userIDs = append(userIDs, profile.UserID)
|
||||||
|
}
|
||||||
|
online, _ := SupportAvailabilityService.onlineUsers(sqls.DB(), userIDs, now)
|
||||||
|
|
||||||
scheduledTeamIDs := make(map[int64]bool, len(schedules))
|
scheduledTeamIDs := make(map[int64]bool, len(schedules))
|
||||||
for _, item := range schedules {
|
for _, team := range teams {
|
||||||
scheduledTeamIDs[item.TeamID] = true
|
calendar, err := SupportCalendarService.Evaluate(sqls.DB(), team.ID, now)
|
||||||
|
if err == nil {
|
||||||
|
scheduledTeamIDs[team.ID] = calendar.Open
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
type teamCounter struct {
|
type teamCounter struct {
|
||||||
@@ -151,10 +159,10 @@ func (s *dashboardService) buildAgentStats(now time.Time, teams []models.AgentTe
|
|||||||
}
|
}
|
||||||
counter.totalAgents++
|
counter.totalAgents++
|
||||||
counter.maxConcurrentCapacity += int64(profile.MaxConcurrentCount)
|
counter.maxConcurrentCapacity += int64(profile.MaxConcurrentCount)
|
||||||
if profile.LastOnlineAt != nil && now.Sub(*profile.LastOnlineAt) <= onlineWindow {
|
if online[profile.UserID] {
|
||||||
counter.onlineAgents++
|
counter.onlineAgents++
|
||||||
onlineAgents++
|
onlineAgents++
|
||||||
if profile.ServiceStatus == enums.ServiceStatusBusy {
|
if effectiveSupportStatus(profile, now) == enums.ServiceStatusBusy {
|
||||||
counter.busyAgents++
|
counter.busyAgents++
|
||||||
busyAgents++
|
busyAgents++
|
||||||
}
|
}
|
||||||
@@ -254,8 +262,11 @@ func (s *dashboardService) buildAlerts(now time.Time, db *gorm.DB, aiAgents []mo
|
|||||||
}
|
}
|
||||||
|
|
||||||
scheduledTeamIDs := make(map[int64]bool, len(schedules))
|
scheduledTeamIDs := make(map[int64]bool, len(schedules))
|
||||||
for _, item := range schedules {
|
for _, team := range teams {
|
||||||
scheduledTeamIDs[item.TeamID] = true
|
calendar, err := SupportCalendarService.Evaluate(sqls.DB(), team.ID, now)
|
||||||
|
if err == nil {
|
||||||
|
scheduledTeamIDs[team.ID] = calendar.Open
|
||||||
|
}
|
||||||
}
|
}
|
||||||
var scheduleMissingCount int64
|
var scheduleMissingCount int64
|
||||||
for _, team := range teams {
|
for _, team := range teams {
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified in the independent AgentDesk fork: localized knowledge workflows and safe display errors.
|
||||||
package services
|
package services
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -136,9 +137,9 @@ func (s *knowledgeBaseService) DeleteKnowledgeBase(id int64) error {
|
|||||||
referencingWorkflows := s.findWorkflowReferencesByKnowledgeBaseID(id)
|
referencingWorkflows := s.findWorkflowReferencesByKnowledgeBaseID(id)
|
||||||
if len(referencingWorkflows) > 0 {
|
if len(referencingWorkflows) > 0 {
|
||||||
if len(referencingWorkflows) == 1 {
|
if len(referencingWorkflows) == 1 {
|
||||||
return errorsx.Forbidden(fmt.Sprintf("知识库正在被流程「%s」使用，请先从知识检索节点中移除", referencingWorkflows[0]))
|
return errorsx.ForbiddenI18n("error.knowledge.workflowReference", referencingWorkflows[0])
|
||||||
}
|
}
|
||||||
return errorsx.Forbidden(fmt.Sprintf("知识库正在被 %d 个流程使用，请先从知识检索节点中移除", len(referencingWorkflows)))
|
return errorsx.ForbiddenI18n("error.knowledge.workflowReferences", len(referencingWorkflows))
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := sqls.WithTransaction(func(ctx *sqls.TxContext) error {
|
if err := sqls.WithTransaction(func(ctx *sqls.TxContext) error {
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified in the independent AgentDesk fork: localized knowledge workflows and safe display errors.
|
||||||
package services
|
package services
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -10,6 +11,7 @@ import (
|
|||||||
"agent-desk/internal/models"
|
"agent-desk/internal/models"
|
||||||
"agent-desk/internal/pkg/dto/request"
|
"agent-desk/internal/pkg/dto/request"
|
||||||
"agent-desk/internal/pkg/enums"
|
"agent-desk/internal/pkg/enums"
|
||||||
|
"agent-desk/internal/pkg/errorsx"
|
||||||
"agent-desk/internal/repositories"
|
"agent-desk/internal/repositories"
|
||||||
|
|
||||||
"github.com/glebarez/sqlite"
|
"github.com/glebarez/sqlite"
|
||||||
@@ -203,3 +205,36 @@ func assertKnowledgeBaseServiceTestCount(t *testing.T, model any, query string,
|
|||||||
t.Fatalf("count %T = %d, want %d", model, count, want)
|
t.Fatalf("count %T = %d, want %d", model, count, want)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestDeleteKnowledgeBaseWorkflowErrorsLocalized(t *testing.T) {
|
||||||
|
for _, count := range []int{1, 2} {
|
||||||
|
t.Run(string(rune('0'+count)), func(t *testing.T) {
|
||||||
|
setupKnowledgeBaseServiceTestDB(t)
|
||||||
|
kb := createKnowledgeBaseServiceTestBase(t, "Keep this knowledge base")
|
||||||
|
for i := 0; i < count; i++ {
|
||||||
|
createKnowledgeBaseServiceTestWorkflow(t, "流程 %s / Процесс"+string(rune('A'+i)), knowledgeBaseServiceTestWorkflowDefinition([]int64{kb.ID}))
|
||||||
|
}
|
||||||
|
err := KnowledgeBaseService.DeleteKnowledgeBase(kb.ID)
|
||||||
|
localized, ok := err.(*errorsx.I18nError)
|
||||||
|
if !ok {
|
||||||
|
t.Fatalf("expected localized application error, got %T: %v", err, err)
|
||||||
|
}
|
||||||
|
key := "error.knowledge.workflowReference"
|
||||||
|
if count > 1 {
|
||||||
|
key = "error.knowledge.workflowReferences"
|
||||||
|
}
|
||||||
|
if localized.Key != key {
|
||||||
|
t.Fatalf("error key = %q", localized.Key)
|
||||||
|
}
|
||||||
|
for _, locale := range []string{"en-US", "ru-RU"} {
|
||||||
|
message := localized.Message(locale)
|
||||||
|
if strings.Contains(message, "%!") || strings.Contains(message, "error.knowledge") || strings.Contains(message, "知识库正在") {
|
||||||
|
t.Fatalf("bad localized message %q", message)
|
||||||
|
}
|
||||||
|
if count == 1 && !strings.Contains(message, "流程 %s / Процесс") {
|
||||||
|
t.Fatalf("workflow name changed: %q", message)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified in the independent AgentDesk fork: localized knowledge workflows and safe display errors.
|
||||||
package services
|
package services
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -43,27 +44,27 @@ type knowledgeFAQImportRow struct {
|
|||||||
Remark string
|
Remark string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *knowledgeFAQService) BuildKnowledgeFAQImportTemplate() (*response.KnowledgeFAQExportedFile, error) {
|
func (s *knowledgeFAQService) BuildKnowledgeFAQImportTemplate(locales ...string) (*response.KnowledgeFAQExportedFile, error) {
|
||||||
workbook := excelize.NewFile()
|
workbook := excelize.NewFile()
|
||||||
defer workbook.Close()
|
defer workbook.Close()
|
||||||
if err := writeKnowledgeFAQWorkbookHeader(workbook); err != nil {
|
if err := writeKnowledgeFAQWorkbookHeader(workbook, locales...); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
_ = workbook.SetCellValue(knowledgeFAQExcelSheetName, "A2", "如何重置密码？")
|
_ = workbook.SetCellValue(knowledgeFAQExcelSheetName, "A2", i18nx.Getf(knowledgeFAQExcelLocale(locales), "knowledge.excel.exampleQuestion"))
|
||||||
_ = workbook.SetCellValue(knowledgeFAQExcelSheetName, "B2", "进入个人设置后点击重置密码。")
|
_ = workbook.SetCellValue(knowledgeFAQExcelSheetName, "B2", i18nx.Getf(knowledgeFAQExcelLocale(locales), "knowledge.excel.exampleAnswer"))
|
||||||
_ = workbook.SetCellValue(knowledgeFAQExcelSheetName, "C2", "忘记密码怎么办\n重置密码在哪里")
|
_ = workbook.SetCellValue(knowledgeFAQExcelSheetName, "C2", i18nx.Getf(knowledgeFAQExcelLocale(locales), "knowledge.excel.exampleSimilar"))
|
||||||
_ = workbook.SetCellValue(knowledgeFAQExcelSheetName, "D2", "账号")
|
_ = workbook.SetCellValue(knowledgeFAQExcelSheetName, "D2", i18nx.Getf(knowledgeFAQExcelLocale(locales), "knowledge.excel.exampleRemark"))
|
||||||
return buildKnowledgeFAQExcelFile("knowledge-faq-import-template.xlsx", workbook)
|
return buildKnowledgeFAQExcelFile("knowledge-faq-import-template.xlsx", workbook)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *knowledgeFAQService) ExportKnowledgeFAQs(knowledgeBaseID int64) (*response.KnowledgeFAQExportedFile, error) {
|
func (s *knowledgeFAQService) ExportKnowledgeFAQs(knowledgeBaseID int64, locales ...string) (*response.KnowledgeFAQExportedFile, error) {
|
||||||
if _, err := s.requireFAQKnowledgeBase(knowledgeBaseID); err != nil {
|
if _, err := s.requireFAQKnowledgeBase(knowledgeBaseID); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
list := repositories.KnowledgeFAQRepository.FindAllByKnowledgeBaseID(sqls.DB(), knowledgeBaseID)
|
list := repositories.KnowledgeFAQRepository.FindAllByKnowledgeBaseID(sqls.DB(), knowledgeBaseID)
|
||||||
workbook := excelize.NewFile()
|
workbook := excelize.NewFile()
|
||||||
defer workbook.Close()
|
defer workbook.Close()
|
||||||
if err := writeKnowledgeFAQWorkbookHeader(workbook); err != nil {
|
if err := writeKnowledgeFAQWorkbookHeader(workbook, locales...); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
for index, item := range list {
|
for index, item := range list {
|
||||||
@@ -182,7 +183,7 @@ func (s *knowledgeFAQService) ImportKnowledgeFAQs(req request.ImportKnowledgeFAQ
|
|||||||
return result, nil
|
return result, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func writeKnowledgeFAQWorkbookHeader(workbook *excelize.File) error {
|
func writeKnowledgeFAQWorkbookHeader(workbook *excelize.File, locales ...string) error {
|
||||||
sheet := workbook.GetSheetName(0)
|
sheet := workbook.GetSheetName(0)
|
||||||
if sheet == "" {
|
if sheet == "" {
|
||||||
sheet = knowledgeFAQExcelSheetName
|
sheet = knowledgeFAQExcelSheetName
|
||||||
@@ -192,7 +193,13 @@ func writeKnowledgeFAQWorkbookHeader(workbook *excelize.File) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
headers := []string{"标准问题", "答案", "相似问", "备注"}
|
locale := knowledgeFAQExcelLocale(locales)
|
||||||
|
headers := []string{
|
||||||
|
i18nx.Getf(locale, "knowledge.excel.question"),
|
||||||
|
i18nx.Getf(locale, "knowledge.excel.answer"),
|
||||||
|
i18nx.Getf(locale, "knowledge.excel.similarQuestions"),
|
||||||
|
i18nx.Getf(locale, "knowledge.excel.remark"),
|
||||||
|
}
|
||||||
for index, header := range headers {
|
for index, header := range headers {
|
||||||
cell, err := excelize.CoordinatesToCellName(index+1, 1)
|
cell, err := excelize.CoordinatesToCellName(index+1, 1)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -274,7 +281,7 @@ func parseKnowledgeFAQImportRows(reader io.Reader, locale string) ([]knowledgeFA
|
|||||||
SimilarQuestions: parseKnowledgeFAQSimilarQuestions(getKnowledgeFAQExcelCell(current, headerMap["similarQuestions"])),
|
SimilarQuestions: parseKnowledgeFAQSimilarQuestions(getKnowledgeFAQExcelCell(current, headerMap["similarQuestions"])),
|
||||||
Remark: getKnowledgeFAQExcelCell(current, headerMap["remark"]),
|
Remark: getKnowledgeFAQExcelCell(current, headerMap["remark"]),
|
||||||
}
|
}
|
||||||
if row.Question == "" {
|
if strings.TrimSpace(row.Question) == "" {
|
||||||
result.Failed++
|
result.Failed++
|
||||||
result.Errors = append(result.Errors, response.KnowledgeFAQImportError{Row: rowNo, Message: i18nx.Getf(locale, "error.e0340")})
|
result.Errors = append(result.Errors, response.KnowledgeFAQImportError{Row: rowNo, Message: i18nx.Getf(locale, "error.e0340")})
|
||||||
continue
|
continue
|
||||||
@@ -284,7 +291,7 @@ func parseKnowledgeFAQImportRows(reader io.Reader, locale string) ([]knowledgeFA
|
|||||||
result.Errors = append(result.Errors, response.KnowledgeFAQImportError{Row: rowNo, Message: i18nx.Getf(locale, "error.e0341")})
|
result.Errors = append(result.Errors, response.KnowledgeFAQImportError{Row: rowNo, Message: i18nx.Getf(locale, "error.e0341")})
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if row.Answer == "" {
|
if strings.TrimSpace(row.Answer) == "" {
|
||||||
result.Failed++
|
result.Failed++
|
||||||
result.Errors = append(result.Errors, response.KnowledgeFAQImportError{Row: rowNo, Message: i18nx.Getf(locale, "error.e0292")})
|
result.Errors = append(result.Errors, response.KnowledgeFAQImportError{Row: rowNo, Message: i18nx.Getf(locale, "error.e0292")})
|
||||||
continue
|
continue
|
||||||
@@ -305,19 +312,34 @@ func buildKnowledgeFAQHeaderMap(headerRow []string) map[string]int {
|
|||||||
"标准问题": "question",
|
"标准问题": "question",
|
||||||
"问题": "question",
|
"问题": "question",
|
||||||
"question": "question",
|
"question": "question",
|
||||||
|
"primary question": "question",
|
||||||
|
"standard question": "question",
|
||||||
|
"основной вопрос": "question",
|
||||||
|
"стандартный вопрос": "question",
|
||||||
|
"вопрос": "question",
|
||||||
"答案": "answer",
|
"答案": "answer",
|
||||||
"answer": "answer",
|
"answer": "answer",
|
||||||
|
"ответ": "answer",
|
||||||
"相似问": "similarQuestions",
|
"相似问": "similarQuestions",
|
||||||
"相似问题": "similarQuestions",
|
"相似问题": "similarQuestions",
|
||||||
"similarquestions": "similarQuestions",
|
"similarquestions": "similarQuestions",
|
||||||
|
"similar questions": "similarQuestions",
|
||||||
|
"similar_questions": "similarQuestions",
|
||||||
|
"похожие вопросы": "similarQuestions",
|
||||||
|
"похожие вопрос": "similarQuestions",
|
||||||
|
"схожие вопросы": "similarQuestions",
|
||||||
"备注": "remark",
|
"备注": "remark",
|
||||||
"remark": "remark",
|
"remark": "remark",
|
||||||
|
"remarks": "remark",
|
||||||
|
"notes": "remark",
|
||||||
|
"примечание": "remark",
|
||||||
|
"примечания": "remark",
|
||||||
}
|
}
|
||||||
result := make(map[string]int)
|
result := map[string]int{"similarQuestions": -1, "remark": -1}
|
||||||
for index, header := range headerRow {
|
for index, header := range headerRow {
|
||||||
key := strings.ToLower(strings.TrimSpace(strings.TrimPrefix(header, "\uFEFF")))
|
key := strings.ToLower(strings.TrimSpace(strings.TrimPrefix(header, "\uFEFF")))
|
||||||
if field, ok := accepted[key]; ok {
|
if field, ok := accepted[key]; ok {
|
||||||
if _, exists := result[field]; !exists {
|
if existing, exists := result[field]; !exists || existing < 0 {
|
||||||
result[field] = index
|
result[field] = index
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -329,7 +351,8 @@ func getKnowledgeFAQExcelCell(row []string, index int) string {
|
|||||||
if index < 0 || index >= len(row) {
|
if index < 0 || index >= len(row) {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
return strings.TrimSpace(row[index])
|
// Keep authored Q/A and notes verbatim; trim only for validation and headers.
|
||||||
|
return row[index]
|
||||||
}
|
}
|
||||||
|
|
||||||
func isKnowledgeFAQExcelRowEmpty(row []string) bool {
|
func isKnowledgeFAQExcelRowEmpty(row []string) bool {
|
||||||
@@ -346,8 +369,8 @@ func parseKnowledgeFAQSimilarQuestions(value string) []string {
|
|||||||
items := make([]string, 0, len(lines))
|
items := make([]string, 0, len(lines))
|
||||||
seen := make(map[string]struct{}, len(lines))
|
seen := make(map[string]struct{}, len(lines))
|
||||||
for _, line := range lines {
|
for _, line := range lines {
|
||||||
item := strings.TrimSpace(strings.ReplaceAll(line, "\r", ""))
|
item := strings.TrimSuffix(line, "\r")
|
||||||
if item == "" {
|
if strings.TrimSpace(item) == "" {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if _, ok := seen[item]; ok {
|
if _, ok := seen[item]; ok {
|
||||||
@@ -369,3 +392,10 @@ func decodeKnowledgeFAQSimilarQuestions(value string) []string {
|
|||||||
}
|
}
|
||||||
return items
|
return items
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func knowledgeFAQExcelLocale(locales []string) string {
|
||||||
|
if len(locales) > 0 {
|
||||||
|
return i18nx.NormalizeLocale(locales[0])
|
||||||
|
}
|
||||||
|
return i18nx.DefaultLocale
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
|
// Modified in the independent AgentDesk fork: localized knowledge workflows and safe display errors.
|
||||||
package services
|
package services
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"reflect"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"agent-desk/internal/models"
|
"agent-desk/internal/models"
|
||||||
@@ -18,7 +20,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func TestKnowledgeFAQExcelTemplateContainsExpectedHeaders(t *testing.T) {
|
func TestKnowledgeFAQExcelTemplateContainsExpectedHeaders(t *testing.T) {
|
||||||
file, err := KnowledgeFAQService.BuildKnowledgeFAQImportTemplate()
|
file, err := KnowledgeFAQService.BuildKnowledgeFAQImportTemplate("zh-CN")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("BuildKnowledgeFAQImportTemplate() error = %v", err)
|
t.Fatalf("BuildKnowledgeFAQImportTemplate() error = %v", err)
|
||||||
}
|
}
|
||||||
@@ -247,3 +249,82 @@ func stubKnowledgeFAQImportIndex(t *testing.T) func() {
|
|||||||
indexKnowledgeFAQAfterImport = original
|
indexKnowledgeFAQAfterImport = original
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestKnowledgeFAQExcelLocalizedTemplatesRoundTrip(t *testing.T) {
|
||||||
|
for _, tc := range []struct {
|
||||||
|
locale string
|
||||||
|
headers []string
|
||||||
|
question string
|
||||||
|
}{
|
||||||
|
{"en-US", []string{"Primary question", "Answer", "Similar questions", "Notes"}, "How do I reset my password?"},
|
||||||
|
{"ru-RU", []string{"Основной вопрос", "Ответ", "Похожие вопросы", "Примечания"}, "Как сбросить пароль?"},
|
||||||
|
{"zh-CN", []string{"标准问题", "答案", "相似问", "备注"}, "如何重置密码？"},
|
||||||
|
} {
|
||||||
|
t.Run(tc.locale, func(t *testing.T) {
|
||||||
|
file, err := KnowledgeFAQService.BuildKnowledgeFAQImportTemplate(tc.locale)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
workbook, err := excelize.OpenReader(bytes.NewReader(file.Data))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
defer workbook.Close()
|
||||||
|
table, err := workbook.GetRows("FAQ")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if !reflect.DeepEqual(table[0], tc.headers) || table[1][0] != tc.question {
|
||||||
|
t.Fatalf("wrong template: %#v", table)
|
||||||
|
}
|
||||||
|
rows, result, err := parseKnowledgeFAQImportRows(bytes.NewReader(file.Data), tc.locale)
|
||||||
|
if err != nil || result.Failed != 0 || len(rows) != 1 || rows[0].Question != tc.question {
|
||||||
|
t.Fatalf("round trip = %+v, %+v, %v", rows, result, err)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestKnowledgeFAQExcelImportAcceptsLegacyAndRussianHeaders(t *testing.T) {
|
||||||
|
for _, headers := range [][]string{
|
||||||
|
{"question", "answer", "similarQuestions", "remark"},
|
||||||
|
{"标准问题", "答案", "相似问", "备注"},
|
||||||
|
{"\ufeffОсновной вопрос", "ОТВЕТ", "Похожие вопросы", "Примечания"},
|
||||||
|
{"Вопрос", "Ответ"},
|
||||||
|
} {
|
||||||
|
question, answer := " Author question 原文 ", "\n Answer 回答：原文\nnext "
|
||||||
|
data := buildKnowledgeFAQExcelWorkbook(t, [][]string{headers, {question, answer}})
|
||||||
|
rows, result, err := parseKnowledgeFAQImportRows(bytes.NewReader(data), "ru-RU")
|
||||||
|
if err != nil || result.Failed != 0 || len(rows) != 1 {
|
||||||
|
t.Fatalf("parse %v = %+v, %v", headers, result, err)
|
||||||
|
}
|
||||||
|
if rows[0].Question != question || rows[0].Answer != answer {
|
||||||
|
t.Fatalf("authored data modified: %+v", rows[0])
|
||||||
|
}
|
||||||
|
if len(rows[0].SimilarQuestions) != 0 || rows[0].Remark != "" {
|
||||||
|
t.Fatalf("missing optional columns copied question: %+v", rows[0])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestKnowledgeFAQExcelLocalizedExportPreservesRows(t *testing.T) {
|
||||||
|
setupKnowledgeFAQExcelTestDB(t)
|
||||||
|
kb := createKnowledgeFAQExcelTestBase(t, enums.StatusOk)
|
||||||
|
item := &models.KnowledgeFAQ{KnowledgeBaseID: kb.ID, Question: " Original 问题 ", Answer: "\nОтвет <tag>原文</tag> ", SimilarQuestions: `[" same question ","相似问"]`, Remark: " Notes 原文 ", Status: enums.StatusOk}
|
||||||
|
if err := repositories.KnowledgeFAQRepository.Create(sqls.DB(), item); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
for _, locale := range []string{"en-US", "ru-RU"} {
|
||||||
|
file, err := KnowledgeFAQService.ExportKnowledgeFAQs(kb.ID, locale)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
rows, result, err := parseKnowledgeFAQImportRows(bytes.NewReader(file.Data), locale)
|
||||||
|
if err != nil || result.Failed != 0 || len(rows) != 1 {
|
||||||
|
t.Fatalf("export round trip: %+v, %v", result, err)
|
||||||
|
}
|
||||||
|
if rows[0].Question != item.Question || rows[0].Answer != item.Answer || rows[0].Remark != item.Remark || !reflect.DeepEqual(rows[0].SimilarQuestions, []string{" same question ", "相似问"}) {
|
||||||
|
t.Fatalf("row changed: %+v", rows[0])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,11 @@
|
|||||||
|
// Modified in AgentDeskNext: authenticated support availability and calendars.
|
||||||
|
// Modified in AgentDeskFixes: safe, reviewed setup repairs and honest routing diagnostics.
|
||||||
package services_test
|
package services_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"slices"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
@@ -9,6 +14,7 @@ import (
|
|||||||
"agent-desk/internal/pkg/constants"
|
"agent-desk/internal/pkg/constants"
|
||||||
"agent-desk/internal/pkg/dto"
|
"agent-desk/internal/pkg/dto"
|
||||||
"agent-desk/internal/pkg/dto/request"
|
"agent-desk/internal/pkg/dto/request"
|
||||||
|
"agent-desk/internal/pkg/dto/response"
|
||||||
"agent-desk/internal/pkg/enums"
|
"agent-desk/internal/pkg/enums"
|
||||||
"agent-desk/internal/services"
|
"agent-desk/internal/services"
|
||||||
|
|
||||||
@@ -44,6 +50,7 @@ func setupSetupReadinessTestDB(t *testing.T) *gorm.DB {
|
|||||||
&models.AgentTeam{},
|
&models.AgentTeam{},
|
||||||
&models.AgentTeamSchedule{},
|
&models.AgentTeamSchedule{},
|
||||||
&models.AgentProfile{},
|
&models.AgentProfile{},
|
||||||
|
&models.SupportCalendar{}, &models.AgentPresenceLease{}, &models.LoginSession{}, &models.Role{}, &models.Permission{}, &models.UserRole{}, &models.RolePermission{}, &models.UserPermission{},
|
||||||
&models.Channel{},
|
&models.Channel{},
|
||||||
&models.Conversation{},
|
&models.Conversation{},
|
||||||
&models.ConversationParticipant{},
|
&models.ConversationParticipant{},
|
||||||
@@ -59,378 +66,483 @@ func setupSetupReadinessTestDB(t *testing.T) *gorm.DB {
|
|||||||
return db
|
return db
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestSetupReadiness_EmptyDBAndQuickSetupAll(t *testing.T) {
|
func setupRepairPrincipal(t *testing.T, db *gorm.DB) *dto.AuthPrincipal {
|
||||||
db := setupSetupReadinessTestDB(t)
|
t.Helper()
|
||||||
|
user := models.User{Username: "setup-admin", Nickname: "Setup Admin", Status: enums.StatusOk}
|
||||||
admin := models.User{
|
if err := db.Create(&user).Error; err != nil {
|
||||||
Username: "admin",
|
t.Fatal(err)
|
||||||
Nickname: "Admin Operator",
|
|
||||||
Status: enums.StatusOk,
|
|
||||||
}
|
}
|
||||||
if err := db.Create(&admin).Error; err != nil {
|
return &dto.AuthPrincipal{
|
||||||
t.Fatalf("create admin error = %v", err)
|
UserID: user.ID, Username: user.Username, Nickname: user.Nickname,
|
||||||
}
|
|
||||||
principal := &dto.AuthPrincipal{
|
|
||||||
UserID: admin.ID,
|
|
||||||
Username: admin.Username,
|
|
||||||
Nickname: admin.Nickname,
|
|
||||||
Roles: []string{constants.RoleCodeSuperAdmin},
|
|
||||||
}
|
|
||||||
|
|
||||||
readiness, err := services.SetupReadinessService.GetReadiness(principal)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("GetReadiness error = %v", err)
|
|
||||||
}
|
|
||||||
if readiness.CanReceiveRequestsNow {
|
|
||||||
t.Fatalf("expected CanReceiveRequestsNow = false on empty DB")
|
|
||||||
}
|
|
||||||
if readiness.ReadySteps != 0 {
|
|
||||||
t.Fatalf("expected ReadySteps = 0 on empty DB, got %d", readiness.ReadySteps)
|
|
||||||
}
|
|
||||||
if readiness.TotalSteps != 6 {
|
|
||||||
t.Fatalf("expected TotalSteps = 6, got %d", readiness.TotalSteps)
|
|
||||||
}
|
|
||||||
if readiness.CurrentOperator.CanReceiveNow {
|
|
||||||
t.Fatalf("expected CurrentOperator.CanReceiveNow = false on empty DB")
|
|
||||||
}
|
|
||||||
|
|
||||||
fixResp, err := services.SetupReadinessService.ApplyQuickFix(request.SetupQuickFixRequest{
|
|
||||||
Action: "quick_setup_all",
|
|
||||||
}, principal)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("ApplyQuickFix(quick_setup_all) error = %v", err)
|
|
||||||
}
|
|
||||||
if !fixResp.Readiness.CanReceiveRequestsNow {
|
|
||||||
t.Fatalf("expected CanReceiveRequestsNow = true after quick_setup_all, steps = %+v", fixResp.Readiness.Steps)
|
|
||||||
}
|
|
||||||
if fixResp.Readiness.ReadySteps != 6 {
|
|
||||||
t.Fatalf("expected ReadySteps = 6 after quick_setup_all, got %d", fixResp.Readiness.ReadySteps)
|
|
||||||
}
|
|
||||||
if !fixResp.Readiness.CurrentOperator.CanReceiveNow {
|
|
||||||
t.Fatalf("expected CurrentOperator.CanReceiveNow = true after quick_setup_all, blockers = %v", fixResp.Readiness.CurrentOperator.BlockerCodes)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Second call must be idempotent
|
|
||||||
fixResp2, err := services.SetupReadinessService.ApplyQuickFix(request.SetupQuickFixRequest{
|
|
||||||
Action: "quick_setup_all",
|
|
||||||
}, principal)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("second ApplyQuickFix(quick_setup_all) error = %v", err)
|
|
||||||
}
|
|
||||||
if !fixResp2.Readiness.CanReceiveRequestsNow {
|
|
||||||
t.Fatalf("expected CanReceiveRequestsNow = true after second quick_setup_all")
|
|
||||||
}
|
|
||||||
|
|
||||||
var teamCount int64
|
|
||||||
db.Model(&models.AgentTeam{}).Count(&teamCount)
|
|
||||||
if teamCount != 1 {
|
|
||||||
t.Fatalf("expected idempotent 1 team, got %d", teamCount)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSetupReadiness_OffHoursAndBusyOperator(t *testing.T) {
|
|
||||||
db := setupSetupReadinessTestDB(t)
|
|
||||||
|
|
||||||
now := time.Now()
|
|
||||||
opUser := models.User{
|
|
||||||
Username: "operator1",
|
|
||||||
Nickname: "Operator One",
|
|
||||||
Status: enums.StatusOk,
|
|
||||||
}
|
|
||||||
if err := db.Create(&opUser).Error; err != nil {
|
|
||||||
t.Fatalf("create user error = %v", err)
|
|
||||||
}
|
|
||||||
team := models.AgentTeam{
|
|
||||||
Name: "Support Team",
|
|
||||||
Status: enums.StatusOk,
|
|
||||||
}
|
|
||||||
if err := db.Create(&team).Error; err != nil {
|
|
||||||
t.Fatalf("create team error = %v", err)
|
|
||||||
}
|
|
||||||
// Schedule in the past (off-hours now)
|
|
||||||
pastSchedule := models.AgentTeamSchedule{
|
|
||||||
TeamID: team.ID,
|
|
||||||
StartAt: now.Add(-48 * time.Hour),
|
|
||||||
EndAt: now.Add(-24 * time.Hour),
|
|
||||||
Status: enums.StatusOk,
|
|
||||||
}
|
|
||||||
if err := db.Create(&pastSchedule).Error; err != nil {
|
|
||||||
t.Fatalf("create past schedule error = %v", err)
|
|
||||||
}
|
|
||||||
// Operator is Busy and AutoAssignEnabled = false
|
|
||||||
profile := models.AgentProfile{
|
|
||||||
UserID: opUser.ID,
|
|
||||||
TeamID: team.ID,
|
|
||||||
AgentCode: "OP-001",
|
|
||||||
DisplayName: "Operator One",
|
|
||||||
ServiceStatus: enums.ServiceStatusBusy,
|
|
||||||
MaxConcurrentCount: 5,
|
|
||||||
AutoAssignEnabled: false,
|
|
||||||
Status: enums.StatusOk,
|
|
||||||
}
|
|
||||||
if err := db.Create(&profile).Error; err != nil {
|
|
||||||
t.Fatalf("create profile error = %v", err)
|
|
||||||
}
|
|
||||||
if err := db.Model(&profile).Update("auto_assign_enabled", false).Error; err != nil {
|
|
||||||
t.Fatalf("update auto_assign_enabled error = %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
principal := &dto.AuthPrincipal{
|
|
||||||
UserID: opUser.ID,
|
|
||||||
Username: opUser.Username,
|
|
||||||
Nickname: opUser.Nickname,
|
|
||||||
Roles: []string{constants.RoleCodeAdmin},
|
Roles: []string{constants.RoleCodeAdmin},
|
||||||
}
|
|
||||||
|
|
||||||
readiness, err := services.SetupReadinessService.GetReadiness(principal)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("GetReadiness error = %v", err)
|
|
||||||
}
|
|
||||||
if readiness.CurrentOperator.TeamHasScheduleNow {
|
|
||||||
t.Fatalf("expected TeamHasScheduleNow = false for past schedule")
|
|
||||||
}
|
|
||||||
if readiness.CurrentOperator.CanReceiveNow {
|
|
||||||
t.Fatalf("expected CurrentOperator.CanReceiveNow = false when busy and off-hours")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fix operator profile and schedule
|
|
||||||
_, err = services.SetupReadinessService.ApplyQuickFix(request.SetupQuickFixRequest{
|
|
||||||
Action: "enable_my_operator_profile",
|
|
||||||
}, principal)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("enable_my_operator_profile error = %v", err)
|
|
||||||
}
|
|
||||||
readinessAfter, err := services.SetupReadinessService.GetReadiness(principal)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("GetReadiness after fix error = %v", err)
|
|
||||||
}
|
|
||||||
if !readinessAfter.CurrentOperator.CanReceiveNow {
|
|
||||||
t.Fatalf("expected CurrentOperator.CanReceiveNow = true after enable_my_operator_profile, blockers = %v", readinessAfter.CurrentOperator.BlockerCodes)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSetupReadiness_SimulateRoute_AIOnlyAndMissingTeams(t *testing.T) {
|
|
||||||
db := setupSetupReadinessTestDB(t)
|
|
||||||
|
|
||||||
opUser := models.User{
|
|
||||||
Username: "op2",
|
|
||||||
Nickname: "Operator Two",
|
|
||||||
Status: enums.StatusOk,
|
|
||||||
}
|
|
||||||
db.Create(&opUser)
|
|
||||||
principal := &dto.AuthPrincipal{
|
|
||||||
UserID: opUser.ID,
|
|
||||||
Username: opUser.Username,
|
|
||||||
Nickname: opUser.Nickname,
|
|
||||||
Roles: []string{constants.RoleCodeAdmin},
|
|
||||||
}
|
|
||||||
|
|
||||||
// Setup team + active schedule + idle operator
|
|
||||||
_, err := services.SetupReadinessService.ApplyQuickFix(request.SetupQuickFixRequest{
|
|
||||||
Action: "enable_my_operator_profile",
|
|
||||||
}, principal)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("enable_my_operator_profile error = %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create AI Agent in AIOnly mode and empty TeamIDs
|
|
||||||
agent := models.AIAgent{
|
|
||||||
Name: "AI Bot",
|
|
||||||
Status: enums.StatusOk,
|
|
||||||
ServiceMode: enums.IMConversationServiceModeAIOnly,
|
|
||||||
RolloutPercent: 100,
|
|
||||||
TeamIDs: "",
|
|
||||||
}
|
|
||||||
db.Create(&agent)
|
|
||||||
|
|
||||||
channel := models.Channel{
|
|
||||||
Name: "Web Widget",
|
|
||||||
ChannelType: "web",
|
|
||||||
ChannelID: "web-test-1",
|
|
||||||
AIAgentID: agent.ID,
|
|
||||||
AIAgentRolloutPercent: 100,
|
|
||||||
Status: enums.StatusOk,
|
|
||||||
}
|
|
||||||
db.Create(&channel)
|
|
||||||
|
|
||||||
sim1, err := services.SetupReadinessService.SimulateRoute(request.SetupSimulateRouteRequest{
|
|
||||||
ChannelID: channel.ID,
|
|
||||||
BypassAI: true,
|
|
||||||
}, principal)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("SimulateRoute 1 error = %v", err)
|
|
||||||
}
|
|
||||||
if sim1.WillReachOperator {
|
|
||||||
t.Fatalf("expected WillReachOperator = false when AIOnly")
|
|
||||||
}
|
|
||||||
if sim1.FinalOutcomeCode != "blocked_ai_only_mode" {
|
|
||||||
t.Fatalf("expected blocked_ai_only_mode, got %s", sim1.FinalOutcomeCode)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Switch to HumanOnly but still empty TeamIDs
|
|
||||||
db.Model(&agent).Update("service_mode", enums.IMConversationServiceModeHumanOnly)
|
|
||||||
sim2, err := services.SetupReadinessService.SimulateRoute(request.SetupSimulateRouteRequest{
|
|
||||||
ChannelID: channel.ID,
|
|
||||||
BypassAI: true,
|
|
||||||
}, principal)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("SimulateRoute 2 error = %v", err)
|
|
||||||
}
|
|
||||||
if sim2.WillReachOperator {
|
|
||||||
t.Fatalf("expected WillReachOperator = false when TeamIDs is empty")
|
|
||||||
}
|
|
||||||
if sim2.FinalOutcomeCode != "blocked_agent_no_teams" {
|
|
||||||
t.Fatalf("expected blocked_agent_no_teams, got %s", sim2.FinalOutcomeCode)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fix AI Agent handoff via quick fix
|
|
||||||
_, err = services.SetupReadinessService.ApplyQuickFix(request.SetupQuickFixRequest{
|
|
||||||
Action: "fix_ai_agent_handoff",
|
|
||||||
EntityID: agent.ID,
|
|
||||||
}, principal)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("fix_ai_agent_handoff error = %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
sim3, err := services.SetupReadinessService.SimulateRoute(request.SetupSimulateRouteRequest{
|
|
||||||
ChannelID: channel.ID,
|
|
||||||
BypassAI: true,
|
|
||||||
}, principal)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("SimulateRoute 3 error = %v", err)
|
|
||||||
}
|
|
||||||
if !sim3.WillReachOperator {
|
|
||||||
t.Fatalf("expected WillReachOperator = true after fix_ai_agent_handoff, got outcome %s", sim3.FinalOutcomeCode)
|
|
||||||
}
|
|
||||||
if sim3.FinalOutcomeCode != "assigned_to_operator" {
|
|
||||||
t.Fatalf("expected assigned_to_operator, got %s", sim3.FinalOutcomeCode)
|
|
||||||
}
|
|
||||||
if sim3.MatchedOperator == nil || sim3.MatchedOperator.UserID != opUser.ID {
|
|
||||||
t.Fatalf("expected MatchedOperator UserID = %d, got %+v", opUser.ID, sim3.MatchedOperator)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestSetupReadiness_QuickFixPermissionEnforcement(t *testing.T) {
|
|
||||||
db := setupSetupReadinessTestDB(t)
|
|
||||||
|
|
||||||
csUser := models.User{
|
|
||||||
Username: "cs_agent",
|
|
||||||
Nickname: "Support Agent",
|
|
||||||
Status: enums.StatusOk,
|
|
||||||
}
|
|
||||||
if err := db.Create(&csUser).Error; err != nil {
|
|
||||||
t.Fatalf("create csUser error = %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Regular cs_user only has view permissions
|
|
||||||
csPrincipal := &dto.AuthPrincipal{
|
|
||||||
UserID: csUser.ID,
|
|
||||||
Username: csUser.Username,
|
|
||||||
Nickname: csUser.Nickname,
|
|
||||||
Roles: []string{constants.RoleCodeCsUser},
|
|
||||||
Permissions: []string{
|
Permissions: []string{
|
||||||
constants.PermissionAgentView.Code,
|
constants.PermissionAgentTeamCreate.Code, constants.PermissionAgentTeamUpdate.Code,
|
||||||
constants.PermissionAgentTeamView.Code,
|
constants.PermissionAgentTeamScheduleCreate.Code, constants.PermissionAgentTeamScheduleUpdate.Code,
|
||||||
constants.PermissionAgentTeamScheduleView.Code,
|
constants.PermissionAgentCreate.Code, constants.PermissionAgentUpdate.Code,
|
||||||
constants.PermissionAIAgentView.Code,
|
constants.PermissionAgentConfig.Code, constants.PermissionAgentUpdateStatus.Code,
|
||||||
constants.PermissionChannelView.Code,
|
constants.PermissionAIAgentCreate.Code, constants.PermissionAIAgentUpdate.Code,
|
||||||
|
constants.PermissionChannelCreate.Code, constants.PermissionChannelUpdate.Code,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 1. GetReadiness for cs_user without mutation permissions must not expose quick-fix actions
|
func applyReviewedSetupFix(t *testing.T, req request.SetupQuickFixRequest, principal *dto.AuthPrincipal) *response.SetupQuickFixResponse {
|
||||||
readiness, err := services.SetupReadinessService.GetReadiness(csPrincipal)
|
t.Helper()
|
||||||
|
preview, err := services.SetupReadinessService.ApplyQuickFix(req, principal)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("GetReadiness error = %v", err)
|
t.Fatalf("preview: %v", err)
|
||||||
}
|
}
|
||||||
for _, step := range readiness.Steps {
|
if preview.Applied || preview.PreviewToken == "" {
|
||||||
if len(step.QuickFixActions) != 0 {
|
t.Fatalf("expected read-only preview: %+v", preview)
|
||||||
t.Fatalf("expected step %s QuickFixActions to be empty for cs_user without write permissions, got %v", step.Key, step.QuickFixActions)
|
}
|
||||||
|
req.Apply, req.PreviewToken = true, preview.PreviewToken
|
||||||
|
applied, err := services.SetupReadinessService.ApplyQuickFix(req, principal)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("apply: %v", err)
|
||||||
|
}
|
||||||
|
if !applied.Applied {
|
||||||
|
t.Fatal("reviewed changes were not applied")
|
||||||
|
}
|
||||||
|
return applied
|
||||||
|
}
|
||||||
|
|
||||||
|
func assertSetupCount(t *testing.T, db *gorm.DB, model any, want int64) {
|
||||||
|
t.Helper()
|
||||||
|
var count int64
|
||||||
|
if err := db.Model(model).Count(&count).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if count != want {
|
||||||
|
t.Fatalf("%T count = %d, want %d", model, count, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSetupReadiness_RequiresReviewedExplicitApply(t *testing.T) {
|
||||||
|
db := setupSetupReadinessTestDB(t)
|
||||||
|
principal := setupRepairPrincipal(t, db)
|
||||||
|
req := request.SetupQuickFixRequest{Action: services.QuickFixActionQuickSetupAll}
|
||||||
|
preview, err := services.SetupReadinessService.ApplyQuickFix(req, principal)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if preview.Applied || len(preview.Changes) != 3 {
|
||||||
|
t.Fatalf("expected three proposed draft setup records: %+v", preview)
|
||||||
|
}
|
||||||
|
for _, change := range preview.Changes {
|
||||||
|
if change.EntityName == "" || len(change.After) == 0 {
|
||||||
|
t.Fatalf("unnamed or unspecified change: %+v", change)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, model := range []any{&models.AgentTeam{}, &models.AgentProfile{}, &models.AIAgent{}, &models.Channel{}, &models.AgentTeamSchedule{}} {
|
||||||
|
assertSetupCount(t, db, model, 0)
|
||||||
|
}
|
||||||
|
req.Apply = true
|
||||||
|
if _, err := services.SetupReadinessService.ApplyQuickFix(req, principal); err == nil {
|
||||||
|
t.Fatal("apply without preview must fail")
|
||||||
|
}
|
||||||
|
req.PreviewToken = preview.PreviewToken
|
||||||
|
applied, err := services.SetupReadinessService.ApplyQuickFix(req, principal)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if !applied.Applied || applied.Readiness == nil || applied.Readiness.CanReceiveRequestsNow {
|
||||||
|
t.Fatalf("configuration must not claim shift coverage: %+v", applied)
|
||||||
|
}
|
||||||
|
for _, model := range []any{&models.AgentTeam{}, &models.AgentProfile{}, &models.AIAgent{}} {
|
||||||
|
assertSetupCount(t, db, model, 1)
|
||||||
|
}
|
||||||
|
assertSetupCount(t, db, &models.Channel{}, 0)
|
||||||
|
assertSetupCount(t, db, &models.AgentTeamSchedule{}, 0)
|
||||||
|
second := applyReviewedSetupFix(t, request.SetupQuickFixRequest{Action: services.QuickFixActionQuickSetupAll}, principal)
|
||||||
|
if len(second.Changes) != 0 {
|
||||||
|
t.Fatalf("existing configuration must be preserved: %+v", second.Changes)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSetupReadiness_PreviewInvalidatedByConfigurationChange(t *testing.T) {
|
||||||
|
db := setupSetupReadinessTestDB(t)
|
||||||
|
principal := setupRepairPrincipal(t, db)
|
||||||
|
req := request.SetupQuickFixRequest{Action: services.QuickFixActionQuickSetupAll}
|
||||||
|
preview, err := services.SetupReadinessService.ApplyQuickFix(req, principal)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := db.Create(&models.AgentTeam{Name: "Deliberately chosen team", Status: enums.StatusOk}).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
req.Apply, req.PreviewToken = true, preview.PreviewToken
|
||||||
|
if _, err := services.SetupReadinessService.ApplyQuickFix(req, principal); err == nil {
|
||||||
|
t.Fatal("stale preview must fail")
|
||||||
|
}
|
||||||
|
assertSetupCount(t, db, &models.AgentTeam{}, 1)
|
||||||
|
assertSetupCount(t, db, &models.AgentProfile{}, 0)
|
||||||
|
assertSetupCount(t, db, &models.AIAgent{}, 0)
|
||||||
|
assertSetupCount(t, db, &models.Channel{}, 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSetupReadiness_RepairTransactionRollsBackAllWrites(t *testing.T) {
|
||||||
|
db := setupSetupReadinessTestDB(t)
|
||||||
|
principal := setupRepairPrincipal(t, db)
|
||||||
|
req := request.SetupQuickFixRequest{Action: services.QuickFixActionQuickSetupAll}
|
||||||
|
preview, err := services.SetupReadinessService.ApplyQuickFix(req, principal)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := db.Callback().Create().Before("gorm:create").Register("fail_setup_agent", func(tx *gorm.DB) {
|
||||||
|
if tx.Statement.Schema != nil && tx.Statement.Schema.Name == "AIAgent" {
|
||||||
|
tx.AddError(errors.New("injected agent write failure"))
|
||||||
|
}
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
req.Apply, req.PreviewToken = true, preview.PreviewToken
|
||||||
|
if _, err := services.SetupReadinessService.ApplyQuickFix(req, principal); err == nil {
|
||||||
|
t.Fatal("expected injected transaction failure")
|
||||||
|
}
|
||||||
|
for _, model := range []any{&models.AgentTeam{}, &models.AgentProfile{}, &models.AIAgent{}, &models.Channel{}} {
|
||||||
|
assertSetupCount(t, db, model, 0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSetupReadiness_PreservesDeletedDisabledAndZeroRollout(t *testing.T) {
|
||||||
|
db := setupSetupReadinessTestDB(t)
|
||||||
|
principal := setupRepairPrincipal(t, db)
|
||||||
|
team := models.AgentTeam{Name: "Deleted team", Status: enums.StatusDeleted}
|
||||||
|
disabledTeam := models.AgentTeam{Name: "Disabled team", Status: enums.StatusDisabled}
|
||||||
|
profile := models.AgentProfile{UserID: principal.UserID, AgentCode: "deleted-profile", Status: enums.StatusDeleted}
|
||||||
|
deletedAgent := models.AIAgent{Name: "Deleted agent", Status: enums.StatusDeleted}
|
||||||
|
disabledAgent := models.AIAgent{Name: "Disabled agent", Status: enums.StatusDisabled, RolloutPercent: 100}
|
||||||
|
zeroAgent := models.AIAgent{Name: "Zero rollout", Status: enums.StatusOk, RolloutPercent: 100}
|
||||||
|
deletedChannel := models.Channel{Name: "Deleted channel", ChannelID: "deleted-channel", Status: enums.StatusDeleted}
|
||||||
|
disabledChannel := models.Channel{Name: "Disabled channel", ChannelID: "disabled-channel", Status: enums.StatusDisabled, AIAgentRolloutPercent: 100}
|
||||||
|
for _, model := range []any{&team, &disabledTeam, &profile, &deletedAgent, &disabledAgent, &zeroAgent, &deletedChannel, &disabledChannel} {
|
||||||
|
if err := db.Create(model).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := db.Model(&zeroAgent).Update("rollout_percent", 0).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := db.Model(&disabledChannel).Update("ai_agent_rollout_percent", 0).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
result := applyReviewedSetupFix(t, request.SetupQuickFixRequest{Action: services.QuickFixActionQuickSetupAll}, principal)
|
||||||
|
if len(result.Changes) != 0 {
|
||||||
|
t.Fatalf("broad repair must preserve intentional configurations: %+v", result.Changes)
|
||||||
|
}
|
||||||
|
for _, req := range []request.SetupQuickFixRequest{
|
||||||
|
{Action: services.QuickFixActionEnsureTeamSchedule, EntityID: team.ID},
|
||||||
|
{Action: services.QuickFixActionFixAIAgentHandoff, EntityID: deletedAgent.ID},
|
||||||
|
{Action: services.QuickFixActionEnsureDefaultChannel, EntityID: deletedChannel.ID},
|
||||||
|
{Action: services.QuickFixActionEnableMyProfile},
|
||||||
|
} {
|
||||||
|
if _, err := services.SetupReadinessService.ApplyQuickFix(req, principal); err == nil {
|
||||||
|
t.Fatalf("deleted target must not be restored: %+v", req)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, id := range []int64{disabledAgent.ID, zeroAgent.ID} {
|
||||||
|
res := applyReviewedSetupFix(t, request.SetupQuickFixRequest{Action: services.QuickFixActionFixAIAgentHandoff, EntityID: id}, principal)
|
||||||
|
if len(res.Changes) != 0 {
|
||||||
|
t.Fatalf("disabled/zero rollout changed: %+v", res)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := db.First(&zeroAgent, zeroAgent.ID).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if zeroAgent.RolloutPercent != 0 {
|
||||||
|
t.Fatal("zero rollout was overwritten")
|
||||||
|
}
|
||||||
|
if err := db.First(&disabledChannel, disabledChannel.ID).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if disabledChannel.Status != enums.StatusDisabled || disabledChannel.AIAgentRolloutPercent != 0 {
|
||||||
|
t.Fatal("disabled channel was overwritten")
|
||||||
|
}
|
||||||
|
assertSetupCount(t, db, &models.AgentTeamSchedule{}, 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSetupReadiness_TargetedHandoffDoesNotRewriteOtherAgents(t *testing.T) {
|
||||||
|
db := setupSetupReadinessTestDB(t)
|
||||||
|
principal := setupRepairPrincipal(t, db)
|
||||||
|
first := models.AIAgent{Name: "Selected", Status: enums.StatusOk, RolloutPercent: 25, ServiceMode: enums.IMConversationServiceModeAIOnly, TeamIDs: "12"}
|
||||||
|
second := models.AIAgent{Name: "Unrelated", Status: enums.StatusOk, RolloutPercent: 10, ServiceMode: enums.IMConversationServiceModeAIOnly, TeamIDs: "23"}
|
||||||
|
for _, agent := range []*models.AIAgent{&first, &second} {
|
||||||
|
if err := db.Create(agent).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := db.Model(agent).Update("auto_handoff_on_failure", false).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if _, err := services.SetupReadinessService.ApplyQuickFix(request.SetupQuickFixRequest{Action: services.QuickFixActionFixAIAgentHandoff}, principal); err == nil {
|
||||||
|
t.Fatal("existing agents require a named target")
|
||||||
|
}
|
||||||
|
result := applyReviewedSetupFix(t, request.SetupQuickFixRequest{Action: services.QuickFixActionFixAIAgentHandoff, EntityID: first.ID}, principal)
|
||||||
|
if len(result.Changes) != 1 || result.Changes[0].EntityID != first.ID {
|
||||||
|
t.Fatalf("wrong scope: %+v", result.Changes)
|
||||||
|
}
|
||||||
|
if err := db.First(&first, first.ID).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := db.First(&second, second.ID).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if first.ServiceMode != enums.IMConversationServiceModeAIFirst || first.RolloutPercent != 25 || first.TeamIDs != "12" {
|
||||||
|
t.Fatal("selected agent was not minimally updated")
|
||||||
|
}
|
||||||
|
if second.ServiceMode != enums.IMConversationServiceModeAIOnly || second.AutoHandoffOnFailure || second.RolloutPercent != 10 || second.TeamIDs != "23" {
|
||||||
|
t.Fatal("unrelated agent was changed")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSetupReadiness_OffHoursIsNotMissingSchedule(t *testing.T) {
|
||||||
|
db := setupSetupReadinessTestDB(t)
|
||||||
|
principal := setupRepairPrincipal(t, db)
|
||||||
|
now := time.Now()
|
||||||
|
team := models.AgentTeam{Name: "Day shift", Status: enums.StatusOk}
|
||||||
|
other := models.AgentTeam{Name: "Other team", Status: enums.StatusOk}
|
||||||
|
for _, model := range []any{&team, &other} {
|
||||||
|
if err := db.Create(model).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
schedule := models.AgentTeamSchedule{TeamID: team.ID, StartAt: now.Add(24 * time.Hour), EndAt: now.Add(32 * time.Hour), Status: enums.StatusOk}
|
||||||
|
if err := db.Create(&schedule).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
result := applyReviewedSetupFix(t, request.SetupQuickFixRequest{Action: services.QuickFixActionEnsureTeamSchedule, EntityID: team.ID}, principal)
|
||||||
|
if len(result.Changes) != 0 {
|
||||||
|
t.Fatal("off-hours team must not be mutated")
|
||||||
|
}
|
||||||
|
assertSetupCount(t, db, &models.AgentTeamSchedule{}, 1)
|
||||||
|
if result.Readiness == nil {
|
||||||
|
t.Fatal("missing readiness")
|
||||||
|
}
|
||||||
|
foundOffHours, foundMissing := false, false
|
||||||
|
for _, step := range result.Readiness.Steps {
|
||||||
|
if step.Key != "schedules" {
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
for _, issue := range step.Issues {
|
for _, issue := range step.Issues {
|
||||||
|
if issue.EntityID == team.ID && issue.Code == "team_off_hours_now" {
|
||||||
|
foundOffHours = true
|
||||||
|
}
|
||||||
|
if issue.EntityID == other.ID && issue.Code == "team_no_schedule_configured" {
|
||||||
|
foundMissing = true
|
||||||
|
}
|
||||||
if issue.QuickFixAction != "" {
|
if issue.QuickFixAction != "" {
|
||||||
t.Fatalf("expected issue %s QuickFixAction to be empty for cs_user without write permissions, got %s", issue.Code, issue.QuickFixAction)
|
t.Fatal("shift changes require explicit scheduling")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if !foundOffHours || !foundMissing {
|
||||||
// 2. Direct API calls to ApplyQuickFix must fail with Forbidden (error.e0225) and leave DB untouched
|
t.Fatal("missing and off-hours schedules must be distinguished")
|
||||||
for _, action := range []string{
|
|
||||||
services.QuickFixActionQuickSetupAll,
|
|
||||||
services.QuickFixActionEnsureTeamSchedule,
|
|
||||||
services.QuickFixActionEnableMyProfile,
|
|
||||||
services.QuickFixActionFixAIAgentHandoff,
|
|
||||||
services.QuickFixActionEnsureDefaultChannel,
|
|
||||||
} {
|
|
||||||
_, err := services.SetupReadinessService.ApplyQuickFix(request.SetupQuickFixRequest{
|
|
||||||
Action: action,
|
|
||||||
}, csPrincipal)
|
|
||||||
if err == nil {
|
|
||||||
t.Fatalf("expected Forbidden error when cs_user executes %s without permissions, got nil", action)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var teamCount, agentCount, channelCount, profileCount int64
|
|
||||||
db.Model(&models.AgentTeam{}).Count(&teamCount)
|
|
||||||
db.Model(&models.AIAgent{}).Count(&agentCount)
|
|
||||||
db.Model(&models.Channel{}).Count(&channelCount)
|
|
||||||
db.Model(&models.AgentProfile{}).Count(&profileCount)
|
|
||||||
if teamCount != 0 || agentCount != 0 || channelCount != 0 || profileCount != 0 {
|
|
||||||
t.Fatalf("expected zero entities created after forbidden quick fixes, got teams=%d aiAgents=%d channels=%d profiles=%d",
|
|
||||||
teamCount, agentCount, channelCount, profileCount)
|
|
||||||
}
|
|
||||||
|
|
||||||
// 3. Seed an active team + active schedule + busy profile for csUser
|
|
||||||
now := time.Now()
|
|
||||||
team := models.AgentTeam{Name: "Main Team", Status: enums.StatusOk}
|
|
||||||
db.Create(&team)
|
|
||||||
db.Create(&models.AgentTeamSchedule{
|
|
||||||
TeamID: team.ID,
|
|
||||||
StartAt: now.Add(-1 * time.Hour),
|
|
||||||
EndAt: now.Add(24 * time.Hour),
|
|
||||||
Status: enums.StatusOk,
|
|
||||||
})
|
|
||||||
db.Create(&models.AgentProfile{
|
|
||||||
UserID: csUser.ID,
|
|
||||||
TeamID: team.ID,
|
|
||||||
AgentCode: "AG-CS1",
|
|
||||||
DisplayName: "Support Agent",
|
|
||||||
ServiceStatus: enums.ServiceStatusBusy,
|
|
||||||
MaxConcurrentCount: 5,
|
|
||||||
AutoAssignEnabled: true,
|
|
||||||
Status: enums.StatusOk,
|
|
||||||
})
|
|
||||||
|
|
||||||
// Grant only agent.updateStatus to csPrincipal: can switch own existing profile to Idle,
|
|
||||||
// but still cannot modify AI agents or channels!
|
|
||||||
statusOnlyPrincipal := &dto.AuthPrincipal{
|
|
||||||
UserID: csUser.ID,
|
|
||||||
Username: csUser.Username,
|
|
||||||
Nickname: csUser.Nickname,
|
|
||||||
Roles: []string{constants.RoleCodeCsUser},
|
|
||||||
Permissions: []string{
|
|
||||||
constants.PermissionAgentView.Code,
|
|
||||||
constants.PermissionAgentUpdateStatus.Code,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := services.SetupReadinessService.ApplyQuickFix(request.SetupQuickFixRequest{
|
|
||||||
Action: services.QuickFixActionFixAIAgentHandoff,
|
|
||||||
}, statusOnlyPrincipal); err == nil {
|
|
||||||
t.Fatalf("expected Forbidden when statusOnlyPrincipal calls fix_ai_agent_handoff")
|
|
||||||
}
|
|
||||||
if _, err := services.SetupReadinessService.ApplyQuickFix(request.SetupQuickFixRequest{
|
|
||||||
Action: services.QuickFixActionEnsureDefaultChannel,
|
|
||||||
}, statusOnlyPrincipal); err == nil {
|
|
||||||
t.Fatalf("expected Forbidden when statusOnlyPrincipal calls ensure_default_channel")
|
|
||||||
}
|
|
||||||
|
|
||||||
fixProfileResp, err := services.SetupReadinessService.ApplyQuickFix(request.SetupQuickFixRequest{
|
|
||||||
Action: services.QuickFixActionEnableMyProfile,
|
|
||||||
}, statusOnlyPrincipal)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("expected statusOnlyPrincipal to succeed on enable_my_operator_profile when team+schedule+profile exist, got %v", err)
|
|
||||||
}
|
|
||||||
if !fixProfileResp.Readiness.CurrentOperator.CanReceiveNow {
|
|
||||||
t.Fatalf("expected CurrentOperator.CanReceiveNow = true after status update, blockers = %v", fixProfileResp.Readiness.CurrentOperator.BlockerCodes)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestSetupReadiness_AdminRoleDoesNotOverridePermissionDenial(t *testing.T) {
|
||||||
|
db := setupSetupReadinessTestDB(t)
|
||||||
|
principal := setupRepairPrincipal(t, db)
|
||||||
|
principal.Permissions = nil
|
||||||
|
for _, role := range []string{constants.RoleCodeAdmin, constants.RoleCodeSuperAdmin} {
|
||||||
|
principal.Roles = []string{role}
|
||||||
|
for _, action := range []string{services.QuickFixActionQuickSetupAll, services.QuickFixActionEnsureTeamSchedule, services.QuickFixActionEnableMyProfile, services.QuickFixActionFixAIAgentHandoff, services.QuickFixActionEnsureDefaultChannel} {
|
||||||
|
if _, err := services.SetupReadinessService.ApplyQuickFix(request.SetupQuickFixRequest{Action: action}, principal); err == nil {
|
||||||
|
t.Fatalf("role %s bypassed explicit permission list for %s", role, action)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
assertSetupCount(t, db, &models.AgentTeam{}, 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSetupReadiness_StatusOnlyPermissionRemainsScoped(t *testing.T) {
|
||||||
|
db := setupSetupReadinessTestDB(t)
|
||||||
|
principal := setupRepairPrincipal(t, db)
|
||||||
|
team := models.AgentTeam{Name: "Existing", Status: enums.StatusOk}
|
||||||
|
if err := db.Create(&team).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
profile := models.AgentProfile{UserID: principal.UserID, TeamID: team.ID, AgentCode: "status-only", Status: enums.StatusOk, ServiceStatus: enums.ServiceStatusBusy, AutoAssignEnabled: true, MaxConcurrentCount: 5}
|
||||||
|
if err := db.Create(&profile).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
principal.Permissions = []string{constants.PermissionAgentUpdateStatus.Code}
|
||||||
|
result := applyReviewedSetupFix(t, request.SetupQuickFixRequest{Action: services.QuickFixActionEnableMyProfile}, principal)
|
||||||
|
if len(result.Changes) != 1 || len(result.Changes[0].After) != 1 {
|
||||||
|
t.Fatalf("status-only permission exceeded: %+v", result.Changes)
|
||||||
|
}
|
||||||
|
assertSetupCount(t, db, &models.AgentTeamSchedule{}, 0)
|
||||||
|
if err := db.Model(&profile).Update("auto_assign_enabled", false).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, err := services.SetupReadinessService.ApplyQuickFix(request.SetupQuickFixRequest{Action: services.QuickFixActionEnableMyProfile}, principal); err == nil {
|
||||||
|
t.Fatal("status permission must not authorize config edits")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSetupReadiness_SimulationEmptyArraysAndHonestCoverage(t *testing.T) {
|
||||||
|
db := setupSetupReadinessTestDB(t)
|
||||||
|
principal := setupRepairPrincipal(t, db)
|
||||||
|
for _, channelID := range []int64{0, 9999} {
|
||||||
|
result, err := services.SetupReadinessService.SimulateRoute(request.SetupSimulateRouteRequest{ChannelID: channelID}, principal)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
encoded, err := json.Marshal(result)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if !strings.Contains(string(encoded), `"candidate_operators":[]`) {
|
||||||
|
t.Fatalf("null candidates: %s", encoded)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
applyReviewedSetupFix(t, request.SetupQuickFixRequest{Action: services.QuickFixActionQuickSetupAll}, principal)
|
||||||
|
var team models.AgentTeam
|
||||||
|
var agent models.AIAgent
|
||||||
|
if err := db.First(&team).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := db.First(&agent).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := db.Model(&agent).Update("published_revision_id", 1).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
channel := models.Channel{Name: "Published human-only test route", ChannelID: "human-only-test", ChannelType: "web", AIAgentID: agent.ID, AIAgentRolloutPercent: 100, Status: enums.StatusOk}
|
||||||
|
if err := db.Create(&channel).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
now := time.Now()
|
||||||
|
if err := db.Create(&models.AgentTeamSchedule{TeamID: team.ID, StartAt: now.Add(-time.Hour), EndAt: now.Add(time.Hour), Status: enums.StatusOk}).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
// A configured profile alone is not live staffing. This specific success
|
||||||
|
// fixture supplies an employee account, current permission, and login lease;
|
||||||
|
// other setup fixtures retain their original visitor/permission boundaries.
|
||||||
|
seedSetupSimulationPresence(t, db, principal, now)
|
||||||
|
result, err := services.SetupReadinessService.SimulateRoute(request.SetupSimulateRouteRequest{ChannelID: channel.ID}, principal)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if !result.WillReachOperator || result.MatchedOperator == nil || result.MatchedOperator.UserID != principal.UserID {
|
||||||
|
t.Fatalf("human-only check failed: %+v", result)
|
||||||
|
}
|
||||||
|
if _, err := services.SetupReadinessService.SimulateRoute(request.SetupSimulateRouteRequest{ChannelID: channel.ID, BypassAI: true}, principal); err == nil {
|
||||||
|
t.Fatal("unsupported bypass must be explicitly rejected")
|
||||||
|
}
|
||||||
|
if err := db.Model(&models.AIAgent{}).Where("id = ?", channel.AIAgentID).Update("service_mode", enums.IMConversationServiceModeAIFirst).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
result, err = services.SetupReadinessService.SimulateRoute(request.SetupSimulateRouteRequest{ChannelID: channel.ID}, principal)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if result.WillReachOperator || result.FinalOutcomeCode != "ai_execution_not_simulated" {
|
||||||
|
t.Fatalf("AI route must not promise assignment: %+v", result)
|
||||||
|
}
|
||||||
|
if err := db.Model(&channel).Update("ai_agent_rollout_percent", 25).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
result, err = services.SetupReadinessService.SimulateRoute(request.SetupSimulateRouteRequest{ChannelID: channel.ID}, principal)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if result.WillReachOperator || result.FinalOutcomeCode != "partial_rollout_not_simulated" {
|
||||||
|
t.Fatalf("partial rollout must not promise assignment: %+v", result)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSetupReadiness_PostCommitFailuresAreVisible(t *testing.T) {
|
||||||
|
db := setupSetupReadinessTestDB(t)
|
||||||
|
principal := setupRepairPrincipal(t, db)
|
||||||
|
req := request.SetupQuickFixRequest{Action: services.QuickFixActionQuickSetupAll}
|
||||||
|
preview, err := services.SetupReadinessService.ApplyQuickFix(req, principal)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := db.Callback().Query().Before("gorm:query").Register("fail_post_commit_dispatch", func(tx *gorm.DB) {
|
||||||
|
if tx.Statement.Schema != nil && tx.Statement.Schema.Name == "Conversation" {
|
||||||
|
tx.AddError(errors.New("injected dispatch read failure"))
|
||||||
|
}
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
req.Apply, req.PreviewToken = true, preview.PreviewToken
|
||||||
|
result, err := services.SetupReadinessService.ApplyQuickFix(req, principal)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("committed repair must not appear rolled back: %v", err)
|
||||||
|
}
|
||||||
|
if !result.Applied || !slices.Contains(result.WarningCodes, "dispatch_failed") {
|
||||||
|
t.Fatalf("dispatch failure must be visible: %+v", result)
|
||||||
|
}
|
||||||
|
for _, model := range []any{&models.AgentTeam{}, &models.AgentProfile{}, &models.AIAgent{}} {
|
||||||
|
assertSetupCount(t, db, model, 1)
|
||||||
|
}
|
||||||
|
assertSetupCount(t, db, &models.Channel{}, 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSetupReadiness_DefaultChannelRequiresPublishedAgent(t *testing.T) {
|
||||||
|
db := setupSetupReadinessTestDB(t)
|
||||||
|
principal := setupRepairPrincipal(t, db)
|
||||||
|
applyReviewedSetupFix(t, request.SetupQuickFixRequest{Action: services.QuickFixActionQuickSetupAll}, principal)
|
||||||
|
result := applyReviewedSetupFix(t, request.SetupQuickFixRequest{Action: services.QuickFixActionEnsureDefaultChannel}, principal)
|
||||||
|
if len(result.Changes) != 0 || !slices.Contains(result.WarningCodes, "agent_publication_required") {
|
||||||
|
t.Fatalf("draft agent must not be bound implicitly: %+v", result)
|
||||||
|
}
|
||||||
|
assertSetupCount(t, db, &models.Channel{}, 0)
|
||||||
|
var agent models.AIAgent
|
||||||
|
if err := db.First(&agent).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
// This unit fixture supplies the publication marker; revision publication itself
|
||||||
|
// belongs to the existing agent publishing service's tests.
|
||||||
|
if err := db.Model(&agent).Update("published_revision_id", 1).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
result = applyReviewedSetupFix(t, request.SetupQuickFixRequest{Action: services.QuickFixActionEnsureDefaultChannel}, principal)
|
||||||
|
if len(result.Changes) != 1 || result.Changes[0].EntityType != "channel" {
|
||||||
|
t.Fatalf("expected reviewed channel create: %+v", result.Changes)
|
||||||
|
}
|
||||||
|
assertSetupCount(t, db, &models.Channel{}, 1)
|
||||||
|
assertSetupCount(t, db, &models.AgentTeamSchedule{}, 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSetupReadiness_MyProfileRejectsAnotherNamedTarget(t *testing.T) {
|
||||||
|
db := setupSetupReadinessTestDB(t)
|
||||||
|
principal := setupRepairPrincipal(t, db)
|
||||||
|
applyReviewedSetupFix(t, request.SetupQuickFixRequest{Action: services.QuickFixActionQuickSetupAll}, principal)
|
||||||
|
var profile models.AgentProfile
|
||||||
|
if err := db.Where("user_id = ?", principal.UserID).First(&profile).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, err := services.SetupReadinessService.ApplyQuickFix(request.SetupQuickFixRequest{Action: services.QuickFixActionEnableMyProfile, EntityID: profile.ID + 1}, principal); err == nil {
|
||||||
|
t.Fatal("my-profile action must not silently substitute a different named target")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func seedSetupSimulationPresence(t *testing.T, db *gorm.DB, principal *dto.AuthPrincipal, now time.Time) {
|
||||||
|
t.Helper()
|
||||||
|
if err := db.Model(&models.User{}).Where("id = ?", principal.UserID).Update("user_type", enums.UserTypeEmployee).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
role := models.Role{Code: "setup-simulation-operator", Status: enums.StatusOk}
|
||||||
|
permission := models.Permission{Code: constants.PermissionConversationView.Code, Status: enums.StatusOk}
|
||||||
|
session := models.LoginSession{UserID: principal.UserID, Token: "ak_isolated_setup_simulation", ExpiredAt: now.Add(time.Hour)}
|
||||||
|
if err := db.Where("code = ?", permission.Code).FirstOrCreate(&permission).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
for _, item := range []any{&role, &session} {
|
||||||
|
if err := db.Create(item).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, item := range []any{&models.UserRole{UserID: principal.UserID, RoleID: role.ID}, &models.RolePermission{RoleID: role.ID, PermissionID: permission.ID}, &models.AgentPresenceLease{ID: "setup-simulation-presence", UserID: principal.UserID, LoginSessionID: session.ID, ExpiresAt: now.Add(time.Minute)}} {
|
||||||
|
if err := db.Create(item).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
principal.UserType = enums.UserTypeEmployee
|
||||||
|
principal.LoginSessionID = session.ID
|
||||||
|
principal.ExpiresAt = session.ExpiredAt
|
||||||
|
principal.Permissions = append(principal.Permissions, permission.Code)
|
||||||
|
}
|
||||||
|
|||||||
208
internal/services/support_availability_edge_review_test.go
Normal file
208
internal/services/support_availability_edge_review_test.go
Normal file
@@ -0,0 +1,208 @@
|
|||||||
|
package services
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"agent-desk/internal/models"
|
||||||
|
"agent-desk/internal/pkg/dto/request"
|
||||||
|
"agent-desk/internal/pkg/enums"
|
||||||
|
"agent-desk/internal/repositories"
|
||||||
|
|
||||||
|
"github.com/mlogclub/simple/sqls"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestSupportReviewHalfHourDSTAndMissingWholePeriod(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
name, start, end, at, next string
|
||||||
|
open bool
|
||||||
|
}{
|
||||||
|
{"half-hour gap", "02:10", "03:00", "2026-10-03T15:29:59Z", "2026-10-03T15:30:00Z", false},
|
||||||
|
{"gap opening", "02:10", "03:00", "2026-10-03T15:30:00Z", "", true},
|
||||||
|
{"whole period absent", "02:10", "02:20", "2026-10-03T15:30:00Z", "2026-10-10T15:10:00Z", false},
|
||||||
|
{"fold first occurrence", "01:45", "01:50", "2026-04-04T14:45:00Z", "", true},
|
||||||
|
{"fold second occurrence", "01:45", "01:50", "2026-04-04T15:19:59Z", "", true},
|
||||||
|
{"fold half-open end", "01:45", "01:50", "2026-04-04T15:20:00Z", "2026-04-11T15:15:00Z", false},
|
||||||
|
}
|
||||||
|
for _, tc := range cases {
|
||||||
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
|
calendar := calendarForTest("Australia/Lord_Howe", weeklyForTest(7, tc.start, tc.end))
|
||||||
|
got, err := evaluateRecurringSupportCalendar(calendar, instantForTest(tc.at))
|
||||||
|
if err != nil || got.Open != tc.open || supportTimeString(got.NextOpeningAt) != tc.next {
|
||||||
|
t.Fatalf("got open=%v next=%s error=%v; want open=%v next=%s", got.Open, supportTimeString(got.NextOpeningAt), err, tc.open, tc.next)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSupportReviewNextOpeningKeepsItsTimezone(t *testing.T) {
|
||||||
|
f, p, ai := newAvailabilityFixture(t)
|
||||||
|
secondTeam := models.AgentTeam{Name: "Later opening", Status: enums.StatusOk}
|
||||||
|
if err := f.db.Create(&secondTeam).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := f.db.Model(&ai).Update("team_ids", fmt.Sprintf("%d,%d", p.TeamID, secondTeam.ID)).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
for _, item := range []struct {
|
||||||
|
teamID int64
|
||||||
|
zone string
|
||||||
|
days int
|
||||||
|
}{{p.TeamID, "Pacific/Auckland", 2}, {secondTeam.ID, "America/New_York", 5}} {
|
||||||
|
loc, err := time.LoadLocation(item.zone)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
date := f.now.In(loc).AddDate(0, 0, item.days).Format(time.DateOnly)
|
||||||
|
exceptions, err := json.Marshal([]request.SupportCalendarException{{Date: date, Periods: []request.SupportCalendarPeriod{{Start: "09:00", End: "10:00"}}}})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
calendar := &models.SupportCalendar{TeamID: item.teamID, Mode: "recurring", Timezone: item.zone, WeeklyJSON: "[]", ExceptionsJSON: string(exceptions)}
|
||||||
|
if err := repositories.SupportAvailabilityRepository.SaveCalendar(f.db, calendar); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
want, err := SupportCalendarService.Evaluate(f.db, p.TeamID, f.now)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
got, err := SupportAvailabilityService.PublicStatus(&models.Channel{AIAgentID: ai.ID, Status: enums.StatusOk})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if got.Available || got.Reason != "outside_hours" || got.NextOpeningAt != supportTimeString(want.NextOpeningAt) || got.Timezone != want.Timezone {
|
||||||
|
t.Fatalf("next opening and timezone must belong to the same team: got %+v, want next=%s timezone=%s", got, supportTimeString(want.NextOpeningAt), want.Timezone)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSupportReviewFallbackGuardUsesTransactionConnection(t *testing.T) {
|
||||||
|
f, p, ai := newAvailabilityFixture(t)
|
||||||
|
if err := f.db.Model(&ai).Update("team_ids", "").Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
conversation := models.Conversation{AIAgentID: ai.ID, Status: enums.IMConversationStatusPending}
|
||||||
|
if err := f.db.Create(&conversation).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
sqlDB, err := f.db.DB()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
sqlDB.SetMaxOpenConns(1)
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
err = f.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||||
|
_, err := SupportAvailabilityService.GuardAssignment(tx, p.UserID, true, &conversation, f.now)
|
||||||
|
return err
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("empty AI team IDs must resolve without escaping the held transaction: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSupportReviewDistinctSessionRevocationAndOwnerBinding(t *testing.T) {
|
||||||
|
f, p, _ := newAvailabilityFixture(t)
|
||||||
|
second := models.LoginSession{UserID: p.UserID, Token: "ak_test_only_second_session", ExpiredAt: f.now.Add(time.Hour)}
|
||||||
|
if err := f.db.Create(&second).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
lease := models.AgentPresenceLease{ID: "separate-login", UserID: p.UserID, LoginSessionID: second.ID, ExpiresAt: f.now.Add(agentPresenceLeaseTTL)}
|
||||||
|
if err := f.db.Create(&lease).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := f.db.Model(&f.session).Update("revoked_at", f.now).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
users, err := SupportAvailabilityService.onlineUsers(f.db, []int64{p.UserID}, f.now)
|
||||||
|
if err != nil || !users[p.UserID] {
|
||||||
|
t.Fatalf("revoking one login must not hide another valid login: %v %v", users, err)
|
||||||
|
}
|
||||||
|
if err := f.db.Model(&second).Update("user_id", p.UserID+1000).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
users, err = SupportAvailabilityService.onlineUsers(f.db, []int64{p.UserID}, f.now)
|
||||||
|
if err != nil || users[p.UserID] {
|
||||||
|
t.Fatalf("lease must remain bound to login-session owner: %v %v", users, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSupportReviewGuardRejectsDisabledProfileDespiteLiveSession(t *testing.T) {
|
||||||
|
f, p, ai := newAvailabilityFixture(t)
|
||||||
|
if err := f.db.Model(&p).Update("status", enums.StatusDisabled).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
conversation := models.Conversation{AIAgentID: ai.ID, Status: enums.IMConversationStatusPending}
|
||||||
|
if err := f.db.Create(&conversation).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
err := f.db.Transaction(func(tx *gorm.DB) error {
|
||||||
|
_, err := SupportAvailabilityService.GuardAssignment(tx, p.UserID, false, &conversation, f.now)
|
||||||
|
return err
|
||||||
|
})
|
||||||
|
if !errors.Is(err, errSupportAssignmentIneligible) {
|
||||||
|
t.Fatalf("live session must not bypass disabled profile: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSupportReviewEffectiveStatusFilterAndPagination(t *testing.T) {
|
||||||
|
f, p, _ := newAvailabilityFixture(t)
|
||||||
|
before, now, after := f.now.Add(-time.Hour), f.now, f.now.Add(time.Hour)
|
||||||
|
earlier, later := before.Add(-time.Hour), after.Add(time.Hour)
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
status, fallback enums.ServiceStatus
|
||||||
|
start, end *time.Time
|
||||||
|
want enums.ServiceStatus
|
||||||
|
}{
|
||||||
|
{"ordinary busy ignores absence", enums.ServiceStatusBusy, enums.ServiceStatusIdle, &before, &after, enums.ServiceStatusBusy},
|
||||||
|
{"future vacation returns idle", enums.ServiceStatusVacation, enums.ServiceStatusIdle, &after, &later, enums.ServiceStatusIdle},
|
||||||
|
{"active vacation", enums.ServiceStatusVacation, enums.ServiceStatusBusy, &before, &after, enums.ServiceStatusVacation},
|
||||||
|
{"inclusive vacation start", enums.ServiceStatusVacation, enums.ServiceStatusIdle, &now, &after, enums.ServiceStatusVacation},
|
||||||
|
{"exclusive vacation end", enums.ServiceStatusVacation, enums.ServiceStatusBreak, &before, &now, enums.ServiceStatusBreak},
|
||||||
|
{"expired vacation returns idle", enums.ServiceStatusVacation, enums.ServiceStatusIdle, &earlier, &before, enums.ServiceStatusIdle},
|
||||||
|
{"missing bounds safe fallback", enums.ServiceStatusVacation, enums.ServiceStatusUnavailable, nil, nil, enums.ServiceStatusUnavailable},
|
||||||
|
{"invalid return status safe fallback", enums.ServiceStatusVacation, enums.ServiceStatusVacation, nil, nil, enums.ServiceStatusUnavailable},
|
||||||
|
}
|
||||||
|
expected := map[enums.ServiceStatus][]int64{enums.ServiceStatusIdle: {p.ID}}
|
||||||
|
for i, tc := range cases {
|
||||||
|
profile := models.AgentProfile{UserID: p.UserID + int64(i) + 10, TeamID: p.TeamID, AgentCode: fmt.Sprintf("review-%d", i), DisplayName: tc.name, Status: enums.StatusOk, ServiceStatus: tc.status, AvailabilityReturnStatus: tc.fallback, AbsenceStartAt: tc.start, AbsenceEndAt: tc.end}
|
||||||
|
if err := f.db.Create(&profile).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if got := effectiveSupportStatus(profile, now); got != tc.want {
|
||||||
|
t.Fatalf("%s: policy returned %v, want %v", tc.name, got, tc.want)
|
||||||
|
}
|
||||||
|
expected[tc.want] = append(expected[tc.want], profile.ID)
|
||||||
|
}
|
||||||
|
for _, status := range enums.ServiceStatusValues {
|
||||||
|
wantIDs := expected[status]
|
||||||
|
for page := 1; page <= len(wantIDs)+1; page++ {
|
||||||
|
cnd := sqls.NewCnd().Asc("id").Page(page, 1)
|
||||||
|
repositories.SupportAvailabilityRepository.EffectiveStatusCondition(cnd, status, now)
|
||||||
|
got, paging := repositories.AgentProfileRepository.FindPageByCnd(f.db, cnd)
|
||||||
|
if paging.Total != int64(len(wantIDs)) {
|
||||||
|
t.Fatalf("status %d page %d: total %d, want %d", status, page, paging.Total, len(wantIDs))
|
||||||
|
}
|
||||||
|
if page > len(wantIDs) {
|
||||||
|
if len(got) != 0 {
|
||||||
|
t.Fatalf("status %d: final page was not empty: %+v", status, got)
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if len(got) != 1 || got[0].ID != wantIDs[page-1] {
|
||||||
|
t.Fatalf("status %d page %d: got %+v, want id=%d", status, page, got, wantIDs[page-1])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, value := range []string{"99", "-1", "not-a-status"} {
|
||||||
|
if err := AgentProfileService.FilterEffectiveServiceStatus(sqls.NewCnd(), value); err == nil {
|
||||||
|
t.Fatalf("accepted invalid effective status %q", value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
329
internal/services/support_availability_service.go
Normal file
329
internal/services/support_availability_service.go
Normal file
@@ -0,0 +1,329 @@
|
|||||||
|
package services
|
||||||
|
|
||||||
|
import (
|
||||||
|
"agent-desk/internal/models"
|
||||||
|
"agent-desk/internal/pkg/constants"
|
||||||
|
"agent-desk/internal/pkg/dto"
|
||||||
|
"agent-desk/internal/pkg/dto/request"
|
||||||
|
"agent-desk/internal/pkg/dto/response"
|
||||||
|
"agent-desk/internal/pkg/enums"
|
||||||
|
"agent-desk/internal/pkg/errorsx"
|
||||||
|
"agent-desk/internal/repositories"
|
||||||
|
"errors"
|
||||||
|
"github.com/mlogclub/simple/sqls"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
"slices"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
var errSupportAssignmentIneligible = errors.New("support assignment ineligible")
|
||||||
|
|
||||||
|
var SupportAvailabilityService = &supportAvailabilityService{}
|
||||||
|
|
||||||
|
type supportAvailabilityService struct{}
|
||||||
|
type supportEligibility struct {
|
||||||
|
Eligible, Online bool
|
||||||
|
Reason string
|
||||||
|
EffectiveStatus enums.ServiceStatus
|
||||||
|
Calendar supportCalendarEvaluation
|
||||||
|
ActiveCount int
|
||||||
|
}
|
||||||
|
|
||||||
|
func effectiveSupportStatus(profile models.AgentProfile, now time.Time) enums.ServiceStatus {
|
||||||
|
if profile.ServiceStatus != enums.ServiceStatusVacation {
|
||||||
|
return profile.ServiceStatus
|
||||||
|
}
|
||||||
|
if profile.AbsenceStartAt != nil && profile.AbsenceEndAt != nil && !now.Before(*profile.AbsenceStartAt) && now.Before(*profile.AbsenceEndAt) {
|
||||||
|
return enums.ServiceStatusVacation
|
||||||
|
}
|
||||||
|
if profile.AvailabilityReturnStatus >= enums.ServiceStatusIdle && profile.AvailabilityReturnStatus <= enums.ServiceStatusUnavailable {
|
||||||
|
return profile.AvailabilityReturnStatus
|
||||||
|
}
|
||||||
|
return enums.ServiceStatusUnavailable
|
||||||
|
}
|
||||||
|
|
||||||
|
// eligibilityReason is the only policy decision for new human assignment. All
|
||||||
|
// automatic/manual/status/readiness callers provide facts to this evaluator.
|
||||||
|
func eligibilityReason(profile models.AgentProfile, user, team bool, online bool, calendarOpen bool, activeCount int, automatic bool, now time.Time) string {
|
||||||
|
switch {
|
||||||
|
case profile.Status != enums.StatusOk:
|
||||||
|
return "profile_disabled"
|
||||||
|
case !user:
|
||||||
|
return "user_disabled"
|
||||||
|
case !team:
|
||||||
|
return "team_disabled"
|
||||||
|
case !calendarOpen:
|
||||||
|
return "outside_hours"
|
||||||
|
case !online:
|
||||||
|
return "offline"
|
||||||
|
}
|
||||||
|
switch effectiveSupportStatus(profile, now) {
|
||||||
|
case enums.ServiceStatusBusy:
|
||||||
|
return "busy"
|
||||||
|
case enums.ServiceStatusBreak:
|
||||||
|
return "break"
|
||||||
|
case enums.ServiceStatusUnavailable:
|
||||||
|
return "unavailable"
|
||||||
|
case enums.ServiceStatusVacation:
|
||||||
|
return "vacation"
|
||||||
|
case enums.ServiceStatusIdle:
|
||||||
|
default:
|
||||||
|
return "unavailable"
|
||||||
|
}
|
||||||
|
if automatic && !profile.AutoAssignEnabled {
|
||||||
|
return "auto_assign_disabled"
|
||||||
|
}
|
||||||
|
if profile.MaxConcurrentCount < 0 || profile.MaxConcurrentCount > 0 && activeCount >= profile.MaxConcurrentCount {
|
||||||
|
return "capacity"
|
||||||
|
}
|
||||||
|
return "eligible"
|
||||||
|
}
|
||||||
|
func (s *supportAvailabilityService) Evaluate(db *gorm.DB, profile models.AgentProfile, automatic bool, now time.Time, excludeConversationID int64) (supportEligibility, error) {
|
||||||
|
ret := supportEligibility{EffectiveStatus: effectiveSupportStatus(profile, now)}
|
||||||
|
user, err := repositories.SupportAvailabilityRepository.User(db, profile.UserID)
|
||||||
|
if err != nil {
|
||||||
|
return ret, err
|
||||||
|
}
|
||||||
|
team, err := repositories.SupportAvailabilityRepository.Team(db, profile.TeamID)
|
||||||
|
if err != nil {
|
||||||
|
return ret, err
|
||||||
|
}
|
||||||
|
calendar, err := SupportCalendarService.Evaluate(db, profile.TeamID, now)
|
||||||
|
if err != nil {
|
||||||
|
return ret, err
|
||||||
|
}
|
||||||
|
ret.Calendar = calendar
|
||||||
|
online, err := s.onlineUsers(db, []int64{profile.UserID}, now)
|
||||||
|
if err != nil {
|
||||||
|
return ret, err
|
||||||
|
}
|
||||||
|
ret.Online = online[profile.UserID]
|
||||||
|
count, err := repositories.SupportAvailabilityRepository.ActiveCount(db, profile.UserID, excludeConversationID)
|
||||||
|
if err != nil {
|
||||||
|
return ret, err
|
||||||
|
}
|
||||||
|
ret.ActiveCount = count
|
||||||
|
userEnabled := user != nil && user.DeletedAt == nil && user.Status == enums.StatusOk && user.UserType == enums.UserTypeEmployee
|
||||||
|
ret.Reason = eligibilityReason(profile, userEnabled, team != nil && team.Status == enums.StatusOk, ret.Online, calendar.Open, count, automatic, now)
|
||||||
|
ret.Eligible = ret.Reason == "eligible"
|
||||||
|
return ret, nil
|
||||||
|
}
|
||||||
|
func (s *supportAvailabilityService) onlineUsers(db *gorm.DB, userIDs []int64, now time.Time) (map[int64]bool, error) {
|
||||||
|
online, err := repositories.SupportAvailabilityRepository.OnlineUsers(db, userIDs, now)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
// Current account/role/permission state is checked on every use, not only on
|
||||||
|
// lease creation, so revoked privileges cannot linger for the lease lifetime.
|
||||||
|
for userID := range online {
|
||||||
|
user, err := repositories.SupportAvailabilityRepository.User(db, userID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if user == nil || user.Status != enums.StatusOk || user.DeletedAt != nil || user.UserType != enums.UserTypeEmployee {
|
||||||
|
delete(online, userID)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
_, permissions, err := AuthService.loadUserAuthScope(db, userID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if !slices.Contains(permissions, constants.PermissionConversationView.Code) {
|
||||||
|
delete(online, userID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return online, nil
|
||||||
|
}
|
||||||
|
func (s *supportAvailabilityService) ForUser(userID int64, automatic bool) (*response.SupportAvailabilityResponse, error) {
|
||||||
|
profile, err := repositories.SupportAvailabilityRepository.ProfileByUser(sqls.DB(), userID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, supportAvailabilityPersistenceError(err)
|
||||||
|
}
|
||||||
|
if profile == nil {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
return s.build(sqls.DB(), *profile, automatic, time.Now(), 0)
|
||||||
|
}
|
||||||
|
func (s *supportAvailabilityService) build(db *gorm.DB, profile models.AgentProfile, automatic bool, now time.Time, excludeConversationID int64) (*response.SupportAvailabilityResponse, error) {
|
||||||
|
eligibility, err := s.Evaluate(db, profile, automatic, now, excludeConversationID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, supportAvailabilityPersistenceError(err)
|
||||||
|
}
|
||||||
|
calendar, err := SupportCalendarService.get(db, profile.TeamID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, supportAvailabilityPersistenceError(err)
|
||||||
|
}
|
||||||
|
return &response.SupportAvailabilityResponse{UserID: profile.UserID, ProfileID: profile.ID, TeamID: profile.TeamID, DisplayName: profile.DisplayName, ServiceStatus: profile.ServiceStatus, ReturnServiceStatus: profile.AvailabilityReturnStatus, EffectiveServiceStatus: eligibility.EffectiveStatus, AbsenceStartAt: supportTimeString(profile.AbsenceStartAt), AbsenceEndAt: supportTimeString(profile.AbsenceEndAt), Online: eligibility.Online, Eligible: eligibility.Eligible, Reason: eligibility.Reason, Calendar: *calendar, CalendarOpen: eligibility.Calendar.Open, NextOpeningAt: supportTimeString(eligibility.Calendar.NextOpeningAt)}, nil
|
||||||
|
}
|
||||||
|
func (s *supportAvailabilityService) List(conversationID int64, operator *dto.AuthPrincipal) ([]response.SupportAvailabilityResponse, error) {
|
||||||
|
var teamIDs []int64
|
||||||
|
if conversationID > 0 {
|
||||||
|
conversation := ConversationService.Get(conversationID)
|
||||||
|
if conversation == nil {
|
||||||
|
return nil, errorsx.InvalidParamI18n("error.e0116")
|
||||||
|
}
|
||||||
|
if !slices.Contains(operator.Permissions, constants.PermissionConversationView.Code) {
|
||||||
|
return nil, errorsx.ForbiddenI18n("error.e0225")
|
||||||
|
}
|
||||||
|
if conversation.Status == enums.IMConversationStatusActive && !ConversationService.canTransferConversation(conversation, operator) {
|
||||||
|
return nil, errorsx.ForbiddenI18n("error.e0223")
|
||||||
|
}
|
||||||
|
ai := AIAgentService.Get(conversation.AIAgentID)
|
||||||
|
if ai == nil || ai.Status != enums.StatusOk {
|
||||||
|
teamIDs = []int64{}
|
||||||
|
} else {
|
||||||
|
teamIDs = resolveDispatchTeamIDs(ai.TeamIDs)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
profiles, err := repositories.SupportAvailabilityRepository.Profiles(sqls.DB(), teamIDs)
|
||||||
|
if err != nil {
|
||||||
|
return nil, supportAvailabilityPersistenceError(err)
|
||||||
|
}
|
||||||
|
result := make([]response.SupportAvailabilityResponse, 0, len(profiles))
|
||||||
|
now := time.Now()
|
||||||
|
for _, profile := range profiles {
|
||||||
|
item, err := s.build(sqls.DB(), profile, false, now, conversationID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
result = append(result, *item)
|
||||||
|
}
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
func validateSupportAbsence(req request.SupportAvailabilityRequest) (*time.Time, *time.Time, error) {
|
||||||
|
if !enums.IsValidServiceStatus(req.ServiceStatus) {
|
||||||
|
return nil, nil, errorsx.InvalidParamI18n("error.supportAvailability.invalidStatus")
|
||||||
|
}
|
||||||
|
if req.ServiceStatus != enums.ServiceStatusVacation {
|
||||||
|
return nil, nil, nil
|
||||||
|
}
|
||||||
|
start, err1 := time.Parse(time.RFC3339, req.AbsenceStartAt)
|
||||||
|
end, err2 := time.Parse(time.RFC3339, req.AbsenceEndAt)
|
||||||
|
if err1 != nil || err2 != nil || !end.After(start) {
|
||||||
|
return nil, nil, errorsx.InvalidParamI18n("error.supportAvailability.invalidAbsence")
|
||||||
|
}
|
||||||
|
return &start, &end, nil
|
||||||
|
}
|
||||||
|
func (s *supportAvailabilityService) Update(userID int64, req request.SupportAvailabilityRequest, operator *dto.AuthPrincipal) (*response.SupportAvailabilityResponse, error) {
|
||||||
|
if operator == nil {
|
||||||
|
return nil, errorsx.UnauthorizedI18n("error.auth.expired")
|
||||||
|
}
|
||||||
|
start, end, err := validateSupportAbsence(req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
err = sqls.WithTransaction(func(ctx *sqls.TxContext) error {
|
||||||
|
profile, err := repositories.SupportAvailabilityRepository.LockProfile(ctx.Tx, userID)
|
||||||
|
if err != nil {
|
||||||
|
return errorsx.InvalidParamI18n("error.supportAvailability.noProfile")
|
||||||
|
}
|
||||||
|
user, err := repositories.SupportAvailabilityRepository.User(ctx.Tx, userID)
|
||||||
|
if err != nil {
|
||||||
|
return supportAvailabilityPersistenceError(err)
|
||||||
|
}
|
||||||
|
if profile.Status != enums.StatusOk || user == nil || user.Status != enums.StatusOk || user.DeletedAt != nil || user.UserType != enums.UserTypeEmployee {
|
||||||
|
return errorsx.InvalidParamI18n("error.supportAvailability.noProfile")
|
||||||
|
}
|
||||||
|
returnStatus := profile.AvailabilityReturnStatus
|
||||||
|
if req.ServiceStatus == enums.ServiceStatusVacation && profile.ServiceStatus != enums.ServiceStatusVacation {
|
||||||
|
returnStatus = profile.ServiceStatus
|
||||||
|
}
|
||||||
|
if req.ServiceStatus != enums.ServiceStatusVacation {
|
||||||
|
returnStatus = req.ServiceStatus
|
||||||
|
}
|
||||||
|
return supportAvailabilityPersistenceError(repositories.AgentProfileRepository.Updates(ctx.Tx, profile.ID, map[string]any{"service_status": req.ServiceStatus, "availability_return_status": returnStatus, "absence_start_at": start, "absence_end_at": end, "last_status_at": time.Now(), "update_user_id": operator.UserID, "update_user_name": operator.Username, "updated_at": time.Now()}))
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
_, _ = ConversationDispatchService.DispatchPendingConversations(0)
|
||||||
|
return s.ForUser(userID, true)
|
||||||
|
}
|
||||||
|
func (s *supportAvailabilityService) GuardAssignment(db *gorm.DB, userID int64, automatic bool, conversation *models.Conversation, now time.Time) (*models.AgentProfile, error) {
|
||||||
|
profile, err := repositories.SupportAvailabilityRepository.LockProfile(db, userID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, errSupportAssignmentIneligible
|
||||||
|
}
|
||||||
|
ai := repositories.AIAgentRepository.Get(db, conversation.AIAgentID)
|
||||||
|
if ai == nil || ai.Status != enums.StatusOk {
|
||||||
|
return nil, errSupportAssignmentIneligible
|
||||||
|
}
|
||||||
|
// Empty explicit team IDs mean all enabled teams. The shared evaluator
|
||||||
|
// checks this profile team using the transaction DB, not sqls.DB().
|
||||||
|
teamIDs := orderedPositiveIDs(ai.TeamIDs)
|
||||||
|
if len(teamIDs) > 0 && !slices.Contains(teamIDs, profile.TeamID) {
|
||||||
|
return nil, errSupportAssignmentIneligible
|
||||||
|
}
|
||||||
|
eligibility, err := s.Evaluate(db, *profile, automatic, now, conversation.ID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, supportAvailabilityPersistenceError(err)
|
||||||
|
}
|
||||||
|
if !eligibility.Eligible {
|
||||||
|
return nil, errSupportAssignmentIneligible
|
||||||
|
}
|
||||||
|
return profile, nil
|
||||||
|
}
|
||||||
|
func (s *supportAvailabilityService) PublicStatus(channel *models.Channel) (*response.PublicSupportStatusResponse, error) {
|
||||||
|
result := &response.PublicSupportStatusResponse{Reason: "temporarily_absent", Timezone: "UTC"}
|
||||||
|
if channel == nil || channel.Status != enums.StatusOk {
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
ai := AIAgentService.Get(channel.AIAgentID)
|
||||||
|
if ai == nil || ai.Status != enums.StatusOk {
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
now := time.Now()
|
||||||
|
teams := resolveDispatchTeamIDs(ai.TeamIDs)
|
||||||
|
anyOpen := false
|
||||||
|
enabledTeamCount := 0
|
||||||
|
atCapacity := false
|
||||||
|
var next *time.Time
|
||||||
|
nextTimezone := ""
|
||||||
|
for _, id := range teams {
|
||||||
|
team, err := repositories.SupportAvailabilityRepository.Team(sqls.DB(), id)
|
||||||
|
if err != nil {
|
||||||
|
return nil, supportAvailabilityPersistenceError(err)
|
||||||
|
}
|
||||||
|
if team == nil || team.Status != enums.StatusOk {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
enabledTeamCount++
|
||||||
|
calendar, err := SupportCalendarService.Evaluate(sqls.DB(), id, now)
|
||||||
|
if err != nil {
|
||||||
|
return nil, supportAvailabilityPersistenceError(err)
|
||||||
|
}
|
||||||
|
result.Timezone = calendar.Timezone
|
||||||
|
anyOpen = anyOpen || calendar.Open
|
||||||
|
if calendar.NextOpeningAt != nil && (next == nil || calendar.NextOpeningAt.Before(*next)) {
|
||||||
|
next = calendar.NextOpeningAt
|
||||||
|
nextTimezone = calendar.Timezone
|
||||||
|
}
|
||||||
|
}
|
||||||
|
profiles, err := repositories.SupportAvailabilityRepository.Profiles(sqls.DB(), teams)
|
||||||
|
if err != nil {
|
||||||
|
return nil, supportAvailabilityPersistenceError(err)
|
||||||
|
}
|
||||||
|
for _, profile := range profiles {
|
||||||
|
eligibility, err := s.Evaluate(sqls.DB(), profile, true, now, 0)
|
||||||
|
if err != nil {
|
||||||
|
return nil, supportAvailabilityPersistenceError(err)
|
||||||
|
}
|
||||||
|
if eligibility.Eligible {
|
||||||
|
result.Available = true
|
||||||
|
result.Reason = "available"
|
||||||
|
result.Timezone = eligibility.Calendar.Timezone
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
atCapacity = atCapacity || eligibility.Reason == "capacity"
|
||||||
|
}
|
||||||
|
if enabledTeamCount > 0 && !anyOpen {
|
||||||
|
result.Reason = "outside_hours"
|
||||||
|
result.NextOpeningAt = supportTimeString(next)
|
||||||
|
if nextTimezone != "" {
|
||||||
|
result.Timezone = nextTimezone
|
||||||
|
}
|
||||||
|
} else if atCapacity {
|
||||||
|
result.Reason = "capacity"
|
||||||
|
}
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
384
internal/services/support_availability_service_test.go
Normal file
384
internal/services/support_availability_service_test.go
Normal file
@@ -0,0 +1,384 @@
|
|||||||
|
package services
|
||||||
|
|
||||||
|
import (
|
||||||
|
"agent-desk/internal/models"
|
||||||
|
"agent-desk/internal/pkg/dto/request"
|
||||||
|
"agent-desk/internal/pkg/dto/response"
|
||||||
|
"agent-desk/internal/pkg/enums"
|
||||||
|
"agent-desk/internal/repositories"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
func calendarForTest(zone string, periods ...request.SupportCalendarWeeklyPeriod) *response.SupportCalendarResponse {
|
||||||
|
return &response.SupportCalendarResponse{SupportCalendarRequest: request.SupportCalendarRequest{TeamID: 1, Mode: "recurring", Timezone: zone, Weekly: periods, Exceptions: []request.SupportCalendarException{}}, EffectiveTimezone: zone}
|
||||||
|
}
|
||||||
|
func weeklyForTest(day int, start, end string) request.SupportCalendarWeeklyPeriod {
|
||||||
|
return request.SupportCalendarWeeklyPeriod{Weekday: day, SupportCalendarPeriod: request.SupportCalendarPeriod{Start: start, End: end}}
|
||||||
|
}
|
||||||
|
func instantForTest(s string) time.Time {
|
||||||
|
t, err := time.Parse(time.RFC3339, s)
|
||||||
|
if err != nil {
|
||||||
|
panic(err)
|
||||||
|
}
|
||||||
|
return t
|
||||||
|
}
|
||||||
|
func TestSupportCalendarSplitOvernightExceptionAndNextOpening(t *testing.T) {
|
||||||
|
c := calendarForTest("Europe/Berlin", weeklyForTest(1, "09:00", "12:00"), weeklyForTest(1, "13:00", "17:00"), weeklyForTest(5, "22:00", "06:00"))
|
||||||
|
tests := []struct {
|
||||||
|
at string
|
||||||
|
open bool
|
||||||
|
next string
|
||||||
|
}{
|
||||||
|
{"2026-10-12T08:00:00Z", true, ""}, {"2026-10-12T10:30:00Z", false, "2026-10-12T11:00:00Z"},
|
||||||
|
{"2026-10-16T21:00:00Z", true, ""}, {"2026-10-17T03:59:59Z", true, ""}, {"2026-10-17T04:00:00Z", false, "2026-10-19T07:00:00Z"},
|
||||||
|
}
|
||||||
|
for _, tt := range tests {
|
||||||
|
got, err := evaluateRecurringSupportCalendar(c, instantForTest(tt.at))
|
||||||
|
if err != nil || got.Open != tt.open || supportTimeString(got.NextOpeningAt) != tt.next {
|
||||||
|
t.Errorf("%s: %+v %v next %s", tt.at, got, err, supportTimeString(got.NextOpeningAt))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
c.Exceptions = []request.SupportCalendarException{{Date: "2026-10-17", Closed: true}}
|
||||||
|
got, err := evaluateRecurringSupportCalendar(c, instantForTest("2026-10-17T00:00:00+02:00"))
|
||||||
|
if err != nil || got.Open {
|
||||||
|
t.Fatalf("holiday must suppress overnight carry: %+v %v", got, err)
|
||||||
|
}
|
||||||
|
c.Exceptions = []request.SupportCalendarException{{Date: "2026-10-17", Periods: []request.SupportCalendarPeriod{{Start: "10:00", End: "11:00"}}}}
|
||||||
|
got, err = evaluateRecurringSupportCalendar(c, instantForTest("2026-10-17T00:00:00+02:00"))
|
||||||
|
if err != nil || supportTimeString(got.NextOpeningAt) != "2026-10-17T08:00:00Z" {
|
||||||
|
t.Fatalf("date override: %+v %v", got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
func TestSupportCalendarDSTGapAndFold(t *testing.T) {
|
||||||
|
spring := calendarForTest("America/New_York", weeklyForTest(7, "02:30", "04:00"))
|
||||||
|
got, err := evaluateRecurringSupportCalendar(spring, instantForTest("2026-03-08T06:59:00Z"))
|
||||||
|
if err != nil || got.Open || supportTimeString(got.NextOpeningAt) != "2026-03-08T07:00:00Z" {
|
||||||
|
t.Fatalf("gap boundary: %+v %v", got, err)
|
||||||
|
}
|
||||||
|
got, err = evaluateRecurringSupportCalendar(spring, instantForTest("2026-03-08T07:00:00Z"))
|
||||||
|
if err != nil || !got.Open {
|
||||||
|
t.Fatalf("gap opening: %+v %v", got, err)
|
||||||
|
}
|
||||||
|
fold := calendarForTest("America/New_York", weeklyForTest(7, "01:30", "01:45"))
|
||||||
|
for _, at := range []string{"2026-11-01T05:30:00Z", "2026-11-01T06:15:00Z", "2026-11-01T06:44:59Z"} {
|
||||||
|
got, err = evaluateRecurringSupportCalendar(fold, instantForTest(at))
|
||||||
|
if err != nil || !got.Open {
|
||||||
|
t.Errorf("fold %s: %+v %v", at, got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
got, err = evaluateRecurringSupportCalendar(fold, instantForTest("2026-11-01T06:45:00Z"))
|
||||||
|
if err != nil || got.Open {
|
||||||
|
t.Fatalf("fold end: %+v %v", got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
func TestSupportCalendarValidationAndBoundedUnknownOpening(t *testing.T) {
|
||||||
|
for _, req := range []request.SupportCalendarRequest{
|
||||||
|
{TeamID: 0, Mode: "recurring"}, {TeamID: 1, Mode: "recurring", Timezone: "Local"}, {TeamID: 1, Mode: "recurring", Timezone: "Not/AZone"},
|
||||||
|
{TeamID: 1, Mode: "recurring", Weekly: []request.SupportCalendarWeeklyPeriod{weeklyForTest(1, "09:00", "09:00")}},
|
||||||
|
{TeamID: 1, Mode: "recurring", Exceptions: []request.SupportCalendarException{{Date: "2026-02-30", Closed: true}}},
|
||||||
|
} {
|
||||||
|
if validateSupportCalendar(req) == nil {
|
||||||
|
t.Errorf("accepted invalid config: %+v", req)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
c := calendarForTest("UTC")
|
||||||
|
got, err := evaluateRecurringSupportCalendar(c, time.Now())
|
||||||
|
if err != nil || got.Open || got.NextOpeningAt != nil {
|
||||||
|
t.Fatalf("empty calendar invented opening: %+v %v", got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
func TestSupportAvailabilityEffectiveAbsenceAndUnlimitedCapacity(t *testing.T) {
|
||||||
|
start := instantForTest("2026-10-17T09:00:00Z")
|
||||||
|
end := start.Add(48 * time.Hour)
|
||||||
|
p := models.AgentProfile{Status: enums.StatusOk, ServiceStatus: enums.ServiceStatusVacation, AvailabilityReturnStatus: enums.ServiceStatusBusy, AbsenceStartAt: &start, AbsenceEndAt: &end, AutoAssignEnabled: true}
|
||||||
|
for _, tt := range []struct {
|
||||||
|
at time.Time
|
||||||
|
want enums.ServiceStatus
|
||||||
|
}{{start.Add(-time.Second), enums.ServiceStatusBusy}, {start, enums.ServiceStatusVacation}, {end.Add(-time.Second), enums.ServiceStatusVacation}, {end, enums.ServiceStatusBusy}} {
|
||||||
|
if got := effectiveSupportStatus(p, tt.at); got != tt.want {
|
||||||
|
t.Errorf("effective at %v: %v", tt.at, got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
p.ServiceStatus = enums.ServiceStatusIdle
|
||||||
|
p.MaxConcurrentCount = 0
|
||||||
|
if got := eligibilityReason(p, true, true, true, true, 999, true, start); got != "eligible" {
|
||||||
|
t.Fatal(got)
|
||||||
|
}
|
||||||
|
p.MaxConcurrentCount = 1
|
||||||
|
if got := eligibilityReason(p, true, true, true, true, 1, true, start); got != "capacity" {
|
||||||
|
t.Fatal(got)
|
||||||
|
}
|
||||||
|
p.MaxConcurrentCount = 0
|
||||||
|
p.AutoAssignEnabled = false
|
||||||
|
if got := eligibilityReason(p, true, true, true, true, 0, true, start); got != "auto_assign_disabled" {
|
||||||
|
t.Fatal(got)
|
||||||
|
}
|
||||||
|
if got := eligibilityReason(p, true, true, true, true, 0, false, start); got != "eligible" {
|
||||||
|
t.Fatal(got)
|
||||||
|
}
|
||||||
|
p.ReceiveOfflineMessage = true
|
||||||
|
if got := eligibilityReason(p, true, true, false, true, 0, false, start); got != "offline" {
|
||||||
|
t.Fatal(got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
func TestSupportAvailabilityAbsenceRequiresOffsetAndBounds(t *testing.T) {
|
||||||
|
for _, req := range []request.SupportAvailabilityRequest{{ServiceStatus: 4}, {ServiceStatus: 4, AbsenceStartAt: "2026-10-16T10:00", AbsenceEndAt: "2026-10-17T10:00"}, {ServiceStatus: 4, AbsenceStartAt: "2026-10-17T10:00:00Z", AbsenceEndAt: "2026-10-16T10:00:00Z"}, {ServiceStatus: 99}} {
|
||||||
|
if _, _, err := validateSupportAbsence(req); err == nil {
|
||||||
|
t.Fatalf("accepted %+v", req)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
func newAvailabilityFixture(t *testing.T) (*authSessionFixture, models.AgentProfile, models.AIAgent) {
|
||||||
|
t.Helper()
|
||||||
|
f := newWsAuthFixture(t, true)
|
||||||
|
if err := f.db.AutoMigrate(&models.AgentPresenceLease{}, &models.SupportCalendar{}, &models.AgentTeam{}, &models.AgentTeamSchedule{}, &models.AgentProfile{}, &models.AIAgent{}, &models.Conversation{}, &models.ConversationAssignment{}, &models.ConversationEventLog{}); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
team := models.AgentTeam{Name: "Support", Status: enums.StatusOk}
|
||||||
|
if err := f.db.Create(&team).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
p := models.AgentProfile{UserID: f.user.ID, TeamID: team.ID, AgentCode: "test", DisplayName: "Test", Status: enums.StatusOk, AutoAssignEnabled: true, MaxConcurrentCount: 1}
|
||||||
|
ai := models.AIAgent{Name: "Test", TeamIDs: fmt.Sprint(team.ID), Status: enums.StatusOk}
|
||||||
|
weekly := make([]request.SupportCalendarWeeklyPeriod, 0, 7)
|
||||||
|
for day := 1; day <= 7; day++ {
|
||||||
|
weekly = append(weekly, weeklyForTest(day, "00:00", "24:00"))
|
||||||
|
}
|
||||||
|
raw, _ := json.Marshal(weekly)
|
||||||
|
for _, item := range []any{&p, &ai, &models.SupportCalendar{TeamID: team.ID, Mode: "recurring", Timezone: "UTC", WeeklyJSON: string(raw), ExceptionsJSON: "[]"}, &models.AgentPresenceLease{ID: "one", UserID: f.user.ID, LoginSessionID: f.session.ID, ExpiresAt: f.now.Add(agentPresenceLeaseTTL)}} {
|
||||||
|
if err := f.db.Create(item).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return f, p, ai
|
||||||
|
}
|
||||||
|
func TestSupportAvailabilityPresenceMultiTabAndRevocation(t *testing.T) {
|
||||||
|
f, p, _ := newAvailabilityFixture(t)
|
||||||
|
lease := models.AgentPresenceLease{ID: "second", UserID: p.UserID, LoginSessionID: f.session.ID, ExpiresAt: f.now.Add(agentPresenceLeaseTTL)}
|
||||||
|
if err := f.db.Create(&lease).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := repositories.SupportAvailabilityRepository.EndPresence(f.db, "one", f.now.Add(agentPresenceDisconnectGrace)); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
users, err := SupportAvailabilityService.onlineUsers(f.db, []int64{p.UserID}, f.now.Add(20*time.Second))
|
||||||
|
if err != nil || !users[p.UserID] {
|
||||||
|
t.Fatalf("closing one tab hid another: %v %v", users, err)
|
||||||
|
}
|
||||||
|
users, err = SupportAvailabilityService.onlineUsers(f.db, []int64{p.UserID}, f.now.Add(agentPresenceLeaseTTL))
|
||||||
|
if err != nil || users[p.UserID] {
|
||||||
|
t.Fatalf("crashed sessions outlived TTL: %v %v", users, err)
|
||||||
|
}
|
||||||
|
if err := f.db.Model(&f.session).Update("revoked_at", f.now).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
users, err = SupportAvailabilityService.onlineUsers(f.db, []int64{p.UserID}, f.now)
|
||||||
|
if err != nil || users[p.UserID] {
|
||||||
|
t.Fatalf("revoked session still present: %v %v", users, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
func TestSupportAvailabilityPresencePermissionAndDisabledAccount(t *testing.T) {
|
||||||
|
for _, column := range []string{"permission", "disabled", "deleted", "expired"} {
|
||||||
|
t.Run(column, func(t *testing.T) {
|
||||||
|
f, p, _ := newAvailabilityFixture(t)
|
||||||
|
switch column {
|
||||||
|
case "permission":
|
||||||
|
f.db.Delete(&f.permission)
|
||||||
|
case "disabled":
|
||||||
|
f.db.Model(&f.user).Update("status", enums.StatusDisabled)
|
||||||
|
case "deleted":
|
||||||
|
f.db.Model(&f.user).Update("deleted_at", f.now)
|
||||||
|
case "expired":
|
||||||
|
f.db.Model(&f.session).Update("expired_at", f.now.Add(-time.Second))
|
||||||
|
}
|
||||||
|
got, err := SupportAvailabilityService.Evaluate(f.db, p, true, f.now, 0)
|
||||||
|
if err != nil || got.Eligible || got.Online {
|
||||||
|
t.Fatalf("%s: %+v %v", column, got, err)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
func TestSupportAvailabilityAbsenceDoesNotChangeExistingConversations(t *testing.T) {
|
||||||
|
f, p, ai := newAvailabilityFixture(t)
|
||||||
|
existing := models.Conversation{AIAgentID: ai.ID, CurrentAssigneeID: p.UserID, CurrentTeamID: p.TeamID, Status: enums.IMConversationStatusActive}
|
||||||
|
if err := f.db.Create(&existing).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
req := request.SupportAvailabilityRequest{ServiceStatus: enums.ServiceStatusVacation, AbsenceStartAt: f.now.Add(-time.Minute).Format(time.RFC3339), AbsenceEndAt: f.now.Add(time.Hour).Format(time.RFC3339)}
|
||||||
|
result, err := SupportAvailabilityService.Update(p.UserID, req, f.principal)
|
||||||
|
if err != nil || !result.Online || result.Eligible || result.EffectiveServiceStatus != enums.ServiceStatusVacation {
|
||||||
|
t.Fatalf("vacation: %+v %v", result, err)
|
||||||
|
}
|
||||||
|
var current models.Conversation
|
||||||
|
if err := f.db.First(¤t, existing.ID).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if current.Status != existing.Status || current.CurrentAssigneeID != existing.CurrentAssigneeID {
|
||||||
|
t.Fatal("vacation changed existing assignment")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
func TestSupportAvailabilityLegacyCalendarIsNotReinterpreted(t *testing.T) {
|
||||||
|
f, p, _ := newAvailabilityFixture(t)
|
||||||
|
if err := f.db.Where("team_id = ?", p.TeamID).Delete(&models.SupportCalendar{}).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
start := f.now.Add(-time.Hour)
|
||||||
|
end := f.now.Add(time.Hour)
|
||||||
|
schedule := models.AgentTeamSchedule{TeamID: p.TeamID, StartAt: start, EndAt: end, Status: enums.StatusOk}
|
||||||
|
if err := f.db.Create(&schedule).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
global := models.SupportCalendar{TeamID: 0, Timezone: "Pacific/Auckland", Mode: "recurring", WeeklyJSON: "[]", ExceptionsJSON: "[]"}
|
||||||
|
if err := f.db.Create(&global).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
got, err := SupportCalendarService.Evaluate(f.db, p.TeamID, f.now)
|
||||||
|
if err != nil || !got.Open || got.Mode != "legacy" || got.Timezone != time.Local.String() {
|
||||||
|
t.Fatalf("legacy changed: %+v %v", got, err)
|
||||||
|
}
|
||||||
|
c := models.SupportCalendar{TeamID: p.TeamID, Mode: "recurring", Timezone: "", WeeklyJSON: "[]", ExceptionsJSON: "[]"}
|
||||||
|
if err := f.db.Create(&c).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
got, err = SupportCalendarService.Evaluate(f.db, p.TeamID, f.now)
|
||||||
|
if err != nil || got.Open || got.Timezone != "Pacific/Auckland" {
|
||||||
|
t.Fatalf("explicit opt-in ignored: %+v %v", got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
func TestSupportAvailabilityGuardPreventsCapacityAndStaleVacation(t *testing.T) {
|
||||||
|
f, p, ai := newAvailabilityFixture(t)
|
||||||
|
pending := []models.Conversation{{AIAgentID: ai.ID, Status: enums.IMConversationStatusPending}, {AIAgentID: ai.ID, Status: enums.IMConversationStatusPending}}
|
||||||
|
if err := f.db.Create(&pending).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
sqlDB, _ := f.db.DB()
|
||||||
|
sqlDB.SetMaxOpenConns(1)
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
results := make(chan *models.Conversation, 2)
|
||||||
|
errs := make(chan error, 2)
|
||||||
|
for _, conversation := range pending {
|
||||||
|
wg.Add(1)
|
||||||
|
go func(id int64) {
|
||||||
|
defer wg.Done()
|
||||||
|
got, err := ConversationDispatchService.tryAssignConversation(id, p, "test")
|
||||||
|
results <- got
|
||||||
|
errs <- err
|
||||||
|
}(conversation.ID)
|
||||||
|
}
|
||||||
|
wg.Wait()
|
||||||
|
close(results)
|
||||||
|
close(errs)
|
||||||
|
count := 0
|
||||||
|
for got := range results {
|
||||||
|
if got != nil {
|
||||||
|
count++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for err := range errs {
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if count != 1 {
|
||||||
|
t.Fatalf("capacity=1 admitted %d", count)
|
||||||
|
}
|
||||||
|
// A candidate selected before the operator changes availability cannot commit.
|
||||||
|
if err := f.db.Model(&models.Conversation{}).Where("current_assignee_id = ?", p.UserID).Update("status", enums.IMConversationStatusClosed).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
start, end := f.now.Add(-time.Hour), f.now.Add(time.Hour)
|
||||||
|
if err := f.db.Model(&p).Updates(map[string]any{"service_status": enums.ServiceStatusVacation, "absence_start_at": start, "absence_end_at": end}).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
third := models.Conversation{AIAgentID: ai.ID, Status: enums.IMConversationStatusPending}
|
||||||
|
f.db.Create(&third)
|
||||||
|
got, err := ConversationDispatchService.tryAssignConversation(third.ID, p, "stale")
|
||||||
|
if err != nil || got != nil {
|
||||||
|
t.Fatalf("stale vacation assigned: %+v %v", got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
func TestSupportAvailabilityPublicStatusIsChannelScopedAndMinimal(t *testing.T) {
|
||||||
|
f, p, ai := newAvailabilityFixture(t)
|
||||||
|
channel := &models.Channel{AIAgentID: ai.ID, Status: enums.StatusOk}
|
||||||
|
got, err := SupportAvailabilityService.PublicStatus(channel)
|
||||||
|
if err != nil || !got.Available || got.Reason != "available" {
|
||||||
|
t.Fatalf("status %+v %v", got, err)
|
||||||
|
}
|
||||||
|
if err := f.db.Model(&p).Update("service_status", enums.ServiceStatusBusy).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
got, err = SupportAvailabilityService.PublicStatus(channel)
|
||||||
|
if err != nil || got.Available || got.Reason != "temporarily_absent" {
|
||||||
|
t.Fatalf("busy aggregate %+v %v", got, err)
|
||||||
|
}
|
||||||
|
bytes, _ := json.Marshal(got)
|
||||||
|
var fields map[string]any
|
||||||
|
json.Unmarshal(bytes, &fields)
|
||||||
|
for key := range fields {
|
||||||
|
if key != "available" && key != "reason" && key != "timezone" && key != "nextOpeningAt" {
|
||||||
|
t.Fatalf("private status field %s", key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
other := &models.Channel{AIAgentID: ai.ID + 999, Status: enums.StatusOk}
|
||||||
|
got, err = SupportAvailabilityService.PublicStatus(other)
|
||||||
|
if err != nil || got.Available {
|
||||||
|
t.Fatalf("other channel leaked available operator: %+v %v", got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSupportAvailabilityNoEnabledRoutedTeamIsNotOutsideHours(t *testing.T) {
|
||||||
|
f, profile, ai := newAvailabilityFixture(t)
|
||||||
|
if err := f.db.Model(&models.AgentTeam{}).Where("id = ?", profile.TeamID).Update("status", enums.StatusDisabled).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
got, err := SupportAvailabilityService.PublicStatus(&models.Channel{AIAgentID: ai.ID, Status: enums.StatusOk})
|
||||||
|
if err != nil || got.Reason != "temporarily_absent" || got.Available || got.NextOpeningAt != "" {
|
||||||
|
t.Fatalf("disabled team: %+v %v", got, err)
|
||||||
|
}
|
||||||
|
if err := f.db.Model(&ai).Update("team_ids", "9999").Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
got, err = SupportAvailabilityService.PublicStatus(&models.Channel{AIAgentID: ai.ID, Status: enums.StatusOk})
|
||||||
|
if err != nil || got.Reason != "temporarily_absent" || got.Available || got.NextOpeningAt != "" {
|
||||||
|
t.Fatalf("missing team: %+v %v", got, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSupportAvailabilityWSLeaseDoesNotRenewAfterCloseOrFromVisitorSocket(t *testing.T) {
|
||||||
|
f, profile, _ := newAvailabilityFixture(t)
|
||||||
|
if err := f.db.Where("user_id = ?", profile.UserID).Delete(&models.AgentPresenceLease{}).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
ws := newWsService()
|
||||||
|
session := &ClientSession{Principal: f.principal, Role: realtimeRoleNotification, PresenceLeaseID: "platform-connection"}
|
||||||
|
ws.renewAgentPresence(session)
|
||||||
|
var lease models.AgentPresenceLease
|
||||||
|
if err := f.db.First(&lease, "id = ?", session.PresenceLeaseID).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if lease.ExpiresAt.After(time.Now().Add(agentPresenceLeaseTTL)) || !lease.ExpiresAt.After(time.Now().Add(agentPresenceDisconnectGrace)) {
|
||||||
|
t.Fatalf("unexpected lease expiry: %v", lease.ExpiresAt)
|
||||||
|
}
|
||||||
|
ws.endAgentPresence(session)
|
||||||
|
session.PresenceRenewedAt.Store(0)
|
||||||
|
ws.renewAgentPresence(session)
|
||||||
|
if err := f.db.First(&lease, "id = ?", session.PresenceLeaseID).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if lease.ExpiresAt.After(time.Now().Add(agentPresenceDisconnectGrace)) {
|
||||||
|
t.Fatal("closed session was renewed")
|
||||||
|
}
|
||||||
|
visitor := &ClientSession{Principal: f.principal, Role: realtimeRoleUser, PresenceLeaseID: "visitor-connection"}
|
||||||
|
ws.renewAgentPresence(visitor)
|
||||||
|
var count int64
|
||||||
|
if err := f.db.Model(&models.AgentPresenceLease{}).Where("id = ?", visitor.PresenceLeaseID).Count(&count).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if count != 0 {
|
||||||
|
t.Fatal("visitor socket established platform presence")
|
||||||
|
}
|
||||||
|
}
|
||||||
337
internal/services/support_calendar_service.go
Normal file
337
internal/services/support_calendar_service.go
Normal file
@@ -0,0 +1,337 @@
|
|||||||
|
package services
|
||||||
|
|
||||||
|
import (
|
||||||
|
"agent-desk/internal/models"
|
||||||
|
"agent-desk/internal/pkg/dto/request"
|
||||||
|
"agent-desk/internal/pkg/dto/response"
|
||||||
|
"agent-desk/internal/pkg/errorsx"
|
||||||
|
"agent-desk/internal/repositories"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"github.com/mlogclub/simple/sqls"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
"sort"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
_ "time/tzdata"
|
||||||
|
)
|
||||||
|
|
||||||
|
const supportNextOpeningSearchDays = 366
|
||||||
|
|
||||||
|
var SupportCalendarService = &supportCalendarService{}
|
||||||
|
|
||||||
|
type supportCalendarService struct{}
|
||||||
|
type supportCalendarEvaluation struct {
|
||||||
|
Open bool
|
||||||
|
Timezone, Mode string
|
||||||
|
NextOpeningAt *time.Time
|
||||||
|
}
|
||||||
|
type supportCalendarInterval struct{ start, end time.Time }
|
||||||
|
|
||||||
|
func supportAvailabilityPersistenceError(err error) error {
|
||||||
|
if err == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return errorsx.InvalidParamI18n("error.supportAvailability.persistence")
|
||||||
|
}
|
||||||
|
func (s *supportCalendarService) Get(teamID int64) (*response.SupportCalendarResponse, error) {
|
||||||
|
return s.get(sqls.DB(), teamID)
|
||||||
|
}
|
||||||
|
func (s *supportCalendarService) get(db *gorm.DB, teamID int64) (*response.SupportCalendarResponse, error) {
|
||||||
|
global, err := repositories.SupportAvailabilityRepository.Calendar(db, 0)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
zone := "UTC"
|
||||||
|
if global != nil && global.Timezone != "" {
|
||||||
|
zone = global.Timezone
|
||||||
|
}
|
||||||
|
item := global
|
||||||
|
if teamID != 0 {
|
||||||
|
item, err = repositories.SupportAvailabilityRepository.Calendar(db, teamID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ret := &response.SupportCalendarResponse{SupportCalendarRequest: request.SupportCalendarRequest{TeamID: teamID, Mode: "legacy", Weekly: []request.SupportCalendarWeeklyPeriod{}, Exceptions: []request.SupportCalendarException{}}, EffectiveTimezone: zone, DeploymentTimezone: zone}
|
||||||
|
if teamID == 0 {
|
||||||
|
ret.Timezone = zone
|
||||||
|
ret.Mode = "recurring"
|
||||||
|
}
|
||||||
|
if item != nil {
|
||||||
|
ret.Mode = item.Mode
|
||||||
|
ret.Timezone = item.Timezone
|
||||||
|
if err = json.Unmarshal([]byte(item.WeeklyJSON), &ret.Weekly); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err = json.Unmarshal([]byte(item.ExceptionsJSON), &ret.Exceptions); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if item.Timezone != "" {
|
||||||
|
ret.EffectiveTimezone = item.Timezone
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Dated schedules are absolute stored instants; their existing input/display
|
||||||
|
// convention is the process local zone, never the new recurring UTC default.
|
||||||
|
if ret.Mode == "legacy" {
|
||||||
|
ret.EffectiveTimezone = time.Local.String()
|
||||||
|
}
|
||||||
|
return ret, nil
|
||||||
|
}
|
||||||
|
func validateSupportCalendar(req request.SupportCalendarRequest) error {
|
||||||
|
invalid := func() error { return errorsx.InvalidParamI18n("error.supportAvailability.invalidCalendar") }
|
||||||
|
if req.TeamID < 0 || (req.Mode != "legacy" && req.Mode != "recurring") || len(req.Weekly) > 100 || len(req.Exceptions) > 730 {
|
||||||
|
return invalid()
|
||||||
|
}
|
||||||
|
if req.TeamID == 0 && (req.Timezone == "" || len(req.Weekly) > 0 || len(req.Exceptions) > 0) {
|
||||||
|
return invalid()
|
||||||
|
}
|
||||||
|
if req.Timezone != "" {
|
||||||
|
if req.Timezone == "Local" {
|
||||||
|
return invalid()
|
||||||
|
}
|
||||||
|
if _, err := time.LoadLocation(req.Timezone); err != nil {
|
||||||
|
return invalid()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, period := range req.Weekly {
|
||||||
|
if period.Weekday < 1 || period.Weekday > 7 || !validSupportPeriod(period.SupportCalendarPeriod) {
|
||||||
|
return invalid()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
seen := map[string]bool{}
|
||||||
|
for _, exception := range req.Exceptions {
|
||||||
|
date, err := time.Parse(time.DateOnly, exception.Date)
|
||||||
|
if err != nil || date.Format(time.DateOnly) != exception.Date || seen[exception.Date] || len(exception.Periods) > 24 || exception.Closed && len(exception.Periods) > 0 {
|
||||||
|
return invalid()
|
||||||
|
}
|
||||||
|
seen[exception.Date] = true
|
||||||
|
for _, period := range exception.Periods {
|
||||||
|
if !validSupportPeriod(period) {
|
||||||
|
return invalid()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
func supportClockMinutes(clock string, allow24 bool) (int, bool) {
|
||||||
|
if allow24 && clock == "24:00" {
|
||||||
|
return 1440, true
|
||||||
|
}
|
||||||
|
t, err := time.Parse("15:04", clock)
|
||||||
|
if err != nil || t.Format("15:04") != clock {
|
||||||
|
return 0, false
|
||||||
|
}
|
||||||
|
return t.Hour()*60 + t.Minute(), true
|
||||||
|
}
|
||||||
|
func validSupportPeriod(period request.SupportCalendarPeriod) bool {
|
||||||
|
a, ok := supportClockMinutes(period.Start, false)
|
||||||
|
b, ok2 := supportClockMinutes(period.End, true)
|
||||||
|
return ok && ok2 && a != b
|
||||||
|
}
|
||||||
|
func (s *supportCalendarService) Save(req request.SupportCalendarRequest) (*response.SupportCalendarResponse, error) {
|
||||||
|
req.Timezone = strings.TrimSpace(req.Timezone)
|
||||||
|
if err := validateSupportCalendar(req); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if req.TeamID > 0 {
|
||||||
|
team, err := repositories.SupportAvailabilityRepository.Team(sqls.DB(), req.TeamID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, supportAvailabilityPersistenceError(err)
|
||||||
|
}
|
||||||
|
if team == nil {
|
||||||
|
return nil, errorsx.InvalidParamI18n("error.e0169")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if req.TeamID == 0 {
|
||||||
|
req.Mode = "recurring"
|
||||||
|
}
|
||||||
|
if req.Weekly == nil {
|
||||||
|
req.Weekly = []request.SupportCalendarWeeklyPeriod{}
|
||||||
|
}
|
||||||
|
if req.Exceptions == nil {
|
||||||
|
req.Exceptions = []request.SupportCalendarException{}
|
||||||
|
}
|
||||||
|
weekly, _ := json.Marshal(req.Weekly)
|
||||||
|
exceptions, _ := json.Marshal(req.Exceptions)
|
||||||
|
item := &models.SupportCalendar{TeamID: req.TeamID, Mode: req.Mode, Timezone: req.Timezone, WeeklyJSON: string(weekly), ExceptionsJSON: string(exceptions), UpdatedAt: time.Now()}
|
||||||
|
if err := repositories.SupportAvailabilityRepository.SaveCalendar(sqls.DB(), item); err != nil {
|
||||||
|
return nil, supportAvailabilityPersistenceError(err)
|
||||||
|
}
|
||||||
|
_, _ = ConversationDispatchService.DispatchPendingConversations(0)
|
||||||
|
ret, err := s.Get(req.TeamID)
|
||||||
|
return ret, supportAvailabilityPersistenceError(err)
|
||||||
|
}
|
||||||
|
func (s *supportCalendarService) Preview(req request.SupportCalendarPreviewRequest) (*response.SupportCalendarPreviewResponse, error) {
|
||||||
|
if err := validateSupportCalendar(req.Calendar); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
now := time.Now()
|
||||||
|
if req.At != "" {
|
||||||
|
var err error
|
||||||
|
now, err = time.Parse(time.RFC3339, req.At)
|
||||||
|
if err != nil {
|
||||||
|
return nil, errorsx.InvalidParamI18n("error.supportAvailability.invalidTime")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
calendar := &response.SupportCalendarResponse{SupportCalendarRequest: req.Calendar, EffectiveTimezone: req.Calendar.Timezone}
|
||||||
|
if calendar.EffectiveTimezone == "" {
|
||||||
|
global, err := s.get(sqls.DB(), 0)
|
||||||
|
if err != nil {
|
||||||
|
return nil, supportAvailabilityPersistenceError(err)
|
||||||
|
}
|
||||||
|
calendar.EffectiveTimezone = global.EffectiveTimezone
|
||||||
|
}
|
||||||
|
result, err := s.evaluateCalendar(sqls.DB(), calendar, now)
|
||||||
|
if err != nil {
|
||||||
|
return nil, supportAvailabilityPersistenceError(err)
|
||||||
|
}
|
||||||
|
return &response.SupportCalendarPreviewResponse{Open: result.Open, Timezone: result.Timezone, Mode: result.Mode, NextOpeningAt: supportTimeString(result.NextOpeningAt)}, nil
|
||||||
|
}
|
||||||
|
func (s *supportCalendarService) Evaluate(db *gorm.DB, teamID int64, now time.Time) (supportCalendarEvaluation, error) {
|
||||||
|
calendar, err := s.get(db, teamID)
|
||||||
|
if err != nil {
|
||||||
|
return supportCalendarEvaluation{}, err
|
||||||
|
}
|
||||||
|
return s.evaluateCalendar(db, calendar, now)
|
||||||
|
}
|
||||||
|
func (s *supportCalendarService) evaluateCalendar(db *gorm.DB, calendar *response.SupportCalendarResponse, now time.Time) (supportCalendarEvaluation, error) {
|
||||||
|
if calendar.Mode == "legacy" {
|
||||||
|
ret := supportCalendarEvaluation{Mode: "legacy", Timezone: time.Local.String()}
|
||||||
|
items, err := repositories.SupportAvailabilityRepository.LegacySchedules(db, calendar.TeamID, now)
|
||||||
|
if err != nil {
|
||||||
|
return ret, err
|
||||||
|
}
|
||||||
|
for _, item := range items {
|
||||||
|
if !item.StartAt.After(now) {
|
||||||
|
ret.Open = true
|
||||||
|
} else if ret.NextOpeningAt == nil {
|
||||||
|
next := item.StartAt
|
||||||
|
ret.NextOpeningAt = &next
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ret.Open {
|
||||||
|
ret.NextOpeningAt = nil
|
||||||
|
}
|
||||||
|
return ret, nil
|
||||||
|
}
|
||||||
|
return evaluateRecurringSupportCalendar(calendar, now)
|
||||||
|
}
|
||||||
|
func evaluateRecurringSupportCalendar(calendar *response.SupportCalendarResponse, now time.Time) (supportCalendarEvaluation, error) {
|
||||||
|
ret := supportCalendarEvaluation{Mode: "recurring", Timezone: calendar.EffectiveTimezone}
|
||||||
|
loc, err := time.LoadLocation(calendar.EffectiveTimezone)
|
||||||
|
if err != nil {
|
||||||
|
return ret, err
|
||||||
|
}
|
||||||
|
day := now.In(loc)
|
||||||
|
year, month, date := day.Date()
|
||||||
|
day = time.Date(year, month, date, 12, 0, 0, 0, loc)
|
||||||
|
exceptions := map[string]request.SupportCalendarException{}
|
||||||
|
for _, item := range calendar.Exceptions {
|
||||||
|
exceptions[item.Date] = item
|
||||||
|
}
|
||||||
|
for offset := -1; offset <= supportNextOpeningSearchDays; offset++ {
|
||||||
|
current := day.AddDate(0, 0, offset)
|
||||||
|
periods := []request.SupportCalendarPeriod{}
|
||||||
|
if exception, ok := exceptions[current.Format(time.DateOnly)]; ok {
|
||||||
|
if !exception.Closed {
|
||||||
|
periods = exception.Periods
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
for _, p := range calendar.Weekly {
|
||||||
|
if p.Weekday == weekdayForBatchRequest(current) {
|
||||||
|
periods = append(periods, p.SupportCalendarPeriod)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
intervals := []supportCalendarInterval{}
|
||||||
|
for _, period := range periods {
|
||||||
|
startMinute, ok := supportClockMinutes(period.Start, false)
|
||||||
|
endMinute, ok2 := supportClockMinutes(period.End, true)
|
||||||
|
if !ok || !ok2 || startMinute == endMinute {
|
||||||
|
return ret, fmt.Errorf("invalid calendar period")
|
||||||
|
}
|
||||||
|
endDay := current
|
||||||
|
if endMinute <= startMinute || endMinute == 1440 {
|
||||||
|
endDay = current.AddDate(0, 0, 1)
|
||||||
|
if endMinute == 1440 {
|
||||||
|
endMinute = 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
start, err := resolveSupportWallTime(current, startMinute, loc, false)
|
||||||
|
if err != nil {
|
||||||
|
return ret, err
|
||||||
|
}
|
||||||
|
end, err := resolveSupportWallTime(endDay, endMinute, loc, true)
|
||||||
|
if err != nil {
|
||||||
|
return ret, err
|
||||||
|
}
|
||||||
|
// Any exception owns its whole civil date, including an overnight carry.
|
||||||
|
if endDay.Format(time.DateOnly) != current.Format(time.DateOnly) {
|
||||||
|
if _, exists := exceptions[endDay.Format(time.DateOnly)]; exists {
|
||||||
|
end, err = resolveSupportWallTime(endDay, 0, loc, false)
|
||||||
|
if err != nil {
|
||||||
|
return ret, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if end.After(start) {
|
||||||
|
intervals = append(intervals, supportCalendarInterval{start: start, end: end})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sort.Slice(intervals, func(i, j int) bool { return intervals[i].start.Before(intervals[j].start) })
|
||||||
|
for _, interval := range intervals {
|
||||||
|
if !now.Before(interval.start) && now.Before(interval.end) {
|
||||||
|
ret.Open = true
|
||||||
|
ret.NextOpeningAt = nil
|
||||||
|
return ret, nil
|
||||||
|
}
|
||||||
|
if interval.start.After(now) && (ret.NextOpeningAt == nil || interval.start.Before(*ret.NextOpeningAt)) {
|
||||||
|
next := interval.start
|
||||||
|
ret.NextOpeningAt = &next
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ret.NextOpeningAt != nil && offset >= 0 {
|
||||||
|
return ret, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ret, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// At a DST fold the earlier occurrence starts a shift and the later occurrence
|
||||||
|
// ends it. Missing boundary minutes move forward to the first valid wall minute.
|
||||||
|
// This is deterministic across hosts and includes both occurrences of a fold.
|
||||||
|
func resolveSupportWallTime(day time.Time, minute int, loc *time.Location, end bool) (time.Time, error) {
|
||||||
|
y, m, d := day.Date()
|
||||||
|
wall := time.Date(y, m, d, minute/60, minute%60, 0, 0, time.UTC)
|
||||||
|
offsets := map[int]bool{}
|
||||||
|
for delta := -48; delta <= 48; delta += 6 {
|
||||||
|
_, offset := day.Add(time.Duration(delta) * time.Hour).Zone()
|
||||||
|
offsets[offset] = true
|
||||||
|
}
|
||||||
|
for shift := 0; shift <= 24*60; shift++ {
|
||||||
|
target := wall.Add(time.Duration(shift) * time.Minute)
|
||||||
|
var candidates []time.Time
|
||||||
|
for offset := range offsets {
|
||||||
|
instant := target.Add(-time.Duration(offset) * time.Second)
|
||||||
|
local := instant.In(loc)
|
||||||
|
if local.Format("2006-01-02 15:04") == target.Format("2006-01-02 15:04") {
|
||||||
|
candidates = append(candidates, instant)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(candidates) > 0 {
|
||||||
|
sort.Slice(candidates, func(i, j int) bool { return candidates[i].Before(candidates[j]) })
|
||||||
|
if end {
|
||||||
|
return candidates[len(candidates)-1], nil
|
||||||
|
}
|
||||||
|
return candidates[0], nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return time.Time{}, fmt.Errorf("unresolvable civil time")
|
||||||
|
}
|
||||||
|
func supportTimeString(value *time.Time) string {
|
||||||
|
if value == nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return value.UTC().Format(time.RFC3339)
|
||||||
|
}
|
||||||
78
internal/services/test_network_test.go
Normal file
78
internal/services/test_network_test.go
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
package services
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"agent-desk/internal/models"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Service integration fixtures may enqueue outbound work asynchronously. Keep
|
||||||
|
// those clients inside this test process's loopback fixtures even when a test
|
||||||
|
// accidentally supplies an external URL. Production transports are unchanged.
|
||||||
|
type loopbackTestTransport struct {
|
||||||
|
base http.RoundTripper
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t loopbackTestTransport) RoundTrip(req *http.Request) (*http.Response, error) {
|
||||||
|
host := req.URL.Hostname()
|
||||||
|
ip := net.ParseIP(host)
|
||||||
|
if host != "localhost" && (ip == nil || !ip.IsLoopback()) {
|
||||||
|
return nil, fmt.Errorf("external HTTP transport disabled in service tests: %s", host)
|
||||||
|
}
|
||||||
|
return t.base.RoundTrip(req)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMain(m *testing.M) {
|
||||||
|
// These service fixtures do not contain AI-runtime tables/configuration.
|
||||||
|
// Runtime behavior has its own suite; focused hook tests install their own
|
||||||
|
// spies. Never let a transitive runtime init launch unowned background work.
|
||||||
|
TriggerAIReplyAsyncHook = func(models.Conversation, models.Message) {}
|
||||||
|
transport := http.DefaultTransport.(*http.Transport).Clone()
|
||||||
|
transport.Proxy = nil
|
||||||
|
http.DefaultTransport = loopbackTestTransport{base: transport}
|
||||||
|
os.Exit(m.Run())
|
||||||
|
}
|
||||||
|
|
||||||
|
type testRoundTripper func(*http.Request) (*http.Response, error)
|
||||||
|
|
||||||
|
func (f testRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
|
||||||
|
return f(req)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestServiceTransportRejectsExternalHostsBeforeDial(t *testing.T) {
|
||||||
|
for _, address := range []string{"https://slack.com/api/chat.postMessage", "https://api.telegram.org/test", "http://example.invalid", "http://192.0.2.1", "http://[2001:db8::1]"} {
|
||||||
|
t.Run(address, func(t *testing.T) {
|
||||||
|
transport := loopbackTestTransport{base: testRoundTripper(func(*http.Request) (*http.Response, error) {
|
||||||
|
t.Fatal("external request reached the underlying transport")
|
||||||
|
return nil, nil
|
||||||
|
})}
|
||||||
|
req, err := http.NewRequest(http.MethodGet, address, nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if _, err := transport.RoundTrip(req); err == nil {
|
||||||
|
t.Fatal("external request was not blocked")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestServiceTransportRejectsRedirectOutsideLoopback(t *testing.T) {
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
http.Redirect(w, r, "https://example.invalid/forbidden", http.StatusFound)
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
response, err := http.Get(server.URL)
|
||||||
|
if response != nil {
|
||||||
|
response.Body.Close()
|
||||||
|
}
|
||||||
|
if err == nil || !strings.Contains(err.Error(), "external HTTP transport disabled") {
|
||||||
|
t.Fatalf("redirect did not hit the loopback guard: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
200
internal/services/ws_auth_security_test.go
Normal file
200
internal/services/ws_auth_security_test.go
Normal file
@@ -0,0 +1,200 @@
|
|||||||
|
package services
|
||||||
|
|
||||||
|
import (
|
||||||
|
"slices"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"agent-desk/internal/models"
|
||||||
|
"agent-desk/internal/pkg/constants"
|
||||||
|
"agent-desk/internal/pkg/dto"
|
||||||
|
"agent-desk/internal/pkg/enums"
|
||||||
|
|
||||||
|
"github.com/mlogclub/simple/sqls"
|
||||||
|
"gorm.io/gorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
func newWsAuthFixture(t *testing.T, hasConversationView bool) *authSessionFixture {
|
||||||
|
t.Helper()
|
||||||
|
f := newAuthSessionFixture(t)
|
||||||
|
f.permission.Code = constants.PermissionConversationView.Code
|
||||||
|
if err := f.db.Model(&f.permission).Update("code", f.permission.Code).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
permissions := []string{f.permission.Code}
|
||||||
|
if !hasConversationView {
|
||||||
|
if err := f.db.Where("role_id = ?", f.role.ID).Delete(&models.RolePermission{}).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
permissions = nil
|
||||||
|
}
|
||||||
|
f.principal = buildAuthPrincipal(&f.user, &f.session, []string{f.role.Code}, permissions)
|
||||||
|
previousDB := sqls.DB()
|
||||||
|
sqls.SetDB(f.db)
|
||||||
|
t.Cleanup(func() { sqls.SetDB(previousDB) })
|
||||||
|
return f
|
||||||
|
}
|
||||||
|
|
||||||
|
func newWsAuthClient(f *authSessionFixture, id, role string) *ClientSession {
|
||||||
|
return &ClientSession{
|
||||||
|
ID: id,
|
||||||
|
Role: role,
|
||||||
|
Principal: f.principal,
|
||||||
|
Topics: make(map[string]struct{}),
|
||||||
|
Send: make(chan []byte, 16),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestWsStaffWithoutViewPermissionHasNoConversationDefaults(t *testing.T) {
|
||||||
|
f := newWsAuthFixture(t, false)
|
||||||
|
ws := newWsService()
|
||||||
|
session := newWsAuthClient(f, "no-view", realtimeRoleAdmin)
|
||||||
|
if !ws.revalidateSession(session) {
|
||||||
|
t.Fatal("expected a valid authenticated staff session")
|
||||||
|
}
|
||||||
|
if topics := ws.defaultTopics(session); len(topics) != 0 {
|
||||||
|
t.Fatalf("staff without view permission received default topics: %v", topics)
|
||||||
|
}
|
||||||
|
if topics := ws.filterAllowedTopics(session, []string{realtimeTopicAdminAll, ws.adminTopic(f.user.ID), "conversation:100"}); len(topics) != 0 {
|
||||||
|
t.Fatalf("staff without view permission could subscribe: %v", topics)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestWsNotificationSessionOnlyReceivesOwnNotificationTopic(t *testing.T) {
|
||||||
|
for _, hasView := range []bool{false, true} {
|
||||||
|
name := "without view permission"
|
||||||
|
if hasView {
|
||||||
|
name = "with view permission"
|
||||||
|
}
|
||||||
|
t.Run(name, func(t *testing.T) {
|
||||||
|
f := newWsAuthFixture(t, hasView)
|
||||||
|
ws := newWsService()
|
||||||
|
session := newWsAuthClient(f, "notification", realtimeRoleNotification)
|
||||||
|
ownTopic := ws.notificationTopic(f.user.ID)
|
||||||
|
if got := ws.defaultTopics(session); !slices.Equal(got, []string{ownTopic}) {
|
||||||
|
t.Fatalf("unexpected notification defaults: %v", got)
|
||||||
|
}
|
||||||
|
requested := []string{ownTopic, ws.notificationTopic(f.user.ID + 1), realtimeTopicAdminAll, "conversation:100"}
|
||||||
|
if got := ws.filterAllowedTopics(session, requested); !slices.Equal(got, []string{ownTopic}) {
|
||||||
|
t.Fatalf("notification connection escaped its own topic: %v", got)
|
||||||
|
}
|
||||||
|
// Simulate stale or incorrectly registered membership. Delivery must
|
||||||
|
// still reject conversation events, including when view is granted.
|
||||||
|
ws.manager.Register(session, requested)
|
||||||
|
ws.PublishToTopic("conversation:100", ws.newEvent("conversation:100", RealtimeConversationChangedEvent{Type: enums.IMRealtimeEventConversationUpdated}))
|
||||||
|
ws.PublishToTopic(realtimeTopicAdminAll, ws.newEvent(realtimeTopicAdminAll, RealtimeConversationChangedEvent{Type: enums.IMRealtimeEventConversationUpdated}))
|
||||||
|
if len(session.Send) != 0 {
|
||||||
|
t.Fatal("notification connection received a conversation event")
|
||||||
|
}
|
||||||
|
ws.PublishToTopic(ownTopic, ws.newEvent(ownTopic, RealtimeNotificationCreatedEvent{}))
|
||||||
|
if len(session.Send) != 1 || session.Closed.Load() {
|
||||||
|
t.Fatal("valid notification connection did not receive its own notification")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestWsStaleAdminAllMembershipDoesNotGrantDelivery(t *testing.T) {
|
||||||
|
f := newWsAuthFixture(t, false)
|
||||||
|
ws := newWsService()
|
||||||
|
session := newWsAuthClient(f, "stale-member", realtimeRoleAdmin)
|
||||||
|
ws.manager.Register(session, []string{realtimeTopicAdminAll})
|
||||||
|
ws.PublishToTopic(realtimeTopicAdminAll, ws.newEvent(realtimeTopicAdminAll, RealtimeConversationChangedEvent{Type: enums.IMRealtimeEventConversationUpdated}))
|
||||||
|
if len(session.Send) != 0 {
|
||||||
|
t.Fatal("stale admin:all membership bypassed conversation-view permission")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestWsStaffRevocationClosesBeforeDeliveryOrIncomingMessage(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
name string
|
||||||
|
change func(*authSessionFixture) error
|
||||||
|
}{
|
||||||
|
{"revoked login", func(f *authSessionFixture) error {
|
||||||
|
return f.db.Model(&f.session).Update("revoked_at", time.Now()).Error
|
||||||
|
}},
|
||||||
|
{"expired login", func(f *authSessionFixture) error {
|
||||||
|
return f.db.Model(&f.session).Update("expired_at", time.Now().Add(-time.Second)).Error
|
||||||
|
}},
|
||||||
|
{"disabled user", func(f *authSessionFixture) error {
|
||||||
|
return f.db.Model(&f.user).Update("status", enums.StatusDisabled).Error
|
||||||
|
}},
|
||||||
|
{"downgraded user type", func(f *authSessionFixture) error {
|
||||||
|
return f.db.Model(&f.user).Update("user_type", enums.UserTypeUser).Error
|
||||||
|
}},
|
||||||
|
{"deleted user", func(f *authSessionFixture) error { return f.db.Model(&f.user).Update("deleted_at", time.Now()).Error }},
|
||||||
|
{"removed role", func(f *authSessionFixture) error {
|
||||||
|
return f.db.Where("user_id = ?", f.user.ID).Delete(&models.UserRole{}).Error
|
||||||
|
}},
|
||||||
|
{"disabled role", func(f *authSessionFixture) error {
|
||||||
|
return f.db.Model(&f.role).Update("status", enums.StatusDisabled).Error
|
||||||
|
}},
|
||||||
|
{"removed permission", func(f *authSessionFixture) error {
|
||||||
|
return f.db.Where("role_id = ?", f.role.ID).Delete(&models.RolePermission{}).Error
|
||||||
|
}},
|
||||||
|
{"disabled permission", func(f *authSessionFixture) error {
|
||||||
|
return f.db.Model(&f.permission).Update("status", enums.StatusDisabled).Error
|
||||||
|
}},
|
||||||
|
}
|
||||||
|
for _, tc := range cases {
|
||||||
|
for _, trigger := range []string{"fanout", "incoming"} {
|
||||||
|
t.Run(tc.name+"/"+trigger, func(t *testing.T) {
|
||||||
|
f := newWsAuthFixture(t, true)
|
||||||
|
ws := newWsService()
|
||||||
|
session := newWsAuthClient(f, "staff", realtimeRoleAdmin)
|
||||||
|
ws.manager.Register(session, ws.defaultTopics(session))
|
||||||
|
if !ws.revalidateSession(session) {
|
||||||
|
t.Fatal("expected valid staff session before access change")
|
||||||
|
}
|
||||||
|
if err := tc.change(f); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
event := ws.newEvent(realtimeTopicAdminAll, RealtimeConversationChangedEvent{Type: enums.IMRealtimeEventConversationUpdated})
|
||||||
|
if trigger == "fanout" {
|
||||||
|
ws.PublishToTopic(realtimeTopicAdminAll, event)
|
||||||
|
} else {
|
||||||
|
ws.handleClientMessage(session, []byte(`{"type":"ping"}`))
|
||||||
|
}
|
||||||
|
if !session.Closed.Load() || ws.manager.HasTopic(realtimeTopicAdminAll) {
|
||||||
|
t.Fatal("stale staff connection remained registered")
|
||||||
|
}
|
||||||
|
if len(session.Send) != 0 {
|
||||||
|
t.Fatal("stale staff connection received an event or pong")
|
||||||
|
}
|
||||||
|
ws.handleClientMessage(session, []byte(`{"type":"subscribe","topics":["admin:all","conversation:100"]}`))
|
||||||
|
ws.PublishToTopic(realtimeTopicAdminAll, event)
|
||||||
|
if len(session.Send) != 0 || len(ws.manager.TopicList(session)) != 0 {
|
||||||
|
t.Fatal("closed connection processed later messages or delivery")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Existing realtime integration tests also need real login-session bindings now
|
||||||
|
// that delivery revalidates authorization instead of trusting topic membership.
|
||||||
|
func seedRealtimeStaffPrincipal(t *testing.T, db *gorm.DB) *dto.AuthPrincipal {
|
||||||
|
t.Helper()
|
||||||
|
if err := db.AutoMigrate(&models.Role{}, &models.Permission{}, &models.UserRole{}, &models.RolePermission{}, &models.UserPermission{}, &models.LoginSession{}); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
user := models.User{ID: 1001, Username: "realtime-observer", UserType: enums.UserTypeEmployee, Status: enums.StatusOk}
|
||||||
|
role := models.Role{Code: "realtime-observer", Status: enums.StatusOk}
|
||||||
|
permission := models.Permission{Code: constants.PermissionConversationView.Code, Status: enums.StatusOk}
|
||||||
|
for _, item := range []any{&user, &role, &permission} {
|
||||||
|
if err := db.Create(item).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
session := models.LoginSession{UserID: user.ID, Token: "ak_test_only_realtime", ExpiredAt: time.Now().Add(time.Hour)}
|
||||||
|
for _, item := range []any{
|
||||||
|
&session,
|
||||||
|
&models.UserRole{UserID: user.ID, RoleID: role.ID},
|
||||||
|
&models.RolePermission{RoleID: role.ID, PermissionID: permission.ID},
|
||||||
|
} {
|
||||||
|
if err := db.Create(item).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return buildAuthPrincipal(&user, &session, []string{role.Code}, []string{permission.Code})
|
||||||
|
}
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
|
// Modified in the independent hardening fork; see docs/hardening.
|
||||||
|
|
||||||
package services
|
package services
|
||||||
|
|
||||||
import "sync"
|
import "sync"
|
||||||
@@ -23,6 +25,9 @@ func (m *WsConnectionManager) Register(session *ClientSession, defaultTopics []s
|
|||||||
m.mu.Lock()
|
m.mu.Lock()
|
||||||
defer m.mu.Unlock()
|
defer m.mu.Unlock()
|
||||||
|
|
||||||
|
if session.Closed.Load() {
|
||||||
|
return len(m.sessions)
|
||||||
|
}
|
||||||
m.sessions[session.ID] = session
|
m.sessions[session.ID] = session
|
||||||
for _, topic := range defaultTopics {
|
for _, topic := range defaultTopics {
|
||||||
m.subscribeLocked(session, topic)
|
m.subscribeLocked(session, topic)
|
||||||
@@ -53,6 +58,9 @@ func (m *WsConnectionManager) Subscribe(session *ClientSession, topics []string)
|
|||||||
m.mu.Lock()
|
m.mu.Lock()
|
||||||
defer m.mu.Unlock()
|
defer m.mu.Unlock()
|
||||||
|
|
||||||
|
if session.Closed.Load() {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
ret := make([]string, 0, len(topics))
|
ret := make([]string, 0, len(topics))
|
||||||
for _, topic := range topics {
|
for _, topic := range topics {
|
||||||
if _, exists := session.Topics[topic]; exists {
|
if _, exists := session.Topics[topic]; exists {
|
||||||
@@ -132,3 +140,16 @@ func (m *WsConnectionManager) unsubscribeLocked(session *ClientSession, topic st
|
|||||||
}
|
}
|
||||||
delete(session.Topics, topic)
|
delete(session.Topics, topic)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m *WsConnectionManager) TopicList(session *ClientSession) []string {
|
||||||
|
m.mu.RLock()
|
||||||
|
defer m.mu.RUnlock()
|
||||||
|
if session == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
topics := make([]string, 0, len(session.Topics))
|
||||||
|
for topic := range session.Topics {
|
||||||
|
topics = append(topics, topic)
|
||||||
|
}
|
||||||
|
return topics
|
||||||
|
}
|
||||||
|
|||||||
139
internal/services/ws_pump_security_test.go
Normal file
139
internal/services/ws_pump_security_test.go
Normal file
@@ -0,0 +1,139 @@
|
|||||||
|
package services
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"agent-desk/internal/pkg/enums"
|
||||||
|
"github.com/gorilla/websocket"
|
||||||
|
)
|
||||||
|
|
||||||
|
// The listener exists only inside the test. No app server or external service is
|
||||||
|
// involved; the DB fixture is temporary and every pump is joined before cleanup.
|
||||||
|
func newSecuritySocketPair(t *testing.T) (*websocket.Conn, *websocket.Conn) {
|
||||||
|
t.Helper()
|
||||||
|
accepted := make(chan *websocket.Conn, 1)
|
||||||
|
failed := make(chan error, 1)
|
||||||
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
upgrader := websocket.Upgrader{}
|
||||||
|
conn, err := upgrader.Upgrade(w, r, nil)
|
||||||
|
if err != nil {
|
||||||
|
failed <- err
|
||||||
|
return
|
||||||
|
}
|
||||||
|
accepted <- conn
|
||||||
|
}))
|
||||||
|
t.Cleanup(server.Close)
|
||||||
|
client, _, err := websocket.DefaultDialer.Dial("ws"+strings.TrimPrefix(server.URL, "http"), nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
var serverConn *websocket.Conn
|
||||||
|
select {
|
||||||
|
case serverConn = <-accepted:
|
||||||
|
case err := <-failed:
|
||||||
|
t.Fatal(err)
|
||||||
|
case <-time.After(time.Second):
|
||||||
|
t.Fatal("test websocket upgrade timed out")
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { _ = client.Close(); _ = serverConn.Close() })
|
||||||
|
return serverConn, client
|
||||||
|
}
|
||||||
|
|
||||||
|
func startSecurityPumps(t *testing.T, ws *wsService, session *ClientSession, reader bool) {
|
||||||
|
t.Helper()
|
||||||
|
written := make(chan struct{})
|
||||||
|
go func() { defer close(written); ws.writePump(session) }()
|
||||||
|
var read chan struct{}
|
||||||
|
if reader {
|
||||||
|
read = make(chan struct{})
|
||||||
|
go func() { defer close(read); ws.readPump(session) }()
|
||||||
|
}
|
||||||
|
t.Cleanup(func() {
|
||||||
|
ws.closeSession(session)
|
||||||
|
select {
|
||||||
|
case <-written:
|
||||||
|
case <-time.After(time.Second):
|
||||||
|
t.Error("write pump did not stop")
|
||||||
|
}
|
||||||
|
if read != nil {
|
||||||
|
select {
|
||||||
|
case <-read:
|
||||||
|
case <-time.After(time.Second):
|
||||||
|
t.Error("read pump did not stop")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func requireSecuritySocketClosed(t *testing.T, client *websocket.Conn) {
|
||||||
|
t.Helper()
|
||||||
|
_ = client.SetReadDeadline(time.Now().Add(time.Second))
|
||||||
|
_, _, err := client.ReadMessage()
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("revoked connection delivered a buffered message")
|
||||||
|
}
|
||||||
|
if networkErr, ok := err.(interface{ Timeout() bool }); ok && networkErr.Timeout() {
|
||||||
|
t.Fatal("revoked connection stayed open until test deadline")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestWsWritePumpRejectsBufferedEventAfterRevocation(t *testing.T) {
|
||||||
|
f := newWsAuthFixture(t, true)
|
||||||
|
ws := newWsService()
|
||||||
|
session := newWsAuthClient(f, "buffered", realtimeRoleAdmin)
|
||||||
|
serverConn, client := newSecuritySocketPair(t)
|
||||||
|
session.Conn = serverConn
|
||||||
|
ws.manager.Register(session, ws.defaultTopics(session))
|
||||||
|
session.enqueueEvent(ws.newEvent(realtimeTopicAdminAll, RealtimeConversationChangedEvent{Type: enums.IMRealtimeEventConversationUpdated}))
|
||||||
|
if err := f.db.Model(&f.session).Update("revoked_at", time.Now()).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
startSecurityPumps(t, ws, session, false)
|
||||||
|
requireSecuritySocketClosed(t, client)
|
||||||
|
if !session.Closed.Load() {
|
||||||
|
t.Fatal("writer did not revoke session")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestWsReadPumpRejectsIncomingFrameAfterRevocation(t *testing.T) {
|
||||||
|
f := newWsAuthFixture(t, true)
|
||||||
|
ws := newWsService()
|
||||||
|
session := newWsAuthClient(f, "incoming", realtimeRoleAdmin)
|
||||||
|
serverConn, client := newSecuritySocketPair(t)
|
||||||
|
session.Conn = serverConn
|
||||||
|
ws.manager.Register(session, ws.defaultTopics(session))
|
||||||
|
startSecurityPumps(t, ws, session, true)
|
||||||
|
if err := f.db.Model(&f.session).Update("revoked_at", time.Now()).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := client.WriteMessage(websocket.TextMessage, []byte(`{"type":"ping"}`)); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
requireSecuritySocketClosed(t, client)
|
||||||
|
if !session.Closed.Load() {
|
||||||
|
t.Fatal("reader did not revoke session")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestWsIdlePumpClosesRevokedConnection(t *testing.T) {
|
||||||
|
f := newWsAuthFixture(t, true)
|
||||||
|
ws := newWsService()
|
||||||
|
// Same production timer path, shortened only on this isolated service instance.
|
||||||
|
ws.authCheckPeriod = 10 * time.Millisecond
|
||||||
|
session := newWsAuthClient(f, "idle", realtimeRoleAdmin)
|
||||||
|
serverConn, client := newSecuritySocketPair(t)
|
||||||
|
session.Conn = serverConn
|
||||||
|
ws.manager.Register(session, ws.defaultTopics(session))
|
||||||
|
startSecurityPumps(t, ws, session, false)
|
||||||
|
if err := f.db.Model(&f.session).Update("revoked_at", time.Now()).Error; err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
requireSecuritySocketClosed(t, client)
|
||||||
|
if !session.Closed.Load() {
|
||||||
|
t.Fatal("idle authorization timer did not revoke session")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,3 +1,6 @@
|
|||||||
|
// Modified in AgentDeskNext: authenticated support availability and calendars.
|
||||||
|
// Modified in the independent hardening fork; see docs/hardening.
|
||||||
|
|
||||||
package services
|
package services
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -17,6 +20,7 @@ const (
|
|||||||
realtimeWriteWait = 10 * time.Second
|
realtimeWriteWait = 10 * time.Second
|
||||||
realtimePongWait = 60 * time.Second
|
realtimePongWait = 60 * time.Second
|
||||||
realtimePingPeriod = 30 * time.Second
|
realtimePingPeriod = 30 * time.Second
|
||||||
|
realtimeAuthCheckPeriod = 5 * time.Second
|
||||||
realtimeMaxMessageSize = 8 << 10
|
realtimeMaxMessageSize = 8 << 10
|
||||||
realtimeSendBufferSize = 64
|
realtimeSendBufferSize = 64
|
||||||
)
|
)
|
||||||
@@ -28,8 +32,7 @@ const (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
realtimeTopicUserPrefix = "user:"
|
realtimeTopicCustomerPrefix = "customer:"
|
||||||
realtimeTopicGuestPrefix = "guest:"
|
|
||||||
realtimeTopicAdminPrefix = "admin:"
|
realtimeTopicAdminPrefix = "admin:"
|
||||||
realtimeTopicConversationPrefix = "conversation:"
|
realtimeTopicConversationPrefix = "conversation:"
|
||||||
realtimeTopicNotificationPrefix = "notification:"
|
realtimeTopicNotificationPrefix = "notification:"
|
||||||
@@ -311,10 +314,16 @@ type realtimeClientMessage struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type ClientSession struct {
|
type ClientSession struct {
|
||||||
|
presenceMu sync.Mutex
|
||||||
|
PresenceEnded bool
|
||||||
|
PresenceLeaseID string
|
||||||
|
PresenceRenewedAt atomic.Int64
|
||||||
ID string
|
ID string
|
||||||
Conn *websocket.Conn
|
Conn *websocket.Conn
|
||||||
Principal *dto.AuthPrincipal
|
Principal *dto.AuthPrincipal
|
||||||
External *openidentity.ExternalUser
|
External *openidentity.ExternalUser
|
||||||
|
CustomerSession *CustomerSessionVerifyResult
|
||||||
|
sendMu sync.RWMutex
|
||||||
Role string
|
Role string
|
||||||
TerminalType string
|
TerminalType string
|
||||||
Topics map[string]struct{}
|
Topics map[string]struct{}
|
||||||
@@ -325,7 +334,12 @@ type ClientSession struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *ClientSession) enqueue(payload []byte) bool {
|
func (s *ClientSession) enqueue(payload []byte) bool {
|
||||||
if s == nil || s.Closed.Load() {
|
if s == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
s.sendMu.RLock()
|
||||||
|
defer s.sendMu.RUnlock()
|
||||||
|
if s.Closed.Load() {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
select {
|
select {
|
||||||
@@ -350,14 +364,3 @@ func (s *ClientSession) touch() {
|
|||||||
}
|
}
|
||||||
s.LastActiveAt.Store(time.Now().Unix())
|
s.LastActiveAt.Store(time.Now().Unix())
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *ClientSession) topicList() []string {
|
|
||||||
if s == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
ret := make([]string, 0, len(s.Topics))
|
|
||||||
for topic := range s.Topics {
|
|
||||||
ret = append(ret, topic)
|
|
||||||
}
|
|
||||||
return ret
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
// Modified in AgentDeskNext: authenticated support availability and calendars.
|
||||||
|
// Modified in the independent hardening fork; see docs/hardening.
|
||||||
|
|
||||||
package services
|
package services
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -31,6 +34,7 @@ type wsService struct {
|
|||||||
upgrader websocket.Upgrader
|
upgrader websocket.Upgrader
|
||||||
seq atomic.Uint64
|
seq atomic.Uint64
|
||||||
manager *WsConnectionManager
|
manager *WsConnectionManager
|
||||||
|
authCheckPeriod time.Duration
|
||||||
}
|
}
|
||||||
|
|
||||||
func newWsService() *wsService {
|
func newWsService() *wsService {
|
||||||
@@ -41,6 +45,7 @@ func newWsService() *wsService {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
manager: newWsConnectionManager(),
|
manager: newWsConnectionManager(),
|
||||||
|
authCheckPeriod: realtimeAuthCheckPeriod,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -50,6 +55,10 @@ func (s *wsService) HandleDashboardWS(ctx *gin.Context) {
|
|||||||
ctx.AbortWithStatusJSON(http.StatusUnauthorized, web.JsonErrorCode(errorsx.CodeAuthUnauthorized, i18nx.T(ctx, "error.auth.expired")))
|
ctx.AbortWithStatusJSON(http.StatusUnauthorized, web.JsonErrorCode(errorsx.CodeAuthUnauthorized, i18nx.T(ctx, "error.auth.expired")))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if !slices.Contains(principal.Permissions, constants.PermissionConversationView.Code) {
|
||||||
|
ctx.AbortWithStatusJSON(http.StatusForbidden, web.JsonErrorCode(errorsx.CodeAuthForbidden, i18nx.T(ctx, "error.e0225")))
|
||||||
|
return
|
||||||
|
}
|
||||||
if err := s.upgradeConnection(ctx, principal, nil, realtimeRoleAdmin); err != nil {
|
if err := s.upgradeConnection(ctx, principal, nil, realtimeRoleAdmin); err != nil {
|
||||||
slog.Error("upgrade admin websocket failed", "error", err, "path", ctx.Request.URL.Path)
|
slog.Error("upgrade admin websocket failed", "error", err, "path", ctx.Request.URL.Path)
|
||||||
ctx.Abort()
|
ctx.Abort()
|
||||||
@@ -77,28 +86,34 @@ func (s *wsService) HandleOpenWS(ctx *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
// The customer endpoint always authenticates the customer credential. A staff
|
||||||
principal = AuthService.GetAuthPrincipal(ctx)
|
// cookie/bearer must not turn this into a second dashboard subscription path.
|
||||||
external *openidentity.ExternalUser
|
|
||||||
customerSessionInfo *CustomerSessionVerifyResult
|
|
||||||
)
|
|
||||||
if principal == nil {
|
|
||||||
result, err := CustomerSessionService.VerifyRequest(ctx, channel)
|
result, err := CustomerSessionService.VerifyRequest(ctx, channel)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.AbortWithStatusJSON(http.StatusUnauthorized, web.JsonError(err))
|
ctx.AbortWithStatusJSON(http.StatusUnauthorized, web.JsonError(err))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
external = result.ExternalUser
|
if err := s.upgradeConnection(ctx, nil, result.ExternalUser, realtimeRoleUser, result); err != nil {
|
||||||
customerSessionInfo = result
|
slog.Error("upgrade open im websocket failed", "error", err, "path", ctx.Request.URL.Path, "channel_id", channel.ID)
|
||||||
}
|
|
||||||
if err := s.upgradeConnection(ctx, principal, external, realtimeRoleUser, customerSessionInfo); err != nil {
|
|
||||||
slog.Error("upgrade open im websocket failed", "error", err, "path", ctx.Request.URL.Path, "channelId", channel.ChannelID, "channel_id", channel.ID)
|
|
||||||
ctx.Abort()
|
ctx.Abort()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *wsService) upgradeConnection(ctx *gin.Context, principal *dto.AuthPrincipal, external *openidentity.ExternalUser, role string, customerSessionInfo ...*CustomerSessionVerifyResult) error {
|
func (s *wsService) upgradeConnection(ctx *gin.Context, principal *dto.AuthPrincipal, external *openidentity.ExternalUser, role string, customerSessionInfo ...*CustomerSessionVerifyResult) error {
|
||||||
|
if principal != nil {
|
||||||
|
fresh, err := AuthService.RevalidatePrincipal(principal)
|
||||||
|
if err != nil {
|
||||||
|
ctx.AbortWithStatusJSON(http.StatusUnauthorized, web.JsonError(err))
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
principal = fresh
|
||||||
|
if role == realtimeRoleAdmin && !slices.Contains(principal.Permissions, constants.PermissionConversationView.Code) {
|
||||||
|
err := errorsx.ForbiddenI18n("error.e0225")
|
||||||
|
ctx.AbortWithStatusJSON(http.StatusForbidden, web.JsonError(err))
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
conn, err := s.upgrader.Upgrade(ctx.Writer, ctx.Request, nil)
|
conn, err := s.upgrader.Upgrade(ctx.Writer, ctx.Request, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -114,12 +129,22 @@ func (s *wsService) upgradeConnection(ctx *gin.Context, principal *dto.AuthPrinc
|
|||||||
Topics: make(map[string]struct{}),
|
Topics: make(map[string]struct{}),
|
||||||
Send: make(chan []byte, realtimeSendBufferSize),
|
Send: make(chan []byte, realtimeSendBufferSize),
|
||||||
}
|
}
|
||||||
|
if len(customerSessionInfo) > 0 {
|
||||||
|
session.CustomerSession = customerSessionInfo[0]
|
||||||
|
}
|
||||||
session.touch()
|
session.touch()
|
||||||
|
if principal != nil && (role == realtimeRoleAdmin || role == realtimeRoleNotification) {
|
||||||
|
session.PresenceLeaseID, _ = randomToken("presence_")
|
||||||
|
}
|
||||||
|
|
||||||
conn.SetReadLimit(realtimeMaxMessageSize)
|
conn.SetReadLimit(realtimeMaxMessageSize)
|
||||||
_ = conn.SetReadDeadline(time.Now().Add(realtimePongWait))
|
_ = conn.SetReadDeadline(time.Now().Add(realtimePongWait))
|
||||||
conn.SetPongHandler(func(string) error {
|
conn.SetPongHandler(func(string) error {
|
||||||
|
if !s.revalidateSession(session) {
|
||||||
|
return errorsx.UnauthorizedI18n("error.auth.expired")
|
||||||
|
}
|
||||||
session.touch()
|
session.touch()
|
||||||
|
s.renewAgentPresence(session)
|
||||||
return conn.SetReadDeadline(time.Now().Add(realtimePongWait))
|
return conn.SetReadDeadline(time.Now().Add(realtimePongWait))
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -139,13 +164,10 @@ func (s *wsService) upgradeConnection(ctx *gin.Context, principal *dto.AuthPrinc
|
|||||||
"userId", logUserID,
|
"userId", logUserID,
|
||||||
"externalId", logExternalID,
|
"externalId", logExternalID,
|
||||||
"terminalType", session.TerminalType,
|
"terminalType", session.TerminalType,
|
||||||
"topicCount", len(session.Topics),
|
"topicCount", len(s.manager.TopicList(session)),
|
||||||
"sessionCount", sessionCount,
|
"sessionCount", sessionCount,
|
||||||
)
|
)
|
||||||
|
|
||||||
go s.writePump(session)
|
|
||||||
go s.readPump(session)
|
|
||||||
|
|
||||||
session.enqueueEvent(s.newEvent("", RealtimeConnectedEvent{
|
session.enqueueEvent(s.newEvent("", RealtimeConnectedEvent{
|
||||||
Payload: RealtimeConnectedPayload{
|
Payload: RealtimeConnectedPayload{
|
||||||
ConnID: session.ID,
|
ConnID: session.ID,
|
||||||
@@ -153,7 +175,7 @@ func (s *wsService) upgradeConnection(ctx *gin.Context, principal *dto.AuthPrinc
|
|||||||
GuestID: logExternalID,
|
GuestID: logExternalID,
|
||||||
Role: role,
|
Role: role,
|
||||||
TerminalType: session.TerminalType,
|
TerminalType: session.TerminalType,
|
||||||
Topics: session.topicList(),
|
Topics: s.manager.TopicList(session),
|
||||||
},
|
},
|
||||||
}))
|
}))
|
||||||
if len(customerSessionInfo) > 0 && customerSessionInfo[0] != nil && customerSessionInfo[0].Refreshed {
|
if len(customerSessionInfo) > 0 && customerSessionInfo[0] != nil && customerSessionInfo[0].Refreshed {
|
||||||
@@ -164,6 +186,9 @@ func (s *wsService) upgradeConnection(ctx *gin.Context, principal *dto.AuthPrinc
|
|||||||
},
|
},
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
s.renewAgentPresence(session)
|
||||||
|
go s.writePump(session)
|
||||||
|
go s.readPump(session)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -181,6 +206,9 @@ func (s *wsService) readPump(session *ClientSession) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *wsService) handleClientMessage(session *ClientSession, payload []byte) {
|
func (s *wsService) handleClientMessage(session *ClientSession, payload []byte) {
|
||||||
|
if !s.revalidateSession(session) {
|
||||||
|
return
|
||||||
|
}
|
||||||
input := realtimeClientMessage{}
|
input := realtimeClientMessage{}
|
||||||
if err := json.Unmarshal(payload, &input); err != nil {
|
if err := json.Unmarshal(payload, &input); err != nil {
|
||||||
session.enqueueEvent(s.newEvent("", RealtimeResyncRequiredEvent{
|
session.enqueueEvent(s.newEvent("", RealtimeResyncRequiredEvent{
|
||||||
@@ -193,6 +221,7 @@ func (s *wsService) handleClientMessage(session *ClientSession, payload []byte)
|
|||||||
|
|
||||||
switch strings.TrimSpace(input.Type) {
|
switch strings.TrimSpace(input.Type) {
|
||||||
case enums.IMRealtimeClientTypePing:
|
case enums.IMRealtimeClientTypePing:
|
||||||
|
s.renewAgentPresence(session)
|
||||||
session.enqueueEvent(s.newEvent("", RealtimePongEvent{}))
|
session.enqueueEvent(s.newEvent("", RealtimePongEvent{}))
|
||||||
case enums.IMRealtimeClientTypeSubscribe:
|
case enums.IMRealtimeClientTypeSubscribe:
|
||||||
topics := s.subscribeTopics(session, input.Topics)
|
topics := s.subscribeTopics(session, input.Topics)
|
||||||
@@ -214,7 +243,7 @@ func (s *wsService) handleClientMessage(session *ClientSession, payload []byte)
|
|||||||
"eventId", strings.TrimSpace(input.EventID),
|
"eventId", strings.TrimSpace(input.EventID),
|
||||||
)
|
)
|
||||||
case enums.IMRealtimeClientTypePresence:
|
case enums.IMRealtimeClientTypePresence:
|
||||||
if input.ConversationID > 0 && session.Principal != nil {
|
if input.ConversationID > 0 && session.Role == realtimeRoleAdmin && session.Principal != nil && s.canSubscribeConversation(session, input.ConversationID) {
|
||||||
action := strings.TrimSpace(input.Action)
|
action := strings.TrimSpace(input.Action)
|
||||||
if action == "" {
|
if action == "" {
|
||||||
action = "viewing"
|
action = "viewing"
|
||||||
@@ -232,8 +261,10 @@ func (s *wsService) handleClientMessage(session *ClientSession, payload []byte)
|
|||||||
|
|
||||||
func (s *wsService) writePump(session *ClientSession) {
|
func (s *wsService) writePump(session *ClientSession) {
|
||||||
ticker := time.NewTicker(realtimePingPeriod)
|
ticker := time.NewTicker(realtimePingPeriod)
|
||||||
|
authTicker := time.NewTicker(s.authCheckPeriod)
|
||||||
defer func() {
|
defer func() {
|
||||||
ticker.Stop()
|
ticker.Stop()
|
||||||
|
authTicker.Stop()
|
||||||
s.closeSession(session)
|
s.closeSession(session)
|
||||||
}()
|
}()
|
||||||
|
|
||||||
@@ -245,9 +276,24 @@ func (s *wsService) writePump(session *ClientSession) {
|
|||||||
_ = session.Conn.WriteMessage(websocket.CloseMessage, []byte{})
|
_ = session.Conn.WriteMessage(websocket.CloseMessage, []byte{})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
// Recheck after queueing as well: logout or permission revocation can
|
||||||
|
// happen while a slow client still has messages buffered.
|
||||||
|
if !s.revalidateSession(session) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var envelope struct {
|
||||||
|
Topic string `json:"topic"`
|
||||||
|
}
|
||||||
|
if json.Unmarshal(payload, &envelope) != nil || (envelope.Topic != "" && len(s.filterAllowedTopics(session, []string{envelope.Topic})) == 0) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
if err := session.Conn.WriteMessage(websocket.TextMessage, payload); err != nil {
|
if err := session.Conn.WriteMessage(websocket.TextMessage, payload); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
case <-authTicker.C:
|
||||||
|
if !s.revalidateSession(session) {
|
||||||
|
return
|
||||||
|
}
|
||||||
case <-ticker.C:
|
case <-ticker.C:
|
||||||
_ = session.Conn.SetWriteDeadline(time.Now().Add(realtimeWriteWait))
|
_ = session.Conn.SetWriteDeadline(time.Now().Add(realtimeWriteWait))
|
||||||
if err := session.Conn.WriteMessage(websocket.PingMessage, nil); err != nil {
|
if err := session.Conn.WriteMessage(websocket.PingMessage, nil); err != nil {
|
||||||
@@ -262,10 +308,15 @@ func (s *wsService) closeSession(session *ClientSession) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
session.closeOnce.Do(func() {
|
session.closeOnce.Do(func() {
|
||||||
|
s.endAgentPresence(session)
|
||||||
|
session.sendMu.Lock()
|
||||||
session.Closed.Store(true)
|
session.Closed.Store(true)
|
||||||
|
if session.Send != nil {
|
||||||
|
close(session.Send)
|
||||||
|
}
|
||||||
|
session.sendMu.Unlock()
|
||||||
remaining := s.manager.Unregister(session)
|
remaining := s.manager.Unregister(session)
|
||||||
|
|
||||||
close(session.Send)
|
|
||||||
if session.Conn != nil {
|
if session.Conn != nil {
|
||||||
_ = session.Conn.Close()
|
_ = session.Conn.Close()
|
||||||
}
|
}
|
||||||
@@ -587,6 +638,9 @@ func (s *wsService) PublishToTopicsWithFilter(topics []string, event RealtimeEve
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, session := range targets {
|
for _, session := range targets {
|
||||||
|
if !s.revalidateSession(session) || !s.canReceiveEvent(session, normalized, event.Topic) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
if filter != nil && !filter(session) {
|
if filter != nil && !filter(session) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@@ -603,12 +657,11 @@ func (s *wsService) PublishToTopicsWithFilter(topics []string, event RealtimeEve
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *wsService) IsGuestOnline(guestID string) bool {
|
func (s *wsService) IsCustomerOnline(customerID, channelID int64) bool {
|
||||||
guestID = strings.TrimSpace(guestID)
|
if customerID <= 0 || channelID <= 0 {
|
||||||
if guestID == "" {
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
return s.manager.HasTopic(s.guestTopic(guestID))
|
return s.manager.HasTopic(s.customerTopic(customerID, channelID))
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *wsService) routeConversationTopics(conversation *models.Conversation) []string {
|
func (s *wsService) routeConversationTopics(conversation *models.Conversation) []string {
|
||||||
@@ -617,8 +670,8 @@ func (s *wsService) routeConversationTopics(conversation *models.Conversation) [
|
|||||||
}
|
}
|
||||||
|
|
||||||
topics := []string{s.conversationTopic(conversation.ID)}
|
topics := []string{s.conversationTopic(conversation.ID)}
|
||||||
if identity := ConversationService.GetConversationExternalIdentity(conversation); identity != nil && strings.TrimSpace(identity.ExternalID) != "" {
|
if conversation.CustomerID > 0 && conversation.ChannelID > 0 {
|
||||||
topics = append(topics, s.guestTopic(identity.ExternalID))
|
topics = append(topics, s.customerTopic(conversation.CustomerID, conversation.ChannelID))
|
||||||
}
|
}
|
||||||
if conversation.CurrentAssigneeID > 0 {
|
if conversation.CurrentAssigneeID > 0 {
|
||||||
topics = append(topics, s.adminTopic(conversation.CurrentAssigneeID))
|
topics = append(topics, s.adminTopic(conversation.CurrentAssigneeID))
|
||||||
@@ -640,17 +693,13 @@ func (s *wsService) defaultTopics(session *ClientSession) []string {
|
|||||||
}
|
}
|
||||||
return []string{s.notificationTopic(session.Principal.UserID)}
|
return []string{s.notificationTopic(session.Principal.UserID)}
|
||||||
case realtimeRoleAdmin:
|
case realtimeRoleAdmin:
|
||||||
if session.Principal == nil || session.Principal.UserID <= 0 {
|
if session.Principal == nil || session.Principal.UserID <= 0 || !slices.Contains(session.Principal.Permissions, constants.PermissionConversationView.Code) {
|
||||||
return []string{realtimeTopicAdminAll}
|
return nil
|
||||||
}
|
}
|
||||||
return []string{s.adminTopic(session.Principal.UserID), realtimeTopicAdminAll}
|
return []string{s.adminTopic(session.Principal.UserID), realtimeTopicAdminAll}
|
||||||
default:
|
default:
|
||||||
// 开放 IM：仅 External、无 AuthPrincipal 的访客连接必须仍能订阅 guest:{externalId}，否则收不到推送。
|
if session.CustomerSession != nil && session.External != nil && session.CustomerSession.CustomerID > 0 && session.CustomerSession.ChannelID > 0 {
|
||||||
if session.External != nil && strings.TrimSpace(session.External.ExternalID) != "" {
|
return []string{s.customerTopic(session.CustomerSession.CustomerID, session.CustomerSession.ChannelID)}
|
||||||
return []string{s.guestTopic(session.External.ExternalID)}
|
|
||||||
}
|
|
||||||
if session.Principal != nil && session.Principal.UserID > 0 {
|
|
||||||
return []string{s.userTopic(session.Principal.UserID)}
|
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -693,7 +742,7 @@ func (s *wsService) filterAllowedTopics(session *ClientSession, topics []string)
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *wsService) canSubscribeConversation(session *ClientSession, conversationID int64) bool {
|
func (s *wsService) canSubscribeConversation(session *ClientSession, conversationID int64) bool {
|
||||||
if session == nil || conversationID <= 0 {
|
if session == nil || conversationID <= 0 || session.Role == realtimeRoleNotification {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
if session.Role == realtimeRoleAdmin {
|
if session.Role == realtimeRoleAdmin {
|
||||||
@@ -751,12 +800,8 @@ func (s *wsService) nextID(prefix string) string {
|
|||||||
return fmt.Sprintf("%s_%d_%d", prefix, time.Now().UnixNano(), seq)
|
return fmt.Sprintf("%s_%d_%d", prefix, time.Now().UnixNano(), seq)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *wsService) userTopic(userID int64) string {
|
func (s *wsService) customerTopic(customerID, channelID int64) string {
|
||||||
return realtimeTopicUserPrefix + strconv.FormatInt(userID, 10)
|
return realtimeTopicCustomerPrefix + strconv.FormatInt(channelID, 10) + ":" + strconv.FormatInt(customerID, 10)
|
||||||
}
|
|
||||||
|
|
||||||
func (s *wsService) guestTopic(guestID string) string {
|
|
||||||
return realtimeTopicGuestPrefix + strings.TrimSpace(guestID)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *wsService) adminTopic(userID int64) string {
|
func (s *wsService) adminTopic(userID int64) string {
|
||||||
@@ -817,3 +862,30 @@ func formatWsTime(t *time.Time) string {
|
|||||||
}
|
}
|
||||||
return t.Format(time.DateTime)
|
return t.Format(time.DateTime)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Topic membership is an optimization, never an authorization grant.
|
||||||
|
func (s *wsService) canReceiveEvent(session *ClientSession, routingTopics []string, eventTopic string) bool {
|
||||||
|
if eventTopic != "" {
|
||||||
|
return len(s.filterAllowedTopics(session, []string{eventTopic})) > 0
|
||||||
|
}
|
||||||
|
return len(s.filterAllowedTopics(session, routingTopics)) > 0
|
||||||
|
}
|
||||||
|
|
||||||
|
// Principal snapshots are immutable. Closing when their scope changes avoids
|
||||||
|
// races between fanout/read/write goroutines and forces a fresh subscription set.
|
||||||
|
func (s *wsService) revalidateSession(session *ClientSession) bool {
|
||||||
|
if session == nil || session.Closed.Load() {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
valid := false
|
||||||
|
if session.Principal != nil {
|
||||||
|
fresh, err := AuthService.RevalidatePrincipal(session.Principal)
|
||||||
|
valid = err == nil && fresh.UserType == session.Principal.UserType && slices.Equal(fresh.Roles, session.Principal.Roles) && slices.Equal(fresh.Permissions, session.Principal.Permissions)
|
||||||
|
} else if session.Role == realtimeRoleUser {
|
||||||
|
valid = CustomerSessionService.VerifyConnection(session.CustomerSession)
|
||||||
|
}
|
||||||
|
if !valid {
|
||||||
|
s.closeSession(session)
|
||||||
|
}
|
||||||
|
return valid
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
// Modified in the independent hardening fork; see docs/hardening.
|
||||||
|
|
||||||
package services
|
package services
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -6,7 +8,6 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"agent-desk/internal/models"
|
"agent-desk/internal/models"
|
||||||
"agent-desk/internal/pkg/dto"
|
|
||||||
"agent-desk/internal/pkg/dto/response"
|
"agent-desk/internal/pkg/dto/response"
|
||||||
"agent-desk/internal/pkg/enums"
|
"agent-desk/internal/pkg/enums"
|
||||||
)
|
)
|
||||||
@@ -49,12 +50,9 @@ func TestWsAgentActivityEventType(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestPublishAgentActivity(t *testing.T) {
|
func TestPublishAgentActivity(t *testing.T) {
|
||||||
|
f := newWsAuthFixture(t, true)
|
||||||
ws := newWsService()
|
ws := newWsService()
|
||||||
session := &ClientSession{
|
session := newWsAuthClient(f, "test-sess", realtimeRoleAdmin)
|
||||||
ID: "test-sess",
|
|
||||||
Topics: map[string]struct{}{},
|
|
||||||
Send: make(chan []byte, 10),
|
|
||||||
}
|
|
||||||
ws.manager.Register(session, []string{"conversation:100"})
|
ws.manager.Register(session, []string{"conversation:100"})
|
||||||
|
|
||||||
conv := &models.Conversation{ID: 100}
|
conv := &models.Conversation{ID: 100}
|
||||||
@@ -100,27 +98,16 @@ func TestWsOperatorPresenceEventType(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestPublishOperatorPresence(t *testing.T) {
|
func TestPublishOperatorPresence(t *testing.T) {
|
||||||
|
f := newWsAuthFixture(t, true)
|
||||||
ws := newWsService()
|
ws := newWsService()
|
||||||
|
|
||||||
subscriber := &ClientSession{
|
subscriber := newWsAuthClient(f, "subscriber-conn", realtimeRoleAdmin)
|
||||||
ID: "subscriber-conn",
|
|
||||||
Topics: map[string]struct{}{},
|
|
||||||
Send: make(chan []byte, 10),
|
|
||||||
}
|
|
||||||
ws.manager.Register(subscriber, []string{"conversation:100"})
|
ws.manager.Register(subscriber, []string{"conversation:100"})
|
||||||
|
|
||||||
sender := &ClientSession{
|
sender := newWsAuthClient(f, "sender-conn", realtimeRoleAdmin)
|
||||||
ID: "sender-conn",
|
|
||||||
Topics: map[string]struct{}{},
|
|
||||||
Send: make(chan []byte, 10),
|
|
||||||
}
|
|
||||||
ws.manager.Register(sender, []string{"conversation:100"})
|
ws.manager.Register(sender, []string{"conversation:100"})
|
||||||
|
|
||||||
principal := &dto.AuthPrincipal{
|
principal := f.principal
|
||||||
UserID: 2,
|
|
||||||
Username: "operator",
|
|
||||||
Nickname: "Agent Smith",
|
|
||||||
}
|
|
||||||
|
|
||||||
ws.PublishOperatorPresence(100, principal, "typing", sender.ID)
|
ws.PublishOperatorPresence(100, principal, "typing", sender.ID)
|
||||||
|
|
||||||
@@ -136,7 +123,7 @@ func TestPublishOperatorPresence(t *testing.T) {
|
|||||||
if event.Type != enums.IMRealtimeEventOperatorPresence {
|
if event.Type != enums.IMRealtimeEventOperatorPresence {
|
||||||
t.Fatalf("expected type %s, got %s", enums.IMRealtimeEventOperatorPresence, event.Type)
|
t.Fatalf("expected type %s, got %s", enums.IMRealtimeEventOperatorPresence, event.Type)
|
||||||
}
|
}
|
||||||
if event.Data.ConversationID != 100 || event.Data.UserID != 2 || event.Data.Username != "operator" || event.Data.Nickname != "Agent Smith" || event.Data.Action != "typing" {
|
if event.Data.ConversationID != 100 || event.Data.UserID != principal.UserID || event.Data.Username != principal.Username || event.Data.Nickname != principal.Nickname || event.Data.Action != "typing" {
|
||||||
t.Fatalf("unexpected data: %+v", event.Data)
|
t.Fatalf("unexpected data: %+v", event.Data)
|
||||||
}
|
}
|
||||||
case <-time.After(time.Second):
|
case <-time.After(time.Second):
|
||||||
@@ -151,26 +138,13 @@ func TestPublishOperatorPresence(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestHandleClientMessagePresence(t *testing.T) {
|
func TestHandleClientMessagePresence(t *testing.T) {
|
||||||
|
f := newWsAuthFixture(t, true)
|
||||||
ws := newWsService()
|
ws := newWsService()
|
||||||
|
|
||||||
subscriber := &ClientSession{
|
subscriber := newWsAuthClient(f, "subscriber-conn", realtimeRoleAdmin)
|
||||||
ID: "subscriber-conn",
|
|
||||||
Topics: map[string]struct{}{},
|
|
||||||
Send: make(chan []byte, 10),
|
|
||||||
}
|
|
||||||
ws.manager.Register(subscriber, []string{"conversation:100"})
|
ws.manager.Register(subscriber, []string{"conversation:100"})
|
||||||
|
|
||||||
principal := &dto.AuthPrincipal{
|
sender := newWsAuthClient(f, "sender-conn", realtimeRoleAdmin)
|
||||||
UserID: 2,
|
|
||||||
Username: "operator",
|
|
||||||
Nickname: "Agent Smith",
|
|
||||||
}
|
|
||||||
sender := &ClientSession{
|
|
||||||
ID: "sender-conn",
|
|
||||||
Principal: principal,
|
|
||||||
Topics: map[string]struct{}{},
|
|
||||||
Send: make(chan []byte, 10),
|
|
||||||
}
|
|
||||||
ws.manager.Register(sender, []string{"conversation:100"})
|
ws.manager.Register(sender, []string{"conversation:100"})
|
||||||
|
|
||||||
msgJSON := []byte(`{"type":"presence","conversationId":100,"action":"viewing"}`)
|
msgJSON := []byte(`{"type":"presence","conversationId":100,"action":"viewing"}`)
|
||||||
@@ -188,7 +162,7 @@ func TestHandleClientMessagePresence(t *testing.T) {
|
|||||||
if event.Type != enums.IMRealtimeEventOperatorPresence {
|
if event.Type != enums.IMRealtimeEventOperatorPresence {
|
||||||
t.Fatalf("expected %s, got %s", enums.IMRealtimeEventOperatorPresence, event.Type)
|
t.Fatalf("expected %s, got %s", enums.IMRealtimeEventOperatorPresence, event.Type)
|
||||||
}
|
}
|
||||||
if event.Data.ConversationID != 100 || event.Data.Action != "viewing" || event.Data.UserID != 2 {
|
if event.Data.ConversationID != 100 || event.Data.Action != "viewing" || event.Data.UserID != f.principal.UserID {
|
||||||
t.Fatalf("unexpected data: %+v", event.Data)
|
t.Fatalf("unexpected data: %+v", event.Data)
|
||||||
}
|
}
|
||||||
case <-time.After(time.Second):
|
case <-time.After(time.Second):
|
||||||
|
|||||||
34
internal/services/ws_session_concurrency_test.go
Normal file
34
internal/services/ws_session_concurrency_test.go
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
package services
|
||||||
|
|
||||||
|
import (
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Run with -race: close may be triggered independently by revocation, a reader,
|
||||||
|
// a writer, or slow-client eviction while broadcasts still hold a session pointer.
|
||||||
|
func TestWsConcurrentEnqueueCloseAndSubscribe(t *testing.T) {
|
||||||
|
ws := newWsService()
|
||||||
|
session := &ClientSession{ID: "concurrent", Topics: map[string]struct{}{}, Send: make(chan []byte, 64)}
|
||||||
|
ws.manager.Register(session, []string{"notification:1"})
|
||||||
|
var work sync.WaitGroup
|
||||||
|
for i := 0; i < 8; i++ {
|
||||||
|
work.Add(1)
|
||||||
|
go func() {
|
||||||
|
defer work.Done()
|
||||||
|
for j := 0; j < 100; j++ {
|
||||||
|
session.enqueue([]byte("test"))
|
||||||
|
ws.manager.Subscribe(session, []string{"notification:1"})
|
||||||
|
ws.manager.TopicList(session)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
ws.closeSession(session)
|
||||||
|
work.Wait()
|
||||||
|
if !session.Closed.Load() || ws.manager.HasTopic("notification:1") || len(ws.manager.TopicList(session)) != 0 {
|
||||||
|
t.Fatal("closed session was re-registered")
|
||||||
|
}
|
||||||
|
if session.enqueue([]byte("test")) {
|
||||||
|
t.Fatal("closed session accepted a message")
|
||||||
|
}
|
||||||
|
}
|
||||||
47
scripts/audit-customer-identity-scopes.sql
Normal file
47
scripts/audit-customer-identity-scopes.sql
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
-- READ-ONLY preflight after the additive identity_scope column is present.
|
||||||
|
-- Run against an operator-approved backup/staging copy, not an implicit production
|
||||||
|
-- connection. Compatible with SQLite and MySQL. This file never changes data.
|
||||||
|
-- Results contain customer identifiers; keep them private and do not commit them.
|
||||||
|
|
||||||
|
-- 1. Any result is an ambiguous key. Runtime lookup fails closed for these keys,
|
||||||
|
-- including disabled mappings. Resolve ownership before adding a unique index.
|
||||||
|
SELECT identity_scope, external_source, external_id,
|
||||||
|
COUNT(*) AS mapping_count, COUNT(DISTINCT customer_id) AS owner_count
|
||||||
|
FROM t_customer_identity
|
||||||
|
GROUP BY identity_scope, external_source, external_id
|
||||||
|
HAVING COUNT(*) > 1;
|
||||||
|
|
||||||
|
-- 2. Inventory legacy mappings and their conversation channels. A single channel
|
||||||
|
-- is evidence to investigate, NOT proof of the issuer or ownership. Guest IDs
|
||||||
|
-- from unauthenticated exchange are never sufficient proof to recover history.
|
||||||
|
SELECT ci.id AS identity_id, ci.customer_id, ci.external_source, ci.external_id,
|
||||||
|
ci.status AS identity_status, c.channel_id AS channel_record_id,
|
||||||
|
ch.channel_id AS channel_code, COUNT(c.id) AS conversation_count
|
||||||
|
FROM t_customer_identity AS ci
|
||||||
|
LEFT JOIN t_conversation AS c ON c.customer_id = ci.customer_id
|
||||||
|
LEFT JOIN t_channel AS ch ON ch.id = c.channel_id
|
||||||
|
WHERE ci.identity_scope = ''
|
||||||
|
GROUP BY ci.id, ci.customer_id, ci.external_source, ci.external_id, ci.status,
|
||||||
|
c.channel_id, ch.channel_id
|
||||||
|
ORDER BY ci.id, c.channel_id;
|
||||||
|
|
||||||
|
-- 3. Mixed legacy/scoped mappings require explicit review of the legacy owner
|
||||||
|
-- and any new post-upgrade customer before reconciliation. Equal external_id
|
||||||
|
-- values across channels/issuers are not evidence of equal people.
|
||||||
|
SELECT legacy.id AS legacy_identity_id, legacy.customer_id AS legacy_customer_id,
|
||||||
|
scoped.id AS scoped_identity_id, scoped.customer_id AS scoped_customer_id,
|
||||||
|
scoped.identity_scope, legacy.external_source, legacy.external_id
|
||||||
|
FROM t_customer_identity AS legacy
|
||||||
|
JOIN t_customer_identity AS scoped
|
||||||
|
ON scoped.external_source = legacy.external_source
|
||||||
|
AND scoped.external_id = legacy.external_id
|
||||||
|
WHERE legacy.identity_scope = '' AND scoped.identity_scope <> ''
|
||||||
|
ORDER BY legacy.id, scoped.id;
|
||||||
|
|
||||||
|
-- 4. Scoped mappings without their unique digest require a reviewed key backfill.
|
||||||
|
-- Application-created scoped mappings always have a key. Never populate it by
|
||||||
|
-- hashing only external_id: include the scope and external source as implemented
|
||||||
|
-- by repositories.ScopedCustomerIdentityKey (JSON string array, SHA-256).
|
||||||
|
SELECT id, customer_id, identity_scope, external_source, external_id
|
||||||
|
FROM t_customer_identity
|
||||||
|
WHERE identity_scope <> '' AND scoped_key IS NULL;
|
||||||
@@ -1,74 +1,54 @@
|
|||||||
|
// Modified in AgentDeskFixes: safe, reviewed setup repairs and honest routing diagnostics.
|
||||||
"use client"
|
"use client"
|
||||||
|
|
||||||
import {
|
import {
|
||||||
AlertTriangleIcon,
|
AlertTriangleIcon,
|
||||||
ArrowRightIcon,
|
ArrowRightIcon,
|
||||||
CheckCircle2Icon,
|
CheckCircle2Icon,
|
||||||
Loader2Icon,
|
|
||||||
SparklesIcon,
|
SparklesIcon,
|
||||||
} from "lucide-react"
|
} from "lucide-react"
|
||||||
import Link from "next/link"
|
import Link from "next/link"
|
||||||
import { useCallback, useEffect, useState } from "react"
|
import { useEffect, useState } from "react"
|
||||||
import { toast } from "sonner"
|
|
||||||
|
|
||||||
import {
|
import {
|
||||||
notifySetupReadinessUpdated,
|
|
||||||
SETUP_READINESS_UPDATED_EVENT,
|
SETUP_READINESS_UPDATED_EVENT,
|
||||||
} from "@/components/operator-readiness-indicator"
|
} from "@/components/operator-readiness-indicator"
|
||||||
import { Badge } from "@/components/ui/badge"
|
import { Badge } from "@/components/ui/badge"
|
||||||
import { Button } from "@/components/ui/button"
|
import { Button } from "@/components/ui/button"
|
||||||
import { useI18n } from "@/i18n/provider"
|
import { useI18n } from "@/i18n/provider"
|
||||||
import {
|
import {
|
||||||
applySetupQuickFix,
|
|
||||||
fetchSetupReadiness,
|
fetchSetupReadiness,
|
||||||
type SetupReadinessResponse,
|
type SetupReadinessResponse,
|
||||||
} from "@/lib/api/setup-readiness"
|
} from "@/lib/api/setup-readiness"
|
||||||
|
|
||||||
export function SetupReadinessBanner({
|
export function SetupReadinessBanner({ onUpdated }: {
|
||||||
onUpdated,
|
|
||||||
}: {
|
|
||||||
onUpdated?: () => void
|
onUpdated?: () => void
|
||||||
}) {
|
}) {
|
||||||
const t = useI18n()
|
const t = useI18n()
|
||||||
const [readiness, setReadiness] = useState<SetupReadinessResponse | null>(null)
|
const [readiness, setReadiness] = useState<SetupReadinessResponse | null>(null)
|
||||||
const [fixing, setFixing] = useState(false)
|
|
||||||
|
|
||||||
const loadReadiness = useCallback(async () => {
|
|
||||||
try {
|
|
||||||
const data = await fetchSetupReadiness()
|
|
||||||
setReadiness(data)
|
|
||||||
} catch {
|
|
||||||
// Ignore in banner if failed
|
|
||||||
}
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
void loadReadiness()
|
let active = true
|
||||||
|
let latestRequest = 0
|
||||||
|
const loadReadiness = () => {
|
||||||
|
const request = ++latestRequest
|
||||||
|
void fetchSetupReadiness().then((data) => {
|
||||||
|
if (active && request === latestRequest) setReadiness(data)
|
||||||
|
}).catch(() => {
|
||||||
|
// Keep this optional background banner quiet on failure.
|
||||||
|
})
|
||||||
|
}
|
||||||
|
loadReadiness()
|
||||||
const handleUpdated = () => {
|
const handleUpdated = () => {
|
||||||
void loadReadiness()
|
loadReadiness()
|
||||||
|
onUpdated?.()
|
||||||
}
|
}
|
||||||
window.addEventListener(SETUP_READINESS_UPDATED_EVENT, handleUpdated)
|
window.addEventListener(SETUP_READINESS_UPDATED_EVENT, handleUpdated)
|
||||||
return () => {
|
return () => {
|
||||||
|
active = false
|
||||||
window.removeEventListener(SETUP_READINESS_UPDATED_EVENT, handleUpdated)
|
window.removeEventListener(SETUP_READINESS_UPDATED_EVENT, handleUpdated)
|
||||||
}
|
}
|
||||||
}, [loadReadiness])
|
}, [onUpdated])
|
||||||
|
|
||||||
async function handleQuickSetupAll() {
|
|
||||||
setFixing(true)
|
|
||||||
try {
|
|
||||||
const res = await applySetupQuickFix({ action: "quick_setup_all" })
|
|
||||||
setReadiness(res.readiness)
|
|
||||||
notifySetupReadinessUpdated()
|
|
||||||
onUpdated?.()
|
|
||||||
toast.success(t("setupWizard.quickFixSuccess"))
|
|
||||||
} catch (error) {
|
|
||||||
toast.error(
|
|
||||||
error instanceof Error ? error.message : t("common.operationFailed"),
|
|
||||||
)
|
|
||||||
} finally {
|
|
||||||
setFixing(false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!readiness) {
|
if (!readiness) {
|
||||||
return null
|
return null
|
||||||
@@ -137,24 +117,12 @@ export function SetupReadinessBanner({
|
|||||||
|
|
||||||
<div className="flex shrink-0 flex-wrap items-center gap-2">
|
<div className="flex shrink-0 flex-wrap items-center gap-2">
|
||||||
{canQuickSetupAll ? (
|
{canQuickSetupAll ? (
|
||||||
<Button
|
<Button size="sm" className="gap-1.5 rounded-md" render={<Link href="/dashboard/setup" />}>
|
||||||
size="sm"
|
|
||||||
className="gap-1.5 rounded-md"
|
|
||||||
disabled={fixing}
|
|
||||||
onClick={() => void handleQuickSetupAll()}
|
|
||||||
>
|
|
||||||
{fixing ? (
|
|
||||||
<Loader2Icon className="size-4 animate-spin" />
|
|
||||||
) : (
|
|
||||||
<SparklesIcon className="size-4" />
|
<SparklesIcon className="size-4" />
|
||||||
)}
|
<span>{t("setupWizard.preview.review")}</span>
|
||||||
<span>
|
|
||||||
{fixing
|
|
||||||
? t("setupWizard.quickSetupRunning")
|
|
||||||
: t("setupWizard.quickSetupAll")}
|
|
||||||
</span>
|
|
||||||
</Button>
|
</Button>
|
||||||
) : null}
|
) : null}
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
variant="outline"
|
variant="outline"
|
||||||
size="sm"
|
size="sm"
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
|
// Modified in this independent fork for explicit dated/recurring calendar modes; see docs/hardening/README.md.
|
||||||
"use client"
|
"use client"
|
||||||
|
|
||||||
|
import Link from "next/link"
|
||||||
import { useCallback, useEffect, useMemo, useState } from "react"
|
import { useCallback, useEffect, useMemo, useState } from "react"
|
||||||
import {
|
import {
|
||||||
CalendarDaysIcon,
|
CalendarDaysIcon,
|
||||||
@@ -286,6 +288,7 @@ export default function DashboardAgentTeamSchedulesPage() {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div className="flex h-[calc(100vh-var(--header-height))] min-h-0 flex-1 flex-col gap-4 overflow-hidden p-4 lg:p-6">
|
<div className="flex h-[calc(100vh-var(--header-height))] min-h-0 flex-1 flex-col gap-4 overflow-hidden p-4 lg:p-6">
|
||||||
|
<p className="shrink-0 rounded-md border bg-muted/30 p-3 text-xs text-muted-foreground">{t("supportAvailability.datedShiftsNotice")} <Link href="/dashboard/support-availability" className="underline underline-offset-2">{t("supportAvailability.title")}</Link></p>
|
||||||
<div className="shrink-0 flex flex-col gap-3 xl:flex-row xl:items-center xl:justify-between">
|
<div className="shrink-0 flex flex-col gap-3 xl:flex-row xl:items-center xl:justify-between">
|
||||||
<div className="flex flex-wrap items-center gap-2">
|
<div className="flex flex-wrap items-center gap-2">
|
||||||
<ButtonGroup>
|
<ButtonGroup>
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified in this independent fork for support availability; see docs/hardening/README.md.
|
||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import { zodResolver } from "@hookform/resolvers/zod";
|
import { zodResolver } from "@hookform/resolvers/zod";
|
||||||
@@ -46,6 +47,7 @@ import {
|
|||||||
type CreateAdminAgentTeamPayload,
|
type CreateAdminAgentTeamPayload,
|
||||||
} from "@/lib/api/admin";
|
} from "@/lib/api/admin";
|
||||||
import { useI18n } from "@/i18n/provider";
|
import { useI18n } from "@/i18n/provider";
|
||||||
|
import { availabilityStatusOptions } from "@/lib/support-availability-i18n";
|
||||||
import { ServiceStatus } from "@/lib/generated/enums";
|
import { ServiceStatus } from "@/lib/generated/enums";
|
||||||
|
|
||||||
type TFunction = (key: string, values?: Record<string, string | number>) => string;
|
type TFunction = (key: string, values?: Record<string, string | number>) => string;
|
||||||
@@ -65,7 +67,7 @@ const emptyForm: EditForm = {
|
|||||||
agentCode: "",
|
agentCode: "",
|
||||||
displayName: "",
|
displayName: "",
|
||||||
avatar: "",
|
avatar: "",
|
||||||
serviceStatus: String(ServiceStatus.Idle) as "0" | "1",
|
serviceStatus: String(ServiceStatus.Idle) as "0" | "1" | "2" | "3" | "4",
|
||||||
maxConcurrentCount: "0",
|
maxConcurrentCount: "0",
|
||||||
priorityLevel: "0",
|
priorityLevel: "0",
|
||||||
autoAssignEnabled: true,
|
autoAssignEnabled: true,
|
||||||
@@ -79,7 +81,7 @@ type EditForm = {
|
|||||||
agentCode: string;
|
agentCode: string;
|
||||||
displayName: string;
|
displayName: string;
|
||||||
avatar: string;
|
avatar: string;
|
||||||
serviceStatus: "0" | "1";
|
serviceStatus: "0" | "1" | "2" | "3" | "4";
|
||||||
maxConcurrentCount: string;
|
maxConcurrentCount: string;
|
||||||
priorityLevel: string;
|
priorityLevel: string;
|
||||||
autoAssignEnabled: boolean;
|
autoAssignEnabled: boolean;
|
||||||
@@ -94,7 +96,7 @@ function createEditFormSchema(t: TFunction) {
|
|||||||
agentCode: z.string().trim().min(1, t("agentProfile.agentCodeRequired")),
|
agentCode: z.string().trim().min(1, t("agentProfile.agentCodeRequired")),
|
||||||
displayName: z.string().trim().min(1, t("agentProfile.displayNameRequired")),
|
displayName: z.string().trim().min(1, t("agentProfile.displayNameRequired")),
|
||||||
avatar: z.string().trim(),
|
avatar: z.string().trim(),
|
||||||
serviceStatus: z.enum(["0", "1"], {
|
serviceStatus: z.enum(["0", "1", "2", "3", "4"], {
|
||||||
message: t("agentProfile.statusRequired"),
|
message: t("agentProfile.statusRequired"),
|
||||||
}),
|
}),
|
||||||
maxConcurrentCount: z
|
maxConcurrentCount: z
|
||||||
@@ -112,10 +114,7 @@ function createEditFormSchema(t: TFunction) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function getServiceStatusOptions(t: TFunction) {
|
function getServiceStatusOptions(t: TFunction) {
|
||||||
return [
|
return availabilityStatusOptions(t, false);
|
||||||
{ value: String(ServiceStatus.Idle), label: t("agentProfile.statusIdle") },
|
|
||||||
{ value: String(ServiceStatus.Busy), label: t("agentProfile.statusBusy") },
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildForm(item: AdminAgentProfile | null): EditForm {
|
function buildForm(item: AdminAgentProfile | null): EditForm {
|
||||||
@@ -529,7 +528,7 @@ function AgentEditDialogBody({
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
|
<div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
|
||||||
<Field data-invalid={!!errors.serviceStatus}>
|
{!itemId ? <Field data-invalid={!!errors.serviceStatus}>
|
||||||
<FieldLabel>{t("agentProfile.serviceStatus")}</FieldLabel>
|
<FieldLabel>{t("agentProfile.serviceStatus")}</FieldLabel>
|
||||||
<FieldContent>
|
<FieldContent>
|
||||||
<Controller
|
<Controller
|
||||||
@@ -548,7 +547,7 @@ function AgentEditDialogBody({
|
|||||||
/>
|
/>
|
||||||
<FieldError errors={[errors.serviceStatus]} />
|
<FieldError errors={[errors.serviceStatus]} />
|
||||||
</FieldContent>
|
</FieldContent>
|
||||||
</Field>
|
</Field> : <p className="text-sm text-muted-foreground">{t("supportAvailability.statusSeparate")}</p>}
|
||||||
|
|
||||||
<Field className="min-h-32">
|
<Field className="min-h-32">
|
||||||
<FieldLabel>{t("agentProfile.avatar")}</FieldLabel>
|
<FieldLabel>{t("agentProfile.avatar")}</FieldLabel>
|
||||||
@@ -625,10 +624,12 @@ function AgentEditDialogBody({
|
|||||||
render={({ field }) => (
|
render={({ field }) => (
|
||||||
<Switch
|
<Switch
|
||||||
checked={field.value}
|
checked={field.value}
|
||||||
|
disabled
|
||||||
onCheckedChange={field.onChange}
|
onCheckedChange={field.onChange}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
|
<p className="text-xs text-muted-foreground">{t("supportAvailability.offlineDeprecated")}</p>
|
||||||
</FieldContent>
|
</FieldContent>
|
||||||
</Field>
|
</Field>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// Modified in this independent fork for support availability; see docs/hardening/README.md.
|
||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@@ -5,13 +6,19 @@ import {
|
|||||||
PanelLeftOpenIcon,
|
PanelLeftOpenIcon,
|
||||||
UserCogIcon,
|
UserCogIcon,
|
||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
import { useCallback, useMemo, useState } from "react";
|
import { useCallback, useEffect, useMemo, useState } from "react";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
DashboardCrudPage,
|
DashboardCrudPage,
|
||||||
type DashboardCrudColumn,
|
type DashboardCrudColumn,
|
||||||
type DashboardCrudFilter,
|
type DashboardCrudFilter,
|
||||||
} from "@/components/dashboard/crud";
|
} from "@/components/dashboard/crud";
|
||||||
|
import { isSameSession } from "@/lib/session-request-guard";
|
||||||
|
import type { AuthSession } from "@/lib/auth";
|
||||||
|
import { useAuth } from "@/components/auth-provider";
|
||||||
|
import { AVAILABILITY_UPDATED_EVENT, notifyAvailabilityUpdated, OperatorStatusDialog } from "@/components/support-availability/operator-status";
|
||||||
|
import { fetchAvailabilityAgents, type OperatorAvailability } from "@/lib/api/support-availability";
|
||||||
|
import { availabilityReasonLabel, availabilityStatusLabel, availabilityStatusOptions } from "@/lib/support-availability-i18n";
|
||||||
import { Badge } from "@/components/ui/badge";
|
import { Badge } from "@/components/ui/badge";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import {
|
import {
|
||||||
@@ -24,7 +31,6 @@ import {
|
|||||||
type CreateAdminAgentProfilePayload,
|
type CreateAdminAgentProfilePayload,
|
||||||
} from "@/lib/api/admin";
|
} from "@/lib/api/admin";
|
||||||
import { useI18n } from "@/i18n/provider";
|
import { useI18n } from "@/i18n/provider";
|
||||||
import { ServiceStatus } from "@/lib/generated/enums";
|
|
||||||
import { formatDateTime } from "@/lib/utils";
|
import { formatDateTime } from "@/lib/utils";
|
||||||
import { EditDialog } from "./_components/edit";
|
import { EditDialog } from "./_components/edit";
|
||||||
import { AgentTeamSidebar } from "./_components/team-sidebar";
|
import { AgentTeamSidebar } from "./_components/team-sidebar";
|
||||||
@@ -34,20 +40,33 @@ type TFunction = (key: string, values?: Record<string, string | number>) => stri
|
|||||||
function getServiceStatusOptions(t: TFunction) {
|
function getServiceStatusOptions(t: TFunction) {
|
||||||
return [
|
return [
|
||||||
{ value: "all", label: t("agentProfile.allStatuses") },
|
{ value: "all", label: t("agentProfile.allStatuses") },
|
||||||
{ value: String(ServiceStatus.Idle), label: t("agentProfile.statusIdle") },
|
...availabilityStatusOptions(t),
|
||||||
{ value: String(ServiceStatus.Busy), label: t("agentProfile.statusBusy") },
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
function getStatusLabel(value: number, t: TFunction) {
|
|
||||||
return (
|
|
||||||
getServiceStatusOptions(t).find((item) => item.value === String(value))
|
|
||||||
?.label ?? String(value)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function DashboardAgentsPage() {
|
export default function DashboardAgentsPage() {
|
||||||
const t = useI18n();
|
const t = useI18n();
|
||||||
|
const { session } = useAuth();
|
||||||
|
const accountId = session?.user.id;
|
||||||
|
const canUpdateAvailability = Boolean(session?.permissions.includes("agent.update"));
|
||||||
|
const [availability, setAvailability] = useState<{ accountId?: number; items: OperatorAvailability[] }>({ items: [] });
|
||||||
|
const [statusDialog, setStatusDialog] = useState<{ session: AuthSession; value: OperatorAvailability } | null>(null);
|
||||||
|
useEffect(() => {
|
||||||
|
let active = true;
|
||||||
|
let pending = false;
|
||||||
|
async function refresh() {
|
||||||
|
if (pending || !accountId) return;
|
||||||
|
pending = true;
|
||||||
|
try { const items = await fetchAvailabilityAgents(); if (active) setAvailability({ accountId, items }); }
|
||||||
|
catch { if (active) setAvailability({ accountId, items: [] }); }
|
||||||
|
finally { pending = false; }
|
||||||
|
}
|
||||||
|
void refresh();
|
||||||
|
const onRefresh = () => { if (document.visibilityState === "visible") void refresh(); };
|
||||||
|
window.addEventListener(AVAILABILITY_UPDATED_EVENT, onRefresh);
|
||||||
|
const timer = window.setInterval(onRefresh, 30000);
|
||||||
|
return () => { active = false; window.clearInterval(timer); window.removeEventListener(AVAILABILITY_UPDATED_EVENT, onRefresh); };
|
||||||
|
}, [accountId]);
|
||||||
const serviceStatusOptions = useMemo(() => getServiceStatusOptions(t), [t]);
|
const serviceStatusOptions = useMemo(() => getServiceStatusOptions(t), [t]);
|
||||||
const [selectedTeam, setSelectedTeam] = useState<AdminAgentTeam | null>(null);
|
const [selectedTeam, setSelectedTeam] = useState<AdminAgentTeam | null>(null);
|
||||||
const [sidebarCollapsed, setSidebarCollapsed] = useState(false);
|
const [sidebarCollapsed, setSidebarCollapsed] = useState(false);
|
||||||
@@ -130,19 +149,21 @@ export default function DashboardAgentsPage() {
|
|||||||
{
|
{
|
||||||
key: "rules",
|
key: "rules",
|
||||||
label: t("agentProfile.columnRules"),
|
label: t("agentProfile.columnRules"),
|
||||||
render: (item) => (
|
render: (item) => {
|
||||||
<>
|
const current = availability.accountId === accountId ? availability.items.find(value => value.userId === item.userId) : undefined;
|
||||||
<Badge variant="outline">
|
return <>
|
||||||
{getStatusLabel(item.serviceStatus, t)}
|
<div className="flex flex-wrap gap-1.5"><Badge variant="outline">{current ? availabilityStatusLabel(current.effectiveServiceStatus, t) : t("supportAvailability.status.unknown")}</Badge>
|
||||||
</Badge>
|
{current ? <Badge variant="outline">{t(current.online ? "supportAvailability.online" : "supportAvailability.offline")}</Badge> : null}</div>
|
||||||
|
<p className="mt-1 text-xs text-muted-foreground">{current ? availabilityReasonLabel(current.reason, t) : t("supportAvailability.reason.unknown")}</p>
|
||||||
|
{current && canUpdateAvailability ? <Button type="button" variant="link" size="sm" className="h-auto px-0" onClick={() => { if (session) setStatusDialog({ session, value: current }); }}>{t("supportAvailability.manageStatus")}</Button> : null}
|
||||||
<div className="mt-2 text-sm text-muted-foreground">
|
<div className="mt-2 text-sm text-muted-foreground">
|
||||||
{t("agentProfile.capacityPriority", {
|
{t("agentProfile.capacityPriority", {
|
||||||
capacity: item.maxConcurrentCount,
|
capacity: item.maxConcurrentCount,
|
||||||
priority: item.priorityLevel,
|
priority: item.priorityLevel,
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>;
|
||||||
),
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: "dispatch",
|
key: "dispatch",
|
||||||
@@ -154,13 +175,7 @@ export default function DashboardAgentsPage() {
|
|||||||
? t("agentProfile.autoAssign")
|
? t("agentProfile.autoAssign")
|
||||||
: t("agentProfile.noAutoAssign")}
|
: t("agentProfile.noAutoAssign")}
|
||||||
</Badge>
|
</Badge>
|
||||||
<Badge
|
|
||||||
variant={item.receiveOfflineMessage ? "secondary" : "outline"}
|
|
||||||
>
|
|
||||||
{item.receiveOfflineMessage
|
|
||||||
? t("agentProfile.offlineReceive")
|
|
||||||
: t("agentProfile.noOfflineReceive")}
|
|
||||||
</Badge>
|
|
||||||
</div>
|
</div>
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
@@ -183,11 +198,12 @@ export default function DashboardAgentsPage() {
|
|||||||
),
|
),
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
[t],
|
[t, availability, accountId, canUpdateAvailability, session],
|
||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex h-[calc(100vh-4rem)]">
|
<div className="flex h-[calc(100vh-4rem)]">
|
||||||
|
{statusDialog && isSameSession(statusDialog.session, session) ? <OperatorStatusDialog value={statusDialog.value} admin onClose={() => setStatusDialog(null)} onSaved={() => notifyAvailabilityUpdated()} /> : null}
|
||||||
<div
|
<div
|
||||||
className={`shrink-0 overflow-hidden transition-[width] duration-200 ${
|
className={`shrink-0 overflow-hidden transition-[width] duration-200 ${
|
||||||
sidebarCollapsed ? "w-0" : "w-80"
|
sidebarCollapsed ? "w-0" : "w-80"
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
|
// Modified by the independent AgentDesk fork for support reliability and availability.
|
||||||
"use client"
|
"use client"
|
||||||
|
|
||||||
import { useEffect, useMemo, useState } from "react"
|
import { useEffect, useMemo, useState, useSyncExternalStore } from "react"
|
||||||
import { zodResolver } from "@hookform/resolvers/zod"
|
import { zodResolver } from "@hookform/resolvers/zod"
|
||||||
import { Controller, Resolver, useForm, useWatch } from "react-hook-form"
|
import { Controller, Resolver, useForm, useWatch } from "react-hook-form"
|
||||||
import { z } from "zod/v4"
|
import { z } from "zod/v4"
|
||||||
@@ -1375,13 +1376,15 @@ function ChannelFormBody({
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The origin cannot change within a document. An explicit server snapshot keeps
|
||||||
|
// the generated access links hydration-safe without a state-setting effect.
|
||||||
|
const subscribeToOrigin = () => () => {}
|
||||||
|
const readBrowserOrigin = () => window.location.origin
|
||||||
|
const readServerOrigin = () => ""
|
||||||
|
|
||||||
function WebAccessGuide({ channelId }: { channelId: string }) {
|
function WebAccessGuide({ channelId }: { channelId: string }) {
|
||||||
const t = useI18n()
|
const t = useI18n()
|
||||||
const [origin, setOrigin] = useState("")
|
const origin = useSyncExternalStore(subscribeToOrigin, readBrowserOrigin, readServerOrigin)
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
setOrigin(window.location.origin)
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
const accessUrl = useMemo(() => {
|
const accessUrl = useMemo(() => {
|
||||||
if (!origin || !channelId) {
|
if (!origin || !channelId) {
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
// Modified in the independent hardening fork; see docs/hardening/README.md.
|
||||||
|
// Modified for AgentDeskFixes: retain operator drafts and forward pending-send state.
|
||||||
"use client"
|
"use client"
|
||||||
|
|
||||||
import { useEffect, useRef, useState } from "react"
|
import { useEffect, useRef, useState } from "react"
|
||||||
@@ -11,11 +13,14 @@ import {
|
|||||||
sendOperatorPresence,
|
sendOperatorPresence,
|
||||||
useAgentConversationsStore,
|
useAgentConversationsStore,
|
||||||
} from "@/hooks/use-agent-conversation-realtime"
|
} from "@/hooks/use-agent-conversation-realtime"
|
||||||
|
import type { MessageEditorDraftStore } from "@/lib/message-editor-drafts"
|
||||||
import { useI18n } from "@/i18n/provider"
|
import { useI18n } from "@/i18n/provider"
|
||||||
import { fetchQuickReplyListAll, type AdminQuickReply } from "@/lib/api/admin"
|
import { fetchQuickReplyListAll, type AdminQuickReply } from "@/lib/api/admin"
|
||||||
import { suggestAgentReply } from "@/lib/api/agent"
|
import { suggestAgentReply } from "@/lib/api/agent"
|
||||||
|
|
||||||
type AgentMessageEditorProps = {
|
type AgentMessageEditorProps = {
|
||||||
|
draftStore: MessageEditorDraftStore
|
||||||
|
sending?: boolean
|
||||||
disabled?: boolean
|
disabled?: boolean
|
||||||
uploadingAsset?: boolean
|
uploadingAsset?: boolean
|
||||||
onSend: (html: string) => Promise<void>
|
onSend: (html: string) => Promise<void>
|
||||||
@@ -28,6 +33,8 @@ type AgentMessageEditorProps = {
|
|||||||
* Supports quick replies picker and slash command (/) autocomplete.
|
* Supports quick replies picker and slash command (/) autocomplete.
|
||||||
*/
|
*/
|
||||||
export function AgentMessageEditor({
|
export function AgentMessageEditor({
|
||||||
|
draftStore,
|
||||||
|
sending = false,
|
||||||
disabled = false,
|
disabled = false,
|
||||||
uploadingAsset = false,
|
uploadingAsset = false,
|
||||||
onSend,
|
onSend,
|
||||||
@@ -79,6 +86,8 @@ export function AgentMessageEditor({
|
|||||||
<SharedMessageEditor
|
<SharedMessageEditor
|
||||||
variant="agent"
|
variant="agent"
|
||||||
conversationId={selectedConversationId}
|
conversationId={selectedConversationId}
|
||||||
|
draftStore={draftStore}
|
||||||
|
sending={sending}
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
uploadingAsset={uploadingAsset}
|
uploadingAsset={uploadingAsset}
|
||||||
quickReplies={{
|
quickReplies={{
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
// Modified in the independent hardening fork; see docs/hardening/README.md.
|
||||||
|
// Modified for AgentDeskFixes: capture operator recipients and preserve failed message drafts.
|
||||||
"use client";
|
"use client";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@@ -61,6 +63,7 @@ import {
|
|||||||
type AIWorkflowRun,
|
type AIWorkflowRun,
|
||||||
} from "@/lib/api/admin";
|
} from "@/lib/api/admin";
|
||||||
import { readSession } from "@/lib/auth";
|
import { readSession } from "@/lib/auth";
|
||||||
|
import { createMessageEditorDraftStore } from "@/lib/message-editor-drafts";
|
||||||
import { renderIMMessageHTML } from "@/lib/im-message";
|
import { renderIMMessageHTML } from "@/lib/im-message";
|
||||||
import {
|
import {
|
||||||
agentConversationSelectors,
|
agentConversationSelectors,
|
||||||
@@ -177,6 +180,8 @@ export function ChatPanel() {
|
|||||||
null,
|
null,
|
||||||
);
|
);
|
||||||
const shouldStickToBottomRef = useRef(true);
|
const shouldStickToBottomRef = useRef(true);
|
||||||
|
const [draftStore] = useState(createMessageEditorDraftStore);
|
||||||
|
useEffect(() => () => draftStore.clear(), [draftStore]);
|
||||||
const [claiming, setClaiming] = useState(false);
|
const [claiming, setClaiming] = useState(false);
|
||||||
const [claimDialogOpen, setClaimDialogOpen] = useState(false);
|
const [claimDialogOpen, setClaimDialogOpen] = useState(false);
|
||||||
const [transferDialogOpen, setTransferDialogOpen] = useState(false);
|
const [transferDialogOpen, setTransferDialogOpen] = useState(false);
|
||||||
@@ -314,12 +319,19 @@ export function ChatPanel() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const handleSend = async (html: string) => {
|
const handleSend = async (html: string) => {
|
||||||
if (!conversation || sending || isClosedConversation) return;
|
// Bind the displayed draft to its recipient before the store reads selection.
|
||||||
|
const recipientId = conversation?.id;
|
||||||
try {
|
try {
|
||||||
|
if (!recipientId || sending || isClosedConversation ||
|
||||||
|
useAgentConversationsStore.getState().selectedConversationId !== recipientId) {
|
||||||
|
throw new Error(t("conversation.sendMessageFailed"));
|
||||||
|
}
|
||||||
shouldStickToBottomRef.current = true;
|
shouldStickToBottomRef.current = true;
|
||||||
await sendMessage(html);
|
const message = await sendMessage(html, recipientId);
|
||||||
|
if (!message) throw new Error(t("conversation.sendMessageFailed"));
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
toast.error(error instanceof Error ? error.message : t("conversation.sendMessageFailed"));
|
toast.error(error instanceof Error ? error.message : t("conversation.sendMessageFailed"));
|
||||||
|
throw error;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -369,7 +381,7 @@ export function ChatPanel() {
|
|||||||
setWorkflowRunLoading(false);
|
setWorkflowRunLoading(false);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
[],
|
[t],
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!conversation) {
|
if (!conversation) {
|
||||||
@@ -495,20 +507,28 @@ export function ChatPanel() {
|
|||||||
<div className="flex h-full min-h-0 flex-col">
|
<div className="flex h-full min-h-0 flex-col">
|
||||||
<div className="min-h-0 flex-1">
|
<div className="min-h-0 flex-1">
|
||||||
<AgentMessageEditor
|
<AgentMessageEditor
|
||||||
disabled={!conversation || sending}
|
draftStore={draftStore}
|
||||||
|
disabled={!conversation}
|
||||||
|
sending={sending}
|
||||||
uploadingAsset={uploadingAsset}
|
uploadingAsset={uploadingAsset}
|
||||||
onSend={handleSend}
|
onSend={handleSend}
|
||||||
onUploadImage={async (file) => {
|
onUploadImage={async (file) => {
|
||||||
shouldStickToBottomRef.current = true;
|
shouldStickToBottomRef.current = true;
|
||||||
const uploaded = await uploadImage(file);
|
try {
|
||||||
return uploaded;
|
return await uploadImage(file, conversation.id);
|
||||||
|
} catch (error) {
|
||||||
|
toast.error(error instanceof Error ? error.message : t("upload.imageUploadFailed"));
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
}}
|
}}
|
||||||
onSendAttachment={async (file) => {
|
onSendAttachment={async (file) => {
|
||||||
shouldStickToBottomRef.current = true;
|
shouldStickToBottomRef.current = true;
|
||||||
try {
|
try {
|
||||||
await sendAttachment(file);
|
const message = await sendAttachment(file, conversation.id);
|
||||||
|
if (!message) throw new Error(t("conversation.sendAttachmentFailed"));
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
toast.error(error instanceof Error ? error.message : t("conversation.sendAttachmentFailed"));
|
toast.error(error instanceof Error ? error.message : t("conversation.sendAttachmentFailed"));
|
||||||
|
throw error;
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user