mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-11-18 14:08:21 +00:00
3 commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
|
|
4d061fdd46
|
🔄 fix: Judge Tenant Profiles on Their Own Base, Clear Config Caches on Principal Deletion, and Add a Config Reload Route (#17397)
Profile writes are judged in the tenant partition the profile merges in. For a role, or a
caller inside a tenant, that is the caller's partition. For a group or user profile written by
an admin without a tenant, it is the stored document's tenant: PUT, PATCH and POST …/changes
validate on librechat.yaml as that tenant resolves it with that tenant's __base__ over it, use
the same Base for the recheck after commit and for key binding, tombstones and field deletes
judge re-entry on that tenant's librechat.yaml, and every route reports `ignored` over that
tenant's Base. Each attempt reads the document in that partition only, and a document that
moved partition while the write ran answers 409 CONFIG_VERSION_CONFLICT. The config store's
partition rules are unchanged; another tenant's Base is read in that tenant's context.
Deleting a group, role or user clears the config caches when it removes or restores the
principal's profile (`invalidatingConfigStore`), awaited before the response and broadcast with
Redis as config writes do; a call that rejects clears too, since it may have committed.
POST …/changes lets `unset` remove any part of a top-level section configSchema does not
define; the section's own `unknown_section` issue is no longer blamed on the removal, and every
other op there still answers 400 UNKNOWN_SECTION.
POST /api/admin/config/reload, for an admin without a tenant holding broad manage:configs (a
tenant admin gets 403, since the reload reaches every tenant), runs the config cache clear without
a write, loads librechat.yaml again on the answering instance, and once it loaded publishes the
clear over Redis so every other instance loads the file on its next read. It uses
ConfigCacheInvalidation.reload, which reports the clear, the load and the publish instead of only
logging a failure (writes keep `invalidate`, which leaves the load to the next read). It answers
200 `{ success: true, broadcast }`, `broadcast` false without Redis; 422 CONFIG_RELOAD_INVALID
with each schema issue's location when the loader refuses the file, keeping the last good config
and publishing nothing; 500 CONFIG_RELOAD_FAILED when a clear fails or the config cannot be built
from the file; and 503 CONFIG_RELOAD_BROADCAST_FAILED when this instance reloaded but the publish
failed, since an instance that misses the broadcast keeps its cached librechat.yaml, which never
expires. Every reload that runs is audited as `config.reloaded`, a failed one with outcome
`failure` and its code. The meta reports `features.reloadRoute`. Writes still reload the file.
The e2e content-filter helper uses the route instead of a sentinel profile.
docs/mcp-overrides.md describes the current timing: the awaited clear, the Redis broadcast, what
still waits for a TTL, that a process the clear misses keeps its old librechat.yaml, and hiding
as an access boundary at checkout.
|
||
|
|
76e3c6b134
|
🪜 fix: Base-First Config Precedence, Profile Lifecycle and Role Renames That Keep Their Profile (#17352)
* 🪜 fix: Base-First Config Precedence, Profile Lifecycle and Role Renames That Keep Their Profile Config documents merge in one total order (`compareConfigPrecedence`): Base (`role` / `__base__`) first whatever its priority, then ascending priority, then role < group < user, then document `_id`. The merge, `getApplicableConfigs` and `listAllConfigs` all use it, so a tie no longer goes to the newest document whatever its type, and Base no longer outranks a profile through its priority. A profile that writes fields of a librechat.yaml MCP server therefore undoes a Base hide of that server for its principals. A write that creates a document without a priority gives it its principal type's default (role 10, group 20, user 100, Base 0), and a write that omits the priority keeps the stored one, so a broad PUT no longer resets a profile to 10. Langfuse writes no longer pass a priority. Profile writes (PUT, PATCH `/fields`, POST `/changes`) validate on librechat.yaml with the active Base document resolved over it (`resolveRawConfig`, the fold the merge itself runs), so a role write that is valid where it lands is accepted and one the merge would strip is refused. Base still validates on librechat.yaml alone, an inactive Base is ignored, and `/changes` still judges what librechat.yaml itself defines on the raw YAML. `PATCH /api/admin/config/:principalType/:principalId/priority { priority, expectedRevision? }` sets only the priority, for broad `manage:configs`, keeping overrides, tombstones and `isActive`; it is audited as `operation: 'priority'`. A write that would create a principal's first document (PUT, PATCH `/fields`, POST `/fields/tombstone`, POST `/changes` including a dry run or a priority-only batch) answers 404 `PRINCIPAL_NOT_FOUND` unless the role (exact name), group or user (lowercase ObjectId) exists in the caller's tenant partition, or at platform level outside a tenant (`principalExists`). Each route checks inside its compare-and-swap write, against the document the write replaces; the tombstone route now plans its write like the others, so `AdminConfigDeps` no longer takes `tombstoneConfigField`. A PUT with `expectedRevision: 'absent'` creates the profile even when it carries no overrides. Renaming a role moves its config profile, system grants and ACL entries to the new name in the caller's tenant partition. The profile moves through the store contract (`movePrincipal`: a create-only copy, then removal at the copied revision). A profile already at the new name answers 409 `ROLE_CONFIG_CONFLICT`, and any failed step rolls back the users, the role document and every move (500 `ROLE_RENAME_FAILED`). Profiles, grants and ACL entries that renames made before this change left at an old name are neither moved nor removed, and a role created under that name still picks them up. The Base principal id is a reserved role name (400 `ROLE_NAME_RESERVED`), and a legacy role by that name never moves or deletes Base. The admin config meta reports `deterministicPrecedence`, `priorityRoute`, `principalCheck` and `roleRenameMovesProfile`. * 🧪 test: Give the E2E Reload Sentinel a Role of Its Own Admin config writes now answer 404 PRINCIPAL_NOT_FOUND for a principal that does not exist, so the content-filter helpers' reload sentinel (a made-up user id) could no longer write and every spec that reloads librechat.yaml failed. The sentinel is now a role the helper creates once (409 when it already exists) and deletes after its profile in cleanup; no user is a member, so its empty profile changes no one's config. * 🛟 fix: Keep a Moved Profile Whose Removal Cannot Be Confirmed, Validate on the Caller's Base and Restore Rolled-Back Descriptions - `movePrincipal` no longer treats a failed read-back of the source, after its removal failed, as the source still being there. It keeps the copy, which may be the only one left, and rethrows the removal's failure instead of deleting the copy. - Profile writes read the Base validation floor from the caller's tenant partition, so a caller without a tenant validates on the platform-level Base and never on a tenant's. - A role rename that rolls back gives a role stored without a description the schema default back, instead of a `$set` of `undefined` that kept the new description. * 🧭 fix: Scope Profile Priority Changes to the Caller's Tenant Partition `setConfigPriority`, behind PATCH `/api/admin/config/:principalType/:principalId/priority`, read and wrote through the unpartitioned config store. A platform-level admin without a tenant runs in the default non-strict context, where the tenant-isolation plugin adds no predicate, so the route could reorder a tenant's profile for the same principal, and answer with it, when no platform-level profile existed. It now runs on the partitioned operations that the role rename and the partitioned `findConfigByPrincipal` use. The read is limited to the caller's partition: that tenant's document, or without a tenant only a platform-level one (no tenant, `null` or `''`). The write is pinned to the `_id` of the document that read returned. A tenantless caller therefore gets 404 `CONFIG_NOT_FOUND` for a profile only a tenant holds. An `expectedRevision` naming such a profile gets a revision conflict and changes nothing. Tests: `config.spec.ts` (data-schemas) adds "setConfigPriority in the caller tenant partition". It covers the platform profile changing alone, a profile that only a tenant holds being neither changed nor returned, and only the active tenant's profile changing inside a tenant. The tenant helpers are now shared with the rename suite. `config.precedence.integration.spec.ts` adds the same check through the handler. With the old wiring, a tenantless PATCH of a profile only tenant-a holds answers 200 and moves tenant-a's profile to 40. With the fix it answers 404 and tenant-a keeps 10. * 🧷 fix: Roll Back Only What a Rename Changed and Validate Profile Writes on the Base They Land Over - Grant moves report what they changed (re-keyed grants, and superseded grants whose removal was confirmed); the undo re-keys only grants still at the new name and re-creates a superseded grant only while the new name still holds the grant that superseded it, so a grant revoked during a rename is never resurrected. - The Mongoose binding settles a create whose acknowledgement was lost by the `_id` it chose (found at version 1: committed, returned), as the store contract now requires; a profile move whose copy committed finishes instead of leaving an orphan copy. The memory engine and the conformance suite cover it, plus a copy that cannot be withdrawn being logged. - A rename rollback moves back only the profile it moved (by identity, edits included), puts back only members still on the new name, and reverts the description only while it is still the one the rename set. - PUT, PATCH /fields and POST /changes read Base beside the profile on every attempt and read it again once the write commits; a write that Base changed under is judged on that Base and withdrawn (only at the revision it wrote) when it fails there. - The priority route rereads a lost race's current revision in the caller's tenant partition. |
||
|
|
8c51a3f9f8
|
🙈 feat: Let Config Profiles Hide librechat.yaml MCP Servers and Remove Their Fields (#17327)
* 🙈 feat: Let Config Profiles Hide librechat.yaml MCP Servers and Remove Their Fields Config profiles are the `__base__`, role, group and user documents written through `/api/admin/config`. A profile can tombstone `mcpServers.<name>`, and the merge then removes that server from the principal's resolved `mcpConfig`. * 🛡️ fix: Apply MCP Hiding to Server Instructions, Failed Removals and the Startup Audit - Server instructions bound for the model now leave out librechat.yaml servers hidden from the acting user, including one a model spec pins. `applyContextToAgent` passes the request user through `formatInstructionsForContext`, which drops the user's hidden set from the user-less catalog it reads. - A config-tier candidate that removes a librechat.yaml value (a field, or a key of a record such as `headers`) and fails inspection now stands as a failed config-source entry instead of falling back to the librechat.yaml base that still carries the removed value. A failed change that removes nothing still falls back, and an entry with no transport (fields written over a hidden server) keeps the documented librechat.yaml fallback. - The startup tombstone report reads every tenant's profiles in the system tenant scope, so it also runs from entry points without an outer system scope under strict tenant isolation, and names each profile's tenant. * 🗂️ fix: Project the Startup MCP Tombstone Report Query and Run It Alongside Connections * 🔑 fix: Keep Removed OAuth Headers Out of the MCP OAuth Callback * 📝 docs: Note That Removed OAuth Headers Stay Out of MCP Sign-In * 🔐 fix: Recheck the MCP OAuth Flow's Server Before Initiation Redirects OAuth initiation redirected to a flow's stored authorization URL, or started a new authorization from the flow's stored server URL, without resolving the server again, so a principal whose profile hid the server after the flow was created could still be sent to its authorization endpoint. The callback's active-server check and its OAuth header fallback lived in the CJS route. resolveMCPOAuthTarget (packages/api/src/mcp/oauth/target.ts) now owns both: it resolves the server in the principal's current config with a strict read, refuses a flow admitted for another server, a server the principal can no longer use, or a redefined one, and selects the headers the flow sends (the initiation snapshot, else the principal's config). Initiation calls it before either redirect (404 or 400); the callback calls it before the exchange and from the token-store fence. * 📝 docs: Note That a Hidden MCP Server Ends OAuth Sign-Ins Already Started * 🚩 feat: Publish the yamlMcpHide Admin Config Meta Flag Profiles can hide librechat.yaml MCP servers and a hidden server is an access boundary, so GET /api/admin/config/meta now reports features.yamlMcpHide for the admin panel to gate its hide UI on. The meta.spec probe checks the behaviour itself: the admin API stores an mcpServers.<name> tombstone, the merged config drops the server, the registry withholds it from principal lookups and checkout but not from app-level lookups, process-backed servers stay, and an unreadable principal config withholds every hideable server. * 🧪 test: Align MCP Tombstone Specs With the Portable Config Store The admin config handlers now write whole documents through writeConfigDocument, so the end-to-end tombstone spec wires it in place of the removed upsertConfig/patchConfigFields deps. A reset of a whole MCP record now also prunes the parents it leaves empty. |