VPN Fixes + Sanity Checking

centinel/vpn/hma.py

@@ -5,56 +5,103 @@
 import os
 import requests
 import sys
+import shutil
+import logging
+import socket
+import zipfile
+import urllib2
 
-
+def unzip(source_filename, dest_dir):
+    with zipfile.ZipFile(source_filename) as zf:
+	zf.extractall(dest_dir)
+
 def create_config_files(directory):
-    """Create all available VPN configuration files in the given directory
+    """
+    Initialize directory ready for vpn walker
+    :param directory: the path where you want this to happen
+    :return:
+    """
+    config_zip_url = "https://hidemyass.com/vpn-config/vpn-configs.zip"
+
+    if not os.path.exists(directory):
+	os.makedirs(directory)
+
+    logging.info("Starting to download hma config file zip")
+
+    zip_response = urllib2.urlopen(config_zip_url)
+    zip_content = zip_response.read()
+    zip_path = os.path.join(directory, '../vpn-configs.zip')
 
-    Note: I am basically just following along with what their script
-    client does
+    with open(zip_path,'w') as f:
+	f.write(zip_content)
+    logging.info("Extracting zip file")
+    unzip(zip_path, os.path.join(directory, '../'))
+
+    ca_url = "https://vpn.hidemyass.com/vpn-config/keys/ca.crt"
+    hmauserauth_url = "https://vpn.hidemyass.com/vpn-config/keys/hmauser.crt"
+    hmauserkey_url = "https://vpn.hidemyass.com/vpn-config/keys/hmauser.key"
+
+    ca_response = urllib2.urlopen(ca_url)
+    ca_content = ca_response.read()
+    with open(os.path.join(directory, '../ca.crt'), 'w') as f:
+	f.write(ca_content)
 
-    """
-    # get the config file template
-    template_url = ("https://securenetconnection.com/vpnconfig/"
-                    "openvpn-template.ovpn")
-    resp = requests.get(template_url)
-    resp.raise_for_status()
-    template = resp.content
-
-    # get the available servers and create a config file for each server
-    server_url = ("https://securenetconnection.com/vpnconfig/"
-                  "servers-cli.php")
-    resp = requests.get(server_url)
-    resp.raise_for_status()
-    servers = resp.content.split("\n")
+    response_userauth = urllib2.urlopen(hmauserauth_url)
+    userauth_content = response_userauth.read()
+    with open(os.path.join(directory, '../hmauser.key'), 'w') as f:
+	f.write(userauth_content)
 
-    if not os.path.exists(directory):
-        os.makedirs(directory)
-    with open(os.path.join(directory, "servers.txt"), 'w') as f:
-        f.write(resp.content)
-
-    for server_line in servers:
-        if server_line.strip() == "":
-            continue
-        server_line = server_line.split("|")
-        try:
-            ip, desc, country, udp_sup, tcp_sup = server_line
-        except ValueError:
-            ip, desc, country, udp_sup, tcp_sup, no_rand = server_line
-        with open(os.path.join(directory, ip + ".ovpn"), 'w') as file_o:
-            file_o.write(template)
-            # create tcp if available, else udp
-            tcp_sup = tcp_sup.strip()
-            if tcp_sup:
-                port, proto = 443, "tcp"
-            else:
-                port, proto = 53, "udp"
-            file_o.write("remote {0} {1}\n".format(ip, port))
-            file_o.write("proto {0}\n".format(proto))
-            # add automatic dns server update
-            file_o.write("up /etc/openvpn/update-resolv-conf\n")
-            file_o.write("down /etc/openvpn/update-resolv-conf\n")
+    response_userkey = urllib2.urlopen(hmauserkey_url)
+    userkey_content = response_userkey.read()
+    with open(os.path.join(directory, '../hmauser.key'), 'w') as f:
+	f.write(userkey_content)
+
+    # remove zip file
+    os.remove(zip_path)
+
+    # move all config files to /vpns
+    orig_path = os.path.join(directory, '../TCP')
+
+    server_country = {}
+    for filename in os.listdir(orig_path):
+	if filename.endswith('.ovpn'):
+	    country = filename.split('.')[0]
+	file_path = os.path.join(orig_path, filename)
+	lines = [line.rstrip('\n') for line in open(file_path)]
+
+	ip = ""
+	for line in lines:
+	    if line.startswith('remote'):
+		hostname = line.split(' ')[1]
+		try:
+		    ip = socket.gethostbyname(hostname)
+		    break
+		except socket.gaierror:
+		    logging.info("Hostname %s failed" %hostname)
+		    continue
+	if len(ip) > 0:
+	    new_path = os.path.join(directory, ip + '.ovpn')
+	    shutil.copyfile(file_path, new_path)
+	    server_country[ip] = country
+
+    # remove extracted folder
+    shutil.rmtree(os.path.join(directory, '../TCP'))
+    shutil.rmtree(os.path.join(directory, '../UDP'))
+
+    # add dns update options to each file
+    logging.info("Appending DNS update options")
+    for filename in os.listdir(directory):
+	file_path = os.path.join(directory, filename)
+	with open(file_path, 'a') as f:
+	    f.write('\n')
+	    f.write('up /etc/openvpn/update-resolv-conf\n')
+	    f.write('down /etc/openvpn/update-resolv-conf\n')
+
 
