The installer now sets the root password.

diff --git a/src/pomona/src/installer.py b/src/pomona/src/installer.py
index b26b8bf1f41971eee22fc7904340d75d06362804..204f0ec33632de128a0d6b467cf0fa6b4a8fcb3c 100644 (file)
--- a/src/pomona/src/installer.py
+++ b/src/pomona/src/installer.py
@@ -20,6 +20,7 @@
 ###############################################################################
 
 import sys, os, re
+import users
 from optparse import OptionParser
 import inutil, isys, dispatch
 from flags import flags
@@ -172,6 +173,7 @@ if __name__ == "__main__":
 
     pomona.id = instClass.installDataClass(pomona)
     instClass.setInstallData(pomona)
+    users.createLuserConf(pomona.rootPath)
 
     pomona.setDispatch()
 

diff --git a/src/pomona/src/instdata.py b/src/pomona/src/instdata.py
index 4690e5dc78c6214feb20db435db993ca0a0780fb..74637fbc23cdbc3c16ebda8692c97bf6fe958ee3 100644 (file)
--- a/src/pomona/src/instdata.py
+++ b/src/pomona/src/instdata.py
@@ -23,7 +23,7 @@ import fsset
 import bootloader
 import partitions
 import partedUtils
-#import users
+import users
 from flags import *
 from constants import *
 
@@ -64,10 +64,10 @@ class InstallData:
         #self.timezone.write(pomona.rootPath)
         #self.network.write(pomona.rootPath)
 
-        #self.users = users.Users()
+        self.users = users.Users()
 
         # User should already exist, just without a password.
-        #self.users.setRootPassword(self.rootPassword["password"])
+        self.users.setRootPassword(self.rootPassword["password"])
 
     def __init__(self, pomona):
         self.instLanguage = language.Language()

diff --git a/src/pomona/src/pomona b/src/pomona/src/pomona
index 84fa4439131d1019546d5d34cbd0992dd04f7dba..42d72d0b4ebc9d96c1b553d294af52d394cd73d2 100644 (file)
--- a/src/pomona/src/pomona
+++ b/src/pomona/src/pomona
@@ -25,6 +25,8 @@
 #                                                                             #
 ###############################################################################
 
+export LIBUSER_CONF=/etc/libuser.conf
+
 echo "Running the Pomona Text Installer..."
 sleep 2
 

diff --git a/src/pomona/src/users.py b/src/pomona/src/users.py
new file mode 100644 (file)
index 0000000..bb11788
--- /dev/null
+++ b/src/pomona/src/users.py
@@ -0,0 +1,157 @@
+#
+# users.py:  Code for creating user accounts and setting the root password
+#
+# Copyright (C) 2006, 2007, 2008 Red Hat, Inc.  All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author(s): Chris Lumens <clumens@redhat.com>
+#
+
+import libuser
+import string
+import crypt
+import random
+import tempfile
+import os
+import os.path
+
+import logging
+log = logging.getLogger("pomona")
+
+def createLuserConf(instPath, algoname='sha512'):
+    """Writes a libuser.conf for instPath."""
+    if os.getenv("LIBUSER_CONF") and \
+       os.access(os.environ["LIBUSER_CONF"], os.R_OK):
+        fn = os.environ["LIBUSER_CONF"]
+        fd = open(fn, 'w')
+    else:
+        (fp, fn) = tempfile.mkstemp(prefix="libuser.")
+        fd = os.fdopen(fp, 'w')
+
+    buf = """
+[defaults]
+skeleton = %(instPath)s/etc/skel
+mailspooldir = %(instPath)s/var/mail
+crypt_style = %(algo)s
+modules = files shadow
+create_modules = files shadow
+[files]
+directory = %(instPath)s/etc
+[shadow]
+directory = %(instPath)s/etc
+""" % {"instPath": instPath, "algo": algoname}
+
+    fd.write(buf)
+    fd.close()
+    os.environ["LIBUSER_CONF"] = fn
+
+# These are explained in crypt/crypt-entry.c in glibc's code.  The prefixes
+# we use for the different crypt salts:
+#     $1$    MD5
+#     $5$    SHA256
+#     $6$    SHA512
+def cryptPassword(password, algo=None):
+    salts = {'md5': '$1$', 'sha256': '$5$', 'sha512': '$6$', None: ''}
+    saltstr = salts[algo]
+    saltlen = 2
+
+    if algo == 'md5' or algo == 'sha256' or algo == 'sha512':
+        saltlen = 16
+
+    for i in range(saltlen):
+        saltstr = saltstr + random.choice(string.letters +
+                                           string.digits + './')
+
+    return crypt.crypt(password, saltstr)
+
+class Users:
+    def __init__ (self):
+        self.admin = libuser.admin()
+
+    def createUser(self, name=None, password=None, isCrypted=False, groups=[],
+                    homedir=None, shell=None, uid=None, algo=None, lock=False,
+                    root="/mnt/target"):
+        childpid = os.fork()
+
+        if not childpid:
+            os.chroot(root)
+
+            del(os.environ["LIBUSER_CONF"])
+            self.admin = libuser.admin()
+
+            try:
+                if self.admin.lookupUserByName(name):
+                    os._exit(1)
+
+                userEnt = self.admin.initUser(name)
+                groupEnt = self.admin.initGroup(name)
+
+                grpLst = filter(lambda grp: grp,
+                                map(lambda name: self.admin.lookupGroupByName(name), groups))
+                userEnt.set(libuser.GIDNUMBER, [groupEnt.get(libuser.GIDNUMBER)[0]] +
+                            map(lambda grp: grp.get(libuser.GIDNUMBER)[0], grpLst))
+
+                if not homedir:
+                    homedir = "/home/" + name
+
+                userEnt.set(libuser.HOMEDIRECTORY, homedir)
+
+                if shell:
+                    userEnt.set(libuser.LOGINSHELL, shell)
+
+                if uid >= 0:
+                    userEnt.set(libuser.UIDNUMBER, uid)
+
+                self.admin.addUser(userEnt)
+                self.admin.addGroup(groupEnt)
+
+                if password:
+                    if isCrypted:
+                        self.admin.setpassUser(userEnt, password, True)
+                    else:
+                        self.admin.setpassUser(userEnt,
+                                            cryptPassword(password, algo=algo),
+                                            True)
+
+                if lock:
+                    self.admin.lockUser(userEnt)
+
+                # Add the user to all the groups they should be part of.
+                for grp in grpLst:
+                    grp.add(libuser.MEMBERNAME, name)
+                    self.admin.modifyGroup(grp)
+
+                os._exit(0)
+            except Exception, e:
+                log.critical("Error when creating new user: %s" % str(e))
+                os._exit(1)
+
+        try:
+            (pid, status) = os.waitpid(childpid, 0)
+        except OSError, (num, msg):
+            log.critical("exception from waitpid while creating a user: %s %s" % (num, msg))
+            return False
+
+        if os.WIFEXITED(status) and (os.WEXITSTATUS(status) == 0):
+            return True
+        else:
+            return False
+
+    def setRootPassword(self, password, algo=None):
+        rootUser = self.admin.lookupUserByName("root")
+
+        self.admin.setpassUser(rootUser, cryptPassword(password, algo=algo), True)
+
+        self.admin.modifyUser(rootUser)