diff options
| -rw-r--r-- | .SRCINFO | 11 | ||||
| -rw-r--r-- | PKGBUILD | 22 | ||||
| -rwxr-xr-x | pia | 284 | ||||
| -rw-r--r-- | source.tar.gz | bin | 918 -> 490 bytes |
4 files changed, 19 insertions, 298 deletions
@@ -1,6 +1,6 @@ pkgbase = private-internet-access-vpn pkgdesc = Installs VPN profiles for Private Internet Access Service - pkgver = 1.5 + pkgver = 2.0 pkgrel = 1 url = https://www.privateinternetaccess.com/ arch = any @@ -10,16 +10,17 @@ pkgbase = private-internet-access-vpn optdepends = connman: Enables PIA for Connman optdepends = openvpn: Allows running configurations from command-line noextract = openvpn.zip + noextract = pia.8.gz source = https://www.privateinternetaccess.com/openvpn/openvpn.zip source = https://raw.githubusercontent.com/masterkorp/openvpn-update-resolv-conf/master/update-resolv-conf.sh source = source.tar.gz - source = pia source = pia.8.gz + source = git+https://github.com/flamusdiu/python-pia.git#tag=v2.0 sha256sums = c2f9af251ae63395896366e0be03ff4eea7748dcc6333fbe777a8f09317bba92 sha256sums = 6d3bdc9531f16cc1ad199913a71554a0b50aea87e140b28d079c4ab4c0b8c51b - sha256sums = 0ee7b31d6a36379adbe402b3db565ce95111443d6d2fd0e6a3ccd4d8a39681c7 - sha256sums = 9dc895351f55f744329a12a43a300b76dd9cabfa45f9fd0450a4329a09c6930d - sha256sums = 55c0935a10a4d036a20fdbe7c690fd1e454802418d4a3d88c4454b99a3260693 + sha256sums = 604fec9bb019a79c582cf581bac960109cea87bf0a5d7dc242fe8210efbe9cd5 + sha256sums = f74e0a601d74409c39d36f4d5c6a2f11c9832d05782f804243b3f6ae7e695aab + sha256sums = SKIP pkgname = private-internet-access-vpn @@ -1,6 +1,6 @@ # Maintainer: Jesse Spangenberger <azulephoenix@gmail.com> pkgname=private-internet-access-vpn -pkgver=1.5 +pkgver=2.0 pkgrel=1 pkgdesc="Installs VPN profiles for Private Internet Access Service" arch=('any') @@ -12,17 +12,19 @@ optdepends=('networkmanager: Enables PIA for Network Manager' 'openvpn: Allows running configurations from command-line') sha256sums=('c2f9af251ae63395896366e0be03ff4eea7748dcc6333fbe777a8f09317bba92' '6d3bdc9531f16cc1ad199913a71554a0b50aea87e140b28d079c4ab4c0b8c51b' - '0ee7b31d6a36379adbe402b3db565ce95111443d6d2fd0e6a3ccd4d8a39681c7' - '9dc895351f55f744329a12a43a300b76dd9cabfa45f9fd0450a4329a09c6930d' - '55c0935a10a4d036a20fdbe7c690fd1e454802418d4a3d88c4454b99a3260693') + '604fec9bb019a79c582cf581bac960109cea87bf0a5d7dc242fe8210efbe9cd5' + 'f74e0a601d74409c39d36f4d5c6a2f11c9832d05782f804243b3f6ae7e695aab' + 'SKIP') source=("https://www.privateinternetaccess.com/openvpn/openvpn.zip" "https://raw.githubusercontent.com/masterkorp/openvpn-update-resolv-conf/master/update-resolv-conf.sh" - "source.tar.gz" - "pia" - "pia.8.gz") + "source.tar.gz" + "pia.8.gz" + "git+https://github.com/flamusdiu/python-pia.git#tag=v2.0") -noextract=("openvpn.zip") +noextract=("openvpn.zip" + "pia.8.gz") + prepare() { cd "${srcdir}" @@ -71,6 +73,8 @@ package() { install -Dm 600 vpn-configs/*.* "${pkgdir}/etc/openvpn/" install -m 755 update-resolv-conf.sh "${pkgdir}/etc/openvpn" - install -m 755 pia "${pkgdir}/usr/bin" install -m 644 pia.8.gz "${pkgdir}/usr/share/man/man8" + + cd "python-pia" + python setup.py install --root="${pkgdir}/" --optimize=1 } diff --git a/pia b/pia deleted file mode 100755 index 4ffc323a59f0..000000000000 --- a/pia +++ /dev/null @@ -1,284 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -__VERSION__ = (1,5) - -import os, stat -import argparse, glob -import pathlib, re, uuid - -# Class holds all static variables -class Props(object): - _openvpn_conf_dir = '/etc/openvpn' - _login_config = '/etc/private-internet-access/login.conf' - _system_connection_conf = '/etc/private-internet-access/system-connection-example' - _connman_connection_conf = '/etc/private-internet-access/connman-config-example.config' - _nm_conf_dir = '/etc/NetworkManager/system-connections' - _cm_conf_dir = '/var/lib/connman-vpn' - _progs = {'cm':False,'nm':False, 'openvpn':False} - _openvpn_configs = {} - - @property - def openvpn_conf_dir(self): - return self._openvpn_conf_dir - - @property - def login_config(self): - return self._login_config - - @property - def system_connection_conf(self): - return self._system_connection_conf - - @property - def nm_conf_dir (self): - return self._nm_conf_dir - - @property - def cm_conf_dir (self): - return self._cm_conf_dir - - @property - def connman_connection_conf (self): - return self._connman_connection_conf - - @property - def progs (self): - return self._progs - - @progs.setter - def progs (self, prog, installed): - self._progs[prog] = installed - - @property - def openvpn_configs(self): - return self._openvpn_configs - - @openvpn_configs.setter - def openvpn_configs(self, configs): - self._openvpn_configs = configs - - def __init__(self): - self.get_openvpn_configs() - - def get_openvpn_configs(self): - openvpn_configs = {} - for filename in glob.glob(self.openvpn_conf_dir + '/*.conf') : - id = re.sub('_',' ', re.match(r"^/(.*/)*(.+)\.conf$", filename).group(2)) - openvpn_configs[id] = [re.sub(' ', '_', id), filename] - - self.openvpn_configs = openvpn_configs - - def remove_configurations(self): - for config in self.openvpn_configs: - id,filename = self.openvpn_configs[config] - - if (self.progs['nm']): - try: - os.remove(self.nm_conf_dir + "/" + id) - except IOError: - print('Cannot remove configuration for ' + id) - pass - - if (self.progs['cm']): - try: - os.remove(self.cm_conf_dir + "/" + id + ".config") - except IOError: - print('Cannot delete configuration for ' + id + '. Skipping...') - pass - -props = Props() - -# Checks if script has root permissions only. -def has_proper_permissions(filepath): - st = os.stat(filepath) - - return bool(st.st_uid == 0 & st.st_gid == 0 & int(oct(stat.S_IMODE(os.stat(filepath).st_mode)) == "0o600")) - -# Modifies OpenVPN configurations in /etc/openvpn -def openvpn_autologin (id, filename, enable=True): - try: - p = pathlib.Path(filename) - with p.open() as f: - content = f.read() - - if (enable): - content = re.sub("(auth-user-pass)(?:.*)","auth-user-pass " + props.login_config, content) - else: - content = re.sub("(auth-user-pass)(?:.*)","auth-user-pass", content) - - with open(filename, "w") as f: - f.write(content) - except IOError: - print ('Cannot access ' + filename + '.') - exit (1) - -def check_installed(): - global props - - if os.path.isfile('/usr/bin/nmcli'): - if os.path.isfile('/usr/lib/networkmanager/nm-openvpn-service'): - props.progs['nm'] = True - - if os.path.isfile('/usr/bin/connmanctl'): - props.progs['cm'] = True - - if os.path.isfile('/usr/bin/openvpn'): - props.progs['openvpn'] = True - -# Modifies Network Connection configurations -def nm_autologin(id, filename): - # Creates dictionary to hold replacement values - re_dict = {} - - try: - #Opens login.conf and reads login and passwords from file - p = pathlib.Path(props.login_config) - with p.open() as f: - content = f.read().splitlines() - - except IOError: - print ('Cannot access ' + props.login_config + '. Please make sure the file is created and readable by root.') - - else: - re_dict["##username##"] = content[0] - re_dict["##password##"] = content[1] - - re_dict["##id##"] = id - - # Creates uuid for configuration file - re_dict["##uuid##"] = str(uuid.uuid4()) - - # Retrieves remote address from OpenVPN configuration - re_dict["##remote##"] = get_remote_address(filename) - - try: - p = pathlib.Path(props.system_connection_conf) - with p.open() as f: - content = f.read() - - except IOError: - print('Network Manager template missing from ' + props.system_connection_conf) - - else: - nm_conf = props.nm_conf_dir + "/" + id - - try: - #Opens Network Configurations and replaces options from the "re_dict" dictionary - with open(nm_conf,"w") as f: - f.write(multiple_replace(re_dict,content)) - - os.chmod(nm_conf,0o600) - os.chown(nm_conf,0,0) - except IOError: - #No Network Manager installed? - pass - -def cm_autologin(id, filename): - # Creates dictionary to hold replacement values - re_dict = {} - - re_dict["##id##"] = id - re_dict["##filename##"] = filename - # Retrieves remote address from OpenVPN configuration - re_dict["##remote##"] = get_remote_address(filename) - - try: - p = pathlib.Path(props.connman_connection_conf) - with p.open() as f: - content = f.read() - - except IOError: - print('Connman template missing from ' + props.connman_connection_conf) - - else: - cm_conf = props.cm_conf_dir + "/" + re.sub(' ','_',id) + ".config" - - try: - #Opens Connman Configurations and replaces options from the "re_dict" dictionary - with open(cm_conf,"w") as f: - f.write(multiple_replace(re_dict,content)) - - os.chmod(cm_conf,0o600) - os.chown(cm_conf,0,0) - except IOError: - print('Cannot modify configuration for ' + id + '. Skipping...') - pass - -# Gets remote address from OpenVPn files -def get_remote_address(filename): - p = pathlib.Path(filename) - - with p.open() as f: - contents = f.read() - - return ''.join(re.findall("(?:remote.)(.*)(?:.\d{4})",contents)) - -def multiple_replace(dict, text): - # Create a regular expression from the dictionary keys - regex = re.compile("(%s)" % "|".join(map(re.escape, dict.keys()))) - - # For each match, look-up corresponding value in dictionary - return regex.sub(lambda mo: dict[mo.string[mo.start():mo.end()]], text) - -if __name__ == "__main__": - - parser = argparse.ArgumentParser(description='Configures PIA VPN Services for Connman, Network Manager, and OpenVPN') - - group = parser.add_mutually_exclusive_group(required=False) - group.add_argument('-a','--auto-configure', dest='configure', action='store_true',help='Automatically generates configurations') - group.add_argument('-r','--remove-configurations', dest='configure', action='store_false',help='Removes auto-generated configurations') - - parser.add_argument('-e','--exclude', dest='exclude', choices=props.progs, action='append', - help='Excludes modifying the configurations of the listed program. Maybe used more then once.') - - parser.add_argument('host',nargs='*', help='Lists of host names to configure') - - parser.add_argument('-v','--verbose', dest='verbose', action='store_true',help='Enables more verbose logging') - parser.add_argument('--version', action='version', version='%(prog)s 1.5') - parser.parse_args(namespace=props) - - if os.getuid() > 0: - print ('ERROR: You must run this script with administrative privilages!') - exit(1) - - - if not has_proper_permissions(props.login_config): - print ('ERROR: ' + props.login_config + ' must be owned by root and not world readable!') - exit(1) - - check_installed() - - if props.exclude: - for prog in props.exclude: - props.progs[prog] = False - - custom_configs = {} - - if props.host: - for id in props.host: - custom_configs[id] = props.openvpn_configs[id] - - if custom_configs: - props.openvpn_configs = custom_configs - - if props.configure: - for config in props.openvpn_configs: - id, filename = props.openvpn_configs[config] - - if (props.verbose): - if (props.auto_login): - print ("Enabling auto-logins for " + config + " remote server...") - else: - print ("Disablig auto-logins for " + config + " remote server...") - - if (props.configure): - if (props.progs['openvpn']): - openvpn_autologin(id, filename) - - if (props.progs['nm']): - nm_autologin(id, filename) - - if (props.progs['cm']): - cm_autologin(id, filename) - else: - props.remove_configurations() diff --git a/source.tar.gz b/source.tar.gz Binary files differindex 239ff52b9352..bdc2691431b2 100644 --- a/source.tar.gz +++ b/source.tar.gz |