derped/AutoDevReverseProxy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add support for optional database names.

Browse source
This commit is contained in:
Kevin Baensch 2023-01-18 16:54:30 +01:00
parent 981f632e13
commit 90702ac55e
3 changed files with 39 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
script/myssh
View file

@ -84,34 +84,50 @@ get_host() {
# $4 - username (optional) # $4 - username (optional)
# $5 - password (optional) # $5 - password (optional)
set_host_env() { set_host_env() {
if [ "$1" = 'mysql' ] || [ "$1" = 'postgres' ] # Unquote argument
ARG="${1//\"/}"
if [ "${ARG}" = 'mysql' ] || [ "${ARG}" = 'postgres' ]
then then
TARGET_HOST_TYPE="$1" TARGET_HOST_TYPE="${ARG}"
else else
printf 'Invalid Database type: "%s"\n' "$1" printf 'Invalid Database type: "%s"\n' "$T"
exit 1 exit 1
fi fi
if [[ "$2" =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]
ARG="${2//\"/}"
if [[ "${ARG}" =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]
then then
TARGET_HOST_IP="$2" TARGET_HOST_IP="${ARG}"
else else
printf 'Invalid Host IP "%s" given.\n' "$2" printf 'Invalid Host IP "%s" given.\n' "${ARG}"
exit 1 exit 1
fi fi
if [[ "$3" =~ ^[0-9]+$ ]]
ARG="${3//\"/}"
if [[ "${ARG}" =~ ^[0-9]+$ ]]
then then
TARGET_HOST_PORT="$3" TARGET_HOST_PORT="${ARG}"
else else
printf 'Invalid Host Port "%s" given.\n' "$3" printf 'Invalid Host Port "%s" given.\n' "${ARG}"
exit 1 exit 1
fi fi
if [ -z "${TARGET_HOST_USERNAME}" ] && [ -n "$4" ]
ARG="${4//\"/}"
if [ -z "${TARGET_HOST_DBNAME}" ] && [ -n "${ARG}" ]
then then
TARGET_HOST_USERNAME="$4" TARGET_HOST_DBNAME="${ARG}"
fi fi
if [ -z "${TARGET_HOST_PASSWORD}" ] && [ -n "$5" ]
ARG="${5//\"/}"
if [ -z "${TARGET_HOST_USERNAME}" ] && [ -n "${ARG}" ]
then then
TARGET_HOST_PASSWORD="$5" TARGET_HOST_USERNAME="${ARG}"
fi
ARG="${6//\"/}"
if [ -z "${TARGET_HOST_PASSWORD}" ] && [ -n "${ARG}" ]
then
TARGET_HOST_PASSWORD="${ARG}"
fi fi
} }
@ -121,6 +137,7 @@ set_host_env() {
# $1 - sql type (mysql or psql) # $1 - sql type (mysql or psql)
# $2 - username # $2 - username
# $3 - password # $3 - password
# $4 - dbname (optional)
run_client() { run_client() {
if [ "$1" = 'mysql' ] if [ "$1" = 'mysql' ]
then then
@ -129,7 +146,7 @@ run_client() {
open "mysql://$2:$3@${SQL_PROXY_HOST}:6033" -a "Sequel Ace" open "mysql://$2:$3@${SQL_PROXY_HOST}:6033" -a "Sequel Ace"
elif which mysql >/dev/null 2>&1 elif which mysql >/dev/null 2>&1
then then
mysql --protocol=TCP -u "$2" -p"$3" -h "${SQL_PROXY_HOST}" -P 6033 mysql --protocol=TCP -u "$2" -p"$3" -h "${SQL_PROXY_HOST}" "${4:+-D$4}" -P 6033
else else
SHOW_CLI_HELP=true SHOW_CLI_HELP=true
fi fi
@ -137,7 +154,7 @@ run_client() {
then then
if which psql >/dev/null 2>&1 if which psql >/dev/null 2>&1
then then
psql "postgresql://$2:$3@${SQL_PROXY_HOST}:6033/postgres" psql "postgresql://$2:$3@${SQL_PROXY_HOST}:6033/${4:-postgres}"
else else
SHOW_CLI_HELP=true SHOW_CLI_HELP=true
fi fi
@ -175,8 +192,9 @@ case "${MAIN_OPTION}" in
while getopts "u:p:" o while getopts "u:p:" o
do do
case "$o" in case "$o" in
u) TARGET_HOST_USERNAME="$OPTARG" ;; u) TARGET_HOST_USERNAME="${OPTARG}" ;;
p) TARGET_HOST_PASSWORD="$OPTARG" ;; p) TARGET_HOST_PASSWORD="${OPTARG}" ;;
d) TARGET_HOST_DBNAME="${OPTARG}" ;;
c) USE_CLI=true ;; c) USE_CLI=true ;;
esac esac
done done
@ -186,7 +204,7 @@ case "${MAIN_OPTION}" in
port_forward "${TARGET_HOST_IP}" "$TARGET_HOST_PORT" port_forward "${TARGET_HOST_IP}" "$TARGET_HOST_PORT"
if [ -n "${TARGET_HOST_USERNAME}" ] && [ -n "${TARGET_HOST_PASSWORD}" ] if [ -n "${TARGET_HOST_USERNAME}" ] && [ -n "${TARGET_HOST_PASSWORD}" ]
then then
run_client "${TARGET_HOST_TYPE}" "${TARGET_HOST_USERNAME}" "${TARGET_HOST_PASSWORD}" run_client "${TARGET_HOST_TYPE}" "${TARGET_HOST_USERNAME}" "${TARGET_HOST_PASSWORD}" "${TARGET_HOST_DBNAME}"
fi fi
;; ;;
disconnect) disconnect)

