[PR #22757] [CLOSED] fix: persist MCP OAuth 2.1 client registration to database #26847

Closed
opened 2026-04-20 06:44:29 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/open-webui/open-webui/pull/22757
Author: @PedroFCM
Created: 3/17/2026
Status: Closed

Base: devHead: main


📝 Commits (10+)

📊 Changes

1 file changed (+10 additions, -2 deletions)

View changed files

📝 backend/open_webui/main.py (+10 -2)

📄 Description

Pull Request Checklist

Note to first-time contributors: Please open a discussion post in Discussions to discuss your idea/fix with the community before creating a pull request, and describe your changes before submitting a pull request.

This is to ensure large feature PRs are discussed with the community first, before starting work on it. If the community does not want this feature or it is not relevant for Open WebUI as a project, it can be identified in the discussion before working on the feature and submitting the PR.

Before submitting, make sure you've checked the following:

  • Target branch: Verify that the pull request targets the dev branch. PRs targeting main will be immediately closed.
  • Description: Provide a concise description of the changes made in this pull request down below.
  • Changelog: Ensure a changelog entry following the format of Keep a Changelog is added at the bottom of the PR description.
  • Documentation: Add docs in Open WebUI Docs Repository. Document user-facing behavior, environment variables, public APIs/interfaces, or deployment steps.
  • Dependencies: Are there any new or upgraded dependencies? If so, explain why, update the changelog/docs, and include any compatibility notes. Actually run the code/function that uses updated library to ensure it doesn't crash.
  • Testing: Perform manual tests to verify the implemented fix/feature works as intended AND does not break any other functionality. Include reproducible steps to demonstrate the issue before the fix. Test edge cases (URL encoding, HTML entities, types). Take this as an opportunity to make screenshots of the feature/fix and include them in the PR description.
  • Agentic AI Code: Confirm this Pull Request is not written by any AI Agent or has at least gone through additional human review AND manual testing. If any AI Agent is the co-author of this PR, it may lead to immediate closure of the PR.
  • Code review: Have you performed a self-review of your code, addressing any coding standard issues and ensuring adherence to the project's coding standards?
  • Design & Architecture: Prefer smart defaults over adding new settings; use local state for ephemeral UI logic. Open a Discussion for major architectural or UX changes.
  • Git Hygiene: Keep PRs atomic (one logical change). Clean up commits and rebase on dev to ensure no unrelated commits (e.g. from main) are included. Push updates to the existing PR branch instead of closing and reopening.
  • Title Prefix: To clearly categorize this pull request, prefix the pull request title using one of the following:
    • fix: Bug fix or error correction

Changelog Entry

Description

Fixes MCP OAuth 2.1 Dynamic Client Registration (DCR) not being persisted to the database, causing users to get a 404 on /oauth/clients/mcp:<id>/authorize.

Discussion: #22756
Related: #20869, #21190

Root cause: register_client() updates TOOL_SERVER_CONNECTIONS via in-place list mutation (config.TOOL_SERVER_CONNECTIONS[idx] = {...}). Since AppConfig.__getattr__ returns the list reference directly, in-place mutation never triggers AppConfig.__setattr__PersistentConfig.save(). The oauth_client_info only lives in process memory.

Impact:

  • Multi-instance deployments: only the worker that handled DCR has the client info — requests hitting other workers get 404
  • Single instance: any restart loses the client info — all users get 404

Added

  • Fallback DCR re-registration on the authorize route when the OAuth client is not found, before returning 404

Changed

  • register_client() now reassigns TOOL_SERVER_CONNECTIONS with a new list instead of mutating in-place, triggering AppConfig.__setattr__PersistentConfig.save()

Fixed

  • oauth_client_info from MCP OAuth 2.1 DCR is now persisted to the database
  • Authorize route attempts DCR re-registration before returning 404 when client info is missing

Additional Information

  • Two changes in main.py, no new dependencies
  • Tested on v0.8.10 with a GitLab MCP server (OAuth 2.1 / DCR)
  • Verified: admin registers MCP server → different user completes OAuth flow successfully
  • Verified: after container restart, OAuth flow still works (client info loaded from DB)
  • The same in-place mutation pattern could affect other AppConfig attributes that hold mutable values (lists, dicts) — any code that modifies these in-place without reassigning the attribute will silently fail to persist

Screenshots or Videos

Before fix: Non-admin user gets 404 on /oauth/clients/mcp:gitlab-mcp/authorize after admin registers the MCP server.

After fix: Non-admin user completes the full OAuth 2.1 flow and can use the MCP tool.

Contributor License Agreement

Note

Deleting the CLA section will lead to immediate closure of your PR and it will not be merged in.


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/open-webui/open-webui/pull/22757 **Author:** [@PedroFCM](https://github.com/PedroFCM) **Created:** 3/17/2026 **Status:** ❌ Closed **Base:** `dev` ← **Head:** `main` --- ### 📝 Commits (10+) - [`fe6783c`](https://github.com/open-webui/open-webui/commit/fe6783c16699911c7be17392596d579333fb110c) Merge pull request #19030 from open-webui/dev - [`fc05e0a`](https://github.com/open-webui/open-webui/commit/fc05e0a6c5d39da60b603b4d520f800d6e36f748) Merge pull request #19405 from open-webui/dev - [`e3faec6`](https://github.com/open-webui/open-webui/commit/e3faec62c58e3a83d89aa3df539feacefa125e0c) Merge pull request #19416 from open-webui/dev - [`9899293`](https://github.com/open-webui/open-webui/commit/9899293f050ad50ae12024cbebee7e018acd851e) Merge pull request #19448 from open-webui/dev - [`140605e`](https://github.com/open-webui/open-webui/commit/140605e660b8186a7d5c79fb3be6ffb147a2f498) Merge pull request #19462 from open-webui/dev - [`6f1486f`](https://github.com/open-webui/open-webui/commit/6f1486ffd0cb288d0e21f41845361924e0d742b3) Merge pull request #19466 from open-webui/dev - [`d95f533`](https://github.com/open-webui/open-webui/commit/d95f533214e3fe5beb5e41ec1f349940bc4c7043) Merge pull request #19729 from open-webui/dev - [`a727153`](https://github.com/open-webui/open-webui/commit/a7271532f8a38da46785afcaa7e65f9a45e7d753) 0.6.43 (#20093) - [`6adde20`](https://github.com/open-webui/open-webui/commit/6adde203cd292a9e3af9c64a2ae36b603fed096a) Merge pull request #20394 from open-webui/dev - [`f9b0534`](https://github.com/open-webui/open-webui/commit/f9b0534e0c442631d1cb7205169588b9b6204179) Merge pull request #20522 from open-webui/dev ### 📊 Changes **1 file changed** (+10 additions, -2 deletions) <details> <summary>View changed files</summary> 📝 `backend/open_webui/main.py` (+10 -2) </details> ### 📄 Description <!-- ⚠️ CRITICAL CHECKS FOR CONTRIBUTORS (READ, DON'T DELETE) ⚠️ 1. Target the `dev` branch. PRs targeting `main` will be automatically closed. 2. Do NOT delete the CLA section at the bottom. It is required for the bot to accept your PR. --> # Pull Request Checklist ### Note to first-time contributors: Please open a discussion post in [Discussions](https://github.com/open-webui/open-webui/discussions) to discuss your idea/fix with the community before creating a pull request, and describe your changes before submitting a pull request. This is to ensure large feature PRs are discussed with the community first, before starting work on it. If the community does not want this feature or it is not relevant for Open WebUI as a project, it can be identified in the discussion before working on the feature and submitting the PR. **Before submitting, make sure you've checked the following:** - [x] **Target branch:** Verify that the pull request targets the `dev` branch. **PRs targeting `main` will be immediately closed.** - [x] **Description:** Provide a concise description of the changes made in this pull request down below. - [x] **Changelog:** Ensure a changelog entry following the format of [Keep a Changelog](https://keepachangelog.com/) is added at the bottom of the PR description. - [x] **Documentation:** Add docs in [Open WebUI Docs Repository](https://github.com/open-webui/docs). Document user-facing behavior, environment variables, public APIs/interfaces, or deployment steps. - [x] **Dependencies:** Are there any new or upgraded dependencies? If so, explain why, update the changelog/docs, and include any compatibility notes. Actually run the code/function that uses updated library to ensure it doesn't crash. - [x] **Testing:** Perform manual tests to **verify the implemented fix/feature works as intended AND does not break any other functionality**. Include reproducible steps to demonstrate the issue before the fix. Test edge cases (URL encoding, HTML entities, types). Take this as an opportunity to **make screenshots of the feature/fix and include them in the PR description**. - [x] **Agentic AI Code:** Confirm this Pull Request is **not written by any AI Agent** or has at least **gone through additional human review AND manual testing**. If any AI Agent is the co-author of this PR, it may lead to immediate closure of the PR. - [x] **Code review:** Have you performed a self-review of your code, addressing any coding standard issues and ensuring adherence to the project's coding standards? - [x] **Design & Architecture:** Prefer smart defaults over adding new settings; use local state for ephemeral UI logic. Open a Discussion for major architectural or UX changes. - [x] **Git Hygiene:** Keep PRs atomic (one logical change). Clean up commits and rebase on `dev` to ensure no unrelated commits (e.g. from `main`) are included. Push updates to the existing PR branch instead of closing and reopening. - [x] **Title Prefix:** To clearly categorize this pull request, prefix the pull request title using one of the following: - **fix**: Bug fix or error correction # Changelog Entry ### Description Fixes MCP OAuth 2.1 Dynamic Client Registration (DCR) not being persisted to the database, causing users to get a 404 on `/oauth/clients/mcp:<id>/authorize`. Discussion: #22756 Related: #20869, #21190 **Root cause:** `register_client()` updates `TOOL_SERVER_CONNECTIONS` via in-place list mutation (`config.TOOL_SERVER_CONNECTIONS[idx] = {...}`). Since `AppConfig.__getattr__` returns the list reference directly, in-place mutation never triggers `AppConfig.__setattr__` → `PersistentConfig.save()`. The `oauth_client_info` only lives in process memory. **Impact:** - Multi-instance deployments: only the worker that handled DCR has the client info — requests hitting other workers get 404 - Single instance: any restart loses the client info — all users get 404 ### Added - Fallback DCR re-registration on the authorize route when the OAuth client is not found, before returning 404 ### Changed - `register_client()` now reassigns `TOOL_SERVER_CONNECTIONS` with a new list instead of mutating in-place, triggering `AppConfig.__setattr__` → `PersistentConfig.save()` ### Fixed - `oauth_client_info` from MCP OAuth 2.1 DCR is now persisted to the database - Authorize route attempts DCR re-registration before returning 404 when client info is missing --- ### Additional Information - Two changes in `main.py`, no new dependencies - Tested on v0.8.10 with a GitLab MCP server (OAuth 2.1 / DCR) - Verified: admin registers MCP server → different user completes OAuth flow successfully - Verified: after container restart, OAuth flow still works (client info loaded from DB) - The same in-place mutation pattern could affect other `AppConfig` attributes that hold mutable values (lists, dicts) — any code that modifies these in-place without reassigning the attribute will silently fail to persist ### Screenshots or Videos _Before fix:_ Non-admin user gets 404 on `/oauth/clients/mcp:gitlab-mcp/authorize` after admin registers the MCP server. _After fix:_ Non-admin user completes the full OAuth 2.1 flow and can use the MCP tool. ### Contributor License Agreement <!-- 🚨 DO NOT DELETE THE TEXT BELOW 🚨 Keep the "Contributor License Agreement" confirmation text intact. Deleting it will trigger the CLA-Bot to INVALIDATE your PR. Your PR will NOT be reviewed or merged until you check the box below confirming that you have read and agree to the terms of the CLA. --> - [x] By submitting this pull request, I confirm that I have read and fully agree to the [Contributor License Agreement (CLA)](https://github.com/open-webui/open-webui/blob/main/CONTRIBUTOR_LICENSE_AGREEMENT), and I am providing my contributions under its terms. > [!NOTE] > Deleting the CLA section will lead to immediate closure of your PR and it will not be merged in. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-20 06:44:29 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/open-webui#26847