From c217bd1f1456cf10ceabf698ea6f4dd8f636f454 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Wed, 8 Aug 2012 07:22:36 +0900
Subject: check for validity of the remote_ip entry (is ip?)

---
 src/leap/eip/config.py | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

(limited to 'src/leap/eip/config.py')

diff --git a/src/leap/eip/config.py b/src/leap/eip/config.py
index 91c3953b..6118c9de 100644
--- a/src/leap/eip/config.py
+++ b/src/leap/eip/config.py
@@ -3,6 +3,7 @@ import grp
 import logging
 import os
 import platform
+import socket
 
 from leap.util.fileutil import (which, mkdir_p,
                                 check_and_fix_urw_only)
@@ -24,6 +25,14 @@ class EIPNoPolkitAuthAgentAvailable(Exception):
     pass
 
 
+class EIPInitNoProviderError(Exception):
+    pass
+
+
+class EIPInitBadProviderError(Exception):
+    pass
+
+
 class EIPInitNoKeyFileError(Exception):
     pass
 
@@ -90,6 +99,14 @@ def get_default_provider_path():
     return default_provider_path
 
 
+def validate_ip(ip_str):
+    """
+    raises exception if the ip_str is
+    not a valid representation of an ip
+    """
+    socket.inet_aton(ip_str)
+
+
 def check_or_create_default_vpnconf(config):
     """
     checks that a vpn config file
@@ -118,10 +135,18 @@ def check_or_create_default_vpnconf(config):
     # by now. Get it from a list of gateways
     # instead.
 
-    remote_ip = config.get('provider',
-                           'remote_ip')
+    try:
+        remote_ip = config.get('provider',
+                               'remote_ip')
+        validate_ip(remote_ip)
+
+    except ConfigParser.NoOptionError:
+        raise EIPInitNoProviderError
+
+    except socket.error:
+        # this does not look like an ip, dave
+        raise EIPInitBadProviderError
 
-    # XXX check that IT LOOKS LIKE AN IP!!!
     if config.has_option('provider', 'remote_port'):
         remote_port = config.get('provider',
                                  'remote_port')
-- 
cgit v1.2.3