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

Added support for DNS config fetch

Browse Source
This commit is contained in:
Ivan Ilves 2017-02-07 05:47:56 +01:00
parent 54ff0bd9e2
commit d80ddb069a
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/client-teardown.sh
View File

@ -2,8 +2,6 @@
# #
# Teardown client after disconnection # Teardown client after disconnection
# #
set -e
if [[ ${#} != 1 ]]; then if [[ ${#} != 1 ]]; then
echo "Usage: ${0} TUNNEL_ID" echo "Usage: ${0} TUNNEL_ID"
exit 1 exit 1

33
xiringuito
View File

@ -32,12 +32,20 @@ cd $(dirname ${0})
trap teardown EXIT trap teardown EXIT
function teardown() { function teardown() {
set +e
echo "Tearing down tunnel..." echo "Tearing down tunnel..."
if [[ -f /etc/resolv.conf.orig ]]; then
sudo cp /etc/resolv.conf.orig /etc/resolv.conf
fi
if [[ ${SSH_PID} ]]; then
kill ${SSH_PID}
fi
./scripts/client-teardown.sh ${TUNNEL_ID} ./scripts/client-teardown.sh ${TUNNEL_ID}
ssh ${SSH_OPTS} ${SSH_SERVER} pkill -f ${REMOTE_PATH}/server-execute.sh ssh ${SSH_OPTS} ${SSH_SERVER} pkill -f ${REMOTE_PATH}/server-execute.sh
} }
echo "TUNNEL ID: ${TUNNEL_ID}" echo "TUNNEL ID: ${TUNNEL_ID}"
./scripts/client-setup.sh ${TUNNEL_ID} ${IP_BASE} ./scripts/client-setup.sh ${TUNNEL_ID} ${IP_BASE}
for NETWORK in ${NETWORKS}; do for NETWORK in ${NETWORKS}; do
@ -46,8 +54,29 @@ for NETWORK in ${NETWORKS}; do
done done
ssh ${SSH_OPTS} ${SSH_SERVER} mkdir -p ${REMOTE_PATH} ssh ${SSH_OPTS} ${SSH_SERVER} mkdir -p ${REMOTE_PATH}
scp -oLogLevel=QUIET ./scripts/server-*.sh ${SSH_SERVER}:${REMOTE_PATH} >/dev/null scp ${SSH_OPTS} ./scripts/server-*.sh ${SSH_SERVER}:${REMOTE_PATH} >/dev/null
ssh ${SSH_OPTS} ${SSH_SERVER} ${REMOTE_PATH}/server-setup.sh ${TUNNEL_ID} ${IP_BASE} ssh ${SSH_OPTS} ${SSH_SERVER} ${REMOTE_PATH}/server-setup.sh ${TUNNEL_ID} ${IP_BASE}
sleep 1; echo -n "SERVER: ${SSH_SERVER} ... " sleep 1; echo -n "SERVER: ${SSH_SERVER} ... "
ssh ${SSH_OPTS} -w ${TUNNEL_ID}:${TUNNEL_ID} ${SSH_SERVER} ${REMOTE_PATH}/server-execute.sh ${TUNNEL_ID} ${IP_BASE} ssh ${SSH_OPTS} -w ${TUNNEL_ID}:${TUNNEL_ID} ${SSH_SERVER} ${REMOTE_PATH}/server-execute.sh ${TUNNEL_ID} ${IP_BASE} &
SSH_PID=${!}
sleep 2
if [[ ! ${NO_DNS} && ! -z "${NETWORKS}" ]]; then
echo
echo "* Will now replace your DNS config with one fetched from the SSH server."
echo "* Set enviromental variable 'NO_DNS', if you do not want this to happen."
REMOTE_RESOLV_CONF=$(ssh ${SSH_OPTS} ${SSH_SERVER} cat /etc/resolv.conf | grep -v "[#;]" )
if [[ ! "$(grep xiringuito /etc/resolv.conf)" ]]; then
sudo cp /etc/resolv.conf /etc/resolv.conf.orig
if [[ "${REMOTE_RESOLV_CONF}" =~ nameserver ]]; then
echo "--- resolv.conf ---"
echo "# Added by xiringuito" | sudo tee /etc/resolv.conf
echo "${REMOTE_RESOLV_CONF}" | sudo tee -a /etc/resolv.conf
echo "--- resolv.conf ---"
fi
fi
fi
while true; do sleep 60000; done