def copyUserDefinedFiles():
# Copy everything in the user directory to the addon directory
infoTrace("vpnproviders.py",
"Copying user defined files from userdata directory")
source_path = getUserDataPath((user_def_str) + "/")
dest_path = getAddonPath(True, user_def_str + "/")
# Get the list of connection profiles and another list of strings to abuse for the selection screen
try:
files = getUserDataList(user_def_str, "*")
if len(files) == 0:
errorTrace(
"vpnproviders.py",
"No User Defined files available to copy from " + source_path)
return False
for file in files:
name = file[file.rfind(getSeparator()) + 1:]
dest_file = dest_path + getSeparator() + name
xbmcvfs.copy(file, dest_file)
if not xbmcvfs.exists(dest_file):
raise IOError('Failed to copy user def file ' + file + " to " +
dest_file)
return True
except Exception as e:
errorTrace(
"vpnproviders.py",
"Error copying files from " + source_path + " to " + dest_path)
errorTrace("vpnproviders.py", str(e))
return False
def copyUserDefinedFiles():
# Copy everything in the user directory to the addon directory
infoTrace("vpnproviders.py", "Copying user defined files from userdata directory")
source_path = getUserDataPath((user_def_str)+"/")
dest_path = getAddonPath(True, user_def_str + "/")
# Get the list of connection profiles and another list of strings to abuse for the selection screen
try:
files = getUserDataList(user_def_str, "*")
if len(files) == 0:
errorTrace("vpnproviders.py", "No User Defined files available to copy from " + source_path)
return False
for file in files:
name = file[file.rfind(getSeparator())+1:]
dest_file = dest_path + getSeparator() + name
xbmcvfs.copy(file, dest_file)
if not xbmcvfs.exists(dest_file): raise IOError('Failed to copy user def file ' + file + " to " + dest_file)
return True
except Exception as e:
errorTrace("vpnproviders.py", "Error copying files from " + source_path + " to " + dest_path)
errorTrace("vpnproviders.py", str(e))
return False
def importWizard():
addon = xbmcaddon.Addon("service.vpn.manager")
addon_name = addon.getAddonInfo("name")
errorMessage = ""
success = False
cancel = False
xbmcgui.Dialog().ok(
addon_name,
"The User Defined import wizard helps you set up an unsupported VPN provider. It may not work without additional user intervention. You should review the import log and subsequent VPN logs to debug any problems."
)
# Warn the user that files will be deleted and kittens will be harmed
if xbmcgui.Dialog().yesno(
addon_name,
"Any existing User Defined settings and files will be deleted. Do you want to continue?",
"", ""):
removeGeneratedFiles()
success = clearUserData()
addon.setSetting("vpn_provider", "User Defined")
if not success:
errorMessage = "Could not clear the UserDefined directory. Check the log."
else:
success = False
errorMessage = "Import wizard has not been run, no settings or files have been changed."
# Get the list of files to be used
if success:
if xbmcgui.Dialog().yesno(
addon_name,
"Select ALL files needed to connect to the VPN provider, including .ovpn, .key and .crt files. Select a directory (sub directories are ignored) or select multiple files within a directory?.",
"", "", "Directory", "Files"):
directory_input = False
files = xbmcgui.Dialog().browse(1, "Select all VPN provider files",
"files", "", False, False, "",
True)
else:
directory_input = True
dname = xbmcgui.Dialog().browse(
0, "Select a directory containing VPN provider files", "files",
"", False, False, "", False)
debugTrace("Import from directory " + dname)
dirs, files = xbmcvfs.listdir(dname)
# Separate the selected files into ovpn files and other files
ovpn_files = []
other_files = []
for name in files:
if directory_input:
name = dname + name
debugTrace("Found file " + name)
if name.endswith(".ovpn"):
ovpn_files.append(name)
else:
other_files.append(name)
if len(ovpn_files) == 0:
success = False
errorMessage = "No .ovpn files found. You must provide at least one .ovpn file."
# Copy and modify the ovpn files
if success:
# Create some logs to write out later
summary = []
detail = []
summary.append("Importing selected files to User Defined directory, " +
getUserDataPath("UserDefined/") + "\n")
summary.append("at " + time.strftime('%Y-%m-%d %H:%M:%S') + "\n")
detail.append("\n=== Import details ===\n\n")
update = False
rename = False
if xbmcgui.Dialog().yesno(
addon_name,
"Update the .ovpn files to best guess values and determine the best User Defined provider settings (recommended)?",
"", ""):
update = True
detail.append("Updating the .ovpn files to best guess settings\n")
if xbmcgui.Dialog().yesno(
addon_name,
"Rename the .ovpn files to indicate either a UDP or TCP connection type to allow filtering of connections?",
"", ""):
rename = True
detail.append("Files will be renamed to indicate UDP or TCP\n")
# Display dialog to show progress of copying files
dialog_step = 100 / (len(ovpn_files) + len(other_files))
progress = xbmcgui.DialogProgress()
progress_title = "Copying User Defined files."
progress.create(addon_name, progress_title)
prog_step = 0
xbmc.sleep(500)
try:
dest_path = getUserDataPath("UserDefined/")
debugTrace("Checking directory path exists before copying " +
dest_path)
if not os.path.exists(dest_path):
infoTrace("import.py", "Creating " + dest_path)
os.makedirs(os.path.dirname(dest_path))
xbmc.sleep(500)
# Loop around waiting for the directory to be created. After 10 seconds we'll carry
# on and let he open file calls fail and throw an exception
t = 0
while not os.path.exists(os.path.dirname(dest_path)):
if t == 9:
errorTrace(
"vpnprovider.py",
"Waited 10 seconds to create directory but it never appeared"
)
break
xbmc.sleep(1000)
t += 1
other_files_count = []
for fname in other_files:
path, dest_name = os.path.split(fname)
dest_name = getUserDataPath("UserDefined/" + dest_name)
# Report file being copied, then do it
progress_message = "Copying " + fname
progress.update(prog_step, progress_title, progress_message)
xbmc.sleep(100)
prog_step += dialog_step
infoTrace("import.py", "Copying " + fname + " to " + dest_name)
detail.append("Copying " + fname + " to " + dest_name + "\n")
xbmcvfs.copy(fname, dest_name)
if not xbmcvfs.exists(dest_name):
raise IOError('Failed to copy user def file ' + fname +
" to " + dest_name)
other_files_count.append(0)
if progress.iscanceled():
cancel = True
break
auth_count = 0
auth_found = 0
cert_count = 0
cert_found = 0
multiple_certs = False
last_cert_found = ""
ecert_count = 0
key_count = 0
key_found = 0
key_pass_found = 0
key_pass_count = 0
multiple_keys = False
last_key_found = ""
ekey_count = 0
if not cancel:
metadata = getGitMetaData("UserDefined")
mods = []
if not metadata == None:
for line in metadata:
line = line.strip(' \t\n\r')
mods.append(line)
for oname in ovpn_files:
path, dest_name = os.path.split(oname)
dest_name = getUserDataPath("UserDefined/" + dest_name)
# Update dialog to saywhat's happening
if update:
progress_message = "Copying and updating " + oname
else:
progress_message = "Copying " + oname
progress.update(prog_step, progress_title,
progress_message)
xbmc.sleep(100)
prog_step += dialog_step
# Copy the ovpn file
infoTrace("import.py",
"Copying " + oname + " to " + dest_name)
detail.append("Copying " + oname + " to " + dest_name +
"\n")
xbmcvfs.copy(oname, dest_name)
if not xbmcvfs.exists(dest_name):
raise IOError('Failed to copy user def ovpn ' + oname +
" to " + dest_name)
if update:
# Read the copied file in and then overwrite it with any updates needed
# Was doing a read from source and write here but this failed on Linux over an smb mount (file not found)
auth = False
keypass = False
infoTrace("import.py", "Updating " + dest_name)
detail.append("Updating " + dest_name + "\n")
source_file = open(dest_name, 'r')
source = source_file.readlines()
source_file.close()
dest_file = open(dest_name, 'w')
proto = "UDP"
flags = [False, False, False, False, False]
for line in source:
line = line.strip(' \t\n\r')
old_line = line
i = 0
# Look for each non ovpn file uploaded and update it to make sure the path is good
for fname in other_files:
path, name = os.path.split(fname)
if not line.startswith("#"):
params = line.split()
if len(params) == 2:
# Remove the separator in order to get any fully qualified filename as space delimited
params[1].replace(getSeparator(), " ")
# Add in a leading space for unqualified filenames
params[1] = " " + params[1]
if params[1].endswith(" " + name):
old_line = line
line = params[
0] + " " + "#PATH" + getSeparatorOutput(
) + name
detail.append(" Found " + name +
", old line was : " +
old_line + "\n")
detail.append(" New line is " +
line + "\n")
other_files_count[i] += 1
if line.startswith(
"auth-user-pass"):
auth_found += 1
auth = True
if line.startswith("cert "):
cert_found += 1
if line.startswith("key "):
key_found += 1
if line.startswith("askpass "):
key_pass_found += 1
keypass = True
i += 1
# Do some tag counting to determine authentication methods to use
if not line.startswith("#"):
for mod in mods:
flag, verb, parms = mod.split(",")
if flag == "1" and line.startswith(
verb) and parms in line:
flags[0] = True
if flag == "3" and line.startswith(verb):
flags[2] = True
if flag == "4" and line.startswith(verb):
line = verb + " " + parms
if flag == "5" and not flags[
4] and verb in line:
detail.append(" WARNING, " + parms +
"\n")
flags[4] = True
if line.startswith("auth-user-pass"):
auth_count += 1
if not auth:
line = "auth-user-pass #PATH" + getSeparatorOutput(
) + "pass.txt"
if line.startswith("cert "):
cert_count += 1
if not last_cert_found == old_line:
if not last_cert_found == "":
multiple_certs = True
last_cert_found = old_line
if line.startswith("key "):
key_count += 1
if not last_key_found == old_line:
if not last_key_found == "":
multiple_keys = True
last_key_found = old_line
if line.startswith("askpass"):
key_pass_count += 1
if not keypass:
line = "askpass #PATH" + getSeparatorOutput(
) + "key.txt"
if line.startswith("proto "):
if "tcp" in (line.lower()): proto = "TCP"
if line.startswith("<cert>"):
ecert_count += 1
if line.startswith("<key>"):
ekey_count += 1
if not flags[2]: dest_file.write(line + "\n")
flags[2] = False
for mod in mods:
flag, verb, parms = mod.split(",")
if flag == "2":
dest_file.write(verb + "\n")
dest_file.close()
flags[4] = False
if flags[0]:
if xbmcvfs.exists(dest_name):
xbmcvfs.delete(dest_name)
detail.append(
" wARNING, couldn't import file as it contains errors or is unsupported\n"
)
elif rename:
proto = " (" + proto + ").ovpn"
new_name = dest_name.replace(".ovpn", proto)
if not xbmcvfs.exists(new_name):
xbmcvfs.rename(dest_name, new_name)
detail.append(" Renamed to " + new_name +
"\n")
else:
detail.append(
" WARNING, couldn't rename file to " +
new_name +
" as a file with that name already exists\n"
)
if progress.iscanceled():
cancel = True
break
except Exception as e:
errorTrace("import.py", "Failed to copy (or update) file")
errorTrace("import.py", str(e))
success = False
errorMessage = "Failed to copy (or update) selected files. Check the log."
progress_message = "Outputting results of import wizard"
progress.update(100, progress_title, progress_message)
xbmc.sleep(500)
# General import results
summary.append("\n=== Summary of import ===\n\n")
if cancel:
summary.append("Import was cancelled\n")
else:
summary.append("Imported " + str(len(ovpn_files)) +
" .ovpn files and " + str(len(other_files)) +
" other files.\n")
summary.append(
"\nYou should understand any WARNINGs below, and validate that the .ovpn files imported have been updated correctly.\n\n"
)
summary.append(
"If the VPN connection fails view the VPN log to determine why, using Google to understand the errors if necessary.\n"
)
summary.append(
"You can fix problems either by editing your local files and re-importing, or by editing the contents of the User Defined directory.\n\n"
)
if update:
# Report on how user names and passwords will be handled
if auth_count > 0:
if auth_found > 0:
# Not using a password as resolved by file
addon.setSetting("user_def_credentials", "false")
summary.append(
"The auth-user-pass tag was found " +
str(auth_count) +
" times, but was resolved using a supplied file so user name and password don't need to be entered.\n"
)
if not auth_found == auth_count:
summary.append(
" WARNING : The auth-user-pass tag was found "
+ str(auth_count) +
" times, but only resolved using a supplied file "
+ str(auth_found) +
" times. Some connections may not work.\n")
else:
# Using a password as auth-user-pass tag was found
addon.setSetting("user_def_credentials", "true")
summary.append(
"The auth-user-pass tag was found " +
str(auth_count) +
" times so assuming user name and password authentication is used.\n"
)
if auth_count < len(ovpn_files):
summary.append(
" WARNING : The auth-user-pass tag was only found in "
+ str(auth_count) + " .ovpn files, out of " +
str(len(ovpn_files)) +
". Some connections may not work.\n")
else:
# Not using a password as no auth-user-pass tag was found
addon.setSetting("user_def_credentials", "false")
summary.append(
"No auth-user-pass tag was found, so assuming user name and password is not needed.\n"
)
# Report on how keys and certs will be handled
if (cert_count > 0 or key_count > 0):
summary.append("The key tag was found " + str(key_count) +
" times, and the cert tag was found " +
str(cert_count) + " times.\n")
if cert_found > 0 or key_found > 0:
# Key and cert resolved by file so not asking user for them
addon.setSetting("user_def_keys", "None")
summary.append(
"The key and certificate don't need to be requested as the key tags were resolved using a supplied file "
+ str(key_found) +
" times, and the cert tags were resolved using a supplied file "
+ str(cert_found) + " times.\n")
if (not cert_found == cert_count) or (not key_found
== key_count):
summary.append(
" WARNING : The key or cert tags were not resolved by a supplied file for all occurrences. Some connections may not work.\n"
)
else:
if multiple_certs or multiple_keys:
# Key and cert tags found with different file names, but no files supplied. Assume multiple files, user supplied
addon.setSetting("user_def_keys", "Multiple")
summary.append(
"Found key and cert tags with multiple filenames, but no key or certificate files were supplied. These will be requested during connection.\n"
)
else:
# Key and cert tags found with same file names, but no files supplied. Assume single file, user supplied
addon.setSetting("user_def_keys", "Single")
summary.append(
"Found key and cert tags all with the same filename, but no key or certificate files were supplied. These will be requested during connection.\n"
)
if cert_count < len(ovpn_files) or key_count < len(
ovpn_files):
summary.append(
" WARNING : The key tag was found " +
str(key_count) +
" times, and the cert tag was found " +
str(cert_count) +
" times. Expected to find one of each in all " +
str(len(ovpn_files)) +
" .ovpn files. Some connections may not work.\n")
else:
# Embedded key and certs found, so not asking user for them
addon.setSetting("user_def_keys", "None")
if (ekey_count > 0 or ecert_count > 0):
if ekey_count == ecert_count and key_count == len(
ovpn_files):
summary.append(
"Using embedded user keys and certificates so keys and certs don't need to be entered.\n"
)
else:
summary.append(
" WARNING : Using embedded user keys and certificates, but found "
+ str(ekey_count) + " keys and " +
str(ecert_count) + " certificates in " +
str(len(ovpn_files)) +
" .ovpn files. There should be one of each in all .ovpn files otherwise some connections may not work.\n"
)
else:
summary.append(
"No user key or cert tags were found so assuming this type of authentication is not used.\n"
)
# Report on how key passwords will be handled
if key_pass_count > 0:
if key_pass_found > 0:
# Not using a password as resolved by file
addon.setSetting("user_def_key_password", "false")
summary.append(
"The askpass tag was found " + str(auth_count) +
" times, but was resolved using a supplied file so the key password doesn't need to be entered.\n"
)
if not key_pass_found == key_pass_count:
summary.append(
" WARNING : The askpass tag was found " +
str(key_pass_count) +
" times, but only resolved using a supplied file "
+ str(key_pass_found) +
" times. Some connections may not work.\n")
else:
# Using a password as auth-user-pass tag was found
addon.setSetting("user_def_key_password", "true")
summary.append(
"The askpass tag was found " +
str(key_pass_count) +
" times so assuming key password authentication is used.\n"
)
if key_pass_count < len(ovpn_files):
summary.append(
" WARNING : The askpass tag was only found in " +
str(key_pass_count) + " .ovpn files, out of " +
str(len(ovpn_files)) +
". Some connections may not work, or you may be asked to enter a password when it's not necessary.\n"
)
else:
# Not using a password as no askpass tag was found
addon.setSetting("user_def_key_password", "false")
summary.append(
"No askpass tag was found, so assuming key password is not needed.\n"
)
# Report how many times each of the non .ovpn files were used
i = 0
for oname in other_files:
summary.append("File " + oname +
" was found and used in .ovpn files " +
str(other_files_count[i]) + " times.\n")
if not other_files_count[i] == len(ovpn_files):
if other_files_count[i] == 0:
summary.append(
" WARNING : " + oname +
" was not used to update any .ovpn files and could be unused.\n"
)
else:
summary.append(
" WARNING : The number of updates for " +
oname +
" was different to the number of .ovpn files, "
+ str(len(ovpn_files)) +
", which could be a problem.\n")
i += 1
else:
summary.append(
"None of the files were updated during import.\n")
# Open a log file so all changes can be recorded without fouling up the kodi log
log_name = getImportLogPath()
if xbmcvfs.exists(log_name): xbmcvfs.delete(log_name)
log_file = open(log_name, 'w')
for line in summary:
log_file.write(line)
for line in detail:
log_file.write(line)
log_file.close()
progress.close()
xbmc.sleep(100)
if success:
if xbmcgui.Dialog().yesno(
addon_name,
"Import wizard finished. You should view the import log to review any issues, enter your user ID and password (if necessary) and then try and validate a VPN connection.",
"", "", "OK", "Import Log"):
popupImportLog()
else:
xbmcgui.Dialog().ok(addon_name, errorMessage)
return success
def importWizard():
addon = xbmcaddon.Addon("service.vpn.manager")
addon_name = addon.getAddonInfo("name")
errorMessage = ""
success = False
cancel = False
xbmcgui.Dialog().ok(addon_name, "The User Defined import wizard helps you set up an unsupported VPN provider. It may not work without additional user intervention. You should review the import log and subsequent VPN logs to debug any problems.")
# Warn the user that files will be deleted and kittens will be harmed
if xbmcgui.Dialog().yesno(addon_name, "Any existing User Defined settings and files will be deleted. Do you want to continue?", "", ""):
removeGeneratedFiles()
success = clearUserData()
addon.setSetting("vpn_provider", "User Defined")
if not success: errorMessage = "Could not clear the UserDefined directory. Check the log."
else:
success = False
errorMessage = "Import wizard has not been run, no settings or files have been changed."
# Get the list of files to be used
if success:
if xbmcgui.Dialog().yesno(addon_name, "Select ALL files needed to connect to the VPN provider, including .ovpn, .key and .crt files. Select a directory (sub directories are ignored) or select multiple files within a directory?.", "", "", "Directory", "Files"):
directory_input = False
files = xbmcgui.Dialog().browse(1, "Select all VPN provider files", "files", "", False, False, "", True)
else:
directory_input = True
dname = xbmcgui.Dialog().browse(0, "Select a directory containing VPN provider files", "files", "", False, False, "", False)
debugTrace("Import from directory " + dname)
dirs, files = xbmcvfs.listdir(dname)
# Separate the selected files into ovpn files and other files
ovpn_files = []
other_files = []
for name in files:
if directory_input:
name = dname + name
debugTrace("Found file " + name)
if name.endswith(".ovpn"):
ovpn_files.append(name)
else:
other_files.append(name)
if len(ovpn_files) == 0:
success = False
errorMessage = "No .ovpn files found. You must provide at least one .ovpn file."
# Copy and modify the ovpn files
if success:
# Create some logs to write out later
summary = []
detail = []
summary.append("Importing selected files to User Defined directory, " + getUserDataPath("UserDefined/") + "\n")
summary.append("at " + time.strftime('%Y-%m-%d %H:%M:%S') + "\n")
detail.append("\n=== Import details ===\n\n")
update = False
rename = False
if xbmcgui.Dialog().yesno(addon_name, "Update the .ovpn files to best guess values and determine the best User Defined provider settings (recommended)?", "", ""):
update = True
detail.append("Updating the .ovpn files to best guess settings\n")
if xbmcgui.Dialog().yesno(addon_name, "Rename the .ovpn files to indicate either a UDP or TCP connection type to allow filtering of connections?", "", ""):
rename = True
detail.append("Files will be renamed to indicate UDP or TCP\n")
# Display dialog to show progress of copying files
dialog_step = 100/(len(ovpn_files) + len(other_files))
progress = xbmcgui.DialogProgress()
progress_title = "Copying User Defined files."
progress.create(addon_name,progress_title)
prog_step = 0
xbmc.sleep(500)
try:
dest_path = getUserDataPath("UserDefined/")
debugTrace("Checking directory path exists before copying " + dest_path)
if not os.path.exists(dest_path):
infoTrace("import.py", "Creating " + dest_path)
os.makedirs(os.path.dirname(dest_path))
xbmc.sleep(500)
# Loop around waiting for the directory to be created. After 10 seconds we'll carry
# on and let he open file calls fail and throw an exception
t = 0
while not os.path.exists(os.path.dirname(dest_path)):
if t == 9:
errorTrace("vpnprovider.py", "Waited 10 seconds to create directory but it never appeared")
break
xbmc.sleep(1000)
t += 1
other_files_count = []
for fname in other_files:
path, dest_name = os.path.split(fname)
dest_name = getUserDataPath("UserDefined/" + dest_name)
# Report file being copied, then do it
progress_message = "Copying " + fname
progress.update(prog_step, progress_title, progress_message)
xbmc.sleep(100)
prog_step += dialog_step
infoTrace("import.py", "Copying " + fname + " to " + dest_name)
detail.append("Copying " + fname + " to " + dest_name + "\n")
xbmcvfs.copy(fname, dest_name)
if not xbmcvfs.exists(dest_name): raise IOError('Failed to copy user def file ' + fname + " to " + dest_name)
other_files_count.append(0)
if progress.iscanceled():
cancel = True
break
auth_count = 0
auth_found = 0
cert_count = 0
cert_found = 0
multiple_certs = False
last_cert_found = ""
ecert_count = 0
key_count = 0
key_found = 0
key_pass_found = 0
key_pass_count = 0
multiple_keys = False
last_key_found = ""
ekey_count = 0
if not cancel:
metadata = getGitMetaData("UserDefined")
mods = []
if not metadata == None:
for line in metadata:
line = line.strip(' \t\n\r')
mods.append(line)
for oname in ovpn_files:
path, dest_name = os.path.split(oname)
dest_name = getUserDataPath("UserDefined/" + dest_name)
# Update dialog to saywhat's happening
if update:
progress_message = "Copying and updating " + oname
else:
progress_message = "Copying " + oname
progress.update(prog_step, progress_title, progress_message)
xbmc.sleep(100)
prog_step += dialog_step
# Copy the ovpn file
infoTrace("import.py", "Copying " + oname + " to " + dest_name)
detail.append("Copying " + oname + " to " + dest_name + "\n")
xbmcvfs.copy(oname, dest_name)
if not xbmcvfs.exists(dest_name): raise IOError('Failed to copy user def ovpn ' + oname + " to " + dest_name)
if update:
# Read the copied file in and then overwrite it with any updates needed
# Was doing a read from source and write here but this failed on Linux over an smb mount (file not found)
auth = False
keypass = False
infoTrace("import.py", "Updating " + dest_name)
detail.append("Updating " + dest_name + "\n")
source_file = open(dest_name, 'r')
source = source_file.readlines()
source_file.close()
dest_file = open(dest_name, 'w')
proto = "UDP"
flags = [False, False, False, False, False]
for line in source:
line = line.strip(' \t\n\r')
old_line = line
i = 0
# Look for each non ovpn file uploaded and update it to make sure the path is good
for fname in other_files:
path, name = os.path.split(fname)
if not line.startswith("#"):
params = line.split()
if len(params) == 2:
# Remove the separator in order to get any fully qualified filename as space delimited
params[1].replace(getSeparator(), " ")
# Add in a leading space for unqualified filenames
params[1] = " " + params[1]
if params[1].endswith(" " + name):
old_line = line
line = params[0] + " " + "#PATH" + getSeparatorOutput() + name
detail.append(" Found " + name + ", old line was : " + old_line + "\n")
detail.append(" New line is " + line + "\n")
other_files_count[i] += 1
if line.startswith("auth-user-pass"):
auth_found += 1
auth = True
if line.startswith("cert "):
cert_found += 1
if line.startswith("key "):
key_found += 1
if line.startswith("askpass "):
key_pass_found += 1
keypass = True
i += 1
# Do some tag counting to determine authentication methods to use
if not line.startswith("#"):
for mod in mods:
flag, verb, parms = mod.split(",")
if flag == "1" and line.startswith(verb) and parms in line: flags[0] = True
if flag == "3" and line.startswith(verb): flags[2] = True
if flag == "4" and line.startswith(verb): line = verb + " " + parms
if flag == "5" and not flags[4] and verb in line:
detail.append(" WARNING, " + parms + "\n")
flags[4] = True
if line.startswith("auth-user-pass"):
auth_count += 1
if not auth: line = "auth-user-pass #PATH" + getSeparatorOutput() + "pass.txt"
if line.startswith("cert "):
cert_count += 1
if not last_cert_found == old_line:
if not last_cert_found == "":
multiple_certs = True
last_cert_found = old_line
if line.startswith("key "):
key_count += 1
if not last_key_found == old_line:
if not last_key_found == "":
multiple_keys = True
last_key_found = old_line
if line.startswith("askpass"):
key_pass_count += 1
if not keypass: line = "askpass #PATH" + getSeparatorOutput() + "key.txt"
if line.startswith("proto "):
if "tcp" in (line.lower()): proto = "TCP"
if line.startswith("<cert>"):
ecert_count += 1
if line.startswith("<key>"):
ekey_count += 1
if not flags[2]: dest_file.write(line+"\n")
flags[2] = False
for mod in mods:
flag, verb, parms = mod.split(",")
if flag == "2":
dest_file.write(verb+"\n")
dest_file.close()
flags[4] = False
if flags[0]:
if xbmcvfs.exists(dest_name):
xbmcvfs.delete(dest_name)
detail.append(" wARNING, couldn't import file as it contains errors or is unsupported\n")
elif rename:
proto = " (" + proto + ").ovpn"
new_name = dest_name.replace(".ovpn", proto)
if not xbmcvfs.exists(new_name):
xbmcvfs.rename(dest_name, new_name)
detail.append(" Renamed to " + new_name + "\n")
else:
detail.append(" WARNING, couldn't rename file to " + new_name + " as a file with that name already exists\n")
if progress.iscanceled():
cancel = True
break
except Exception as e:
errorTrace("import.py", "Failed to copy (or update) file")
errorTrace("import.py", str(e))
success = False
errorMessage = "Failed to copy (or update) selected files. Check the log."
progress_message = "Outputting results of import wizard"
progress.update(100, progress_title, progress_message)
xbmc.sleep(500)
# General import results
summary.append("\n=== Summary of import ===\n\n")
if cancel:
summary.append("Import was cancelled\n")
else:
summary.append("Imported " + str(len(ovpn_files)) + " .ovpn files and " + str(len(other_files)) + " other files.\n")
summary.append("\nYou should understand any WARNINGs below, and validate that the .ovpn files imported have been updated correctly.\n\n")
summary.append("If the VPN connection fails view the VPN log to determine why, using Google to understand the errors if necessary.\n")
summary.append("You can fix problems either by editing your local files and re-importing, or by editing the contents of the User Defined directory.\n\n")
if update:
# Report on how user names and passwords will be handled
if auth_count > 0:
if auth_found > 0:
# Not using a password as resolved by file
addon.setSetting("user_def_credentials", "false")
summary.append("The auth-user-pass tag was found " + str(auth_count) + " times, but was resolved using a supplied file so user name and password don't need to be entered.\n")
if not auth_found == auth_count:
summary.append(" WARNING : The auth-user-pass tag was found " + str(auth_count) + " times, but only resolved using a supplied file " + str(auth_found) + " times. Some connections may not work.\n")
else:
# Using a password as auth-user-pass tag was found
addon.setSetting("user_def_credentials", "true")
summary.append("The auth-user-pass tag was found " + str(auth_count) + " times so assuming user name and password authentication is used.\n")
if auth_count < len(ovpn_files):
summary.append(" WARNING : The auth-user-pass tag was only found in " + str(auth_count) + " .ovpn files, out of " + str(len(ovpn_files)) + ". Some connections may not work.\n")
else:
# Not using a password as no auth-user-pass tag was found
addon.setSetting("user_def_credentials", "false")
summary.append("No auth-user-pass tag was found, so assuming user name and password is not needed.\n")
# Report on how keys and certs will be handled
if (cert_count > 0 or key_count > 0):
summary.append("The key tag was found " + str(key_count) + " times, and the cert tag was found " + str(cert_count) + " times.\n")
if cert_found > 0 or key_found > 0:
# Key and cert resolved by file so not asking user for them
addon.setSetting("user_def_keys", "None")
summary.append("The key and certificate don't need to be requested as the key tags were resolved using a supplied file " + str(key_found) + " times, and the cert tags were resolved using a supplied file " + str(cert_found) + " times.\n")
if (not cert_found == cert_count) or (not key_found == key_count):
summary.append(" WARNING : The key or cert tags were not resolved by a supplied file for all occurrences. Some connections may not work.\n")
else:
if multiple_certs or multiple_keys:
# Key and cert tags found with different file names, but no files supplied. Assume multiple files, user supplied
addon.setSetting("user_def_keys", "Multiple")
summary.append("Found key and cert tags with multiple filenames, but no key or certificate files were supplied. These will be requested during connection.\n")
else:
# Key and cert tags found with same file names, but no files supplied. Assume single file, user supplied
addon.setSetting("user_def_keys", "Single")
summary.append("Found key and cert tags all with the same filename, but no key or certificate files were supplied. These will be requested during connection.\n")
if cert_count < len(ovpn_files) or key_count < len(ovpn_files):
summary.append(" WARNING : The key tag was found " + str(key_count) + " times, and the cert tag was found " + str(cert_count) + " times. Expected to find one of each in all " + str(len(ovpn_files)) + " .ovpn files. Some connections may not work.\n")
else:
# Embedded key and certs found, so not asking user for them
addon.setSetting("user_def_keys", "None")
if (ekey_count > 0 or ecert_count > 0):
if ekey_count == ecert_count and key_count == len(ovpn_files):
summary.append("Using embedded user keys and certificates so keys and certs don't need to be entered.\n")
else:
summary.append(" WARNING : Using embedded user keys and certificates, but found " + str(ekey_count) + " keys and " + str(ecert_count) + " certificates in " + str(len(ovpn_files)) + " .ovpn files. There should be one of each in all .ovpn files otherwise some connections may not work.\n")
else:
summary.append("No user key or cert tags were found so assuming this type of authentication is not used.\n")
# Report on how key passwords will be handled
if key_pass_count > 0:
if key_pass_found > 0:
# Not using a password as resolved by file
addon.setSetting("user_def_key_password", "false")
summary.append("The askpass tag was found " + str(auth_count) + " times, but was resolved using a supplied file so the key password doesn't need to be entered.\n")
if not key_pass_found == key_pass_count:
summary.append(" WARNING : The askpass tag was found " + str(key_pass_count) + " times, but only resolved using a supplied file " + str(key_pass_found) + " times. Some connections may not work.\n")
else:
# Using a password as auth-user-pass tag was found
addon.setSetting("user_def_key_password", "true")
summary.append("The askpass tag was found " + str(key_pass_count) + " times so assuming key password authentication is used.\n")
if key_pass_count < len(ovpn_files):
summary.append(" WARNING : The askpass tag was only found in " + str(key_pass_count) + " .ovpn files, out of " + str(len(ovpn_files)) + ". Some connections may not work, or you may be asked to enter a password when it's not necessary.\n")
else:
# Not using a password as no askpass tag was found
addon.setSetting("user_def_key_password", "false")
summary.append("No askpass tag was found, so assuming key password is not needed.\n")
# Report how many times each of the non .ovpn files were used
i = 0
for oname in other_files:
summary.append("File " + oname + " was found and used in .ovpn files " + str(other_files_count[i]) + " times.\n")
if not other_files_count[i] == len(ovpn_files):
if other_files_count[i] == 0:
summary.append(" WARNING : " + oname + " was not used to update any .ovpn files and could be unused.\n")
else:
summary.append(" WARNING : The number of updates for " + oname + " was different to the number of .ovpn files, " + str(len(ovpn_files)) + ", which could be a problem.\n")
i += 1
else:
summary.append("None of the files were updated during import.\n")
# Open a log file so all changes can be recorded without fouling up the kodi log
log_name = getImportLogPath()
if xbmcvfs.exists(log_name): xbmcvfs.delete(log_name)
log_file = open(log_name, 'w')
for line in summary:
log_file.write(line)
for line in detail:
log_file.write(line)
log_file.close()
progress.close()
xbmc.sleep(100)
if success:
if xbmcgui.Dialog().yesno(addon_name, "Import wizard finished. You should view the import log to review any issues, enter your user ID and password (if necessary) and then try and validate a VPN connection.", "", "", "OK", "Import Log"):
popupImportLog()
else:
xbmcgui.Dialog().ok(addon_name, errorMessage)
return success
def updateVPNFiles(vpn_provider):
# If the OVPN files aren't generated then they need to be updated with location info
infoTrace("vpnproviders.py", "Updating VPN profiles for " + vpn_provider)
# Get the list of VPN profile files
if isUserDefined(vpn_provider):
ovpn_connections = getAddonList(vpn_provider, "*.ovpn")
else:
ovpn_connections = getDownloadList(vpn_provider, "*.ovpn")
# See if there's a port override going on
addon = xbmcaddon.Addon("service.vpn.manager")
if addon.getSetting("default_udp") == "true":
portUDP = ""
else:
portUDP = addon.getSetting("alternative_udp_port")
if addon.getSetting("default_tcp") == "true":
portTCP = ""
else:
portTCP = addon.getSetting("alternative_tcp_port")
# Get the logging level
verb_value = addon.getSetting("openvpn_verb")
if verb_value == "":
verb_value = "1"
addon.setSetting("openvpn_verb", verb_value)
# Open a translate file
try:
debugTrace("Opening translate file for " + vpn_provider)
translate_file = open(
getAddonPath(True, vpn_provider + "/TRANSLATE.txt"), 'w')
debugTrace("Opened translate file for " + vpn_provider)
except Exception as e:
errorTrace("vpnproviders.py",
"Couldn't open the translate file for " + vpn_provider)
errorTrace("vpnproviders.py", str(e))
return False
for connection in ovpn_connections:
try:
f = open(connection, 'r')
debugTrace("Processing file " + connection)
lines = f.readlines()
f.close()
if isUserDefined(vpn_provider):
f = open(connection, 'w')
else:
f = open(
getAddonPath(
True,
vpn_provider + "/" + os.path.basename(connection)),
'w')
# Get the profile friendly name in case we need to generate key/cert names
name = connection[connection.rfind(getSeparator()) +
1:connection.rfind(".ovpn")]
translate_location = name
translate_server = ""
server_count = 0
found_up = False
found_down = False
found_script_sec = False
found_block_dns = False
found_ping = False
proto = "udp"
# Update the necessary values in the ovpn file
for line in lines:
line = line.strip(' \t\n\r')
# Update path to pass.txt
if not isUserDefined(vpn_provider) or addon.getSetting(
"user_def_credentials") == "true":
if line.startswith("auth-user-pass"):
line = "auth-user-pass " + getAddonPathWrapper(
vpn_provider + "/" + "pass.txt")
# Update port numbers
if line.startswith("remote "):
server_count += 1
tokens = line.split()
port = ""
for newline in lines:
if newline.startswith("proto "):
if "tcp" in newline:
proto = "tcp"
if not portTCP == "": port = portTCP
break
if "udp" in newline:
proto = "udp"
if not portUDP == "": port = portUDP
break
if not port == "":
line = "remote " + tokens[1] + " " + port + "\n"
if translate_server == "": translate_server = tokens[1]
# Update user cert and key
if not isUserDefined(vpn_provider) and usesUserKeys(
vpn_provider):
if line.startswith("cert "):
line = "cert " + getUserDataPathWrapper(
vpn_provider + "/" +
getCertName(vpn_provider, name))
if line.startswith("key "):
line = "key " + getUserDataPathWrapper(
vpn_provider + "/" +
getKeyName(vpn_provider, name))
# Update key password (if there is one)
if not isUserDefined(vpn_provider) or usesKeyPass(
vpn_provider):
if line.startswith("askpass"):
line = "askpass " + getUserDataPathWrapper(
vpn_provider + "/" + getKeyPass(vpn_provider))
# For user defined profile we need to replace any path tags with the addon dir path
if isUserDefined(vpn_provider):
line = line.replace("#PATH",
getAddonPathWrapper(vpn_provider))
# Set the logging level
if line.startswith("verb "):
line = "verb " + verb_value
if line.startswith("up "):
found_up = True
if line.startswith("down "):
found_down = True
if line.startswith("script-security "):
found_script_sec = True
if line.startswith("block-outside-dns"):
found_block_dns = True
if line.startswith("ping"):
found_ping = True
f.write(line + "\n")
if not found_block_dns and getPlatform(
) == platforms.WINDOWS and addon.getSetting(
"block_outside_dns") == "true":
f.write("block-outside-dns\n")
if addon.getSetting("up_down_script") == "true":
if not found_script_sec: f.write("script-security 2\n")
if not found_up: f.write(getUpParam(vpn_provider) + "\n")
if not found_down: f.write(getDownParam(vpn_provider) + "\n")
if not found_ping and addon.getSetting("force_ping") == "true":
if proto == "tcp":
f.write("ping 10\n")
f.write("ping-exit 60\n")
else:
f.write("ping 5\n")
f.write("ping-exit 30\n")
f.write("ping-timer-rem\n")
f.close()
if server_count > 1:
translate_server = translate_server + " & " + str(
server_count - 1) + " more"
translate_file.write(translate_location + "," + translate_server +
" (" + proto.upper() + ")\n")
except Exception as e:
errorTrace("vpnproviders.py", "Failed to update ovpn file")
errorTrace("vpnproviders.py", str(e))
translate_file.close()
return False
# Write the location to server translation file
translate_file.close()
# Flag that the files have been generated
writeGeneratedFile(vpn_provider)
return True
def updateVPNFiles(vpn_provider):
# If the OVPN files aren't generated then they need to be updated with location info
infoTrace("vpnproviders.py", "Updating VPN profiles for " + vpn_provider)
# Get the list of VPN profile files
if isUserDefined(vpn_provider):
ovpn_connections = getAddonList(vpn_provider, "*.ovpn")
else:
ovpn_connections = getDownloadList(vpn_provider, "*.ovpn")
# See if there's a port override going on
addon = xbmcaddon.Addon("service.vpn.manager")
if addon.getSetting("default_udp") == "true":
portUDP = ""
else:
portUDP = addon.getSetting("alternative_udp_port")
if addon.getSetting("default_tcp") == "true":
portTCP = ""
else:
portTCP = addon.getSetting("alternative_tcp_port")
# Get the logging level
verb_value = addon.getSetting("openvpn_verb")
if verb_value == "":
verb_value = "1"
addon.setSetting("openvpn_verb", verb_value)
# Open a translate file
try:
debugTrace("Opening translate file for " + vpn_provider)
translate_file = open(getAddonPath(True, vpn_provider + "/TRANSLATE.txt"), 'w')
debugTrace("Opened translate file for " + vpn_provider)
except Exception as e:
errorTrace("vpnproviders.py", "Couldn't open the translate file for " + vpn_provider)
errorTrace("vpnproviders.py", str(e))
return False
for connection in ovpn_connections:
try:
f = open(connection, 'r')
debugTrace("Processing file " + connection)
lines = f.readlines()
f.close()
if isUserDefined(vpn_provider):
f = open(connection, 'w')
else:
f = open(getAddonPath(True, vpn_provider + "/" + os.path.basename(connection)), 'w')
# Get the profile friendly name in case we need to generate key/cert names
name = connection[connection.rfind(getSeparator())+1:connection.rfind(".ovpn")]
translate_location = name
translate_server = ""
server_count = 0
found_up = False
found_down = False
found_script_sec = False
found_block_dns = False
found_ping = False
found_verb = False
proto = "udp"
# Update the necessary values in the ovpn file
for line in lines:
line = line.strip(' \t\n\r')
# Update path to pass.txt
if not isUserDefined(vpn_provider) or addon.getSetting("user_def_credentials") == "true":
if line.startswith("auth-user-pass"):
line = "auth-user-pass " + getAddonPathWrapper(vpn_provider + "/" + "pass.txt")
# Update port numbers
if line.startswith("remote "):
server_count += 1
tokens = line.split()
port = ""
for newline in lines:
if newline.startswith("proto "):
if "tcp" in newline:
proto = "tcp"
if not portTCP == "": port = portTCP
break
if "udp" in newline:
proto = "udp"
if not portUDP == "": port = portUDP
break
if not port == "":
line = "remote " + tokens[1] + " " + port + "\n"
if translate_server == "": translate_server = tokens[1]
# Update user cert and key
if not isUserDefined(vpn_provider) and usesUserKeys(vpn_provider):
if line.startswith("cert "):
line = "cert " + getUserDataPathWrapper(vpn_provider + "/" + getCertName(vpn_provider, name))
if line.startswith("key "):
line = "key " + getUserDataPathWrapper(vpn_provider + "/" + getKeyName(vpn_provider, name))
# Update key password (if there is one)
if not isUserDefined(vpn_provider) or usesKeyPass(vpn_provider):
if line.startswith("askpass"):
line = "askpass " + getUserDataPathWrapper(vpn_provider + "/" + getKeyPass(vpn_provider))
# For user defined profile we need to replace any path tags with the addon dir path
if isUserDefined(vpn_provider):
line = line.replace("#PATH", getAddonPathWrapper(vpn_provider))
# Set the logging level
if line.startswith("verb "):
line = "verb " + verb_value
found_verb = True
if line.startswith("up "):
found_up = True
if line.startswith("down "):
found_down = True
if line.startswith("script-security "):
found_script_sec = True
if line.startswith("block-outside-dns"):
found_block_dns = True
if line.startswith("ping"):
found_ping = True
f.write(line + "\n")
if not found_block_dns and getPlatform() == platforms.WINDOWS and addon.getSetting("block_outside_dns") == "true":
f.write("block-outside-dns\n")
if addon.getSetting("up_down_script") == "true":
if not found_script_sec: f.write("script-security 2\n")
if not found_up: f.write(getUpParam(vpn_provider)+"\n")
if not found_down: f.write(getDownParam(vpn_provider)+"\n")
if not found_ping and addon.getSetting("force_ping") == "true":
if proto == "tcp":
f.write("ping 10\n")
f.write("ping-exit 60\n")
else:
f.write("ping 5\n")
f.write("ping-exit 30\n")
f.write("ping-timer-rem\n")
if not found_verb:
f.write("verb " + verb_value + "\n")
f.close()
if server_count > 1: translate_server = translate_server + " & " + str(server_count - 1) + " more"
translate_file.write(translate_location + "," + translate_server + " (" + proto.upper() + ")\n")
except Exception as e:
errorTrace("vpnproviders.py", "Failed to update ovpn file")
errorTrace("vpnproviders.py", str(e))
translate_file.close()
return False
# Write the location to server translation file
translate_file.close()
# Flag that the files have been generated
writeGeneratedFile(vpn_provider)
return True