Skip to content

fix: noWatch sync no longer prevents SSH injection #3205

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
raman1236 wants to merge 2 commits into
base: main
Choose a base branch
from
+16 −1
Open

fix: noWatch sync no longer prevents SSH injection #3205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbf7b52
fix: noWatch sync no longer prevents SSH injection
ramanvasi Apr 5, 2026
71b1912
fix: preserve sync:stop event emission for noWatch mode
raman1236 Apr 30, 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
15 changes: 15 additions & 0 deletions pkg/devspace/services/sync/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,21 @@ func (c *controller) startWithWait(ctx devspacecontext.Context, options *Options
}
return nil
})
} else {
// For noWatch syncs: emit sync:stop when context is cancelled or sync
// completes, but do NOT kill the parent tomb (to avoid breaking SSH).
parent.Go(func() error {
select {
case <-ctx.Context().Done():
case <-onDone:
}
client.Stop(nil)
hook.LogExecuteHooks(ctx.WithLogger(options.SyncLog), map[string]interface{}{
"sync_config": options.SyncConfig,
}, hook.EventsForSingle("stop:sync", options.Name).With("sync.stop")...)
ctx.Log().Debugf("Stopped sync %s", options.SyncConfig.Path)
return nil
})
}

return nil
Expand Down
2 changes: 1 addition & 1 deletion pkg/devspace/services/sync/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func startSync(ctx devspacecontext.Context, name, arch string, syncConfig *lates
Arch: arch,
Starter: starter,

RestartOnError: true,
RestartOnError: !syncConfig.NoWatch,
Verbose: ctx.Log().GetLevel() == logrus.DebugLevel,
}

Expand Down