Merge pull request #16 from RandomCoderOrg/7-add-useradd-option

7 add useradd option

Author: SaicharanKandukuri

.gitignore

@@ -1 +1,3 @@
 __pycache__
+logictest.py
+.vscode

bash/adduser.sh

@@ -0,0 +1,62 @@
+#!/bin/bash
+
+# #############################################################################
+#  (C) @RandomCoderOrg @SaicharanKandukuri 2022
+#  A useradd wrapper to add a new non-root user for proot linux container
+# #############################################################################
+
+REQUIRED_DEPS="openssl"
+NOPASSWD=false
+
+# sudo check
+[[ $EUID -ne 0 ]] && die "You need to be root to run this script"
+
+# check for dependencies
+for debs in $REQUIRED_DEPS; do
+    if ! dpkg -s "$debs" >/dev/null 2>&1; then
+        echo "Missing dependency: $debs"
+    fi
+done
+
+# check for arguments
+if [[ $# -le 1 ]]; then
+    echo "Usage: $0 [ -u | --user | --username ] <username> [ -p | --passwd | --password ] <password> [options]"
+    echo "options:"
+    echo "--nopasswd -> do not set a password"
+    exit 1
+fi
+
+while [[ $# -gt 0 ]]; do
+    case $1 in
+    -u | --user | --username)
+        USERNAME="$2"
+        shift 2
+        ;;
+    -p | --passwd | --password)
+        PASSWORD="$2"
+        shift 2
+        ;;
+    --nopasswd) NOPASSWD=true ;;
+    esac
+done
+
+if [ -d /home/$USERNAME ]; then
+    echo "User $USERNAME already exists"
+    exit 1
+fi
+
+echo "creating user $USERNAME"
+if $NOPASSWD; then
+    useradd -m -G sudo -p "$(openssl passwd -1 "$PASSWORD")" -d /home/"$USERNAME" -k /etc/skel -s "$SHELL" "$USERNAME"
+    echo "Adding user $USERNAME to sudoers "
+    echo "$USERNAME" ALL=\(root\) ALL >/etc/sudoers.d/"$USERNAME"
+    chmod 0440 /etc/sudoers.d/"$USERNAME"
+else
+    useradd -m -G sudo -p "$(openssl passwd -1 "$PASSWORD")" -d /home/"$USERNAME" -k /etc/skel -s "$SHELL" "$USERNAME"
+    echo "Adding user $USERNAME to sudoers"
+    echo "$USERNAME" ALL=\(root\) NOPASSWD: ALL >/etc/sudoers.d/"$USERNAME"
+    chmod 0440 /etc/sudoers.d/"$USERNAME"
+fi
+
+# TODO: copy user layout from root to new user
+echo "Done"

install.sh

@@ -66,6 +66,10 @@ if [[ -f /usr/bin/udroid-upgrade ]]; then
     rm -rvf /usr/bin/udroid-upgrade
 fi
 
+if [[ -f /usr/bin/udroid-adduser ]]; then
+    rm -rvf /usr/bin/udroid-adduser
+fi
+
 ln -sv /usr/share/udroid/main.sh /usr/bin/startvnc || {
     die "Failed to create symlink"
 }
@@ -78,5 +82,8 @@ ln -sv /usr/share/udroid/main.sh /usr/bin/udroid-upgrade-check || {
 ln -sv /usr/share/udroid/main.sh /usr/bin/udroid-upgrade || {
     die "Failed to create symlink"
 }
+ln -sv /usr/share/udroid/bash/adduser.sh /usr/bin/udroid-adduser || {
+    die "Failed to create symlink"
+}
 
 shout "Installation Complete."

utils/pkgresolver.py

@@ -0,0 +1,42 @@
+import os
+import logging
+
+
+def resolvdep(deps: list):
+    """Function to check & install debian dependencies
+
+    Args:
+        deps (list): dependencies in standard python list format
+
+    ENV:
+        FORCE_RESOLV_DEPS : set this os environment varibale to force install missing dependencies
+
+    Returns:
+        1: when missing dependencie
+        2: when installation failed
+        0: normal successfull exit
+    """
+    missing_deps    =   None
+    installdeps     =   None
+
+    for dep in deps:
+        if os.WEXITSTATUS(os.system(f"which {dep} >> /dev/null")):
+            logging.info(f"{dep} found in path.")
+            
+            if os.getenv('FORCE_RESOLV_DEPS') is not None:
+                installdeps += dep
+            else:
+                missing_deps += dep
+                logging.warning(f"Missing dependencie {dep}.")
+
+    # check if any missing dependencies
+    if missing_deps is not None:
+        return 1
+
+    # finally try to install dependencies
+    if installdeps is not None:
+        logging.info(f"Installing dependencies: [{installdeps}]")
+        if os.WEXITSTATUS(os.system(f"apt install -y {installdeps}")) != 0:
+            return 2
+    else:
+        return 0