Merge pull request #52 from vcf/topic/sshedi/crypt

Use mkpasswd to generate password hash

Author: oliverkurth

docker/Dockerfile

@@ -18,7 +18,7 @@ RUN tdnf ${TDNF_OPTIONS} makecache && \
     git && \
     rm -rf /var/cache/tdnf
 
-RUN cd / && git clone https://github.com/vmware/photon-os-installer.git
+RUN cd / && git clone --depth 1 https://github.com/vmware/photon-os-installer.git
 
 
 # this stage is a place holder that can be overidden with the
@@ -64,6 +64,7 @@ RUN tdnf ${TDNF_OPTIONS} makecache && \
     qemu-img \
     open-vmdk \
     stig-hardening \
+    mkpasswd \
     $([ "${TARGETARCH}" == "amd64" ] && echo grub2-pc) && \
     rm -rf /var/cache/tdnf
 

docker/build-rpms.sh

@@ -32,7 +32,6 @@ fi
 
 tdnf install -y ${TDNF_OPTIONS} "${BUILD_REQUIRES[@]}"
 
-mkdir -p ${RPM_BUILD_DIR}
 mkdir -p ${RPM_BUILD_DIR}/{SOURCES,BUILD,RPMS,SRPMS}
 mv ${TARBALL} ${RPM_BUILD_DIR}/SOURCES/
 

examples/iso/packages_installer_initrd.json

@@ -30,14 +30,14 @@
     "grub2-efi-image",
     "grub2-theme",
     "gzip",
-    "haveged",
     "libcap",
     "libffi",
     "libgcc",
     "libstdc++",
     "linux",
     "lua",
     "lvm2",
+    "mkpasswd",
     "ncurses",
     "ncurses-terminfo",
     "nspr",
@@ -46,10 +46,8 @@
     "pcre",
     "popt",
     "python3",
-    "python3",
     "python3-cracklib",
     "python3-curses",
-    "python3-libs",
     "python3-requests",
     "readline",
     "rpm",
@@ -58,7 +56,6 @@
     "sqlite",
     "stig-hardening",
     "systemd",
-    "systemd-libs",
     "systemd-pam",
     "systemd-udev",
     "tar",

photon-os-installer.spec

@@ -33,10 +33,12 @@ Requires: grub2-pc
 Requires: gzip
 Requires: kpartx
 Requires: lvm2
+Requires: mkpasswd
 # needed for --rpmdefine option
 Requires: tdnf >= 3.5.6
 Requires: zlib
 
+Requires: python3
 Requires: python3-pyOpenSSL
 Requires: python3-requests
 Requires: python3-cracklib

photon_installer/commandutils.py

@@ -5,7 +5,6 @@
 #
 
 import copy
-import crypt
 import glob
 import json
 import os
@@ -142,8 +141,13 @@ def is_vmware_virtualization():
 
     @staticmethod
     def generate_password_hash(password):
-        """Generate hash for the password"""
-        return crypt.crypt(password)
+        result = subprocess.run(
+            ["mkpasswd", "-m", "sha-512", password],
+            capture_output=True,
+            text=True,
+            check=True
+        )
+        return result.stdout.strip()
 
     @staticmethod
     def _requests_get(url, verify):

photon_installer/packages_installer_initrd.json

@@ -30,14 +30,14 @@
         "grub2-efi-image",
         "grub2-theme",
         "gzip",
-        "haveged",
         "libcap",
         "libffi",
         "libgcc",
         "libstdc++",
         "linux",
         "lua",
         "lvm2",
+        "mkpasswd",
         "ncurses",
         "ncurses-terminfo",
         "nspr",
@@ -49,7 +49,6 @@
         "python3",
         "python3-cracklib",
         "python3-curses",
-        "python3-libs",
         "python3-requests",
         "readline",
         "rpm",
@@ -58,7 +57,6 @@
         "sqlite",
         "stig-hardening",
         "systemd",
-        "systemd-libs",
         "systemd-pam",
         "systemd-udev",
         "tar",