Mirrors/backupninja
1
0
Fork 0
mirror of https://0xacab.org/liberate/backupninja.git synced 2024-11-26 04:32:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

restic: simplify connection tests

Browse Source 
Replace convoluted code to test SFTP and REST backends with a simple
restic snapshots command. Much simpler and supports all backends...
This commit is contained in:
Jerome Charaoui 2021-01-11 20:03:46 -05:00
parent 20faa6943b
commit 36638fa6ed
1 changed files with 24 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
handlers/restic.in
View File

@ -79,58 +79,6 @@ function export_debug {
debug "$1=${!1}"
}
function test_sftp_connection() {
local remote
local sftpport
local output
local ret
remote=$1
if echo "$remote" | grep -q ':[0-9]\+$'; then
sftpport="-P $(echo $remote | @AWK@ -F ':' '{print $2}') "
remote=$(echo $remote | @AWK@ -F ':' '{print $1}')
fi
debug "echo | sftp -o PasswordAuthentication=no ${sftpport}${remote}"
output=$(echo | sftp -o PasswordAuthentication=no ${sftpport}${remote})
ret=$?
if [ $ret -eq 0 ]; then
debug "Connection test to SFTP backend ${remote} succeeded."
else
debug $output
fatal "Failed connecting to SFTP backend at ${remote}."
fi
}
function test_rest_connection() {
local remote
local output
local ret
local remote=$1
if [ ! -x $(which wget) ]; then
error "Unable to test REST connection, wget executable not found!"
return
fi
debug "wget --tries=1 --method=HEAD \"${remote}/config\""
output=$(wget --tries=1 --method=HEAD "${remote}/config")
ret=$?
if [ $ret -eq 0 ]; then
debug "Connection test to REST backend at ${remote} succeeded."
elif [ $ret -eq 8 ]; then
debug $output
fatal "REST backend at ${remote} returned an error, repository may not be created."
else
debug $output
fatal "Failed connecting to REST backend at ${remote}."
fi
}
### PRE-COMMANDS ##############################################################
[ -n "$nicelevel" ] && \
@ -191,38 +139,6 @@ function test_rest_connection() {
### REPOSITORY ################################################################
# SFTP repository
if [ "$(echo "$repository" | @AWK@ -F ':' '{print $1}')" == "sftp" ]; then
# connection test
if [ "$testconnect" = "yes" ] || [ "$test" -eq 1 ]; then
if echo "$repository" | grep -q '^sftp://'; then
remote=$(echo "$repository" | @AWK@ -F '//' '{print $2}')
elif echo "$repository" | grep -q '^sftp:'; then
remote=$(echo "$repository" | @AWK@ -F ':' '{print $2}')
fi
[ -n "$remote" ] || fatal "Unable to parse SFTP repository URL ${repository}."
test_sftp_connection $remote
fi
fi
# REST Server repository
if [ "$(echo "$repository" | @AWK@ -F ':' '{print $1}')" == "rest" ]; then
# connection test
if [ "$testconnect" = "yes" ] || [ "$test" -eq 1 ]; then
remote="${repository#rest:}"
test_rest_connection $remote
fi
fi
# Amazon S3 repository
if [ "$(echo "$repository" | @AWK@ -F ':' '{print $1}')" == "s3" ]; then
@ -287,6 +203,30 @@ if [ "$(echo "$repository" | @AWK@ -F ':' '{print $1}')" == "gs" ]; then
fi
### TEST #######################################################################
if [ "$testconnect" = "yes" ] || [ "$test" -eq 1 ]; then
info "Attempting to connect to repository at ${repository}"
cmd="restic snapshots"
execstr="${cmd} ${cmd_global_options//$'\n'}"
debug "executing restic snapshots"
debug "$execstr"
output=$($execstr 2>&1)
ret=$?
if [ $ret -eq 0 ]; then
debug $output
info "Connected successfully."
else
error $output
fatal "The specified repository is absent or unusable!"
fi
fi
### BACKUP #####################################################################
if [ "$run_backup" == "yes" ]; then