v/xiringuito
1
0
Fork 0
mirror of https://github.com/ivanilves/xiringuito.git synced 2025-05-20 09:10:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34 from ivanilves/select-ssh-private-key

Browse Source 
Select specific SSH key with optional argument
This commit is contained in:
Ivan Ilves 2017-05-31 19:15:36 +02:00 committed by GitHub
commit ebea80fdfd
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
testing/integration/cases/connect_with_ssh_key.sh
View File

@ -1,6 +1,3 @@
unset SSH_AUTH_SOCK
export SSH_EXTRA_OPTS="${SSH_EXTRA_OPTS} -i ${PWD}/ssh-keys/id_rsa"
export EXIT_AFTER_CONNECT=1 export EXIT_AFTER_CONNECT=1
${XIRI_EXE} -X ${SSH_USER}@${REMOTE_IP} ${XIRI_EXE} -k ${PWD}/ssh-keys/id_rsa -X ${SSH_USER}@${REMOTE_IP}

17
xiringuito
View File

@ -8,7 +8,9 @@ function print_help() {
echo "Usage: ${0} [OPTIONS] [SSH_USER@]SSH_SERVER [NETWORK1, NETWORK2, ... NETWORKx]" echo "Usage: ${0} [OPTIONS] [SSH_USER@]SSH_SERVER [NETWORK1, NETWORK2, ... NETWORKx]"
echo echo
echo "OPTIONS" echo "OPTIONS"
echo "-f X fail connection after X ping failures" echo "-k PRIVATE_KEY_PATH use specific SSH private key"
echo "-f MAX_FAILED_PINGS fail connection after X ping failures"
echo
echo "-C do not check if we run outdated app version" echo "-C do not check if we run outdated app version"
echo "-R do not reconnect after connection failure" echo "-R do not reconnect after connection failure"
echo "-D do not fetch DNS config from server" echo "-D do not fetch DNS config from server"
@ -41,8 +43,17 @@ export PATH="${PATH}:."
declare -r ORIGINAL_EXEC=${0} declare -r ORIGINAL_EXEC=${0}
declare -r ORIGINAL_ARGS=${@} declare -r ORIGINAL_ARGS=${@}
while getopts "f:CRDXrh" o; do while getopts "k:f:CRDXrh" o; do
case ${o} in case ${o} in
k)
PRIVATE_KEY_PATH=${OPTARG}
if [[ ! -f "${PRIVATE_KEY_PATH}" ]]; then
echo "Key file does not exist: ${PRIVATE_KEY_PATH}"
exit 1
fi
unset SSH_AUTH_SOCK
SSH_PRIVATE_KEY_OPTS="-i ${PRIVATE_KEY_PATH}"
;;
f) f)
MAX_FAILED_PINGS=${OPTARG} MAX_FAILED_PINGS=${OPTARG}
if [[ ! ${MAX_FAILED_PINGS} =~ ^[0-9]{1,}$ ]]; then if [[ ! ${MAX_FAILED_PINGS} =~ ^[0-9]{1,}$ ]]; then
@ -114,7 +125,7 @@ fi
declare -r TUNNEL_ID=$(cat ${TUNNEL_ID_FILE}) declare -r TUNNEL_ID=$(cat ${TUNNEL_ID_FILE})
declare -r REMOTE_PATH="/tmp/xiringuito.${TUNNEL_ID}" declare -r REMOTE_PATH="/tmp/xiringuito.${TUNNEL_ID}"
declare -r SSH_OPTS="-oLogLevel=${SSH_LOG_LEVEL:-ERROR} -oConnectionAttempts=3 -oConnectTimeout=10 ${SSH_EXTRA_OPTS}" declare -r SSH_OPTS="-oLogLevel=${SSH_LOG_LEVEL:-ERROR} -oConnectionAttempts=3 -oConnectTimeout=10 ${SSH_PRIVATE_KEY_OPTS} ${SSH_EXTRA_OPTS}"
if [[ ${KERNEL} == linux ]]; then if [[ ${KERNEL} == linux ]]; then
declare -r LOCAL_TUNNEL_ID=${TUNNEL_ID} declare -r LOCAL_TUNNEL_ID=${TUNNEL_ID}