Merge branch 'feature/fix-crypted-keyring' into develop

This is a temporary workaround until we find a good solution
to issue #744.

Some old versions of python-keyring are causing a recursion loop.

3 files changed, 13 insertions, 5 deletions

diff --git a/src/leap/base/config.py b/src/leap/base/config.py
index 57f9f1b7..cf01d1aa 100644
--- a/src/leap/base/config.py
+++ b/src/leap/base/config.py
@@ -220,6 +220,7 @@ def get_config_dir():
     # check for $XDG_CONFIG_HOME var?
     # get a more sensible path for win/mac
     # kclair: opinion? ^^
+
     return os.path.expanduser(
         os.path.join('~',
                      '.config',
diff --git a/src/leap/crypto/leapkeyring.py b/src/leap/crypto/leapkeyring.py
index bb0ca147..bceadc75 100644
--- a/src/leap/crypto/leapkeyring.py
+++ b/src/leap/crypto/leapkeyring.py
@@ -1,7 +1,7 @@
-import os
-
 import keyring
 
+from leap.base.config import get_config_file
+
 #############
 # Disclaimer
 #############
@@ -20,7 +20,11 @@ import keyring
 
 class LeapCryptedFileKeyring(keyring.backend.CryptedFileKeyring):
 
-    filename = os.path.expanduser("~/.config/leap/.secrets")
+    filename = ".secrets"
+
+    @property
+    def file_path(self):
+        return get_config_file(self.filename)
 
     def __init__(self, seed=None):
         self.seed = seed
diff --git a/src/leap/gui/firstrunwizard.py b/src/leap/gui/firstrunwizard.py
index 6f2c83ce..a76865fd 100755
--- a/src/leap/gui/firstrunwizard.py
+++ b/src/leap/gui/firstrunwizard.py
@@ -167,7 +167,7 @@ class FirstRunWizard(QtGui.QWizard):
         """
         provider = self.get_provider()
         username = self.field('userName')
-        password = self.field('userPassword')
+        #password = self.field('userPassword')
         remember_pass = self.field('rememberPassword')
 
         logger.debug('chosen provider: %s', provider)
@@ -185,7 +185,10 @@ class FirstRunWizard(QtGui.QWizard):
         seed = self.get_random_str(10)
         settings.setValue("%s_seed" % provider, seed)
 
-        leapkeyring.leap_set_password(username, password, seed=seed)
+        # Commenting out for 0.2.0 release
+        # since we did not fix #744 on time.
+
+        #leapkeyring.leap_set_password(username, password, seed=seed)
 
         logger.debug('First Run Wizard Done.')
         cb = self.success_cb