feat: escaped every variable properly
This commit is contained in:
+1
-1
@@ -7,6 +7,6 @@ LABEL "repository"="https://github.com/ttionya/BitwardenRS-Backup" \
|
|||||||
COPY scripts/*.sh /app/
|
COPY scripts/*.sh /app/
|
||||||
|
|
||||||
RUN chmod +x /app/*.sh \
|
RUN chmod +x /app/*.sh \
|
||||||
&& apk add --no-cache sqlite zip heirloom-mailx tzdata
|
&& apk add --no-cache bash sqlite zip heirloom-mailx tzdata
|
||||||
|
|
||||||
ENTRYPOINT ["/app/entrypoint.sh"]
|
ENTRYPOINT ["/app/entrypoint.sh"]
|
||||||
|
|||||||
+18
-18
@@ -1,13 +1,13 @@
|
|||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
|
|
||||||
. /app/includes.sh
|
. /app/includes.sh
|
||||||
|
|
||||||
function clear_dir() {
|
function clear_dir() {
|
||||||
rm -rf ${BACKUP_DIR}
|
rm -rf "${BACKUP_DIR}"
|
||||||
}
|
}
|
||||||
|
|
||||||
function backup_init() {
|
function backup_init() {
|
||||||
NOW=$(date +"${BACKUP_FILE_DATE_FORMAT}")
|
NOW="$(date +"${BACKUP_FILE_DATE_FORMAT}")"
|
||||||
# backup bitwarden_rs database file
|
# backup bitwarden_rs database file
|
||||||
BACKUP_FILE_DB="${BACKUP_DIR}/db.${NOW}.sqlite3"
|
BACKUP_FILE_DB="${BACKUP_DIR}/db.${NOW}.sqlite3"
|
||||||
# backup bitwarden_rs config file
|
# backup bitwarden_rs config file
|
||||||
@@ -22,7 +22,7 @@ function backup_db() {
|
|||||||
color blue "backup bitwarden_rs sqlite database"
|
color blue "backup bitwarden_rs sqlite database"
|
||||||
|
|
||||||
if [[ -f "${DATA_DB}" ]]; then
|
if [[ -f "${DATA_DB}" ]]; then
|
||||||
sqlite3 ${DATA_DB} ".backup ${BACKUP_FILE_DB}"
|
sqlite3 "${DATA_DB}" ".backup '${BACKUP_FILE_DB}'"
|
||||||
else
|
else
|
||||||
color yellow "not found bitwarden_rs sqlite database, skipping"
|
color yellow "not found bitwarden_rs sqlite database, skipping"
|
||||||
fi
|
fi
|
||||||
@@ -32,7 +32,7 @@ function backup_config() {
|
|||||||
color blue "backup bitwarden_rs config"
|
color blue "backup bitwarden_rs config"
|
||||||
|
|
||||||
if [[ -f "${DATA_CONFIG}" ]]; then
|
if [[ -f "${DATA_CONFIG}" ]]; then
|
||||||
cp -f ${DATA_DIR}/config.json ${BACKUP_FILE_CONFIG}
|
cp -f "${DATA_DIR}/config.json" "${BACKUP_FILE_CONFIG}"
|
||||||
else
|
else
|
||||||
color yellow "not found bitwarden_rs config, skipping"
|
color yellow "not found bitwarden_rs config, skipping"
|
||||||
fi
|
fi
|
||||||
@@ -44,24 +44,24 @@ function backup_attachments() {
|
|||||||
local DATA_ATTACHMENTS="attachments"
|
local DATA_ATTACHMENTS="attachments"
|
||||||
|
|
||||||
if [[ -d "${DATA_DIR}/${DATA_ATTACHMENTS}" ]]; then
|
if [[ -d "${DATA_DIR}/${DATA_ATTACHMENTS}" ]]; then
|
||||||
tar -c -C ${DATA_DIR} -f ${BACKUP_FILE_ATTACHMENTS} ${DATA_ATTACHMENTS}
|
tar -c -C "${DATA_DIR}" -f "${BACKUP_FILE_ATTACHMENTS}" "${DATA_ATTACHMENTS}"
|
||||||
|
|
||||||
color blue "display attachments tar file list"
|
color blue "display attachments tar file list"
|
||||||
|
|
||||||
tar -tf ${BACKUP_FILE_ATTACHMENTS}
|
tar -tf "${BACKUP_FILE_ATTACHMENTS}"
|
||||||
else
|
else
|
||||||
color yellow "not found bitwarden_rs attachments directory, skipping"
|
color yellow "not found bitwarden_rs attachments directory, skipping"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function backup() {
|
function backup() {
|
||||||
mkdir -p ${BACKUP_DIR}
|
mkdir -p "${BACKUP_DIR}"
|
||||||
|
|
||||||
backup_db
|
backup_db
|
||||||
backup_config
|
backup_config
|
||||||
backup_attachments
|
backup_attachments
|
||||||
|
|
||||||
ls -lah ${BACKUP_DIR}
|
ls -lah "${BACKUP_DIR}"
|
||||||
}
|
}
|
||||||
|
|
||||||
function backup_package() {
|
function backup_package() {
|
||||||
@@ -70,13 +70,13 @@ function backup_package() {
|
|||||||
|
|
||||||
UPLOAD_FILE="${BACKUP_FILE_ZIP}"
|
UPLOAD_FILE="${BACKUP_FILE_ZIP}"
|
||||||
|
|
||||||
zip -jP ${ZIP_PASSWORD} ${BACKUP_FILE_ZIP} ${BACKUP_DIR}/*
|
zip -jP "${ZIP_PASSWORD}" "${BACKUP_FILE_ZIP}" "${BACKUP_DIR}"/*
|
||||||
|
|
||||||
ls -lah ${BACKUP_DIR}
|
ls -lah "${BACKUP_DIR}"
|
||||||
|
|
||||||
color blue "display backup zip file list"
|
color blue "display backup zip file list"
|
||||||
|
|
||||||
zip -sf ${BACKUP_FILE_ZIP}
|
zip -sf "${BACKUP_FILE_ZIP}"
|
||||||
else
|
else
|
||||||
color yellow "skip package backup files"
|
color yellow "skip package backup files"
|
||||||
|
|
||||||
@@ -88,7 +88,7 @@ function upload() {
|
|||||||
color blue "upload backup file to storage system"
|
color blue "upload backup file to storage system"
|
||||||
|
|
||||||
# upload file not exist
|
# upload file not exist
|
||||||
if [[ ! -f ${UPLOAD_FILE} ]]; then
|
if [[ ! -f "${UPLOAD_FILE}" ]]; then
|
||||||
color red "upload file not found"
|
color red "upload file not found"
|
||||||
|
|
||||||
send_mail_content "FALSE" "File upload failed at $(date +"%Y-%m-%d %H:%M:%S %Z"). Reason: Upload file not found."
|
send_mail_content "FALSE" "File upload failed at $(date +"%Y-%m-%d %H:%M:%S %Z"). Reason: Upload file not found."
|
||||||
@@ -96,7 +96,7 @@ function upload() {
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rclone copy ${UPLOAD_FILE} "${RCLONE_REMOTE}"
|
rclone copy "${UPLOAD_FILE}" "${RCLONE_REMOTE}"
|
||||||
if [[ $? != 0 ]]; then
|
if [[ $? != 0 ]]; then
|
||||||
color red "upload failed"
|
color red "upload failed"
|
||||||
|
|
||||||
@@ -110,15 +110,15 @@ function clear_history() {
|
|||||||
if [[ "${BACKUP_KEEP_DAYS}" -gt 0 ]]; then
|
if [[ "${BACKUP_KEEP_DAYS}" -gt 0 ]]; then
|
||||||
color blue "delete ${BACKUP_KEEP_DAYS} days ago backup files"
|
color blue "delete ${BACKUP_KEEP_DAYS} days ago backup files"
|
||||||
|
|
||||||
local RCLONE_DELETE_LIST=$(rclone lsf "${RCLONE_REMOTE}" --min-age ${BACKUP_KEEP_DAYS}d)
|
mapfile -t RCLONE_DELETE_LIST < <(rclone lsf "${RCLONE_REMOTE}" --min-age "${BACKUP_KEEP_DAYS}d")
|
||||||
|
|
||||||
for RCLONE_DELETE_FILE in ${RCLONE_DELETE_LIST}
|
for RCLONE_DELETE_FILE in "${RCLONE_DELETE_LIST[@]}"
|
||||||
do
|
do
|
||||||
color yellow "deleting ${RCLONE_DELETE_FILE}"
|
color yellow "deleting \"${RCLONE_DELETE_FILE}\""
|
||||||
|
|
||||||
rclone delete "${RCLONE_REMOTE}/${RCLONE_DELETE_FILE}"
|
rclone delete "${RCLONE_REMOTE}/${RCLONE_DELETE_FILE}"
|
||||||
if [[ $? != 0 ]]; then
|
if [[ $? != 0 ]]; then
|
||||||
color red "delete ${RCLONE_DELETE_FILE} failed"
|
color red "delete \"${RCLONE_DELETE_FILE}\" failed"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
|
|
||||||
. /app/includes.sh
|
. /app/includes.sh
|
||||||
|
|
||||||
@@ -37,7 +37,7 @@ fi
|
|||||||
|
|
||||||
function configure_timezone() {
|
function configure_timezone() {
|
||||||
if [[ ! -f /etc/localtime || ! -f /etc/timezone ]]; then
|
if [[ ! -f /etc/localtime || ! -f /etc/timezone ]]; then
|
||||||
cp -f /usr/share/zoneinfo/${TIMEZONE} /etc/localtime
|
cp -f "/usr/share/zoneinfo/${TIMEZONE}" /etc/localtime
|
||||||
echo "${TIMEZONE}" > /etc/timezone
|
echo "${TIMEZONE}" > /etc/timezone
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
@@ -45,7 +45,7 @@ function configure_timezone() {
|
|||||||
function configure_cron() {
|
function configure_cron() {
|
||||||
local FIND_CRON_COUNT=$(crontab -l | grep -c 'backup.sh')
|
local FIND_CRON_COUNT=$(crontab -l | grep -c 'backup.sh')
|
||||||
if [[ ${FIND_CRON_COUNT} -eq 0 ]]; then
|
if [[ ${FIND_CRON_COUNT} -eq 0 ]]; then
|
||||||
echo "${CRON} sh /app/backup.sh > /dev/stdout" >> /etc/crontabs/root
|
echo "${CRON} bash /app/backup.sh > /dev/stdout" >> /etc/crontabs/root
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
|
|
||||||
DATA_DIR="/bitwarden/data"
|
DATA_DIR="/bitwarden/data"
|
||||||
DATA_DB="${DATA_DIR}/db.sqlite3"
|
DATA_DB="${DATA_DIR}/db.sqlite3"
|
||||||
@@ -53,7 +53,7 @@ function send_mail() {
|
|||||||
local MAIL_VERBOSE="-v"
|
local MAIL_VERBOSE="-v"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "$2" | mailx ${MAIL_VERBOSE} -s "$1" ${MAIL_SMTP_VARIABLES} ${MAIL_TO}
|
echo "$2" | mailx "${MAIL_VERBOSE}" -s "$1" ${MAIL_SMTP_VARIABLES} "${MAIL_TO}"
|
||||||
if [[ $? != 0 ]]; then
|
if [[ $? != 0 ]]; then
|
||||||
color red "mail sending failed"
|
color red "mail sending failed"
|
||||||
else
|
else
|
||||||
@@ -161,7 +161,7 @@ function init_env() {
|
|||||||
|
|
||||||
# TIMEZONE
|
# TIMEZONE
|
||||||
local TIMEZONE_MATCHED_COUNT=$(ls "/usr/share/zoneinfo/${TIMEZONE}" 2> /dev/null | wc -l)
|
local TIMEZONE_MATCHED_COUNT=$(ls "/usr/share/zoneinfo/${TIMEZONE}" 2> /dev/null | wc -l)
|
||||||
if [[ ${TIMEZONE_MATCHED_COUNT} -ne 1 ]]; then
|
if [[ "${TIMEZONE_MATCHED_COUNT}" -ne 1 ]]; then
|
||||||
TIMEZONE="UTC"
|
TIMEZONE="UTC"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
+19
-19
@@ -1,4 +1,4 @@
|
|||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
|
|
||||||
. /app/includes.sh
|
. /app/includes.sh
|
||||||
|
|
||||||
@@ -9,7 +9,7 @@ RESTORE_FILE_ZIP=""
|
|||||||
ZIP_PASSWORD=""
|
ZIP_PASSWORD=""
|
||||||
|
|
||||||
function clear_extract_dir() {
|
function clear_extract_dir() {
|
||||||
rm -rf ${RESTORE_EXTRACT_DIR}
|
rm -rf "${RESTORE_EXTRACT_DIR}"
|
||||||
}
|
}
|
||||||
|
|
||||||
function restore_zip() {
|
function restore_zip() {
|
||||||
@@ -20,9 +20,9 @@ function restore_zip() {
|
|||||||
local FIND_FILE_ATTACHMENTS
|
local FIND_FILE_ATTACHMENTS
|
||||||
|
|
||||||
if [[ -n "${ZIP_PASSWORD}" ]]; then
|
if [[ -n "${ZIP_PASSWORD}" ]]; then
|
||||||
unzip -P ${ZIP_PASSWORD} ${RESTORE_FILE_ZIP} -d ${RESTORE_EXTRACT_DIR}
|
unzip -P "${ZIP_PASSWORD}" "${RESTORE_FILE_ZIP}" -d "${RESTORE_EXTRACT_DIR}"
|
||||||
else
|
else
|
||||||
unzip ${RESTORE_FILE_ZIP} -d ${RESTORE_EXTRACT_DIR}
|
unzip "${RESTORE_FILE_ZIP}" -d "${RESTORE_EXTRACT_DIR}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $? == 0 ]]; then
|
if [[ $? == 0 ]]; then
|
||||||
@@ -34,21 +34,21 @@ function restore_zip() {
|
|||||||
|
|
||||||
# get restore db file
|
# get restore db file
|
||||||
RESTORE_FILE_DB=""
|
RESTORE_FILE_DB=""
|
||||||
FIND_FILE_DB=$(basename $(ls ${RESTORE_EXTRACT_DIR}/db.*.sqlite3))
|
FIND_FILE_DB="$( basename "$(ls ${RESTORE_EXTRACT_DIR}/db.*.sqlite3)" )"
|
||||||
if [[ -n "${FIND_FILE_DB}" ]]; then
|
if [[ -n "${FIND_FILE_DB}" ]]; then
|
||||||
RESTORE_FILE_DB="extract/${FIND_FILE_DB}"
|
RESTORE_FILE_DB="extract/${FIND_FILE_DB}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# get restore config file
|
# get restore config file
|
||||||
RESTORE_FILE_CONFIG=""
|
RESTORE_FILE_CONFIG=""
|
||||||
FIND_FILE_CONFIG=$(basename $(ls ${RESTORE_EXTRACT_DIR}/config.*.json))
|
FIND_FILE_CONFIG="$( basename "$(ls ${RESTORE_EXTRACT_DIR}/config.*.json)" )"
|
||||||
if [[ -n "${FIND_FILE_CONFIG}" ]]; then
|
if [[ -n "${FIND_FILE_CONFIG}" ]]; then
|
||||||
RESTORE_FILE_CONFIG="extract/${FIND_FILE_CONFIG}"
|
RESTORE_FILE_CONFIG="extract/${FIND_FILE_CONFIG}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# get restore attachments file
|
# get restore attachments file
|
||||||
RESTORE_FILE_ATTACHMENTS=""
|
RESTORE_FILE_ATTACHMENTS=""
|
||||||
FIND_FILE_ATTACHMENTS=$(basename $(ls ${RESTORE_EXTRACT_DIR}/attachments.*.tar))
|
FIND_FILE_ATTACHMENTS="$( basename "$(ls ${RESTORE_EXTRACT_DIR}/attachments.*.tar)" )"
|
||||||
if [[ -n "${FIND_FILE_ATTACHMENTS}" ]]; then
|
if [[ -n "${FIND_FILE_ATTACHMENTS}" ]]; then
|
||||||
RESTORE_FILE_ATTACHMENTS="extract/${FIND_FILE_ATTACHMENTS}"
|
RESTORE_FILE_ATTACHMENTS="extract/${FIND_FILE_ATTACHMENTS}"
|
||||||
fi
|
fi
|
||||||
@@ -60,7 +60,7 @@ function restore_zip() {
|
|||||||
function restore_db() {
|
function restore_db() {
|
||||||
color blue "restore bitwarden_rs sqlite database"
|
color blue "restore bitwarden_rs sqlite database"
|
||||||
|
|
||||||
cp -f ${RESTORE_FILE_DB} ${DATA_DB}
|
cp -f "${RESTORE_FILE_DB}" "${DATA_DB}"
|
||||||
|
|
||||||
if [[ $? == 0 ]]; then
|
if [[ $? == 0 ]]; then
|
||||||
color green "restore bitwarden_rs sqlite database successful"
|
color green "restore bitwarden_rs sqlite database successful"
|
||||||
@@ -72,7 +72,7 @@ function restore_db() {
|
|||||||
function restore_config() {
|
function restore_config() {
|
||||||
color blue "restore bitwarden_rs config"
|
color blue "restore bitwarden_rs config"
|
||||||
|
|
||||||
cp -f ${RESTORE_FILE_CONFIG} ${DATA_CONFIG}
|
cp -f "${RESTORE_FILE_CONFIG}" "${DATA_CONFIG}"
|
||||||
|
|
||||||
if [[ $? == 0 ]]; then
|
if [[ $? == 0 ]]; then
|
||||||
color green "restore bitwarden_rs config successful"
|
color green "restore bitwarden_rs config successful"
|
||||||
@@ -84,8 +84,8 @@ function restore_config() {
|
|||||||
function restore_attachments() {
|
function restore_attachments() {
|
||||||
color blue "restore bitwarden_rs attachments"
|
color blue "restore bitwarden_rs attachments"
|
||||||
|
|
||||||
rm -rf ${DATA_ATTACHMENTS}
|
rm -rf "${DATA_ATTACHMENTS}"
|
||||||
tar -x -C ${DATA_DIR} -f ${RESTORE_FILE_ATTACHMENTS}
|
tar -x -C "${DATA_DIR}" -f "${RESTORE_FILE_ATTACHMENTS}"
|
||||||
|
|
||||||
if [[ $? == 0 ]]; then
|
if [[ $? == 0 ]]; then
|
||||||
color green "restore bitwarden_rs attachments successful"
|
color green "restore bitwarden_rs attachments successful"
|
||||||
@@ -103,7 +103,7 @@ function check_restore_file_exist() {
|
|||||||
|
|
||||||
function restore_file() {
|
function restore_file() {
|
||||||
if [[ -n "${RESTORE_FILE_ZIP}" ]]; then
|
if [[ -n "${RESTORE_FILE_ZIP}" ]]; then
|
||||||
check_restore_file_exist ${RESTORE_FILE_ZIP} "--zip-file"
|
check_restore_file_exist "${RESTORE_FILE_ZIP}" "--zip-file"
|
||||||
|
|
||||||
RESTORE_FILE_ZIP="${RESTORE_DIR}/${RESTORE_FILE_ZIP}"
|
RESTORE_FILE_ZIP="${RESTORE_DIR}/${RESTORE_FILE_ZIP}"
|
||||||
|
|
||||||
@@ -112,19 +112,19 @@ function restore_file() {
|
|||||||
clear_extract_dir
|
clear_extract_dir
|
||||||
else
|
else
|
||||||
if [[ -n "${RESTORE_FILE_DB}" ]]; then
|
if [[ -n "${RESTORE_FILE_DB}" ]]; then
|
||||||
check_restore_file_exist ${RESTORE_FILE_DB} "--db-file"
|
check_restore_file_exist "${RESTORE_FILE_DB}" "--db-file"
|
||||||
|
|
||||||
RESTORE_FILE_DB="${RESTORE_DIR}/${RESTORE_FILE_DB}"
|
RESTORE_FILE_DB="${RESTORE_DIR}/${RESTORE_FILE_DB}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n "${RESTORE_FILE_CONFIG}" ]]; then
|
if [[ -n "${RESTORE_FILE_CONFIG}" ]]; then
|
||||||
check_restore_file_exist ${RESTORE_FILE_CONFIG} "--config-file"
|
check_restore_file_exist "${RESTORE_FILE_CONFIG}" "--config-file"
|
||||||
|
|
||||||
RESTORE_FILE_CONFIG="${RESTORE_DIR}/${RESTORE_FILE_CONFIG}"
|
RESTORE_FILE_CONFIG="${RESTORE_DIR}/${RESTORE_FILE_CONFIG}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n "${RESTORE_FILE_ATTACHMENTS}" ]]; then
|
if [[ -n "${RESTORE_FILE_ATTACHMENTS}" ]]; then
|
||||||
check_restore_file_exist ${RESTORE_FILE_ATTACHMENTS} "--attachments-file"
|
check_restore_file_exist "${RESTORE_FILE_ATTACHMENTS}" "--attachments-file"
|
||||||
|
|
||||||
RESTORE_FILE_ATTACHMENTS="${RESTORE_DIR}/${RESTORE_FILE_ATTACHMENTS}"
|
RESTORE_FILE_ATTACHMENTS="${RESTORE_DIR}/${RESTORE_FILE_ATTACHMENTS}"
|
||||||
fi
|
fi
|
||||||
@@ -169,22 +169,22 @@ function restore() {
|
|||||||
;;
|
;;
|
||||||
--zip-file)
|
--zip-file)
|
||||||
shift
|
shift
|
||||||
RESTORE_FILE_ZIP=$(basename "$1")
|
RESTORE_FILE_ZIP="$(basename "$1")"
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
--db-file)
|
--db-file)
|
||||||
shift
|
shift
|
||||||
RESTORE_FILE_DB=$(basename "$1")
|
RESTORE_FILE_DB="$(basename "$1")"
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
--config-file)
|
--config-file)
|
||||||
shift
|
shift
|
||||||
RESTORE_FILE_CONFIG=$(basename "$1")
|
RESTORE_FILE_CONFIG="$(basename "$1")"
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
--attachments-file)
|
--attachments-file)
|
||||||
shift
|
shift
|
||||||
RESTORE_FILE_ATTACHMENTS=$(basename "$1")
|
RESTORE_FILE_ATTACHMENTS="$(basename "$1")"
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|||||||
Reference in New Issue
Block a user