fix: use admin .ssh folder, delay deleting ssh key

Author: jburhenn

command-ctrl.sh

@@ -30,27 +30,27 @@ remote_ctrl() {
         SSH_REMOTE_PORT=22
     fi
 
-    PRIVATE_KEY_FILE=/tmp/temp_ssh_key
+    export PRIVATE_KEY_FILE=/tmp/temp_ssh_key
     echo -e "$SSH_PRIVATE_KEY" > "$PRIVATE_KEY_FILE"
     chmod 600 "$PRIVATE_KEY_FILE"
 
     if [ -z "$SSH_HOST_KEY" ]; then
         echo "\$SSH_HOST_KEY is empty"
     else
-        KNOWN_HOSTS_FILE=~/.ssh/known_hosts
+        KNOWN_HOSTS_FILE=~admin/.ssh/known_hosts
         KNOWN_HOST="$SSH_HOST $SSH_HOST_KEY"
         if [ ! -f "$KNOWN_HOSTS_FILE" ] || ! grep -Fxq "$KNOWN_HOST" "$KNOWN_HOSTS_FILE"; then
-            mkdir -p ~/.ssh
+            mkdir -p ~admin/.ssh
             echo "$KNOWN_HOST" >> "$KNOWN_HOSTS_FILE"
         fi
     fi
 
     if [ -z "$SSH_AUTH_KEY" ]; then
         echo "\$SSH_AUTH_KEY is empty"
     else
-        AUTHORIZED_KEYS_FILE=~/.ssh/authorized_keys
+        AUTHORIZED_KEYS_FILE=~admin/.ssh/authorized_keys
         if [ ! -f "$AUTHORIZED_KEYS_FILE" ] || ! grep -Fxq "$SSH_AUTH_KEY" "$AUTHORIZED_KEYS_FILE"; then
-            mkdir -p ~/.ssh
+            mkdir -p ~admin/.ssh
             echo "$SSH_AUTH_KEY" >> "$AUTHORIZED_KEYS_FILE"
         fi
     fi
@@ -60,8 +60,7 @@ remote_ctrl() {
         $(which sshd) -p $SSH_LOCAL_PORT -o "PubkeyAuthentication yes"
     fi
     ssh -o "ExitOnForwardFailure yes" -N -R $SSH_FORWARD_PORT:localhost:$SSH_LOCAL_PORT $SSH_USERNAME@$SSH_HOST -p $SSH_REMOTE_PORT -i $PRIVATE_KEY_FILE &
-    sleep 2
-    rm $PRIVATE_KEY_FILE
+    sh -c 'sleep 10; rm $PRIVATE_KEY_FILE'
 }
 
 update() {