Changes

Dockerfile

@@ -30,15 +30,13 @@ RUN apt-get update && \
 #echo "root:toor" | chpasswd &&\
 
 RUN useradd -m -u 1000 admin && \
-    echo "admin:password" | chpasswd &&\
+    echo "admin:password" | chpasswd && \
     usermod -aG sudo admin && \
-    echo "admin ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers 
+    echo "admin ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
 
 COPY . /app
-
-
        
-#    sudo ufw allow 2222/tcp
+RUN sudo ufw allow 2222/tcp
 
 #RUN sudo ufw disable
 RUN cp /app/sshd_config /etc/ssh/sshd_config # && cat /etc/ssh/sshd_config
@@ -52,13 +50,10 @@ RUN cp /app/sshd_config /etc/ssh/sshd_config # && cat /etc/ssh/sshd_config
 RUN touch  /etc/ssh/ssh_known_hosts &&\
     touch  /etc/ssh/known_hosts
 
-RUN chmod -R 777 /etc/ssh/* && \
-    chown -R admin:admin /etc/ssh
-
-
-    
-RUN echo " Public Key $(cat /etc/ssh/ssh_host_rsa_key.pub)" && \
-    echo " Private Key $(cat /etc/ssh/ssh_host_rsa_key)" 
+RUN chmod -R 777 /etc/ssh/* 
+   
+#RUN echo " Public Key $(cat /etc/ssh/ssh_host_rsa_key.pub)" && \
+#    echo " Private Key $(cat /etc/ssh/ssh_host_rsa_key)" 
         
     
 
@@ -110,8 +105,8 @@ EXPOSE 2222
 
 EXPOSE 7860
 
-RUN chown -R admin:admin /home/admin &&\
-    chmod -R 777 /app /usr/sbin/sshd
+#RUN chown -R admin:admin /home/admin &&\
+#    chmod -R 777 /app /usr/sbin/sshd
 
 RUN echo "* Changing User to Admin :$(echo "password" || su - admin)"
 

WebSSH/Dockerfile

@@ -1,79 +0,0 @@
-FROM alpine:latest
-
-
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Install necessary packages
-RUN apk update && apk add --no-cache openssh openrc openssh-keygen bash sudo python3 py3-pip net-tools
-
-# Create a non-root user (admin)
-RUN adduser -D admin
-RUN echo "admin:password" | chpasswd
-RUN addgroup admin wheel
-RUN adduser admin wheel
-
-# SSH Configuration
-RUN mkdir -p /var/run/sshd /app /app/ssh
-RUN chmod -R 777 /app
-
-# SSH Configuration
-#RUN mkdir /app
-
-# Copy all the contents of the /app folder
-COPY . /app
-
-
-# Generate SSH keys and print them
-#RUN ssh-keygen -t rsa -b 2048 -f /etc/ssh/ssh_host_rsa_key -N "" && \
-#    cat /etc/ssh/ssh_host_rsa_key && \
-#    ssh-keygen -t ecdsa -b 256 -f /etc/ssh/ssh_host_ecdsa_key -N "" && \
-#    cat /etc/ssh/ssh_host_ecdsa_key && \
-#    ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N "" && \
-#    cat /etc/ssh/ssh_host_ed25519_key
-
-# Generate SSH keys
-RUN 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 ""
-
-# Secure SSH Configuration
-RUN sed -i 's/#PermitRootLogin yes/PermitRootLogin no/' /etc/ssh/sshd_config && \
-    sed -i 's/#PasswordAuthentication yes/PasswordAuthentication yes/' /etc/ssh/sshd_config && \
-    sed -i 's/#ChallengeResponseAuthentication yes/ChallengeResponseAuthentication no/' /etc/ssh/sshd_config && \
-    sed -i 's/#UsePAM yes/UsePAM no/' /etc/ssh/sshd_config && \
-    sed -i 's/#Port 22/Port 2222/' /etc/ssh/sshd_config && \
-    echo "AllowUsers admin" >> /etc/ssh/sshd_config
-
-
-
-# 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 && \
-    && cp -r /etc/ssh/* /app/ssh
-
-# List contents of /etc/ssh and /app/ssh
-RUN ls -l /etc/ssh/ && \
-    ls -l /app/ssh/
-
-# Install WebSSH
-RUN python3 -m venv /app/venv && \
-    /app/venv/bin/pip install --no-cache-dir --upgrade pip && \
-    /app/venv/bin/pip install --no-cache-dir -r /app/WebSSH/requirements.txt && \
-    /app/venv/bin/pip list 
-    
-# Expose the new SSH port
-EXPOSE 2222
-
-RUN chmod -R 777 /app
-
-# Copy the start.sh script
-#RUN chmod 777 /app/venv/lib/python3.12/site-packages/
-#RUN touch /app/venv/lib/python3.12/site-packages/known_hosts
-#RUN chmod 777 /app/venv/lib/python3.12/site-packages/known_hosts
-
-EXPOSE 7860
-
-CMD ["/app/start.sh"]

init.sh

@@ -1,5 +1,69 @@
 #!/bin/bash
-
-
-echo "Hi There I am Booting up $(whoami)"
-/app/start.sh
+echo "* Hi There I am Booting up : $(whoami)"
+# Function to print the current hostname and user details
+print_host_details() {
+    #echo "0.0.0.0 abc" | sudo tee -a /etc/hosts
+    echo "* The hostname of this container is: $(cat /etc/hostname). PWD $(pwd)"
+    echo "* The host File of this container is: $(cat /etc/hosts)"
+    echo "* The Sudoers of this container is: $(sudo cat /etc/sudoers)"
+    echo "* ID of the user running the script: $(whoami) *ID : $(id -u) * Group: $(id -g)"
+    echo "* Changing User to Admin :$(echo "password" || su - admin)"
+    echo "* Current User WHO AM I $(whoami)"
+    echo "* Status of Admin : $(id admin 2>/dev/null || echo 'Admin user not found')"
+}
+# Function to generate SSH host keys if missing
+generate_ssh_keys() {
+  
+    sudo rm -rf /etc/ssh/ssh_host_rsa_* 
+    sudo rm -rf /etc/ssh/ssh_host_ecdsa_*
+    sudo rm -rf /etc/ssh/ssh_host_ed25519_* 
+    sudo rm -rf /etc/ssh/ssh_known_* 
+         
+    echo "* Generating SSH host keys *"        
+    yes y | ssh-keygen -t rsa -b 2048 -f /etc/ssh/ssh_host_rsa_key -N "" || { echo "Failed to generate RSA key"; exit 1; }
+    yes y | ssh-keygen -t ecdsa -b 256 -f /etc/ssh/ssh_host_ecdsa_key -N "" || { echo "Failed to generate ECDSA key"; exit 1; }
+    yes y | ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N "" || { echo "Failed to generate ED25519 key"; exit 1; }
+    ssh-keyscan -p 2222 127.0.0.1 >> /etc/ssh/ssh_known_hosts
+    cp /etc/ssh/ssh_known_hosts /etc/ssh/known_host
+    #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 "" 
+    echo "* Public Key:"
+    cat /etc/ssh/ssh_host_rsa_key.pub
+    echo "* Private Key :"
+    cat /etc/ssh/ssh_host_rsa_key
+    echo "* Host Files :"
+    cat /etc/ssh/ssh_known_host
+ 
+}
+# Function to activate virtual environment
+activate_python_and_run() {
+    if [ -d "/app/WebSSHEnv" ]; then
+        echo "* Activating virtual environment *"
+        source /app/WebSSHEnv/bin/activate || { echo "Failed to activate virtual environment"; exit 1; }
+        echo "* Starting WebSSH application *"
+        python3 -u -m /app/WebSSH || { echo "Failed to start WebSSH application"; exit 1; }
+    else
+        echo "* Virtual environment not found, please check setup *"
+    fi
+}
+# Function to start SSH service if not running
+start_ssh_service_with_status() {
+    if ! pgrep -x "sshd" >/dev/null; then
+    #service ssh restart
+    #service sshd restart 
+    echo "* Starting SSH server at port 2222 *"
+    /usr/sbin/sshd -p 2222 || { echo "Failed to start SSH server"; exit 1; }
+    #/usr/sbin/sshd -D -e -ddd|| { echo "Failed to start SSH server"; exit 1; }
+    echo "* Status of SSH service: *"
+    netstat -tuln
+    else
+        echo "* SSH server is already running *"
+    fi
+}
+ 
+print_host_details
+generate_ssh_keys
+start_ssh_service_with_status
+activate_python_and_run
+/app/start.sh

start.sh

@@ -1,66 +1,5 @@
 #!/bin/bash
 
-# Function to print the current hostname and user details
-print_host_details() {
-    #echo "0.0.0.0 abc" | sudo tee -a /etc/hosts
-    echo "* The hostname of this container is: $(cat /etc/hostname). PWD $(pwd)"
-    echo "* The host File of this container is: $(cat /etc/hosts)"
-    echo "* The Sudoers of this container is: $(cat /etc/sudoers)"
-    echo "* ID of the user running the script:$(whoami) *ID : $(id -u) * Group: $(id -g)"
-    echo "* Changing User to Admin :$(echo "password" || su - admin)"
-    echo "* Current User WHO AM I $(whoami)"
-    echo "* Status of Admin: $(id admin 2>/dev/null || echo 'Admin user not found')"
-}
-# Function to generate SSH host keys if missing
-generate_ssh_keys() {
-  
-    rm -rf /etc/ssh/ssh_host_rsa_* 
-    rm -rf /etc/ssh/ssh_host_ecdsa_*
-    rm -rf /etc/ssh/ssh_host_ed25519_* 
-    rm -rf /etc/ssh/ssh_known_* 
-    
-           
-    echo "* Generating SSH host keys *"        
-    yes y | ssh-keygen -t rsa -b 2048 -f /etc/ssh/ssh_host_rsa_key -N "" || { echo "Failed to generate RSA key"; exit 1; }
-    yes y | ssh-keygen -t ecdsa -b 256 -f /etc/ssh/ssh_host_ecdsa_key -N "" || { echo "Failed to generate ECDSA key"; exit 1; }
-    yes y | ssh-keygen -t ed25519 -f /etc/ssh/ssh_host_ed25519_key -N "" || { echo "Failed to generate ED25519 key"; exit 1; }
-    ssh-keyscan -p 2222 127.0.0.1 >> /etc/ssh/ssh_known_hosts
-    cp /etc/ssh/ssh_known_hosts /etc/ssh/known_host
-    #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 "" 
-    echo " Public Key:"
-    cat /etc/ssh/ssh_host_rsa_key.pub
-    echo " Private Key :"
-    cat /etc/ssh/ssh_host_rsa_key
-    echo " Host Files :"
-    cat /etc/ssh/ssh_known_host
- 
-}
-# Function to start SSH service if not running
-start_ssh_service() {
-    if ! pgrep -x "sshd" >/dev/null; then
-    service ssh restart
-    service sshd restart 
-    echo "* Starting SSH server at port 2222 *"
-    #/usr/sbin/sshd -p 2222 || { echo "Failed to start SSH server"; exit 1; }
-    #/usr/sbin/sshd -D -e -ddd|| { echo "Failed to start SSH server"; exit 1; }
-    else
-        echo "* SSH server is already running *"
-    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; }
@@ -72,36 +11,42 @@ print_working_directory_contents() {
     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 /var/log/auth.log
 }
 
-# Main script execution
-print_host_details
-generate_ssh_keys 
-start_ssh_service
-#sshd -T | grep -i 'known hosts'
-echo "* Status of SSH service: *"
-netstat -tuln 
-
-echo "* Testing admin's SSH login locally *"
-#echo "password" | ssh -v -o /etc/ssh/ssh_host_rsa_key.pub admin@localhost -p 2222 
-#ssh admin@localhost -p 2222 
-#sshpass -ppassword ssh -v -o StrictHostKeyChecking=no -i  /etc/ssh/ssh_host_rsa_key.pub admin@127.0.0.1 -p 2222 
-sshpass -p "password" ssh -v -t -o StrictHostKeyChecking=no admin@127.0.0.1 -p 2222 "command ; bash"
-
-
-
+generate_admin_ssh_keys() {
+    if [ ! -f /home/admin/.ssh/id_rsa ]; then
+        echo "* Generating SSH keys for 'admin' user *"
+        mkdir -p /home/admin/.ssh || { echo "Failed to create .ssh directory"; exit 1; }
+        #ssh-keygen -t rsa -b 2048 -f /home/admin/.ssh/id_rsa -q -N "" 
+        #yes y | ssh-keygen -t rsa -b 2048 -f /home/admin/.ssh/id_rsa -N "" || { echo "Failed to generate admin SSH key"; exit 1; }
+        yes y | ssh-keygen -t rsa -b 2048 -f /home/admin/.ssh/id_rsa -N "" || { echo "Failed to generate admin SSH key"; exit 1; }
+        ssh-keyscan -p 2222 127.0.0.1 >> /home/admin/.ssh/known_hosts
+        cp /home/admin/.ssh/known_hosts /home/admin/.ssh/ssh_known_hosts
+        #ssh-copy-id -i ~/.ssh/id_rsa.pub -p 2222 admin@localhost
+        chown -R admin:admin /home/admin
+        #chmod -R 777 /home/admin/.ssh
+        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
+}
+add_admin_authorized_keys() {    
+  echo "* Adding public key to authorized_keys for 'admin' user *"
+  echo "* Admin Public Key :$(cat /home/admin/.ssh/id_rsa.pub)"
+  echo "* Admin Private Key :$(cat /home/admin/.ssh/id_rsa.pub)"
+  cat /home/admin/.ssh/id_rsa.pub >> /home/admin/.ssh/authorized_keys || { echo "Failed to add public key to authorized_keys"; exit 1; }
+  echo "* Authorised Keys: $(cat /home/admin/.ssh/authorized_keys)"
+  echo "* Known HOST File :$(cat /home/admin/.ssh/known_hosts)"
+  #chmod 600 /home/admin/.ssh/authorized_keys || { echo "Failed to set authorized_keys permissions"; exit 1; } 
+}
+echo "password" || su - admin
+echo "I am : $(whoami)"
+generate_admin_ssh_keys
+add_admin_authorized_keys
+tail -f /var/log/auth.log
 
-activate_virtual_env
-set_working_directory
-print_working_directory_contents
-run_webssh_application
-keep_container_running