+    print os.path.join(directory, 'servers.txt'), len(server_country)
+    with open(os.path.join(directory, 'servers.txt'), 'w') as f:
+	for ip in server_country:
+	    f.write('|'.join([ip, server_country[ip]]) + '\n')
 
 if __name__ == "__main__":
     if len(sys.argv) != 2:

centinel/vpn/ipvanish.py

@@ -6,7 +6,7 @@
 import sys
 import urllib
 import zipfile
-
+import urllib2
 
 def unzip(source_filename, dest_dir):
     with zipfile.ZipFile(source_filename) as zf:
@@ -26,13 +26,16 @@ def create_config_files(directory):
         os.makedirs(directory)
 
     logging.info("Starting to download IPVanish config file zip")
-    url_opener = urllib.URLopener()
+    zip_response = urllib2.urlopen(config_zip_url)
+    zip_content = zip_response.read()
     zip_path = os.path.join(directory, '../configs.zip')
     unzip_path = os.path.join(directory, '../unzipped')
+
     if not os.path.exists(unzip_path):
         os.makedirs(unzip_path)
+    with open(zip_path, 'w') as f:
+	f.write(zip_content)
 
-    url_opener.retrieve(config_zip_url, zip_path)
     logging.info("Extracting zip file")
     unzip(zip_path, unzip_path)
 
@@ -57,8 +60,13 @@ def create_config_files(directory):
             for line in lines:
                 if line.startswith('remote'):
                     hostname = line.split(' ')[1]
-                    ip = socket.gethostbyname(hostname)
-                    break
+                    # added because gethostbyname will fail on some hostnames
+                    try:
+                	ip = socket.gethostbyname(hostname)
+                	break
+            	    except socket.gaierror:
+            	        logging.info("Hostname %s failed" %hostname)
+            		continue
 
             if len(ip) > 0:
                 new_path = os.path.join(directory, ip + '.ovpn')

centinel/vpn/purevpn.py

@@ -56,8 +56,13 @@ def create_config_files(directory):
             for line in lines:
                 if line.startswith('remote'):
                     hostname = line.split(' ')[1]
-                    ip = socket.gethostbyname(hostname)
-                    break
+                    # added because gethostbyname will fail on some hostnames
+                    try:
+                	ip = socket.gethostbyname(hostname)
+                	break
+            	    except socket.gaierror:
+            		logging.info("Hostname %s failed" %hostname)
+            		continue
 
             if len(ip) > 0:
                 new_path = os.path.join(directory, ip + '.ovpn')