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

Fix #239 local_user permission denied #497

Merged
merged 3 commits into from
Jun 19, 2019
Merged

Fix #239 local_user permission denied #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fba983e
fix local user permission denied
thde Jun 14, 2019
1b9397b
fix offenses
thde Jun 14, 2019
5fa2bc4
fix specs
thde Jun 14, 2019
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
12 changes: 12 additions & 0 deletions lib/facter/docker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

require 'facter'
require 'json'
require 'etc'

Facter.add(:docker_systemroot) do
confine osfamily: :windows
Expand Down Expand Up @@ -31,6 +32,17 @@
end
end

Facter.add(:docker_home_dirs) do
confine kernel: 'Linux'
setcode do
home_dirs = {}
Etc.passwd do |user|
home_dirs[user.name] = user.dir
end
home_dirs
end
end

docker_command = if Facter.value(:kernel) == 'windows'
'powershell -NoProfile -NonInteractive -NoLogo -ExecutionPolicy Bypass -c docker'
else
Expand Down
7 changes: 5 additions & 2 deletions manifests/registry.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
$exec_provider = undef
$password_env = "\${password}"
$exec_user = $local_user
$local_user_home = $facts['docker_home_dirs'][$local_user]
}

if $ensure == 'present' {
Expand Down Expand Up @@ -103,11 +104,13 @@
Undef => pw_hash($docker_auth, 'SHA-512', $local_user_strip),
default => $pass_hash
}
$_auth_command = "${auth_cmd} || rm -f \"/root/registry-auth-puppet_receipt_${server_strip}_${local_user}\""
$_auth_command = "${auth_cmd} || rm -f \"/${local_user_home}/registry-auth-puppet_receipt_${server_strip}_${local_user}\""

file { "/root/registry-auth-puppet_receipt_${server_strip}_${local_user}":
file { "/${local_user_home}/registry-auth-puppet_receipt_${server_strip}_${local_user}":
ensure => $ensure,
content => $_pass_hash,
owner => $local_user,
group => $local_user,
notify => Exec["${title} auth"],
}
} else {
Expand Down
3 changes: 3 additions & 0 deletions spec/defines/registry_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
lsbdistcodename: 'jessie',
kernelrelease: '3.2.0-4-amd64',
operatingsystemmajrelease: '8',
docker_home_dirs: {
root: '/root',
},
}
end
let(:params) { { 'version' => '17.06', 'pass_hash' => 'test1234', 'receipt' => false } }
Expand Down