Skip to content

Tweak incus file symlink and permission handling #2592

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
merged 3 commits into from
Oct 29, 2025
Merged

Tweak incus file symlink and permission handling #2592

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80de675
incus/file/pull: Respect target name for symlinks
stgraber Oct 29, 2025
9489d7a
incus/file/pull: Allow reading symlink content to stdout
stgraber Oct 29, 2025
4d75826
incus/file/push: Keep remote owner/mode when present and not overriden
stgraber Oct 29, 2025
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
37 changes: 26 additions & 11 deletions cmd/incus/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,11 +571,7 @@ func (c *cmdFilePull) Run(cmd *cobra.Command, args []string) error {
return err
}

if srcInfo.Mode()&os.ModeSymlink == os.ModeSymlink {
targetIsLink = true
}

// Deal with recursion
// Deal with recursion.
if srcInfo.IsDir() {
if c.file.flagRecursive {
if !util.PathExists(target) {
Expand All @@ -598,13 +594,20 @@ func (c *cmdFilePull) Run(cmd *cobra.Command, args []string) error {
return errors.New(i18n.G("Can't pull a directory without --recursive"))
}

// Determine the target path.
var targetPath string
if targetIsDir {
targetPath = filepath.Join(target, filepath.Base(pathSpec[1]))
} else {
targetPath = target
}

// Unless we're writing to stdout, symlinks get re-created as symlinks.
if srcInfo.Mode()&os.ModeSymlink == os.ModeSymlink && targetPath != "-" {
targetIsLink = true
}

// Prepare target.
var f *os.File
var linkName string

Expand Down Expand Up @@ -652,7 +655,7 @@ func (c *cmdFilePull) Run(cmd *cobra.Command, args []string) error {
}

if targetIsLink {
err = os.Symlink(linkName, srcInfo.Name())
err = os.Symlink(linkName, targetPath)
if err != nil {
progress.Done("")
return err
Expand Down Expand Up @@ -882,15 +885,19 @@ func (c *cmdFilePush) Run(cmd *cobra.Command, args []string) error {
}
}

// Transfer the files
// Transfer the files.
args := incus.InstanceFileArgs{
UID: -1,
GID: -1,
Mode: -1,
}

// Check if the path already exists.
_, err := sftpConn.Stat(fpath)
fileExists := err == nil

if !c.noModeChange {
if c.file.flagMode == "" || c.file.flagUID == -1 || c.file.flagGID == -1 {
if !fileExists && (c.file.flagMode == "" || c.file.flagUID == -1 || c.file.flagGID == -1) {
finfo, err := f.Stat()
if err != nil {
return err
Expand All @@ -911,9 +918,17 @@ func (c *cmdFilePush) Run(cmd *cobra.Command, args []string) error {
}
}

args.UID = int64(uid)
args.GID = int64(gid)
args.Mode = int(mode.Perm())
if !fileExists || c.file.flagUID != -1 {
args.UID = int64(uid)
}

if !fileExists || c.file.flagGID != -1 {
args.GID = int64(gid)
}

if !fileExists || c.file.flagMode != "" {
args.Mode = int(mode.Perm())
}
}

args.Type = "file"
Expand Down