Chris CoutinhoandClaude
849c67c32a
This commit completes the Keycloak external IdP integration for the MCP
server, implementing ADR-002 Tier 2 (External Identity Provider) with
full Bearer token authentication support.
Key Changes:
1. **Keycloak backchannel-dynamic configuration**
- Added --hostname-strict=false and --hostname-backchannel-dynamic=true
- Allows external issuer (localhost:8888) with internal endpoints (keycloak:8080)
- Solves Docker networking issue where containers can't reach localhost
2. **CORSMiddleware Bearer token patch**
- Created app-hooks/patches/cors-bearer-token.patch from upstream commit 8fb5e77db82
- Allows Bearer tokens to bypass CORS/CSRF checks (stateless authentication)
- Applied via post-installation hook 20-apply-cors-bearer-token-patch.sh
- Enables app-specific APIs (Notes, Calendar, etc.) to work with Bearer tokens
3. **Patch organization**
- Moved patches to app-hooks/patches/ directory
- Updated docker-compose.yml to mount entire app-hooks directory
- Consolidated patch management for better maintainability
4. **Test improvements**
- All 11 Keycloak integration tests passing
- Tests validate OAuth token acquisition, MCP connectivity, token validation,
tool execution, token persistence, user provisioning, scope filtering,
and error handling
Architecture:
- Keycloak acts as external OAuth/OIDC identity provider
- MCP server uses Keycloak tokens to access Nextcloud APIs
- Nextcloud user_oidc app validates Bearer tokens from Keycloak
- No admin credentials needed - all API access uses user's OAuth tokens
Cache Note:
- Discovery and JWKS caches must be cleared when switching Keycloak configurations
- Use: docker compose exec redis redis-cli DEL "<cache-key>"
- Or: docker compose exec app php occ user_oidc:provider keycloak --clientid nextcloud
Related:
- ADR-002: Vector sync background jobs authentication
- Validates external IdP integration pattern
- Demonstrates offline_access with refresh tokens (Tier 1 & 2)
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
65 lines
2.2 KiB
Bash
Executable File
65 lines
2.2 KiB
Bash
Executable File
#!/bin/bash
|
|
#
|
|
# Apply upstream CORSMiddleware Bearer token authentication patch
|
|
#
|
|
# This patch allows Bearer tokens to bypass CORS/CSRF checks, fixing
|
|
# authentication issues with app-specific APIs (Notes, Calendar, etc.)
|
|
# when using OAuth/OIDC Bearer tokens.
|
|
#
|
|
# Upstream PR: https://github.com/nextcloud/server/pull/XXXXX
|
|
# Commit: 8fb5e77db82 (fix(cors): Allow Bearer token authentication)
|
|
#
|
|
|
|
set -e
|
|
|
|
PATCH_FILE="/docker-entrypoint-hooks.d/patches/cors-bearer-token.patch"
|
|
TARGET_FILE="/var/www/html/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php"
|
|
|
|
echo "===================================================================="
|
|
echo "Applying CORSMiddleware Bearer token authentication patch..."
|
|
echo "===================================================================="
|
|
|
|
# Check if patch file exists
|
|
if [ ! -f "$PATCH_FILE" ]; then
|
|
echo "⚠ Warning: Patch file not found: $PATCH_FILE"
|
|
echo " Skipping CORS Bearer token patch"
|
|
exit 0
|
|
fi
|
|
|
|
# Check if target file exists
|
|
if [ ! -f "$TARGET_FILE" ]; then
|
|
echo "⚠ Warning: Target file not found: $TARGET_FILE"
|
|
echo " Skipping CORS Bearer token patch"
|
|
exit 0
|
|
fi
|
|
|
|
# Check if already patched
|
|
if grep -q "Allow Bearer token authentication for CORS requests" "$TARGET_FILE"; then
|
|
echo "✓ CORSMiddleware already patched for Bearer token support"
|
|
exit 0
|
|
fi
|
|
|
|
echo "Applying patch to CORSMiddleware.php..."
|
|
|
|
# Apply the patch
|
|
cd /var/www/html
|
|
if patch -p1 --dry-run < "$PATCH_FILE" > /dev/null 2>&1; then
|
|
patch -p1 < "$PATCH_FILE"
|
|
echo "✓ Patch applied successfully"
|
|
else
|
|
echo "⚠ Warning: Patch failed to apply (may already be applied or file changed)"
|
|
echo " This is expected if using a Nextcloud version that already includes the fix"
|
|
exit 0
|
|
fi
|
|
|
|
echo ""
|
|
echo "===================================================================="
|
|
echo "✓ CORSMiddleware Bearer token patch applied"
|
|
echo "===================================================================="
|
|
echo ""
|
|
echo "Benefits:"
|
|
echo " • Bearer tokens now work with app-specific APIs (Notes, Calendar, etc.)"
|
|
echo " • OAuth/OIDC authentication works without CORS errors"
|
|
echo " • Stateless API authentication is properly supported"
|
|
echo ""
|