Skip to content
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

Jump to bottom

EnsureFileOwner: cleanup logic #8576

Merged
merged 1 commit into from
Feb 16, 2020
Merged

EnsureFileOwner: cleanup logic #8576

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
40 changes: 25 additions & 15 deletions upup/pkg/fi/files_owner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,28 +33,38 @@ func EnsureFileOwner(destPath string, owner string, groupName string) (bool, err
return changed, fmt.Errorf("error getting file stat for %q: %v", destPath, err)
}

user, err := LookupUser(owner) //user.Lookup(owner)
if err != nil {
return changed, fmt.Errorf("error looking up user %q: %v", owner, err)
}
if user == nil {
return changed, fmt.Errorf("user %q not found", owner)
actualUserID := int(stat.Sys().(*syscall.Stat_t).Uid)
userID := actualUserID
if owner != "" {
user, err := LookupUser(owner) //user.Lookup(owner)
if err != nil {
return changed, fmt.Errorf("error looking up user %q: %v", owner, err)
}
if user == nil {
return changed, fmt.Errorf("user %q not found", owner)
}
userID = user.Uid
}

group, err := LookupGroup(groupName)
if err != nil {
return changed, fmt.Errorf("error looking up group %q: %v", groupName, err)
}
if group == nil {
return changed, fmt.Errorf("group %q not found", owner)
actualGroupID := int(stat.Sys().(*syscall.Stat_t).Gid)
groupID := actualGroupID
if groupName != "" {
group, err := LookupGroup(groupName)
if err != nil {
return changed, fmt.Errorf("error looking up group %q: %v", groupName, err)
}
if group == nil {
return changed, fmt.Errorf("group %q not found", groupName)
}
groupID = group.Gid
}

if int(stat.Sys().(*syscall.Stat_t).Uid) == user.Uid && int(stat.Sys().(*syscall.Stat_t).Gid) == group.Gid {
if actualUserID == userID && actualGroupID == groupID {
return changed, nil
}

klog.Infof("Changing file owner/group for %q to %s:%+v", destPath, owner, group)
err = os.Lchown(destPath, user.Uid, group.Gid)
klog.Infof("Changing file owner/group for %q to %s:%s", destPath, owner, groupName)
err = os.Lchown(destPath, userID, groupID)
if err != nil {
return changed, fmt.Errorf("error setting file owner/group for %q: %v", destPath, err)
}
Expand Down