From 69072cb80f8c4b7f6eff0c7cdfe6545fe59ea7b5 Mon Sep 17 00:00:00 2001
From: Martin Basti <mbasti@redhat.com>
Date: Feb 10 2017 13:03:04 +0000
Subject: py3: change_admin_password: use textual mode


Convert function to NamedTemporaryFile with textual mode, because
passwords are text. Using `with` and NamedTemporaryFile gives more
security agains leaking password from tempfiles.

https://fedorahosted.org/freeipa/ticket/4985

Reviewed-By: Jan Cholasta <jcholast@redhat.com>

---

diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index ceb7bf3..8e979a7 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -951,21 +951,19 @@ class DsInstance(service.Service):
 
     def change_admin_password(self, password):
         root_logger.debug("Changing admin password")
-        dmpwdfile = ""
-        admpwdfile = ""
 
-        try:
-            (dmpwdfd, dmpwdfile) = tempfile.mkstemp(dir=paths.VAR_LIB_IPA)
-            os.write(dmpwdfd, self.dm_password)
-            os.close(dmpwdfd)
+        dir_ipa = paths.VAR_LIB_IPA
+        with tempfile.NamedTemporaryFile("w", dir=dir_ipa) as dmpwdfile, \
+                tempfile.NamedTemporaryFile("w", dir=dir_ipa) as admpwdfile:
+            dmpwdfile.write(self.dm_password)
+            dmpwdfile.flush()
 
-            (admpwdfd, admpwdfile) = tempfile.mkstemp(dir=paths.VAR_LIB_IPA)
-            os.write(admpwdfd, password)
-            os.close(admpwdfd)
+            admpwdfile.write(password)
+            admpwdfile.flush()
 
             args = [paths.LDAPPASSWD, "-h", self.fqdn,
                     "-ZZ", "-x", "-D", str(DN(('cn', 'Directory Manager'))),
-                    "-y", dmpwdfile, "-T", admpwdfile,
+                    "-y", dmpwdfile.name, "-T", admpwdfile.name,
                     str(DN(('uid', 'admin'), ('cn', 'users'), ('cn', 'accounts'), self.suffix))]
             try:
                 env = {'LDAPTLS_CACERTDIR': os.path.dirname(paths.IPA_CA_CRT),
@@ -976,12 +974,6 @@ class DsInstance(service.Service):
                 print("Unable to set admin password", e)
                 root_logger.debug("Unable to set admin password %s" % e)
 
-        finally:
-            if os.path.isfile(dmpwdfile):
-                os.remove(dmpwdfile)
-            if os.path.isfile(admpwdfile):
-                os.remove(admpwdfile)
-
     def uninstall(self):
         if self.is_configured():
             self.print_msg("Unconfiguring directory server")