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

Fix unsafe interpolations #394

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix unsafe interpolations #394

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
4 changes: 2 additions & 2 deletions manifests/server/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
# preseeding files so we need to manualy bootstrap cn=config (but not the
# databases).
exec { 'bootstrap cn=config':
command => "/bin/sed -e 's/@BACKEND@/mdb/g' -e '/^# The database definition.$/q' /usr/share/slapd/slapd.init.ldif | /usr/sbin/slapadd -F ${openldap::server::confdir} -b cn=config",
command => "/bin/sed -e 's/@BACKEND@/mdb/g' -e '/^# The database definition.$/q' /usr/share/slapd/slapd.init.ldif | /usr/sbin/slapadd -F ${openldap::server::confdir.stdlib::shell_escape} -b cn=config",
provider => 'shell',
creates => "${openldap::server::confdir}/cn=config.ldif",
user => $openldap::server::owner,
Expand Down Expand Up @@ -162,7 +162,7 @@
$ldif = file('openldap/cn-config.ldif')
exec { 'bootstrap cn=config':
path => '/usr/local/sbin',
command => "echo '${ldif}' | slapadd -n 0 -F ${openldap::server::confdir}",
command => "echo ${ldif.stdlib::shell_escape} | slapadd -n 0 -F ${openldap::server::confdir.stdlib::shell_escape}",
creates => "${openldap::server::confdir}/cn=config.ldif",
provider => 'shell',
user => $openldap::server::owner,
Expand Down
2 changes: 1 addition & 1 deletion manifests/server/install.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# installation will succed. The module will then be able to tune slapd
# accoding to the user needs and finally start (and unmak) the service.
exec { 'mask-before-openldap-install':
command => "systemctl mask ${openldap::server::service}",
command => "systemctl mask ${openldap::server::service.stdlib::shell_escape}",
unless => 'test -x /usr/sbin/slapd',
creates => "/etc/systemd/system/${openldap::server::service}.service",
path => '/bin:/usr/bin',
Expand Down
Loading