fix: sftp wrapper: handle -P properly (close #553)

bin/plugin/open/sftp

@@ -46,7 +46,6 @@ sub help {
     my $script = <<'END_OF_SCRIPT';
 #! /usr/bin/env bash
 set -u
-shopt -s nocasematch
 # <custom-section>
 SELF="%SELF%"
 BASTION_CMD="%BASTION_CMD%"
@@ -111,7 +110,15 @@ dst="${1:-}"
 if [[ $dst =~ ^(sftp://)?(([^@:/]+)@)?([^@:/]+)(:([0-9]+))?(/(.+))?$ ]]; then
     REMOTE_USER="${BASH_REMATCH[3]:-$SELF}"
     REMOTE_HOST="${BASH_REMATCH[4]}"
-    REMOTE_PORT="${BASH_REMATCH[6]:-22}"
+    # if already set through -P, halt if we have a different port specified through sftp://
+    if [ -n "${REMOTE_PORT:-}" ]; then
+        if [ -n "${BASH_REMATCH[6]:-}" ] && [ "${BASH_REMATCH[6]:-}" != "$REMOTE_PORT" ]; then
+            echo "sftpwrapper: conflicting ports specified ($REMOTE_PORT and ${BASH_REMATCH[6]})" >&2
+            exit 1
+        fi
+    else
+        REMOTE_PORT="${BASH_REMATCH[6]:-22}"
+    fi
     REMOTE_PATH="${BASH_REMATCH[7]}"
     [ "$BASTION_SFTP_DEBUG" = 1 ] && echo "sftpwrapper: parsed user=$REMOTE_USER host=$REMOTE_HOST port=$REMOTE_PORT path=$REMOTE_PATH" >&2
 else

tests/functional/tests.d/395-mfa-scp-sftp-rsync.sh

@@ -199,7 +199,17 @@ EOF
     contain 'sftp> exit'
     contain '>>> Done,'
 
-    success personal_sftp_use_newwrapper_ok /tmp/sftpwrapper -b /tmp/sftpcommands -i $account0key1file $shellaccount@127.0.0.2
+    run personal_sftp_use_newwrapper_badport /tmp/sftpwrapper -b /tmp/sftpcommands -i $account0key1file -P 9999 $shellaccount@127.0.0.2
+    retvalshouldbe 1
+    nocontain 'sftp>'
+    contain 'Access denied'
+
+    run personal_sftp_use_newwrapper_conflictingports /tmp/sftpwrapper -b /tmp/sftpcommands -i $account0key1file -P 9999 $shellaccount@127.0.0.2:7777
+    retvalshouldbe 1
+    nocontain 'sftp>'
+    contain 'conflicting'
+
+    success personal_sftp_use_newwrapper_ok /tmp/sftpwrapper -b /tmp/sftpcommands -i $account0key1file -P 22 $shellaccount@127.0.0.2:22
     contain 'sftp> ls'
     contain 'uptest'
     contain 'sftp> exit'