Merge branch 'feature/windows_install_tap' of git://github.com/chiiph/leap_client into develop

Conflicts:
	src/leap/gui/mainwindow.py

5 files changed, 105 insertions, 1 deletions

diff --git a/changes/feature_windows_tap b/changes/feature_windows_tap
new file mode 100644
index 00000000..1d5df316
--- /dev/null
+++ b/changes/feature_windows_tap
@@ -0,0 +1 @@
+  o Try to install TAP driver on Windows if no tap device is preset.
\ No newline at end of file
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index a62bfc3b..863640ef 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -34,6 +34,7 @@ from leap.gui.wizard import Wizard
 from leap.services.eip.eipbootstrapper import EIPBootstrapper
 from leap.services.eip.eipconfig import EIPConfig
 from leap.services.eip.providerbootstrapper import ProviderBootstrapper
+from leap.platform_init.initializers import init_platform
 from leap.services.eip.vpn import VPN
 from leap.services.eip.vpnlaunchers import (VPNLauncherException,
                                             OpenVPNNotFoundException,
@@ -194,6 +195,9 @@ class MainWindow(QtGui.QMainWindow):
         self._settings = LeapSettings(standalone)
 
         self._center_window()
+
+        init_platform()
+
         self._wizard = None
         self._wizard_firstrun = False
         if self._first_run():
diff --git a/src/leap/platform_init/__init__.py b/src/leap/platform_init/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/leap/platform_init/__init__.py
diff --git a/src/leap/platform_init/initializers.py b/src/leap/platform_init/initializers.py
new file mode 100644
index 00000000..ac08e23f
--- /dev/null
+++ b/src/leap/platform_init/initializers.py
@@ -0,0 +1,96 @@
+# -*- coding: utf-8 -*-
+# initializers.py
+# Copyright (C) 2013 LEAP
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+Platform dependant initializing code
+"""
+
+import logging
+import os
+import platform
+import subprocess
+
+from PySide import QtGui
+
+logger = logging.getLogger(__name__)
+
+
+def init_platform():
+    initializer = None
+    try:
+        initializer = globals()[platform.system() + "Initializer"]
+    except:
+        pass
+    if initializer:
+        logger.debug("Running initializer for %s" % (platform.system(),))
+        initializer()
+    else:
+        logger.debug("Initializer not found for %s" % (platform.system(),))
+
+
+def _windows_has_tap_device():
+    import _winreg as reg
+
+    adapter_key = 'SYSTEM\CurrentControlSet\Control\Class' \
+        '\{4D36E972-E325-11CE-BFC1-08002BE10318}'
+    with reg.OpenKey(reg.HKEY_LOCAL_MACHINE, adapter_key) as adapters:
+        try:
+            for i in xrange(10000):
+                key_name = reg.EnumKey(adapters, i)
+                with reg.OpenKey(adapters, key_name) as adapter:
+                    try:
+                        component_id = reg.QueryValueEx(adapter,
+                                                        'ComponentId')[0]
+                        if component_id.startswith("tap0901"):
+                            return True
+                    except WindowsError:
+                        pass
+        except WindowsError:
+            pass
+    return False
+
+
+def WindowsInitializer():
+    if not _windows_has_tap_device():
+        msg = QtGui.QMessageBox()
+        msg.setWindowTitle(msg.tr("TAP Driver"))
+        msg.setText(msg.tr("LEAPClient needs to install the necessary drivers "
+                           "for Encrypted Internet to work. Would you like to "
+                           "proceed?"))
+        msg.setInformativeText(msg.tr("Encrypted Internet uses VPN, which "
+                                      "needs a TAP device installed and none "
+                                      "has been found"))
+        msg.setStandardButtons(QtGui.QMessageBox.Yes | QtGui.QMessageBox.No)
+        msg.setDefaultButton(QtGui.QMessageBox.Yes)
+        ret = msg.exec_()
+
+        if ret == QtGui.QMessageBox.Yes:
+            driver_path = os.path.join(os.getcwd(),
+                                       "apps",
+                                       "eip",
+                                       "tap_driver")
+            dev_installer = os.path.join(driver_path,
+                                         "devcon.exe")
+            if os.path.isfile(dev_installer) and \
+                    os.access(dev_installer, os.X_OK):
+                inf_path = os.path.join(driver_path,
+                                        "OemWin2k.inf")
+                cmd = [dev_installer, "install", inf_path, "tap0901"]
+                ret = subprocess.call(cmd, stdout=subprocess.PIPE, shell=True)
+            else:
+                logger.error("Tried to install TAP driver, but the installer "
+                             "is not found or not executable")
diff --git a/src/leap/services/eip/vpnlaunchers.py b/src/leap/services/eip/vpnlaunchers.py
index 5267d918..57a8092e 100644
--- a/src/leap/services/eip/vpnlaunchers.py
+++ b/src/leap/services/eip/vpnlaunchers.py
@@ -21,9 +21,12 @@ Platform dependant VPN launchers
 import commands
 import logging
 import getpass
-import grp
 import os
 import platform
+try:
+    import grp
+except ImportError:
+    pass  # ignore, probably windows
 
 from abc import ABCMeta, abstractmethod