Exit IP notice

docker-compose.yml

@@ -158,6 +158,7 @@ services:
     environment:
       - PRIVATE_KEY=${SF_NORDVPN_PRIVATE_KEY:-}
       - PROVIDER=NordVPN
+      - NETWORK=${SF_NET_LG}
       - POST_UP=/sf/bin/vpn_wg2status.sh /sf/run/vpn/status-nordvpn.log up %i
       - PRE_DOWN=/sf/bin/vpn_wg2status.sh /sf/run/vpn/status-nordvpn.log down %i
       - RECONNECT=604800 # Re-Connect every 7 days
@@ -252,6 +253,7 @@ services:
     environment:
       - CONFIG=${SF_MULLVAD_CONFIG:-}
       - PROVIDER=Mullvad
+      - NETWORK=${SF_NET_LG}
       - POST_UP=/sf/bin/vpn_wg2status.sh /sf/run/vpn/status-mullvad.log up %i
       - PRE_DOWN=/sf/bin/vpn_wg2status.sh /sf/run/vpn/status-mullvad.log down %i
       - RECONNECT=604800 # Re-Connect every 7 days
@@ -301,6 +303,7 @@ services:
       - NET_LG=${SF_NET_LG:?}
       - NET_VPN_ROUTER_IP=${SF_NET_VPN_ROUTER_IP:?}
       - SF_NOVPN_IP=${SF_NOVPN_IP}
+      - PROVIDER=NoVPN
       - SF_DIRECT
       - SF_DEBUG
     networks:

guest/fs-root/sf/bin/sf-motd.sh

@@ -26,8 +26,11 @@ CUL="\e[4m"
 source "/config/guest/vpn_status" 2>/dev/null
 
 if [[ -z $IS_VPN_CONNECTED ]]; then
-	if [[ -e "/config/guest/vpn_status.direct" ]]; then
-		VPN_DST="VPN Exit Node     : ${CR}DIRECT ${CF}(no VPN)${CN}"$'\n'
+	if source "/config/guest/vpn_status.direct" 2>/dev/null; then
+		str="${SFVPN_EXIT_IP}                   "
+		VPN_DST="VPN Exit Node     : ${CDG}${str:0:15}"
+		[[ -n $SFVPN_GEOIP ]] && VPN_DST+=" ${CF}(${SFVPN_GEOIP})${CN}"
+		VPN_DST+=" ${CR}>>> DIRECT <<<${CF} (no VPN)${CN}"$'\n'
 	else
 		VPN_DST="VPN Exit Node     : ${CR}TOR ${CF}(no VPN)${CN}"$'\n'
 	fi

router/Dockerfile

@@ -9,6 +9,7 @@ RUN    apt-get update \
               iptables \
               iproute2 \
               iperf \
+              jq \
               lsb-release \
               gnupg \
               net-tools \

router/init-novpn.sh

@@ -1,8 +1,6 @@
 #! /bin/bash
 
-
 [[ -z $SF_DIRECT ]] && {
-    rm -f "/sf/run/vpn/status-novpn.log" 2>/dev/null
     rm -f "/sf/run/vpn/vpn_status.direct" 2>/dev/null
     exit 0
 }
@@ -10,24 +8,22 @@
 source "/sf/bin/funcs.sh"
 source "/sf/bin/funcs_net.sh"
 
-# [[ -z $geo ]] && geo=$(curl -fsSL --retry 3 --max-time 15 https://ipinfo.io 2>/dev/null) && {
-#     local city
-#     local geo
-#     t=$(echo "$geo" | jq '.country | select(. != null)')
-#     country="${t//[^[:alnum:].-_ \/]}"
-#     t=$(echo "$geo" | jq '.city |  select(. != null)')
-#     city="${t//[^[:alnum:].-_ \/]}"
-#     t=$(echo "$geo" | jq '.ip | select(. != null)')
-#     exit_ip="${t//[^0-9.]}"
-#     geo="${city}/${country}"
+[[ -z $geo ]] && geo=$(curl -fsSL --retry 3 --max-time 15 https://ipinfo.io 2>/dev/null) && {
+    t=$(echo "$geo" | jq '.country | select(. != null)')
+    country="${t//[^[:alnum:].-_ \/]}"
+    t=$(echo "$geo" | jq '.city |  select(. != null)')
+    city="${t//[^[:alnum:].-_ \/]}"
+    t=$(echo "$geo" | jq '.ip | select(. != null)')
+    unset geo
+    exit_ip="${t//[^0-9.]}"
+    [[ -n $city || -n $country ]] && geo="${city}/${country}"
+}
+# [[ -z $geo ]] && {
+    # Query local DB for info
 # }
-# # [[ -z $geo ]] && {
-#     # Query local DB for info
-# # }
-# [[ -z $exit_ip ]] && exit_ip=$(curl -fsSL --max-time 15 ifconfig.me 2>/dev/null)
+[[ -z $exit_ip ]] && exit_ip=$(curl -fsSL --max-time 15 ifconfig.me 2>/dev/null)
 
-LOGFNAME="/sf/run/vpn/status-novpn.log"
-PROVIDER="DIRECT"
+LOGFNAME="/config/guest/vpn_status.direct"
 		echo -en "\
 SFVPN_MY_IP=\"${SF_NOVPN_IP}\"\n\
 SFVPN_EXEC_TS=\"$(date -u +%s)\"\n\
@@ -36,8 +32,6 @@ SFVPN_GEOIP=\"${geo:-Artemis}\"\n\
 SFVPN_PROVIDER=\"${PROVIDER}\"
 SFVPN_EXIT_IP=\"${exit_ip:-333.1.2.3}\"\n" >"${LOGFNAME}"
 
-touch "/config/guest/vpn_status.direct"
-
 ip route add "${NET_LG}" via "${NET_VPN_ROUTER_IP}"
 # All outgoing needs to be MASQ'ed.
 iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE

sfbin/vpn_wg2status.sh

@@ -93,8 +93,9 @@ up()
 			t=$(echo "$geo" | jq '.city |  select(. != null)')
 			city="${t//[^[:alnum:].-_ \/]}"
 			t=$(echo "$geo" | jq '.ip | select(. != null)')
+			unset geo
 			exit_ip="${t//[^0-9.]}"
-			geo="${city}/${country}"
+			[[ -n $city || -n $country ]] && geo="${city}/${country}"
 		}
 		# [[ -z $geo ]] && {
 			# Query local DB for info
@@ -121,7 +122,7 @@ SFVPN_EXIT_IP=\"${exit_ip:-333.1.2.3}\"\n" >"${LOGFNAME}"
 	create_vpn_status
 
 	# Old cryptostorm containers set a network route to default IP.
-	# Remote old one as we need to route to SF_ROUTER_IP instead.
+	# Remove; We need to route to SF_ROUTER_IP instead.
 	ip route del 10.11.0.0/24 2>/dev/null
 	ip route add 10.11.0.0/16 via "${SF_ROUTER_IP}" 2>/dev/null