Updated scripts based on latest release of docker-transmission-openvpn, updated Dockerfile, fetches now vpn config externally
This commit is contained in:
Eldwan Brianne
@@ -3,14 +3,13 @@
|
||||
set -e
|
||||
|
||||
# These are the possible bundles from PIA
|
||||
# https://www.privateinternetaccess.com/openvpn/openvpn-nextgen.zip
|
||||
# https://www.privateinternetaccess.com/openvpn/openvpn-strong-nextgen.zip
|
||||
# https://www.privateinternetaccess.com/openvpn/openvpn-ip-nextgen.zip
|
||||
# https://www.privateinternetaccess.com/openvpn/openvpn-tcp-nextgen.zip
|
||||
# https://www.privateinternetaccess.com/openvpn/openvpn-strong-tcp-nextgen.zip
|
||||
# https://www.privateinternetaccess.com/openvpn/openvpn.zip
|
||||
# https://www.privateinternetaccess.com/openvpn/openvpn-strong.zip
|
||||
# https://www.privateinternetaccess.com/openvpn/openvpn-tcp.zip
|
||||
# https://www.privateinternetaccess.com/openvpn/openvpn-strong-tcp.zip
|
||||
|
||||
baseURL="https://www.privateinternetaccess.com/openvpn"
|
||||
PIA_OPENVPN_CONFIG_BUNDLE=${PIA_OPENVPN_CONFIG_BUNDLE:-"openvpn-nextgen"}
|
||||
PIA_OPENVPN_CONFIG_BUNDLE=${PIA_OPENVPN_CONFIG_BUNDLE:-"openvpn"}
|
||||
|
||||
if [ -z "$VPN_PROVIDER_HOME" ]; then
|
||||
echo "ERROR: Need to have VPN_PROVIDER_HOME set to call this script" && exit 1
|
||||
@@ -22,13 +21,10 @@ find "$VPN_PROVIDER_HOME" -type f ! -name "*.sh" -delete
|
||||
# Download and extract wanted bundle into temporary file
|
||||
tmp_file=$(mktemp)
|
||||
echo "Downloading OpenVPN config bundle $PIA_OPENVPN_CONFIG_BUNDLE into temporary file $tmp_file"
|
||||
curl -sSL "${baseURL}/${PIA_OPENVPN_CONFIG_BUNDLE}.zip" -o "$tmp_file"
|
||||
curl -sSL --cookie /dev/null "${baseURL}/${PIA_OPENVPN_CONFIG_BUNDLE}.zip" -o "$tmp_file"
|
||||
|
||||
echo "Extract OpenVPN config bundle into PIA directory $VPN_PROVIDER_HOME"
|
||||
unzip -qjo "$tmp_file" -d "$VPN_PROVIDER_HOME"
|
||||
|
||||
echo "Modify configs for this container"
|
||||
find "$VPN_PROVIDER_HOME" -type f -name "*.ovpn" -print0 | xargs -n 1 -r0 /etc/openvpn/modify-openvpn-config.sh
|
||||
|
||||
# Select a random server as default.ovpn
|
||||
ln -sf "$(find "$VPN_PROVIDER_HOME" -name "*.ovpn" | shuf -n 1)" "$VPN_PROVIDER_HOME"/default.ovpn
|
||||
ln -sf "$(find "$VPN_PROVIDER_HOME" -name "*.ovpn" | shuf -n 1)" "$VPN_PROVIDER_HOME"/default.ovpn
|
||||
@@ -1,120 +0,0 @@
|
||||
#!/bin/bash
|
||||
#export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/root/bin
|
||||
# Source our persisted env variables from container startup
|
||||
## this is an amalgamation of two scripts to keep my PIA working, credit to the main authors, the original scripts linked in the READ.ME
|
||||
#v0.2
|
||||
|
||||
# Settings
|
||||
pia_client_id_file=/etc/deluge/pia_client_id
|
||||
|
||||
sleep 5
|
||||
|
||||
###### PIA Variables ######
|
||||
curl_max_time=15
|
||||
curl_retry=5
|
||||
curl_retry_delay=15
|
||||
user=$(sed -n 1p /config/openvpn-credentials.txt)
|
||||
pass=$(sed -n 2p /config/openvpn-credentials.txt)
|
||||
pf_host=$(ip route | head -1 | grep tun | awk '{ print $3 }')
|
||||
###### Nextgen PIA port forwarding ##################
|
||||
|
||||
get_auth_token () {
|
||||
tok=$(curl --insecure --silent --show-error --request POST --max-time $curl_max_time \
|
||||
--header "Content-Type: application/json" \
|
||||
--data "{\"username\":\"$user\",\"password\":\"$pass\"}" \
|
||||
"https://www.privateinternetaccess.com/api/client/v2/token" | jq -r '.token')
|
||||
[ $? -ne 0 ] && echo "Failed to acquire new auth token" && exit 1
|
||||
#echo "$tok"
|
||||
}
|
||||
|
||||
get_auth_token
|
||||
|
||||
yes '' | sed 3q
|
||||
|
||||
get_sig () {
|
||||
pf_getsig=$(curl --insecure --get --silent --show-error \
|
||||
--retry $curl_retry --retry-delay $curl_retry_delay --max-time $curl_max_time \
|
||||
--data-urlencode "token=$tok" \
|
||||
$verify \
|
||||
"https://$pf_host:19999/getSignature")
|
||||
if [ "$(echo $pf_getsig | jq -r .status)" != "OK" ]; then
|
||||
echo "$(date): getSignature error"
|
||||
echo $pf_getsig
|
||||
echo "the has been a fatal_error"
|
||||
fi
|
||||
pf_payload=$(echo $pf_getsig | jq -r .payload)
|
||||
pf_getsignature=$(echo $pf_getsig | jq -r .signature)
|
||||
pf_port=$(echo $pf_payload | base64 -d | jq -r .port)
|
||||
pf_token_expiry_raw=$(echo $pf_payload | base64 -d | jq -r .expires_at)
|
||||
if date --help 2>&1 /dev/null | grep -i 'busybox' > /dev/null; then
|
||||
pf_token_expiry=$(date -D %Y-%m-%dT%H:%M:%S --date="$pf_token_expiry_raw" +%s)
|
||||
else
|
||||
pf_token_expiry=$(date --date="$pf_token_expiry_raw" +%s)
|
||||
fi
|
||||
}
|
||||
|
||||
bind_port () {
|
||||
pf_bind=$(curl --insecure --get --silent --show-error \
|
||||
--retry $curl_retry --retry-delay $curl_retry_delay --max-time $curl_max_time \
|
||||
--data-urlencode "payload=$pf_payload" \
|
||||
--data-urlencode "signature=$pf_getsignature" \
|
||||
$verify \
|
||||
"https://$pf_host:19999/bindPort")
|
||||
if [ "$(echo $pf_bind | jq -r .status)" = "OK" ]; then
|
||||
echo "the port has been bound to $pf_port $(date)"
|
||||
else
|
||||
echo "$(date): bindPort error"
|
||||
echo $pf_bind
|
||||
echo "the has been a fatal_error"
|
||||
fi
|
||||
}
|
||||
|
||||
get_sig
|
||||
|
||||
#echo "sig is $pf_getsig"
|
||||
echo "port is $pf_port"
|
||||
|
||||
bind_port
|
||||
#echo "pf bind is $pf_bind"
|
||||
new_port="$pf_port"
|
||||
|
||||
echo ""
|
||||
echo "initial setup complete!"
|
||||
echo ""
|
||||
echo "waiting for rebind loop................."
|
||||
|
||||
echo "token expiry $pf_token_expiry"
|
||||
pf_remaining=$(( $pf_token_expiry - $(date +%s) ))
|
||||
echo "remaining = $pf_remaining"
|
||||
pf_bindinterval=$(( 30 * 60))
|
||||
# Get a new token when the current one has less than this remaining
|
||||
# Defaults to 7 days (same as desktop app)
|
||||
pf_minreuse=$(( 60 * 60 * 24 * 7 ))
|
||||
|
||||
pf_remaining=0
|
||||
pf_firstrun=1
|
||||
vpn_ip=$(ip route | head -1 | grep tun | awk '{ print $3 }')
|
||||
pf_host="$vpn_ip"
|
||||
|
||||
while true; do
|
||||
pf_remaining=$(( $pf_token_expiry - $(date +%s) ))
|
||||
# Get a new pf token as the previous one will expire soon
|
||||
if [ $pf_remaining -lt $pf_minreuse ]; then
|
||||
if [ $pf_firstrun -ne 1 ]; then
|
||||
echo "$(date): PF token will expire soon. Getting new one."
|
||||
else
|
||||
echo "$(date): Getting PF token"
|
||||
pf_firstrun=0
|
||||
fi
|
||||
get_sig
|
||||
echo "$(date): Obtained PF token. Expires at $pf_token_expiry_raw"
|
||||
bind_port
|
||||
echo "$(date): Server accepted PF bind"
|
||||
echo "$(date): Forwarding on port $pf_port"
|
||||
echo "$(date): Rebind interval: $pf_bindinterval seconds"
|
||||
fi
|
||||
sleep $pf_bindinterval &
|
||||
wait $!
|
||||
|
||||
bind_port
|
||||
done
|
||||
Reference in New Issue
Block a user