summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/dsinstance.py
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2011-06-17 14:19:45 +0200
committerRob Crittenden <rcritten@redhat.com>2011-06-21 23:45:00 -0400
commitb227208d010bf88a11c46149ac5844c4a55ab9ad (patch)
tree5bbfe6b3f803995394de1b089c5d09bbf9bf2f8b /ipaserver/install/dsinstance.py
parentba42b700eb98978fa5403bf5e39f9c9e31338fb4 (diff)
downloadfreeipa-b227208d010bf88a11c46149ac5844c4a55ab9ad.zip
freeipa-b227208d010bf88a11c46149ac5844c4a55ab9ad.tar.gz
freeipa-b227208d010bf88a11c46149ac5844c4a55ab9ad.tar.xz
Fix IPA install for secure umask
Make sure that IPA can be installed with root umask set to secure value 077. ipa-server-install was failing in DS configuration phase when dirsrv tried to read boot.ldif created during installation. https://fedorahosted.org/freeipa/ticket/1282
Diffstat (limited to 'ipaserver/install/dsinstance.py')
-rw-r--r--ipaserver/install/dsinstance.py39
1 files changed, 23 insertions, 16 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index 574a5af..9033b7b 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -358,10 +358,13 @@ class DsInstance(service.Service):
self.sub_dict['BASEDC'] = self.realm_name.split('.')[0].lower()
base_txt = ipautil.template_str(BASE_TEMPLATE, self.sub_dict)
logging.debug(base_txt)
- base_fd = file("/var/lib/dirsrv/boot.ldif", "w")
- base_fd.write(base_txt)
- base_fd.flush()
- base_fd.close()
+ old_umask = os.umask(022) # must be readable for dirsrv
+ try:
+ base_fd = open("/var/lib/dirsrv/boot.ldif", "w")
+ base_fd.write(base_txt)
+ base_fd.close()
+ finally:
+ os.umask(old_umask)
inf_txt = ipautil.template_str(INF_TEMPLATE, self.sub_dict)
logging.debug("writing inf template")
@@ -394,21 +397,25 @@ class DsInstance(service.Service):
os.remove("/var/lib/dirsrv/boot.ldif")
def __add_default_schemas(self):
- shutil.copyfile(ipautil.SHARE_DIR + "60kerberos.ldif",
- schema_dirname(self.serverid) + "60kerberos.ldif")
- shutil.copyfile(ipautil.SHARE_DIR + "60samba.ldif",
- schema_dirname(self.serverid) + "60samba.ldif")
- shutil.copyfile(ipautil.SHARE_DIR + "60ipaconfig.ldif",
- schema_dirname(self.serverid) + "60ipaconfig.ldif")
- shutil.copyfile(ipautil.SHARE_DIR + "60basev2.ldif",
- schema_dirname(self.serverid) + "60basev2.ldif")
- shutil.copyfile(ipautil.SHARE_DIR + "60ipasudo.ldif",
- schema_dirname(self.serverid) + "60ipasudo.ldif")
+ pent = pwd.getpwnam(DS_USER)
+ for schema_fname in ("60kerberos.ldif",
+ "60samba.ldif",
+ "60ipaconfig.ldif",
+ "60basev2.ldif",
+ "60ipasudo.ldif"):
+ target_fname = schema_dirname(self.serverid) + schema_fname
+ shutil.copyfile(ipautil.SHARE_DIR + schema_fname, target_fname)
+ os.chmod(target_fname, 0440) # read access for dirsrv user/group
+ os.chown(target_fname, pent.pw_uid, pent.pw_gid)
+
try:
shutil.move(schema_dirname(self.serverid) + "05rfc2247.ldif",
schema_dirname(self.serverid) + "05rfc2247.ldif.old")
- shutil.copyfile(ipautil.SHARE_DIR + "05rfc2247.ldif",
- schema_dirname(self.serverid) + "05rfc2247.ldif")
+
+ target_fname = schema_dirname(self.serverid) + "05rfc2247.ldif"
+ shutil.copyfile(ipautil.SHARE_DIR + "05rfc2247.ldif", target_fname)
+ os.chmod(target_fname, 0440)
+ os.chown(target_fname, pent.pw_uid, pent.pw_gid)
except IOError:
# Does not apply with newer DS releases
pass