From 4c500700abd760880c5a8ff5f37d3fe78ca7a457 Mon Sep 17 00:00:00 2001 From: Siphonight Date: Wed, 3 Jul 2024 13:08:09 +0200 Subject: [PATCH] =?UTF-8?q?Correction=20de=20bugs=20au=20red=C3=A9marrage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ajout de vérification de la présence des configurations dans les fichiers de sshd et de sudoers afin de ne pas répéter l'inscription des paramètres à chaque redémarrage du conteneur. Ce problème n'apparaissait pas lors des redéploiements du conteneur, uniquement lors des redémarrages. Correction également d'un bug faisant crasher SSHD lors d'un redémarrage du conteneur et empêchant l'execution du service. --- Dockerfile | 4 +- README.md | 1 - entrypoint.sh | 115 ++++++++++++++++++++++++++------------------------ 3 files changed, 61 insertions(+), 59 deletions(-) diff --git a/Dockerfile b/Dockerfile index c89e223..867ffc2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ FROM alpine:3.20.0 AS monosphere-builder #~The open Monosphere Project~ -#Version : 0.5.6 +#Version : 0.5.7 #Autor : Siphonight :) #Setting default settings, please change them at run -ARG MONOSPHERE_VERSION="0.5.6 Alpha" +ARG MONOSPHERE_VERSION="0.5.7 Alpha" #Defining build settings diff --git a/README.md b/README.md index 227ba16..9efbd54 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,6 @@ Ci-dessous une liste non exhaustive des objectifs des prochaines mises à jour d - [x] Intégration de ttyrec pour la sauvegarde des sessions effectuées sur le bastion. Correction en cours pour les bugs ci dessous : -- Ajout de vérification de la présence des configurations afin de ne pas répéter les paramètres dans les fichiers à chaque redémarrage du conteneur. - Correction d'un bug autorisant systématiquement des utilisateurs du bastion à se connecter sur les serveurs distants si le compte d'accès à ce dernier porte le même nom que l'utilisateur du bastion. ## Installation diff --git a/entrypoint.sh b/entrypoint.sh index 86447a0..f1825d2 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,87 +1,90 @@ #!/bin/bash -echo "Monosphere sshd service daemon is verifying its configuration..." -echo "Port ${PORT}" >> /etc/ssh/sshd_config -echo "#Last authentication configurations" >> /etc/ssh/sshd_config -if [ "${PASSWORD_AUTH}" -eq "1" ]; then - echo "PasswordAuthentication yes" >> /etc/ssh/sshd_config -else - echo "PasswordAuthentication no" >> /etc/ssh/sshd_config -fi -if [ "${KEY_AUTH}" -eq "1" ]; then - echo "PubkeyAuthentication yes" >> /etc/ssh/sshd_config -else - echo "PubkeyAuthentication no" >> /etc/ssh/sshd_config +if ! grep -qo "^Port ${PORT}$" /etc/ssh/sshd_config; then + echo "Génération de la configuration de SSH pour le bastion Monosphere..." + echo "Port ${PORT}" >> /etc/ssh/sshd_config + echo "#Last authentication configurations" >> /etc/ssh/sshd_config + if [ "${PASSWORD_AUTH}" -eq "1" ]; then + echo "PasswordAuthentication yes" >> /etc/ssh/sshd_config + else + echo "PasswordAuthentication no" >> /etc/ssh/sshd_config + fi + if [ "${KEY_AUTH}" -eq "1" ]; then + echo "PubkeyAuthentication yes" >> /etc/ssh/sshd_config + else + echo "PubkeyAuthentication no" >> /etc/ssh/sshd_config + fi fi sshd -t -echo "Monosphere sshd service daemon configuration verified" +echo "Configuration du service SSHD de Monosphere vérifiée." -echo "Monosphere is enabling and executing custom scripts..." +echo "Monosphere active et execute les scripts personalisés" chown -R root:root /opt/custom chmod 700 /opt/custom/scripts/*.sh bash /opt/custom/scripts/*.sh -echo "Monosphere custom scripts are successfully enabled" +echo "Execution des scripts personalisés terminée." -echo "Monosphere is configuring public directory..." +echo "Monosphere configure le répertoire public." chown -R root:root /opt/public chmod -R 755 /opt/public -echo "Monosphere public directory successfully configured" +echo "Répertoire public configuré." #User accounts creation step +echo "Création des groupes d'utilisateurs." if ! grep -q "bastionuser" /etc/group; then addgroup bastionuser fi -if [ ! -f "/root/scripts/users/bastion_users.txt" ]; then - echo "No userfile detected, creating default user. Please change the default password for security purposes..." - adduser --disabled-password --gecos "" bastion --shell /bin/bash - usermod -aG bastionuser bastion - echo bastion:bastion | chpasswd -else - echo "Monosphere is creating the bastion users..." - userfile=$(cat /root/scripts/users/bastion_users.txt) - for userinfo in $userfile; do - user=$(echo "$userinfo" | cut -d ';' -f 1) - is_bastion=$(echo "$userinfo" | cut -d ';' -f 2) - password=$(echo "$userinfo" | cut -d ';' -f 3) - setkeys=$(echo "$userinfo" | cut -d ';' -f 4) +if ! grep -q "bastionadmin" /etc/group; then + addgroup bastionadmin +fi +echo "Fin de la création des groupes d'utilisateurs." - adduser --disabled-password --gecos "" "$user" --shell /bin/bash +echo "Création des utilisateurs en cours..." +userfile=$(cat /root/scripts/users/bastion_users.txt) +for userinfo in $userfile; do + user=$(echo "$userinfo" | cut -d ';' -f 1) + is_bastion=$(echo "$userinfo" | cut -d ';' -f 2) + password=$(echo "$userinfo" | cut -d ';' -f 3) + setkeys=$(echo "$userinfo" | cut -d ';' -f 4) - if [ "$is_bastion" -eq "1" ]; then - usermod -aG bastionuser "$user" - elif [ "$is_bastion" -eq "0" ]; then + adduser --disabled-password --gecos "" "$user" --shell /bin/bash + + if [ "$is_bastion" -eq "1" ]; then + usermod -aG bastionuser "$user" + elif [ "$is_bastion" -eq "0" ]; then + usermod -aG bastionadmin "$user" + if ! grep -qo "^$user ALL=(ALL) NOPASSWD:" /etc/sudoers; then echo "$user ALL=(ALL) NOPASSWD: /usr/local/bin/ttyplay*" | sudo EDITOR='tee -a' visudo echo "$user ALL=(ALL) NOPASSWD: /bin/ls*" | sudo EDITOR='tee -a' visudo - mkdir /home/"$user" - ln -s /opt/public/scripts/server_menu.sh /home/"$user"/server_menu.sh fi + mkdir /home/"$user" + ln -s /opt/public/scripts/server_menu.sh /home/"$user"/server_menu.sh + fi - if [ "$password" != "0" ]; then - echo "$user:$password" | chpasswd - else - echo "$user:$user" | chpasswd - fi + if [ "$password" != "0" ]; then + echo "$user:$password" | chpasswd + else + echo "$user:$user" | chpasswd + fi - if [ "$setkeys" -eq "1" ]; then - mkdir -p /home/"$user"/.ssh - chmod 700 /home/"$user"/.ssh - cp -r /root/scripts/users/"$user"/* /home/"$user"/.ssh/ - chown -R "$user":"$user" /home/"$user"/.ssh - chmod 600 /home/"$user"/.ssh/* - fi - done -fi -echo "Monosphere user creation is finished" + if [ "$setkeys" -eq "1" ]; then + mkdir -p /home/"$user"/.ssh + chmod 700 /home/"$user"/.ssh + cp -r /root/scripts/users/"$user"/* /home/"$user"/.ssh/ + chown -R "$user":"$user" /home/"$user"/.ssh + chmod 600 /home/"$user"/.ssh/* + fi +done +echo "Création des utilisateurs terminée." +echo "Monosphere a bien été configuré et démarré avec succès." -echo "Monosphere sshd service daemon is starting..." +echo "Démarrage du service SSHD de Monosphere." rc-status -rc-service sshd start -echo "Monosphere sshd service daemon is successfully started" +rc-service sshd restart -echo "Monosphere bastion is successfully started" +echo "Le bastion Monosphere est désormais en marche." # Keep the container running tail -f /dev/null -echo "Monosphere bastion is successfully started" \ No newline at end of file