Fix pub key check for info display

Still used old key value separator and was missing new added
user_list.txt file blocks

Readme.md

@@ -16,25 +16,39 @@ chown root. users
 chgrp 600 users
 ```
 
+Alternate download: `git clone http://gitlab-ap.factory.tools/scripts-collections/aws-user-create.git users`
+
 ## Folders
 
 Inside the base folder there are
 * ssh-keygen for temporary holding the PEM/PUB files
 * zip file which holds the created user list, password and PEM/PUB files
 
+## Options
+
+### -t (test)
+
+Run in test mode. This will *NOT* create any groups or users. Nor will it create any ssh key files.
+`user_password` output file will be written with `.TEST` extension
+
+### -i (info)
+
+Do not created anything at all, just print out info strings
+
 ## User list creation
 
 In the `/root/users/` folder there needs to be a file called '*user_list.txt*'
 
 This is a CSV type file with the following layout
 
-ID | Username | Group | Optional Password | Override host name
--|-|-|-|-
+ID | Username | Group | Optional Password | Override host name | Override ssh key type
+-|-|-|-|-|-
 
 The ID, Username and Group column must be filled.
 For sub groups add them with a *,* The first group is the master group
 If the password column is filled, the string from here will be used as the PEM Key password.
 If a override hostname is set it will be used instead of `hostname`
+If the ssh key type is set, it will override the default *ed25519* type. This is not recommended. Only *rsa* is allowed. This is for setting up backwards compatible lists.
 
 The ID can be any string in any form.
 It can also be left empty. It is not used at the moment
@@ -128,7 +142,7 @@ If the user has been created, the creating will be skipped
 
 ## Script output
 
