Changes

Dockerfile

@@ -37,7 +37,9 @@ RUN useradd -m -s /bin/bash admin && \
 COPY . /app
 
 # Create necessary directories and set permissions
-RUN mkdir -p /var/run/sshd /app /app/users/ssh /app/ssh && chmod -R 777 /app /etc/sudoers
+RUN mkdir -p /var/run/sshd /app /app/users/ssh /app/ssh && \
+    chmod -R 777 /app 
+#    touch /etc/sudoers
 
 # Grant full sudo access to the 'administrator' group
 RUN sed -i 's/Defaults !requiretty/Defaults requiretty/' /etc/sudoers && \
@@ -59,7 +61,8 @@ RUN sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin no/' /etc/ssh/s
 # Copy SSH keys to /app/ssh and set permissions
 RUN cp -r /etc/ssh/* /app/ssh && \
     chmod -R 777 /etc/ssh/* /app/ssh/* && \
-    touch /app/ssh/ssh_known_hosts && chmod 777 /app/ssh/ssh_known_hosts
+    touch /app/ssh/ssh_known_hosts && \
+    chmod 777 /app/ssh/ssh_known_hosts
 
 # List contents of /etc/ssh and /app/ssh
 RUN ls -l /etc/ssh/ && \
@@ -67,10 +70,10 @@ RUN ls -l /etc/ssh/ && \
 
 
 # Create administrator group and admin user with full permissions
-RUN groupadd -f administrator && \
-    id -u admin >/dev/null 2>&1 || useradd -m -s /bin/bash -G administrator,sudo admin && \
-    echo 'admin:password' | chpasswd && \
-    echo "%administrator ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+#RUN groupadd -f administrator && \
+#    id -u admin >/dev/null 2>&1 || useradd -m -s /bin/bash -G administrator,sudo admin && \
+#    echo 'admin:password' | chpasswd && \
+#    echo "%administrator ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
 
 # Install WebSSH dependencies
 RUN python3 -m venv /app/WebSSHEnv && \
@@ -95,4 +98,4 @@ EXPOSE 7860 2222
 #RUN chown -R admin:admin /home/admin
 RUN chmod -R 777 /app/* /home/*
 # Default command to keep the container running
-CMD ["/app/start.sh"]
+CMD ["/usr/sbin/sshd -p 2222 &&","/app/start.sh"]

WebSSH/Dockerfile

@@ -42,15 +42,13 @@ RUN sed -i 's/#PermitRootLogin yes/PermitRootLogin no/' /etc/ssh/sshd_config &&
     echo "AllowUsers admin" >> /etc/ssh/sshd_config
 
 
-# Copy all the contents of /etc/ssh to /app/ssh
-RUN mkdir -p /app/ssh && cp -r /etc/ssh/* /app/ssh
-
 
 # Set the permissions for the SSH keys
 RUN chmod 777 /etc/ssh/ssh_host_* && \
     touch /app/ssh/ssh_known_hosts && \
     chmod 777 /app/ssh/ssh_* && \
-    chmod 777 /home
+    chmod 777 /home && \
+    && cp -r /etc/ssh/* /app/ssh
 
 # List contents of /etc/ssh and /app/ssh
 RUN ls -l /etc/ssh/ && \

start.sh

@@ -1,94 +1,127 @@
 #!/bin/bash
 
-# Print the current hostname and user details
-echo "* The hostname of this container is: $(cat /etc/hostname)"
-echo "* The Current User of this container is: $(whoami)"
-#echo "* The host of this container is: $(cat /etc/hosts)"
-echo "* ID of the user running the script: $(id -u) * Group: $(id -g) * Status of Admin: $(id admin 2>/dev/null || echo 'Admin user not found')"
-
-# Switch to admin user and run a command
-echo "password" | su - admin -c "bash -i"
-# Commands to run as admin user
-echo "* Now running as: $(whoami)"
-
-# Ensure SSH host keys are present, generate if missing
-if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
-    echo "* Generating SSH host keys *"
-    ssh-keygen -t rsa -b 2048 -f /etc/ssh/ssh_host_rsa_key -N ""
-    ssh-keygen -t ecdsa -b 256 -f /etc/ssh/ssh_host_ecdsa_key -N ""
-    ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N ""
-fi
-
-# Start SSH service if not running
-if ! pgrep -x "sshd" >/dev/null; then
-    echo "* Starting SSH server on port 2222 *"
-    /usr/sbin/sshd -p 2222
-else
-    echo "* SSH server is already running *"
-fi
-
-# Check if 'admin' user exists, create if missing
-if ! id -u admin >/dev/null 2>&1; then
-    echo "* Creating 'ubuntu' user *"
-    useradd -m -s /bin/bash -G sudo admin
-    echo "admin:password" | chpasswd
-    #echo "%sudo ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
-fi
-
-# Ensure 'admin' home directory permissions
-echo "* Fixing permissions for 'ubuntu' user *"
-chown -R admin:admin /home/admin
-chmod -R 777 /home/admin
-
-# Generate SSH keys for the 'admin' user if missing
-if [ ! -f /home/admin/.ssh/id_rsa ]; then
-    echo "* Generating SSH keys for 'admin' user *"
-    mkdir -p /home/admin/.ssh
-    ssh-keygen -t rsa -b 2048 -f /app/users/ssh/id_rsa_admin -q -N ""
-    ssh-keygen -t rsa -b 2048 -f /home/admin/.ssh/id_rsa -q -N ""
-    chown -R admin:admin /home/admin/.ssh
-    chmod 700 /home/admin/.ssh
-    chmod 600 /home/admin/.ssh/id_rsa
-    chmod 644 /home/admin/.ssh/id_rsa.pub
-fi
-
-# Add public key to authorized_keys for 'admin' user
-if [ ! -f /home/admin/.ssh/authorized_keys ]; then
-    echo "* Adding public key to authorized_keys for 'admin' user *"
-    cat /home/admin/.ssh/id_rsa.pub >> /home/admin/.ssh/authorized_keys
-    chmod 777 /home/admin/.ssh/authorized_keys
-    chown admin:admin /home/admin/.ssh/authorized_keys
-fi
-
-
-echo "* Contents of id_rsa:"
-cat /app/users/ssh/id_rsa_admin
-
-echo "* Contents of id_rsa of Admin:"
-cat /home/admin/.ssh/id_rsa
-
-# Print SSH server status
-echo "* Status of SSH service:"
-netstat -tuln 
-
-# Activate virtual environment
-if [ -d "/app/WebSSHEnv" ]; then
-    echo "* Activating virtual environment *"
-    source /app/WebSSHEnv/bin/activate
-else
-    echo "* Virtual environment not found, please check setup *"
-fi
-
-# Set working directory
-cd /app || exit
-
-# Print the contents of the working directory
-echo "* Contents of /app directory: *"
-ls -la /app
-
-# Run the WebSSH application
-echo "* Starting WebSSH application *"
-python3 -u -m WebSSH
-
-# Keep the container running
-tail -f /dev/null
+# Function to print the current hostname and user details
+print_host_details() {
+    echo "* The hostname of this container is: $(cat /etc/hostname)"
+    echo "* The host of this container is: $(cat /etc/hosts)"
+    echo "* ID of the user running the script: $(id -u) * Group: $(id -g) * Status of Admin: $(id admin 2>/dev/null || echo 'Admin user not found')"
+}
+
+# Function to generate SSH host keys if missing
+generate_ssh_keys() {
+    if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
+        echo "* Generating SSH host keys *"
+        ssh-keygen -t rsa -b 2048 -f /etc/ssh/ssh_host_rsa_key -N "" || { echo "Failed to generate RSA key"; exit 1; }
+        ssh-keygen -t ecdsa -b 256 -f /etc/ssh/ssh_host_ecdsa_key -N "" || { echo "Failed to generate ECDSA key"; exit 1; }
+        ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N "" || { echo "Failed to generate ED25519 key"; exit 1; }
+    fi
+}
+
+# Function to start SSH service if not running
+start_ssh_service() {
+    if ! pgrep -x "sshd" >/dev/null; then
+        echo "* Starting SSH server on port 2222 *"
+        /usr/sbin/sshd -p 2222 || { echo "Failed to start SSH server"; exit 1; }
+    else
+        echo "* SSH server is already running *"
+    fi
+}
+
+# Function to create 'admin' user if missing
+create_admin_user() {
+    if ! id -u admin >/dev/null 2>&1; then
+        echo "* Creating 'admin' user *"
+        useradd -m -s /bin/bash -G sudo admin || { echo "Failed to create admin user"; exit 1; }
+        echo "admin:password" | chpasswd || { echo "Failed to set admin password"; exit 1; }
+        echo "%sudo ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers || { echo "Failed to update sudoers"; exit 1; }
+    fi
+}
+
+# Function to fix permissions for 'admin' user
+fix_admin_permissions() {
+    echo "* Fixing permissions for 'admin' user *"
+    chown -R admin:admin /home/admin || { echo "Failed to change ownership"; exit 1; }
+    chmod -R 700 /home/admin || { echo "Failed to set permissions"; exit 1; }
+}
+
+# Function to generate SSH keys for 'admin' user if missing
+generate_admin_ssh_keys() {
+    if [ ! -f /home/admin/.ssh/id_rsa ]; then
+        echo "* Generating SSH keys for 'admin' user *"
+        sudo -u admin mkdir -p /home/admin/.ssh || { echo "Failed to create .ssh directory"; exit 1; }
+        sudo -u admin ssh-keygen -t rsa -b 2048 -f /home/admin/.ssh/id_rsa -q -N "" || { echo "Failed to generate admin SSH key"; exit 1; }
+        chmod 700 /home/admin/.ssh || { echo "Failed to set .ssh directory permissions"; exit 1; }
+        chmod 600 /home/admin/.ssh/id_rsa || { echo "Failed to set private key permissions"; exit 1; }
+        chmod 644 /home/admin/.ssh/id_rsa.pub || { echo "Failed to set public key permissions"; exit 1; }
+    fi
+}
+
+# Function to add public key to authorized_keys for 'admin' user
+add_admin_authorized_keys() {
+    if [ ! -f /home/admin/.ssh/authorized_keys ]; then
+        echo "* Adding public key to authorized_keys for 'admin' user *"
+        sudo -u admin bash -c "cat /home/admin/.ssh/id_rsa.pub >> /home/admin/.ssh/authorized_keys" || { echo "Failed to add public key to authorized_keys"; exit 1; }
+        chmod 600 /home/admin/.ssh/authorized_keys || { echo "Failed to set authorized_keys permissions"; exit 1; }
+    fi
+}
+
+# Function to activate virtual environment
+activate_virtual_env() {
+    if [ -d "/app/WebSSHEnv" ]; then
+        echo "* Activating virtual environment *"
+        source /app/WebSSHEnv/bin/activate || { echo "Failed to activate virtual environment"; exit 1; }
+    else
+        echo "* Virtual environment not found, please check setup *"
+    fi
+}
+
+# Function to set working directory
+set_working_directory() {
+    cd /app || { echo "Failed to change directory to /app"; exit 1; }
+}
+
+# Function to print the contents of the working directory
+print_working_directory_contents() {
+    echo "* Contents of /app directory: *"
+    ls -la /app
+}
+
+# Function to run the WebSSH application
+run_webssh_application() {
+    echo "* Starting WebSSH application *"
+    python3 -u -m WebSSH || { echo "Failed to start WebSSH application"; exit 1; }
+}
+# Function to change account when username and password are given as parameters
+change_account() {
+    local username=$1
+    local password=$2
+
+    if id -u "$username" >/dev/null 2>&1; then
+        echo "* Switching to user: $username *"
+        echo "$password" | sudo -S -u "$username" -i <<'EOF'
+        echo "* Now running as: $(whoami) *"
+EOF
+    else
+        echo "User $username does not exist"
+    fi
+}
+
+# Function to keep the container running
+keep_container_running() {
+    tail -f /dev/null
+}
+
+# Main script execution
+print_host_details
+generate_ssh_keys
+#start_ssh_service
+#create_admin_user
+#fix_admin_permissions
+change_account "admin" "password"
+generate_admin_ssh_keys
+add_admin_authorized_keys
+activate_virtual_env
+set_working_directory
+print_working_directory_contents
+run_webssh_application
+keep_container_running

start_old.sh

@@ -0,0 +1,94 @@
+#!/bin/bash
+
+# Print the current hostname and user details
+echo "* The hostname of this container is: $(cat /etc/hostname)"
+echo "* The Current User of this container is: $(whoami)"
+#echo "* The host of this container is: $(cat /etc/hosts)"
+echo "* ID of the user running the script: $(id -u) * Group: $(id -g) * Status of Admin: $(id admin 2>/dev/null || echo 'Admin user not found')"
+
+# Switch to admin user and run a command
+echo "password" | su - admin -c "bash -i"
+# Commands to run as admin user
+echo "* Now running as: $(whoami)"
+
+# Ensure SSH host keys are present, generate if missing
+if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
+    echo "* Generating SSH host keys *"
+    ssh-keygen -t rsa -b 2048 -f /etc/ssh/ssh_host_rsa_key -N ""
+    ssh-keygen -t ecdsa -b 256 -f /etc/ssh/ssh_host_ecdsa_key -N ""
+    ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N ""
+fi
+
+# Start SSH service if not running
+if ! pgrep -x "sshd" >/dev/null; then
+    echo "* Starting SSH server on port 2222 *"
+    /usr/sbin/sshd -p 2222
+else
+    echo "* SSH server is already running *"
+fi
+
+# Check if 'admin' user exists, create if missing
+if ! id -u admin >/dev/null 2>&1; then
+    echo "* Creating 'ubuntu' user *"
+    useradd -m -s /bin/bash -G sudo admin
+    echo "admin:password" | chpasswd
+    #echo "%sudo ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+fi
+
+# Ensure 'admin' home directory permissions
+echo "* Fixing permissions for 'ubuntu' user *"
+chown -R admin:admin /home/admin
+chmod -R 777 /home/admin
+
+# Generate SSH keys for the 'admin' user if missing
+if [ ! -f /home/admin/.ssh/id_rsa ]; then
+    echo "* Generating SSH keys for 'admin' user *"
+    mkdir -p /home/admin/.ssh
+    ssh-keygen -t rsa -b 2048 -f /app/users/ssh/id_rsa_admin -q -N ""
+    ssh-keygen -t rsa -b 2048 -f /home/admin/.ssh/id_rsa -q -N ""
+    chown -R admin:admin /home/admin/.ssh
+    chmod 700 /home/admin/.ssh
+    chmod 600 /home/admin/.ssh/id_rsa
+    chmod 644 /home/admin/.ssh/id_rsa.pub
+fi
+
+# Add public key to authorized_keys for 'admin' user
+if [ ! -f /home/admin/.ssh/authorized_keys ]; then
+    echo "* Adding public key to authorized_keys for 'admin' user *"
+    cat /home/admin/.ssh/id_rsa.pub >> /home/admin/.ssh/authorized_keys
+    chmod 777 /home/admin/.ssh/authorized_keys
+    chown admin:admin /home/admin/.ssh/authorized_keys
+fi
+
+
+echo "* Contents of id_rsa:"
+cat /app/users/ssh/id_rsa_admin
+
+echo "* Contents of id_rsa of Admin:"
+cat /home/admin/.ssh/id_rsa
+
+# Print SSH server status
+echo "* Status of SSH service:"
+netstat -tuln 
+
+# Activate virtual environment
+if [ -d "/app/WebSSHEnv" ]; then
+    echo "* Activating virtual environment *"
+    source /app/WebSSHEnv/bin/activate
+else
+    echo "* Virtual environment not found, please check setup *"
+fi
+
+# Set working directory
+cd /app || exit
+
+# Print the contents of the working directory
+echo "* Contents of /app directory: *"
+ls -la /app
+
+# Run the WebSSH application
+echo "* Starting WebSSH application *"
+python3 -u -m WebSSH
+
+# Keep the container running
+tail -f /dev/null

start_upgrade.sh

@@ -1,112 +0,0 @@
-#!/bin/bash
-
-# Function to print the current hostname and user details
-print_host_details() {
-    echo "* The hostname of this container is: $(cat /etc/hostname)"
-    echo "* The host of this container is: $(cat /etc/hosts)"
-    echo "* ID of the user running the script: $(id -u) * Group: $(id -g) * Status of Admin: $(id admin 2>/dev/null || echo 'Admin user not found')"
-}
-
-# Function to generate SSH host keys if missing
-generate_ssh_keys() {
-    if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
-        echo "* Generating SSH host keys *"
-        ssh-keygen -t rsa -b 2048 -f /etc/ssh/ssh_host_rsa_key -N "" || { echo "Failed to generate RSA key"; exit 1; }
-        ssh-keygen -t ecdsa -b 256 -f /etc/ssh/ssh_host_ecdsa_key -N "" || { echo "Failed to generate ECDSA key"; exit 1; }
-        ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N "" || { echo "Failed to generate ED25519 key"; exit 1; }
-    fi
-}
-
-# Function to start SSH service if not running
-start_ssh_service() {
-    if ! pgrep -x "sshd" >/dev/null; then
-        echo "* Starting SSH server on port 2222 *"
-        /usr/sbin/sshd -p 2222 || { echo "Failed to start SSH server"; exit 1; }
-    else
-        echo "* SSH server is already running *"
-    fi
-}
-
-# Function to create 'admin' user if missing
-create_admin_user() {
-    if ! id -u admin >/dev/null 2>&1; then
-        echo "* Creating 'admin' user *"
-        useradd -m -s /bin/bash -G sudo admin || { echo "Failed to create admin user"; exit 1; }
-        echo "admin:password" | chpasswd || { echo "Failed to set admin password"; exit 1; }
-        echo "%sudo ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers || { echo "Failed to update sudoers"; exit 1; }
-    fi
-}
-
-# Function to fix permissions for 'admin' user
-fix_admin_permissions() {
-    echo "* Fixing permissions for 'admin' user *"
-    chown -R admin:admin /home/admin || { echo "Failed to change ownership"; exit 1; }
-    chmod -R 700 /home/admin || { echo "Failed to set permissions"; exit 1; }
-}
-
-# Function to generate SSH keys for 'admin' user if missing
-generate_admin_ssh_keys() {
-    if [ ! -f /home/admin/.ssh/id_rsa ]; then
-        echo "* Generating SSH keys for 'admin' user *"
-        sudo -u admin mkdir -p /home/admin/.ssh || { echo "Failed to create .ssh directory"; exit 1; }
-        sudo -u admin ssh-keygen -t rsa -b 2048 -f /home/admin/.ssh/id_rsa -q -N "" || { echo "Failed to generate admin SSH key"; exit 1; }
-        chmod 700 /home/admin/.ssh || { echo "Failed to set .ssh directory permissions"; exit 1; }
-        chmod 600 /home/admin/.ssh/id_rsa || { echo "Failed to set private key permissions"; exit 1; }
-        chmod 644 /home/admin/.ssh/id_rsa.pub || { echo "Failed to set public key permissions"; exit 1; }
-    fi
-}
-
-# Function to add public key to authorized_keys for 'admin' user
-add_admin_authorized_keys() {
-    if [ ! -f /home/admin/.ssh/authorized_keys ]; then
-        echo "* Adding public key to authorized_keys for 'admin' user *"
-        sudo -u admin bash -c "cat /home/admin/.ssh/id_rsa.pub >> /home/admin/.ssh/authorized_keys" || { echo "Failed to add public key to authorized_keys"; exit 1; }
-        chmod 600 /home/admin/.ssh/authorized_keys || { echo "Failed to set authorized_keys permissions"; exit 1; }
-    fi
-}
-
-# Function to activate virtual environment
-activate_virtual_env() {
-    if [ -d "/app/WebSSHEnv" ]; then
-        echo "* Activating virtual environment *"
-        source /app/WebSSHEnv/bin/activate || { echo "Failed to activate virtual environment"; exit 1; }
-    else
-        echo "* Virtual environment not found, please check setup *"
-    fi
-}
-
-# Function to set working directory
-set_working_directory() {
-    cd /app || { echo "Failed to change directory to /app"; exit 1; }
-}
-
-# Function to print the contents of the working directory
-print_working_directory_contents() {
-    echo "* Contents of /app directory: *"
-    ls -la /app
-}
-
-# Function to run the WebSSH application
-run_webssh_application() {
-    echo "* Starting WebSSH application *"
-    python3 -u -m WebSSH || { echo "Failed to start WebSSH application"; exit 1; }
-}
-
-# Function to keep the container running
-keep_container_running() {
-    tail -f /dev/null
-}
-
-# Main script execution
-print_host_details
-generate_ssh_keys
-start_ssh_service
-create_admin_user
-fix_admin_permissions
-generate_admin_ssh_keys
-add_admin_authorized_keys
-activate_virtual_env
-set_working_directory
-print_working_directory_contents
-run_webssh_application
-keep_container_running