Systemd refresh

Author: Zomboided

addon.py

@@ -23,15 +23,15 @@
 import xbmcplugin
 import xbmcgui
 import os
-from libs.common import connectionValidated, getIPInfo, isVPNConnected, getVPNProfile, getVPNProfileFriendly
+from libs.common import connectionValidated, getIPInfo, isVPNConnected, getVPNProfileFriendly
 from libs.common import getFriendlyProfileList, connectVPN, disconnectVPN, setVPNState, requestVPNCycle, getFilteredProfileList
 from libs.common import isVPNMonitorRunning, setVPNMonitorState, getVPNMonitorState, wizard
 from libs.common import getIconPath, getSystemData, getVPNServer
 from libs.platform import getPlatform, platforms, getPlatformString, fakeConnection
 from libs.vpnproviders import getAddonList, isAlternative, getAlternativeLocations, getAlternativeFriendlyLocations, getAlternativeLocation
 from libs.vpnproviders import allowReconnection
 from libs.utility import debugTrace, errorTrace, infoTrace, newPrint, getID, getName
-from libs.access import getVPNURL
+from libs.access import getVPNURL, getVPNProfile
 from libs.sysbox import popupSysBox
 
 

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="service.vpn.manager"
        name="VPN Manager for OpenVPN"
-       version="6.2.2"
+       version="6.2.3"
        provider-name="Zomboided">
   <requires>
     <import addon="xbmc.python" version="2.7.0"/>

changelog.txt

@@ -1,3 +1,6 @@
+v6.2.3
+- Refresh systemd for Nord default connection
+
 v6.2.2
 - Logging bug fix
 

libs/access.py

@@ -40,10 +40,16 @@ def setVPNURL(address):
     # Store the server name or URL being used
     xbmcgui.Window(10000).setProperty("VPN_Manager_Connected_Server_URL", address)
 
+
 def getVPNURL():
     # Return the server name or URL being used
     return xbmcgui.Window(10000).getProperty("VPN_Manager_Connected_Server_URL")
 
+    
+def getVPNProfile():
+    # Return full profile path name
+    return xbmcgui.Window(10000).getProperty("VPN_Manager_Connected_Profile_Name")    
+    
 
 # Manage the authentication tokens
 def resetTokens():

libs/alternativeNord.py

@@ -26,8 +26,8 @@
 import urllib2
 import time
 from libs.utility import ifHTTPTrace, ifJSONTrace, debugTrace, infoTrace, errorTrace, ifDebug, newPrint, getID, now
-from libs.platform import getAddonPath
-from libs.access import setVPNRequestedServer, getVPNRequestedServer, resetTokens, setTokens, getTokens, setVPNURL, getVPNURL
+from libs.platform import getAddonPath, getSystemdPath, copySystemdFiles, fakeSystemd
+from libs.access import setVPNRequestedServer, getVPNRequestedServer, resetTokens, setTokens, getTokens, setVPNURL, getVPNURL, getVPNProfile
 
 NORD_LOCATIONS = "COUNTRIES.txt"
 
@@ -508,4 +508,13 @@ def resetNordVPN(vpn_provider):
     # Elsewhere the ovpn and location downloads will be deleted
     resetTokens()
     return True    
+    
+    
+def postConnectNordVPN(vpn_provider):
+    # Post connect, might need to update the systemd config
+    addon = xbmcaddon.Addon(getID())
+    if ((addon.getSetting("1_vpn_validated") == getVPNProfile()) and (addon.getSetting("vpn_connect_before_boot") == "true")):
+        if xbmcvfs.exists(getSystemdPath("openvpn.config")) or fakeSystemd():
+            copySystemdFiles()
+    return    
 

libs/alternativeShellfire.py

@@ -657,3 +657,7 @@ def sendAPI(command, command_text, api_data, check_response):
     return rc, api_data
 
 
+def postConnectShellfire(vpn_provider):
+    # Post connect, nothing special to do for Shellfire
+    return
+

libs/common.py

@@ -38,10 +38,10 @@
 from vpnproviders import usesPassAuth, cleanPassFiles, isUserDefined, getKeyPass, getKeyPassName, usesKeyPass, writeKeyPass, refreshVPNFiles
 from vpnproviders import setVPNProviderUpdate, setVPNProviderUpdateTime, getVPNDisplay, isAlternative, allowViewSelection, updateVPNFile
 from vpnproviders import getAlternativePreFetch, getAlternativeFriendlyLocations, getAlternativeFriendlyServers, getAlternativeLocation, getAlternativeServer
