Merge branch 'release-0.6.1'0.6.1

3 files changed, 77 insertions, 10 deletions

diff --git a/src/leap/bitmask/util/autostart.py b/src/leap/bitmask/util/autostart.py
new file mode 100644
index 00000000..d7a8afb8
--- /dev/null
+++ b/src/leap/bitmask/util/autostart.py
@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+# autostart.py
+# Copyright (C) 2013, 2014 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/>.
+"""
+Helpers to enable/disable bitmask's autostart.
+"""
+import logging
+import os
+
+from leap.bitmask.config import flags
+from leap.bitmask.platform_init import IS_LINUX
+from leap.common.files import mkdir_p
+
+logger = logging.getLogger(__name__)
+
+
+DESKTOP_ENTRY = """\
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Application
+Name=Bitmask
+Comment=Secure Communication
+Exec=bitmask --start-hidden
+Terminal=false
+Icon=bitmask
+"""
+
+DESKTOP_ENTRY_PATH = os.path.expanduser("~/.config/autostart/")
+DESKTOP_ENTRY_FILE = os.path.join(DESKTOP_ENTRY_PATH, 'bitmask.desktop')
+
+
+def set_autostart(enabled):
+    """
+    Set the autostart mode to enabled or disabled depending on the parameter.
+    If `enabled` is `True`, save the autostart file to its place. Otherwise,
+    remove that file.
+    Right now we support only Linux autostart.
+
+    :param enabled: whether the autostart should be enabled or not.
+    :type enabled: bool
+    """
+    # we don't do autostart for bundle or systems different than Linux
+    if flags.STANDALONE or not IS_LINUX:
+        return
+
+    if enabled:
+        mkdir_p(DESKTOP_ENTRY_PATH)
+        with open(DESKTOP_ENTRY_FILE, 'w') as f:
+            f.write(DESKTOP_ENTRY)
+    else:
+        try:
+            os.remove(DESKTOP_ENTRY_FILE)
+        except OSError:  # if the file does not exist
+            pass
+        except Exception as e:
+            logger.error("Problem disabling autostart, {0!r}".format(e))
diff --git a/src/leap/bitmask/util/credentials.py b/src/leap/bitmask/util/credentials.py
index 07ded17b..757ce10c 100644
--- a/src/leap/bitmask/util/credentials.py
+++ b/src/leap/bitmask/util/credentials.py
@@ -21,7 +21,7 @@ Credentials utilities
 from PySide import QtCore, QtGui
 
 WEAK_PASSWORDS = ("123456", "qweasd", "qwerty", "password")
-USERNAME_REGEX = r"^[A-Za-z][A-Za-z\d_\-\.]+[A-Za-z\d]$"
+USERNAME_REGEX = r"^[a-z][a-z\d_\-\.]+[a-z\d]$"
 
 USERNAME_VALIDATOR = QtGui.QRegExpValidator(QtCore.QRegExp(USERNAME_REGEX))
 
@@ -69,7 +69,7 @@ def password_checks(username, password, password2):
     if message is None and not password:
         message = _tr("You can't use an empty password")
 
-    if message is None and len(password) < 6:
+    if message is None and len(password) < 8:
         message = _tr("Password too short")
 
     if message is None and password in WEAK_PASSWORDS:
diff --git a/src/leap/bitmask/util/keyring_helpers.py b/src/leap/bitmask/util/keyring_helpers.py
index ee2d7a1c..2b729b65 100644
--- a/src/leap/bitmask/util/keyring_helpers.py
+++ b/src/leap/bitmask/util/keyring_helpers.py
@@ -46,15 +46,12 @@ def _get_keyring_with_fallback():
     This is a workaround for the cases in which the keyring module chooses
     an insecure keyring by default (ie, inside a virtualenv).
     """
-    if not keyring:
+    if keyring is None:
         return None
     kr = keyring.get_keyring()
     if not canuse(kr):
-        try:
-            kr_klass = keyring.backends.SecretService
-            kr = kr_klass.Keyring()
-        except AttributeError:
-            logger.warning("Keyring cannot find SecretService Backend")
+        logger.debug("No usable keyring found")
+        return None
     logger.debug("Selected keyring: %s" % (kr.__class__,))
     if not canuse(kr):
         logger.debug("Not using default keyring since it is obsolete")
@@ -67,7 +64,7 @@ def has_keyring():
 
     :rtype: bool
     """
-    if not keyring:
+    if keyring is None:
         return False
     kr = _get_keyring_with_fallback()
     return canuse(kr)
@@ -79,7 +76,7 @@ def get_keyring():
 
     :rtype: keyringBackend or None
     """
-    if not keyring:
+    if keyring is None:
         return False
     kr = _get_keyring_with_fallback()
     return kr if canuse(kr) else None