Skip to content

fix(criteria,engine): route shell commands through shellexec, not direct sh -c #69

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

Merged
tzone85 merged 1 commit into from
Jun 11, 2026
Merged

fix(criteria,engine): route shell commands through shellexec, not direct sh -c #69

Show file tree
Hide file tree
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
9 changes: 7 additions & 2 deletions internal/criteria/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ import (
"context"
"fmt"
"os"
"os/exec"
"path/filepath"
"strings"
"time"

"github.com/jackc/pgx/v5"

"github.com/tzone85/nexus-dispatch/internal/shellexec"
)

// readDatabaseURL returns the DATABASE_URL value from .nxd-db/connect.env in workDir,
Expand Down Expand Up @@ -43,7 +44,11 @@ func evaluateMigrationSucceeds(ctx context.Context, workDir string, c Criterion)
return Result{Criterion: c, Passed: false,
Message: "no .nxd-db/connect.env in worktree — devdb not provisioned for this story"}
}
cmd := exec.CommandContext(ctx, "sh", "-c", c.Command)
// shellexec.CommandContext picks the right shell per OS (sh on Unix,
// cmd.exe on Windows; NXD_SHELL overrides). Direct exec.Command("sh", ...)
// would silently fail on native Windows even for read-only criteria
// evaluation against an externally-provisioned DB.
cmd := shellexec.CommandContext(ctx, c.Command)
cmd.Dir = workDir
cmd.Env = append(os.Environ(), "DATABASE_URL="+dsn)
out, err := cmd.CombinedOutput()
Expand Down
9 changes: 7 additions & 2 deletions internal/engine/investigator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import (
"encoding/json"
"fmt"
"os"
"os/exec"
"path/filepath"
"strings"

"github.com/tzone85/nexus-dispatch/internal/agent"
"github.com/tzone85/nexus-dispatch/internal/llm"
"github.com/tzone85/nexus-dispatch/internal/shellexec"
)

const (
Expand Down Expand Up @@ -266,7 +266,12 @@ func (inv *Investigator) handleRunCommand(ctx context.Context, repoPath string,
return fmt.Sprintf("error: command not in allowlist: %s", params.Command)
}

cmd := exec.CommandContext(ctx, "sh", "-c", params.Command)
// Investigator commands come from the operator-configured allowlist
// (see isCommandAllowed above). Route through shellexec so Windows
// pipelines (cmd.exe) and NXD_SHELL overrides work the same as the
// gemma runtime's run_command tool — direct `sh -c` would silently
// fail on native Windows.
cmd := shellexec.CommandContext(ctx, params.Command)
cmd.Dir = repoPath

output, err := cmd.CombinedOutput()
Expand Down
Loading