-from vpnproviders import authenticateAlternative, getAlternativeUserPass, getAlternativeProfiles, allowReconnection
+from vpnproviders import authenticateAlternative, getAlternativeUserPass, getAlternativeProfiles, allowReconnection, postConnectAlternative
 from ipinfo import getIPInfoFrom, getIPSources, getNextSource, getAutoSource, isAutoSelect, getErrorValue, getIndex
 from logbox import popupOpenVPNLog
-from access import setVPNURL, getVPNURL
+from access import setVPNURL, getVPNURL, getVPNProfile
 from userdefined import importWizard
 
 
@@ -434,11 +434,6 @@ def setVPNProfile(profile_name):
     return
 
 
-def getVPNProfile():
-    # Return full profile path name
-    return xbmcgui.Window(10000).getProperty("VPN_Manager_Connected_Profile_Name")
-
-    
 def setVPNProfileFriendly(profile_name):
     # Store shortened profile name
     xbmcgui.Window(10000).setProperty("VPN_Manager_Connected_Profile_Friendly_Name", profile_name)
@@ -2040,6 +2035,8 @@ def connectVPN(connection_order, vpn_profile):
         setVPNLastConnectedProfileFriendly("")
         setConnectionErrorCount(0)
         setConnectTime(addon)
+        if isAlternative(vpn_provider):
+            postConnectAlternative(vpn_provider)
         # Indicate to the service that it should update its settings
         updateService("connectVPN")
     elif progress.iscanceled() or cancel_attempt:

libs/generation.py

@@ -40,14 +40,14 @@ def generateAll():
     #generateBlackbox
     #generateBTGuard()
     #generateBulletVPN()
-    generateCelo()
+    #generateCelo()
     #generateCyberGhost()
-    #generateExpressVPN()
+    generateExpressVPN()
     #generateHideMe()
     #generateHMA()
     #generateHideIPVPN()
     #generateibVPN()
-    #generateIPVanish()
+    generateIPVanish()
     #generateIVPN()
     #generateLimeVPN()
     #generateLiquidVPN()
@@ -62,7 +62,7 @@ def generateAll():
     #generateSecureVPN()
     #generateSmartDNSProxy()
     #generatetigerVPN() 
-    #generateTorGuard()
+    generateTorGuard()
     #generateTotalVPN()
     #generateVanishedVPN()
     #generateVPNac()
@@ -72,7 +72,7 @@ def generateAll():
     #generateVPNUnlimited()
     #generateVyprVPN()
     #generateWiTopia()
-    #generateWindscribe()
+    generateWindscribe()
     return
 
 
@@ -219,7 +219,7 @@ def generateCyberGhost():
     # Data is stored as a bunch of ovpn files
     # File name has location but needs mapping.  File has the server
     profiles = getProfileList("CyberGhost")
-    location_file = getLocations("CyberGhost", "Premium and Premium Plus Account")
+    location_file = getLocations("CyberGhost", "")
     for profile in profiles:
         geo = profile[profile.rfind("\\")+1:profile.index(".ovpn")]
         geo = resolveCountry(geo[0:2]) + geo[2:]
@@ -1223,6 +1223,9 @@ def generateWindscribe():
         line = line.strip(" \t\n\r")
         server = line
         geo = line.replace(".windscribe.com", "")
+        if geo.startswith("wf-"):
+            geo = geo.replace("wf-", "")
+            geo = geo + "-Windflix"
         if "-" in geo:
             geo, rest = geo.split("-")
             rest = " " + string.capwords(rest)

libs/vpnproviders.py

@@ -29,12 +29,12 @@
 from utility import ifHTTPTrace, debugTrace, errorTrace, infoTrace, newPrint, getID, getShort
 from platform import getAddonPath, getUserDataPath, fakeConnection, getSeparator, getPlatform, platforms, useSudo, generateVPNs
 from alternativeNord import getNordVPNPreFetch, getNordVPNLocations, getNordVPNFriendlyLocations, getNordVPNLocation, getNordVPNLocationName
