Cutlery/gravity-sync
1
0
Fork 0
mirror of https://github.com/vmstan/gravity-sync.git synced 2025-07-09 02:34:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Test new SSH function

Browse Source
This commit is contained in:
Michael Stanclift 2020-06-02 20:44:46 -05:00
parent b4cc029d7e
commit 92269fe4c3
2 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CHANGELOG.md
View File

@ -1,5 +1,12 @@
# The Changelog # The Changelog
## 1.8
### The Logical Release
- All of the SSH connection logic has been rewritten to be specific to client options between OpenSSH, OpenSSH w/ SSHPASS, and Dropbear.
- Removes INFO that SSHPASS is not installed during config, if it's not needed. Redirects user to documentation.
- Better error handling of configuration options.
## 1.7 ## 1.7
### The Andrew Release ### The Andrew Release
@ -11,10 +18,6 @@
**Known Issues** **Known Issues**
- No new Star Trek references. - No new Star Trek references.
#### 1.7.8
- Removes INFO that SSHPASS is not installed during config, if it's not needed. Redirects user to documentation.
- Better error handling of configuration options.
#### 1.7.7 #### 1.7.7
- `config` function will attempt to ping remote host to validate network connection, can by bypassed by adding `PING_AVOID='1'` to your `gravity-sync.conf` file. - `config` function will attempt to ping remote host to validate network connection, can by bypassed by adding `PING_AVOID='1'` to your `gravity-sync.conf` file.
- Changes some [INFO] messages to [WARN] where approprate. - Changes some [INFO] messages to [WARN] where approprate.

36
gravity-sync.sh
View File

@ -617,23 +617,47 @@ function validate_os_sshpass {
MESSAGE="Validating Connection to ${REMOTE_HOST}" MESSAGE="Validating Connection to ${REMOTE_HOST}"
echo_stat echo_stat
ssh_function
CMD_TIMEOUT='5'
CMD_REQUESTED="exit"
${SSH_SEND}
error_validate
if hash ssh 2>/dev/null if hash ssh 2>/dev/null
then then
if [ -z "$SSHPASSWORD" ] if [ -z "$SSHPASSWORD" ]
then then
timeout 5 ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" -o StrictHostKeyChecking=no ${REMOTE_USER}@${REMOTE_HOST} 'exit' >/dev/null 2>&1 # timeout 5 ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" -o StrictHostKeyChecking=no ${REMOTE_USER}@${REMOTE_HOST} 'exit' >/dev/null 2>&1
error_validate # error_validate
else else
timeout 5 ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -o StrictHostKeyChecking=no ${REMOTE_USER}@${REMOTE_HOST} 'exit' >/dev/null 2>&1 # timeout 5 ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -o StrictHostKeyChecking=no ${REMOTE_USER}@${REMOTE_HOST} 'exit' >/dev/null 2>&1
error_validate # error_validate
fi fi
elif hash dbclient 2>/dev/null elif hash dbclient 2>/dev/null
then then
timeout 5 ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} 'exit' >/dev/null 2>&1 # timeout 5 ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -i "$HOME/${SSH_PKIF}" ${REMOTE_USER}@${REMOTE_HOST} 'exit' >/dev/null 2>&1
error_validate # error_validate
fi fi
} }
## Determine SSH Pathways
function ssh_function {
if hash ssh 2>/dev/null
then
if [ -z "$SSHPASSWORD" ]
then
SSH_SEND="timeout ${CMD_TIMEOUT} ${SSH_CMD} -p ${SSH_PORT} -i \"$HOME/${SSH_PKIF}\" -o StrictHostKeyChecking=no ${REMOTE_USER}@${REMOTE_HOST} \"${CMD_REQUESTED}\""
else
SSH_SEND="timeout ${CMD_TIMEOUT} ${SSHPASSWORD} ${SSH_CMD} -p ${SSH_PORT} -o StrictHostKeyChecking=no ${REMOTE_USER}@${REMOTE_HOST} \"${CMD_REQUESTED}\""
fi
elif hash dbclient 2>/dev/null
then
SSH_SEND="timeout ${CMD_TIMEOUT} ${SSH_CMD} -p ${SSH_PORT} -i \"$HOME/${SSH_PKIF}\" ${REMOTE_USER}@${REMOTE_HOST} \"${CMD_REQUESTED}\""
fi
}
## Detect SSH-KEYGEN ## Detect SSH-KEYGEN
function detect_sshkeygen { function detect_sshkeygen {
MESSAGE="Validating SSH-KEYGEN install on $HOSTNAME" MESSAGE="Validating SSH-KEYGEN install on $HOSTNAME"