2
script/sqlproxy_cli.sh
View file

@ -9,7 +9,7 @@ get_host() {
export HOST=$(echo "${SSH_ORIGINAL_COMMAND}" | cut -d ' ' -f2) export HOST=$(echo "${SSH_ORIGINAL_COMMAND}" | cut -d ' ' -f2)
if [ "${HOST}" != 'get' ] if [ "${HOST}" != 'get' ]
then then
jq -r 'first(.[] | select(.host == $ENV.HOST)) | [ .type, .ip, .port, .user, .password ] | join(" ")' < "${DB_DATA_FILE}" jq -r 'first(.[] | select(.host == $ENV.HOST)) | [ .type, .ip, .port, .dbname, .user, .password ] | "\"" + join("\" \"") + "\""' < "${DB_DATA_FILE}"
fi fi
} }

4
templates/sqlproxy.sh
View file

@ -4,9 +4,9 @@ set -e
WRAP_START='[\n' WRAP_START='[\n'
if ${EXCLUDE_USERPASS} if ${EXCLUDE_USERPASS}
then then
TEMPLATE=' { "ip": "${LOCAL_IP}", "type": "${LOCAL_DB_TYPE}", "host": "${LOCAL_DB_HOST}", "port": "${LOCAL_DB_PORT}" }' TEMPLATE=' { "ip": "${LOCAL_IP}", "type": "${LOCAL_DB_TYPE}", "host": "${LOCAL_DB_HOST}", "port": "${LOCAL_DB_PORT}", "dbname": "${LOCAL_DB_DBNAME}" }'
else else
TEMPLATE=' { "ip": "${LOCAL_IP}", "type": "${LOCAL_DB_TYPE}", "user": "${LOCAL_DB_USER}", "password": "${LOCAL_DB_PASSWORD}", "host": "${LOCAL_DB_HOST}", "port": "${LOCAL_DB_PORT}" }' TEMPLATE=' { "ip": "${LOCAL_IP}", "type": "${LOCAL_DB_TYPE}", "user": "${LOCAL_DB_USER}", "port": "${LOCAL_DB_PORT}", "dbname": "${LOCAL_DB_DBNAME}", "password": "${LOCAL_DB_PASSWORD}", "host": "${LOCAL_DB_HOST}" }'
fi fi
SEPARATOR=',\n' SEPARATOR=',\n'
WRAP_END='\n]' WRAP_END='\n]'