Skip to content

Resolve merge conflicts and fix critical mcp security vulnerabilities #3223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 7 commits into from
Closed

Resolve merge conflicts and fix critical mcp security vulnerabilities #3223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9c9813d
fix(time): Fix `McpError` constructor usage in time server
koic Jan 17, 2026
55a3056
Merge pull request #3222 from koic/fix_time_mcp_erro_constructor
olaservo Jan 17, 2026
d3d5866
Initial plan
Copilot Jan 17, 2026
dd9c5e5
Merge origin/main to resolve dependency conflicts
Copilot Jan 17, 2026
68fbd87
Resolve merge conflicts by accepting main branch changes
Copilot Jan 17, 2026
e8c36d4
Fix security vulnerabilities by updating mcp to >=1.23.0 in all packages
Copilot Jan 17, 2026
e8dd2af
Regenerate lock files to use secure mcp version 1.25.0
Copilot Jan 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/fetch/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ classifiers = [
dependencies = [
"httpx<0.28",
"markdownify>=0.13.1",
"mcp>=1.1.3",
"mcp>=1.23.0",
"protego>=0.3.1",
"pydantic>=2.0.0",
"readabilipy>=0.2.0",
Expand Down
39 changes: 19 additions & 20 deletions src/fetch/uv.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/git/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ classifiers = [
dependencies = [
"click>=8.1.7",
"gitpython>=3.1.45",
"mcp>=1.0.0",
"mcp>=1.23.0",
"pydantic>=2.0.0",
]

Expand Down
27 changes: 13 additions & 14 deletions src/git/uv.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/time/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ classifiers = [
"Programming Language :: Python :: 3.10",
]
dependencies = [
"mcp>=1.0.0",
"mcp>=1.23.0",
"pydantic>=2.0.0",
"tzdata>=2024.2",
"tzlocal>=5.3.1"
"tzlocal>=5.3.1",
]

[project.scripts]
Expand Down
4 changes: 2 additions & 2 deletions src/time/src/mcp_server_time/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

from mcp.server import Server
from mcp.server.stdio import stdio_server
from mcp.types import Tool, TextContent, ImageContent, EmbeddedResource
from mcp.types import Tool, TextContent, ImageContent, EmbeddedResource, ErrorData, INVALID_PARAMS
from mcp.shared.exceptions import McpError

from pydantic import BaseModel
Expand Down Expand Up @@ -54,7 +54,7 @@ def get_zoneinfo(timezone_name: str) -> ZoneInfo:
try:
return ZoneInfo(timezone_name)
except Exception as e:
raise McpError(f"Invalid timezone: {str(e)}")
raise McpError(ErrorData(code=INVALID_PARAMS, message=f"Invalid timezone: {str(e)}"))


class TimeServer:
Expand Down
Loading