-The generated users and the passwords are stored in the '*user_password.txt*' file
+The generated users and the passwords are stored in the '*user_password.YYYYMMDD-hhmmss.txt*' file
 
 For above the output will be
 ```
@@ -154,6 +168,10 @@ This file should be copied localy and then removed from the server
 
 **NOTE** Do not remove the public key data in `ssh-keygen-created-pub/` or the script will create new keys for users in the `user_list.txt` file
 
+## SSH helper
+
+change password or extract public key from pem file
+
 ### PEM key password reset
 
 The SSH PEM key password can be reset or changed with

bin/user_create.sh

@@ -2,17 +2,18 @@
 
 # * input file
 # user_list.txt
-# <ignored id>;<user name>;<group>[;override password][;override hostname]
+# <ignored id>;<user name>;<group>[,sub group,sub group];[override password];[override hostname];[override ssh key type]
 # lines with # are skipped
 # already created users are skipped
+# Mandatory: <ignored id>;<user name>;<group>
 # * output file
 # <date>;<target connect host name>;<hostname>;<username>;<password>
 # If already existing PEM key is used then <password> is [ALREADY SET]
 #
 # * PEM KEY
-# <hostname>%<group>%<user>%<ssh key type>.pem
+# <hostname>#<group>#<user>#<ssh key type>.pem
 # * PUBLIC KEY
-# <hostname>%<group>%<user>%<ssh key type>.pem.pub
+# <hostname>#<group>#<user>#<ssh key type>.pem.pub
 # stored as zip in
 # zip/
 #
@@ -21,12 +22,16 @@
 # They pem pub key must follow the set rules above
 
 # SET TO 1 to TEST [will no create user/group/folder]
-TEST=0;
-while getopts ":t" opt; do
+TEST=0; # no creation except ssh keys
+INFO=0; # no creation of anything, just print info strings
+while getopts ":ti" opt; do
 	case "${opt}" in
 		t|test)
 			TEST=1;
 			;;
+		i|info)
+			INFO=1;
+			;;
 	esac;
 done;
 # hostname for output file only
@@ -71,7 +76,7 @@ if [ $(stat -c %a .) != "600" ]; then
 	echo "!!!! RECOMMENDED TO HAVE BASE FOLDER SET TO '600' AND USER 'root' !!!!"
 fi;
 if [ $(whoami) != "root" ]; then
-	if [ ${TEST} -eq 0 ]; then
+	if [ ${TEST} -eq 0 ] && [ ${INFO} -eq 0 ]; then
 		echo "Script must be run as root user";
 		exit;
 	else
@@ -83,8 +88,8 @@ cat "${root_folder}${input_file}" |
 while read i; do
 	# skip rows start with # (comment)
 	if [[ "${i}" =~ ^\# ]]; then
-		echo -e "";
-	else
+		continue;
+	fi;
 	# make lower case, remove spaces
 	user=$(echo "${i}" | cut -d ";" -f 2 | tr A-Z a-z | tr -d ' ');
 	_group=$(echo "${i}" | cut -d ";" -f 3 | tr A-Z a-z | tr -d ' ');
@@ -105,20 +110,17 @@ while read i; do
 	fi;
 			# do we have a password preset
 	_password=$(echo "${i}" | cut -d ";" -f 4);
+	_ssh_keytype=$(echo "${i}" | cut -d ";" -f 6 | tr A-Z a-z | tr -d ' ');
+	if [ "${_ssh_keytype}" = "rsa" ]; then
+		ssh_keytype="${_ssh_keytype}";
+		#echo "[!!] BACKWARDS COMPATIBLE RSA TYPE SELECTION [!!]";
+	fi;
 	# user & group not set
 	if [ -z "${user}" ] || [ -z "${_group}" ]; then
 		echo "[!!!!!] Missing user or group entry for ${user}/${_group}";
-			echo "[ABORT RUN]"
+		echo "[*** ABORT RUN ***]"
 		break;
 	fi;
-		# add group for each entry in _group
-		for create_group in ${_group//,/ }; do
-			if [ ${TEST} -eq 0 ]; then
-				groupadd -f ${create_group};
-			else
-				echo "$> groupadd -f ${create_group}";
-			fi;
-		done;
 	# SSH file name part without folder
 	ssh_keygen_id="${hostname}${separator}${group}${separator}${user}${separator}${ssh_keytype}.pem";
 	# the full file including folder name
@@ -127,6 +129,29 @@ while read i; do
 	ssh_keyfile_pub="${ssh_keyfile}.pub";
 	# check existing pub file
 	ssh_keyfile_check_pub="${root_folder}${ssh_keygen_folder_created_pub}${ssh_keygen_id}.pub";
+
+	if [ ${INFO} -eq 1 ]; then
+		# test if pub file exists or not, test if user exists
+		echo -n "User: '${user}:${group}(${sub_group})', SSH: ${ssh_keygen_id}";
+		if getent passwd ${user} > /dev/null 2>&1; then
+			echo -n ", User exists";
+		fi;
+		if [ -f "${ssh_keyfile_check_pub}" ]; then
+			echo -n ", SSH Pub key OK";
+		fi;
+		# line break
+		echo "";
+		continue;
+	fi;
+
+	# add group for each entry in _group
+	for create_group in ${_group//,/ }; do
+		if [ ${TEST} -eq 0 ]; then
+			groupadd -f ${create_group};
+		else
+			echo "$> groupadd -f ${create_group}";
+		fi;
+	done;
 	# check if user is not already created
 	if getent passwd ${user} > /dev/null 2>&1; then
 		echo "-- Skip '${user}:${group}(${sub_group})'";
@@ -151,11 +176,15 @@ while read i; do
 		fi;
 		# create SSH key
 		echo " > Create ssh key-pair '${ssh_keyfile}'";
+		if [ ${TEST} -eq 0 ]; then
 			ssh-keygen \
 				-t ${ssh_keytype} \
 				-f "${ssh_keyfile}" \
 				-C "${hostname}: ${user}@${group}" \
 				-a 100 -N "${password}"
+		else
+			echo "$> ssh-keygen -t ${ssh_keytype} -f ${ssh_keyfile} -C ${hostname}: ${user}@${group} -a 100 -N ${password}";
+		fi;
 	else
 		found=$(grep "$(cat ${ssh_keyfile_check_pub})" /home/${user}/.ssh/authorized_keys);
 		if [ ! -z "${found}" ]; then
@@ -171,7 +200,11 @@ while read i; do
 	fi;
 	if [ ${skip_ssh} -eq 0 ]; then
 		# write login info to output file
+		if [ ${TEST} -eq 0 ]; then
 			echo $(date +"%F %T")";"${host}";"${_hostname}";"${user}";"${password} >> ${root_folder}${output_file};
+		else
+			echo $(date +"%F %T")";"${host}";"${_hostname}";"${user}";"${password} >> ${root_folder}${output_file}".TEST";
+		fi;
 		# create the SSH foler and authorized access file with correct permissions
 		echo " > Create .ssh folder";
 		if [ ${TEST} -eq 0 ]; then
@@ -196,9 +229,12 @@ while read i; do
 			echo "$> chmod 600 /home/${user}/.ssh/authorized_keys";
 		fi;
 	fi;
-	fi;
 done;
 
+# End before anything because this is just info run
+if [ ${INFO} -eq 1 ]; then
+	exit;
+fi;
 # zip everything and remove data in ssh key folder, delete output file with passwords
 zip -r \
 	"${root_folder}${output_zip_folder}${output_zip}" \

user_list.txt-sample

@@ -1 +1 @@
-#user_id;user_name;group,subgroup;optional override password;optional override hostname
+#user_id;user_name;group,subgroup;override password;override hostname;override ssh type