-from alternativeNord import getNordVPNUserPass, getNordVPNServers, getNordVPNFriendlyServers, getNordVPNServer, regenerateNordVPN
+from alternativeNord import getNordVPNUserPass, getNordVPNServers, getNordVPNFriendlyServers, getNordVPNServer, regenerateNordVPN, postConnectNordVPN
 from alternativeNord import resetNordVPN, authenticateNordVPN, getNordVPNProfiles, getNordVPNMessages, checkForNordVPNUpdates, refreshFromNordVPN
 from alternativeShellfire import getShellfirePreFetch, getShellfireLocations, getShellfireFriendlyLocations, getShellfireLocation
 from alternativeShellfire import getShellfireLocationName, getShellfireUserPass, getShellfireServers, getShellfireFriendlyServers 
 from alternativeShellfire import getShellfireServer, regenerateShellfire, resetShellfire, authenticateShellfire, getShellfireProfiles
-from alternativeShellfire import getShellfireMessages, checkForShellfireUpdates, refreshFromShellfire
+from alternativeShellfire import getShellfireMessages, checkForShellfireUpdates, refreshFromShellfire, postConnectShellfire
 
 
 # **** ADD MORE VPN PROVIDERS HERE ****
@@ -538,6 +538,10 @@ def checkForAlternativeUpdates(vpn_provider):
 def refreshFromAlternative(vpn_provider):
     return globals()["refreshFrom" + vpn_provider](vpn_provider)    
 
+        
+def postConnectAlternative(vpn_provider):
+    return globals()["postConnect" + vpn_provider](vpn_provider)      
+    
 
 def getLocationFiles(vpn_provider):
     # Return the locations files, add any user version to the end of the list

service.py

@@ -29,7 +29,7 @@
 import urllib2
 import re
 import string
-from libs.common import updateServiceRequested, ackUpdate, getVPNProfile, setVPNProfile, getVPNProfileFriendly, setVPNProfileFriendly, getReconnectTime
+from libs.common import updateServiceRequested, ackUpdate, setVPNProfile, getVPNProfileFriendly, setVPNProfileFriendly, getReconnectTime
 from libs.common import getVPNRequestedProfile, setVPNRequestedProfile, getVPNRequestedProfileFriendly, setVPNRequestedProfileFriendly, getIPInfo
 from libs.common import setVPNState, getVPNState, stopRequested, ackStop, startRequested, ackStart, updateService, stopVPNConnection, startVPNConnection
 from libs.common import getVPNLastConnectedProfile, setVPNLastConnectedProfile, getVPNLastConnectedProfileFriendly, setVPNLastConnectedProfileFriendly
@@ -43,8 +43,8 @@
 from libs.utility import debugTrace, errorTrace, infoTrace, ifDebug, newPrint, setID, setName, setShort, setVery, running, setRunning, now, isCustom
 from libs.vpnproviders import removeGeneratedFiles, cleanPassFiles, fixOVPNFiles, getVPNLocation, usesPassAuth, clearKeysAndCerts, checkForVPNUpdates
 from libs.vpnproviders import populateSupportingFromGit, isAlternative, regenerateAlternative, getAlternativeLocation, updateVPNFile, checkUserDefined
-from libs.vpnproviders import getUserDataPath, getAlternativeMessages
-from libs.access import getVPNURL, setVPNURL
+from libs.vpnproviders import getUserDataPath, getAlternativeMessages, postConnectAlternative
+from libs.access import getVPNURL, setVPNURL, getVPNProfile
 from libs.vpnapi import VPNAPI
 
 # Set the addon name for use in the dialogs
@@ -974,6 +974,8 @@ def onPlayBackStarted(self, *arg):
                                         addon.setSetting("alternative_message_time", str(now()))
                                         addon.setSetting("alternative_message_token", new_id)
                                 addon = xbmcaddon.Addon()
+                                if isAlternative(vpn_provider):
+                                    postConnectAlternative(vpn_provider)
                                 if addon.getSetting("display_location_on_connect") == "true":
                                     _, ip, country, isp = getIPInfo(addon)
                                     xbmcgui.Dialog().notification(notification_title, "Connected to "+ getVPNProfileFriendly() + " via Service Provider " + isp + " in " + country + ". IP is " + ip + ".", getAddonPath(True, icon), 20000, False)