modelcontextprotocol/go-sdk
Watch
1
0
Fork
You've already forked go-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

mcp: finalize cleanup of Go 1.23, make Go version support explicit

Browse source
This commit is contained in:
Maciek Kisiel 2026-02-05 13:59:52 +00:00 • committed by Maciej Kisiel
commit 6a19c95fea
3 changed files with 24 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

17
mcp/resource.go
View file

@ -113,6 +113,23 @@ func computeURIFilepath(rawURI, dirFilepath string, rootFilepaths []string) (str
return uriFilepathRel, nil
}
// withFile calls f on the file at join(dir, rel),
// protecting against path traversal attacks.
func withFile(dir, rel string, f func(*os.File) error) (err error) {
r, err := os.OpenRoot(dir)
if err != nil {
return err
}
defer r.Close()
file, err := r.Open(rel)
if err != nil {
return err
}
// Record error, in case f writes.
defer func() { err = errors.Join(err, file.Close()) }()
return f(file)
}
// fileRoots transforms the Roots obtained from the client into absolute paths on
// the local filesystem.
// TODO(jba): expose this functionality to user ResourceHandlers,

29
mcp/resource_go124.go
View file

@ -1,29 +0,0 @@
// Copyright 2025 The Go MCP SDK Authors. All rights reserved.
// Use of this source code is governed by an MIT-style
// license that can be found in the LICENSE file.
//go:build go1.24
package mcp
import (
"errors"
"os"
)
// withFile calls f on the file at join(dir, rel),
// protecting against path traversal attacks.
func withFile(dir, rel string, f func(*os.File) error) (err error) {
r, err := os.OpenRoot(dir)
if err != nil {
return err
}
defer r.Close()
file, err := r.Open(rel)
if err != nil {
return err
}
// Record error, in case f writes.
defer func() { err = errors.Join(err, file.Close()) }()
return f(file)
}

25
mcp/resource_pre_go124.go
View file

@ -1,25 +0,0 @@
// Copyright 2025 The Go MCP SDK Authors. All rights reserved.
// Use of this source code is governed by an MIT-style
// license that can be found in the LICENSE file.
//go:build !go1.24
package mcp
import (
"errors"
"os"
"path/filepath"
)
// withFile calls f on the file at join(dir, rel).
// It does not protect against path traversal attacks.
func withFile(dir, rel string, f func(*os.File) error) (err error) {
file, err := os.Open(filepath.Join(dir, rel))
if err != nil {
return err
}
// Record error, in case f writes.
defer func() { err = errors.Join(err, file.Close()) }()
return f(file)
}