Skip to content

fix(local): add IsDir checks to Read/Write/Edit to prevent directory-as-file errors #932

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

Open
luchun19921229 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(local): add IsDir checks to Read/Write/Edit to prevent directory-as-file errors #932

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions adk/backend/local/local.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,9 @@ func (s *Local) Read(ctx context.Context, req *filesystem.ReadRequest) (*filesys
if err != nil {
return nil, fmt.Errorf("failed to stat file: %w", err)
}
if info.IsDir() {
return nil, fmt.Errorf("path is a directory, not a file: %s", path)
}
if info.Size() == 0 {
return &filesystem.FileContent{}, nil
}
Expand Down Expand Up @@ -891,6 +894,10 @@ func (s *Local) GlobInfo(ctx context.Context, req *filesystem.GlobInfoRequest) (
func (s *Local) Write(ctx context.Context, req *filesystem.WriteRequest) error {
path := filepath.Clean(req.FilePath)

if fi, statErr := os.Stat(path); statErr == nil && fi.IsDir() {
return fmt.Errorf("path is a directory, not a file: %s", path)
}

parentDir := filepath.Dir(path)
if err := os.MkdirAll(parentDir, 0755); err != nil {
return fmt.Errorf("failed to create parent directory: %w", err)
Expand Down Expand Up @@ -920,6 +927,10 @@ func (s *Local) Edit(ctx context.Context, req *filesystem.EditRequest) error {
return fmt.Errorf("new string must be different from old string")
}

if fi, statErr := os.Stat(path); statErr == nil && fi.IsDir() {
return fmt.Errorf("path is a directory, not a file: %s", path)
}

content, err := os.ReadFile(path)
if err != nil {
return fmt.Errorf("failed to read file: %w", err)
Expand Down
Loading