From 66183a1b24797b8aabc86053505d5fd115ffd988 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 13 Jun 2014 13:22:34 -0500 Subject: remove unneeded exec bit --- src/leap/bitmask/util/pastebin.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 src/leap/bitmask/util/pastebin.py diff --git a/src/leap/bitmask/util/pastebin.py b/src/leap/bitmask/util/pastebin.py old mode 100755 new mode 100644 -- cgit v1.2.3 From a1ed7ee69fc76a978c2ed9a85593492e596689bd Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 16 Jun 2014 17:51:44 -0500 Subject: Add bash script to help copy files from within the bundle. --- pkg/linux/leap-install-helper.sh | 172 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100755 pkg/linux/leap-install-helper.sh diff --git a/pkg/linux/leap-install-helper.sh b/pkg/linux/leap-install-helper.sh new file mode 100755 index 00000000..bed48255 --- /dev/null +++ b/pkg/linux/leap-install-helper.sh @@ -0,0 +1,172 @@ +#!/bin/bash + +# File: leap-install-helper.sh +# Copy the needed binaries and helper files to their destination. +# Copyright (C) 2014 LEAP Encryption Access Project. +# +# 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 . + +LOCAL_SBIN_FOLDER=/usr/local/sbin + +POLKIT_FILE="se.leap.bitmask.bundle.policy" +POLKIT_PATH="/usr/share/polkit-1/actions" + +BITMASK_ROOT_FILE="bitmask-root" +BITMASK_ROOT_PATH="${LOCAL_SBIN_FOLDER}/${BITMASK_ROOT_FILE}" + +OPENVPN_FILE="leap-openvpn" +OPENVPN_PATH="${LOCAL_SBIN_FOLDER}/${OPENVPN_FILE}" + +# The following array stores global files that have been deprecated and we want +# to remove from the system path, after having dropped them there in the past. + +DEPRECATED_FILES=( + '/usr/share/polkit-1/actions/net.openvpn.gui.leap.policy' +) + + +# Variables for parsing and storing the script options. + +FROM_PATH=NONE +REMOVE_OLD_FILES=NO +INSTALL_BITMASK_ROOT=NO +INSTALL_POLKIT_FILE=NO +INSTALL_OPENVPN=NO + + +# Process the options + +while [[ $# > 1 ]] +do +key="$1" +shift + +case $key in + -f|--from-path) + FROM_PATH="$1" + shift + ;; + -r|--remove-old-files) + REMOVE_OLD_FILES="$1" + shift + ;; + --install-bitmask-root) + INSTALL_BITMASK_ROOT="$1" + shift + ;; + --install-polkit-file) + INSTALL_POLKIT_FILE="$1" + shift + ;; + --install-openvpn) + INSTALL_OPENVPN="$1" + shift + ;; + *) + # unknown option + ;; +esac +done +echo "LEAP_INSTALL_HELPER" +echo "-------------------" +echo FROM_PATH = "${FROM_PATH}" +echo REMOVE_OLD_FILES = "${REMOVE_OLD_FILES}" +echo INSTALL_BITMASK_ROOT = "${INSTALL_BITMASK_ROOT}" +echo INSTALL_POLKIT_FILE = "${INSTALL_POLKIT_FILE}" +echo INSTALL_OPENVPN = "${INSTALL_OPENVPN}" +echo + + +# +# helper functions +# + +function check_current_uid() { + current_uid=`id | sed 's/^uid=//;s/(.*$//'` + if [ $current_uid != 0 ] + then + echo "[ERROR] NEED TO BE RUN AS ROOT" + exit 1 + fi +} + +function check_from_path() { + if [ $FROM_PATH == NONE ] + then + echo "[ERROR] YOU NEED TO GIVE --from-path VALUE..." + exit 1 + fi +} + +function remove_old_files() { + for file in "${DEPRECATED_FILES[@]}" + do + rm $file + done +} + +function copy_bitmask_root() { + mkdir -p "${LOCAL_SBIN_FOLDER}" + cp "${FROM_PATH}/${BITMASK_ROOT_FILE}" "${BITMASK_ROOT_PATH}" + chmod 744 "${BITMASK_ROOT_PATH}" + +} + +function copy_polkit_file() { + cp "${FROM_PATH}/${POLKIT_FILE}" "${POLKIT_PATH}" + chmod 644 "${POLKIT_PATH}" +} + +function copy_openvpn_file() { + mkdir -p "${LOCAL_SBIN_FOLDER}" + cp "${FROM_PATH}/${OPENVPN_FILE}" "${OPENVPN_PATH}" + chmod 744 "${OPENVPN_PATH}" + +} + + +# +# Process options and run functions. +# + +check_current_uid + +if [ $INSTALL_BITMASK_ROOT == YES ] || [ $INSTALL_POLKIT_FILE == YES ] || [ $INSTALL_OPENVPN == YES ] +then + check_from_path +fi + +if [ $REMOVE_OLD_FILES == YES ] +then + echo "REMOVING OLD FILES..." + remove_old_files +fi + +if [ $INSTALL_BITMASK_ROOT == YES ] +then + echo "INSTALLING bitmask-root..." + copy_bitmask_root +fi + +if [ $INSTALL_POLKIT_FILE == YES ] +then + echo "INSTALLING policykit file..." + copy_polkit_file +fi + +if [ $INSTALL_OPENVPN == YES ] +then + echo "INSTALLING openvpn..." + copy_openvpn_file +fi -- cgit v1.2.3 From 9dd06067e6bfa475c633a1edcae8d3c318b9f0f5 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 16 Jun 2014 18:50:09 -0500 Subject: use absolute paths --- src/leap/bitmask/platform_init/initializers.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/leap/bitmask/platform_init/initializers.py b/src/leap/bitmask/platform_init/initializers.py index 79fdd554..859e7fe6 100644 --- a/src/leap/bitmask/platform_init/initializers.py +++ b/src/leap/bitmask/platform_init/initializers.py @@ -248,13 +248,13 @@ def _darwin_install_missing_scripts(badexec, notfound): # We expect to execute this from some way of bundle, since # the up/down scripts should be put in place by the installer. success = False - installer_path = os.path.join( - os.getcwd(), - "..", - "Resources", - "openvpn") + installer_path = os.path.abspath( + os.path.join( + os.getcwd(), "..", "Resources", "openvpn")) launcher = DarwinVPNLauncher + + # XXX FIXME !!! call the bash script! if os.path.isdir(installer_path): fd, tempscript = tempfile.mkstemp(prefix="leap_installer-") try: @@ -397,12 +397,15 @@ def _linux_install_missing_scripts(badexec, notfound): :rtype: bool """ success = False - installer_path = os.path.join(os.getcwd(), "apps", "eip", "files") + installer_path = os.path.abspath( + os.path.join(os.getcwd(), "apps", "eip", "files")) launcher = LinuxVPNLauncher # XXX refactor with darwin, same block. if os.path.isdir(installer_path): + + # FIXME --------- call installer script --- fd, tempscript = tempfile.mkstemp(prefix="leap_installer-") polfd, pol_tempfile = tempfile.mkstemp(prefix="leap_installer-") try: -- cgit v1.2.3 From 89d126e96b1ed3ac1076b3c45129f8bc78a09700 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Tue, 17 Jun 2014 11:25:11 -0500 Subject: use bash installer instead of the temporal script --- pkg/linux/README.rst | 7 ++++++- pkg/linux/leap-install-helper.sh | 3 ++- src/leap/bitmask/platform_init/initializers.py | 28 ++++++++------------------ 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/pkg/linux/README.rst b/pkg/linux/README.rst index 249c721f..f89842d3 100644 --- a/pkg/linux/README.rst +++ b/pkg/linux/README.rst @@ -15,10 +15,15 @@ path will be used if the flag ``--standalone`` is set:: bitmask-root -> /usr/local/sbin/bitmask-root polkit/se.leap.bitmask.bundle.policy -> /usr/share/polkit-1/actions/se.leap.bitmask.bundle.policy -You will also have to place an openvpn binary in the following path:: +When running with ``--standalone`` flag, the openvpn binary is expected in the following path:: leap-openvpn -> /usr/local/sbin/leap-openvpn +The bundle will use the script ``leap-install-helper.sh`` to copy the needed +files. If you ever want to use it manually to update the helpers or bins, it +needs a ``--from-path`` parameter to be passed to it. This points to a folder +from where all the needed binaries and scripts can be found. + Binary hashing ============== diff --git a/pkg/linux/leap-install-helper.sh b/pkg/linux/leap-install-helper.sh index bed48255..566dd3d9 100755 --- a/pkg/linux/leap-install-helper.sh +++ b/pkg/linux/leap-install-helper.sh @@ -19,8 +19,9 @@ LOCAL_SBIN_FOLDER=/usr/local/sbin +POLKIT_FOLDER="/usr/share/polkit-1/actions" POLKIT_FILE="se.leap.bitmask.bundle.policy" -POLKIT_PATH="/usr/share/polkit-1/actions" +POLKIT_PATH="${POLKIT_FOLDER}/${POLKIT_FILE}" BITMASK_ROOT_FILE="bitmask-root" BITMASK_ROOT_PATH="${LOCAL_SBIN_FOLDER}/${BITMASK_ROOT_FILE}" diff --git a/src/leap/bitmask/platform_init/initializers.py b/src/leap/bitmask/platform_init/initializers.py index 859e7fe6..b7946c4c 100644 --- a/src/leap/bitmask/platform_init/initializers.py +++ b/src/leap/bitmask/platform_init/initializers.py @@ -401,39 +401,27 @@ def _linux_install_missing_scripts(badexec, notfound): os.path.join(os.getcwd(), "apps", "eip", "files")) launcher = LinuxVPNLauncher - # XXX refactor with darwin, same block. + install_helper = "linux-install-helper.sh" + install_helper_path = os.path.join(installer_path, install_helper) - if os.path.isdir(installer_path): + install_opts = ("--from-path %s --install-bitmask-root YES" + "--install-polkit-file YES --install-openvpn YES" % ( + installer_path,)) - # FIXME --------- call installer script --- - fd, tempscript = tempfile.mkstemp(prefix="leap_installer-") - polfd, pol_tempfile = tempfile.mkstemp(prefix="leap_installer-") + if os.path.isdir(installer_path): try: pkexec = first(launcher.maybe_pkexec()) - - scriptlines = launcher.cmd_for_missing_scripts(installer_path) - with os.fdopen(fd, 'w') as f: - f.write(scriptlines) - - st = os.stat(tempscript) - os.chmod(tempscript, st.st_mode | stat.S_IEXEC | stat.S_IXUSR | - stat.S_IXGRP | stat.S_IXOTH) - cmdline = ["%s %s" % (pkexec, tempscript)] + cmdline = ["%s %s" % (pkexec, install_helper_path, install_opts)] ret = subprocess.call( cmdline, stdout=subprocess.PIPE, shell=True) success = ret == 0 if not success: - logger.error("Install missing scripts failed.") + logger.error("Install of helpers failed.") except Exception as exc: logger.error(badexec) logger.error("Error was: %r" % (exc,)) - finally: - try: - os.remove(tempscript) - except OSError as exc: - logger.error("%r" % (exc,)) else: logger.error(notfound) logger.debug('path searched: %s' % (installer_path,)) -- cgit v1.2.3 From 7b128df99a9729a4b2f16bd92173d9373183e4c9 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Tue, 17 Jun 2014 13:12:41 -0500 Subject: add dialog to inform of missing helpers w/o installing them --- src/leap/bitmask/platform_init/initializers.py | 98 +++++++++++++++++++++----- 1 file changed, 81 insertions(+), 17 deletions(-) diff --git a/src/leap/bitmask/platform_init/initializers.py b/src/leap/bitmask/platform_init/initializers.py index b7946c4c..8dae21bf 100644 --- a/src/leap/bitmask/platform_init/initializers.py +++ b/src/leap/bitmask/platform_init/initializers.py @@ -25,8 +25,9 @@ import sys import subprocess import tempfile -from PySide import QtGui +from PySide import QtGui, QtCore +from leap.bitmask.config import flags from leap.bitmask.config.leapsettings import LeapSettings from leap.bitmask.services.eip import get_vpn_launcher from leap.bitmask.services.eip.linuxvpnlauncher import LinuxVPNLauncher @@ -76,9 +77,9 @@ HELPERS_BADEXEC_MSG = BADEXEC_MSG % ( "helper files", "they", "be copied") -def get_missing_updown_dialog(): +def get_missing_helpers_dialog(): """ - Create a dialog for notifying of missing updown scripts. + Create a dialog for notifying of missing helpers. Returns that dialog. :rtype: QtGui.QMessageBox instance @@ -104,14 +105,25 @@ def check_missing(): raises a dialog to ask user for permission to do it. """ config = LeapSettings() + complain_missing = False alert_missing = config.get_alert_missing_scripts() + if alert_missing and not flags.STANDALONE: + # We refuse to install missing stuff if not running with standalone + # flag. Right now we rely on the flag alone, but we can disable this + # by overwriting some constant from within the debian package. + alert_missing = False + complain_missing = True + launcher = get_vpn_launcher() missing_scripts = launcher.missing_updown_scripts missing_other = launcher.missing_other_files - if alert_missing and (missing_scripts() or missing_other()): - msg = get_missing_updown_dialog() + logger.debug("MISSING OTHER: %s" % (str(missing_other()))) + + missing_some = missing_scripts() or missing_other() + if alert_missing and missing_some: + msg = get_missing_helpers_dialog() ret = msg.exec_() if ret == QtGui.QMessageBox.Yes: @@ -123,8 +135,6 @@ def check_missing(): "Installer not found for platform %s." % (_system,)) return - print "INSTALL FUN", install_missing_fun - # XXX maybe move constants to fun ok = install_missing_fun(HELPERS_BADEXEC_MSG, HELPERS_NOTFOUND_MSG) if not ok: @@ -143,6 +153,12 @@ def check_missing(): "Setting alert_missing_scripts to False, we will not " "ask again") config.set_alert_missing_scripts(False) + + if complain_missing and missing_some: + missing = missing_scripts() + missing_other() + msg = _get_missing_complain_dialog(missing) + ret = msg.exec_() + # # windows initializers # @@ -253,7 +269,6 @@ def _darwin_install_missing_scripts(badexec, notfound): os.getcwd(), "..", "Resources", "openvpn")) launcher = DarwinVPNLauncher - # XXX FIXME !!! call the bash script! if os.path.isdir(installer_path): fd, tempscript = tempfile.mkstemp(prefix="leap_installer-") @@ -352,24 +367,72 @@ def _get_missing_resolvconf_dialog(): :rtype: QtGui.QMessageBox instance """ - NO_RESOLVCONF = ( + msgstr = QtCore.QObject() + msgstr.NO_RESOLVCONF = msgstr.tr( "Could not find resolvconf installed in your system.\n" "Do you want to quit Bitmask now?") - EXPLAIN = ( + msgstr.EXPLAIN = msgstr.tr( "Encrypted Internet needs resolvconf installed to work properly.\n" "Please use your package manager to install it.\n") msg = QtGui.QMessageBox() msg.setWindowTitle(msg.tr("Missing resolvconf framework")) - msg.setText(msg.tr(NO_RESOLVCONF)) + msg.setText(msgstr.NO_RESOLVCONF) # but maybe the user really deserve to know more - msg.setInformativeText(msg.tr(EXPLAIN)) + msg.setInformativeText(msgstr.EXPLAIN) msg.setStandardButtons(QtGui.QMessageBox.Yes | QtGui.QMessageBox.No) msg.setDefaultButton(QtGui.QMessageBox.Yes) return msg +def _get_missing_complain_dialog(stuff): + """ + Create a dialog for notifying about missing helpers (but doing nothing). + Used from non-standalone runs. + + :param stuff: list of missing items to display + :type stuff: list + :rtype: QtGui.QMessageBox instance + """ + msgstr = QtCore.QObject() + msgstr.NO_HELPERS = msgstr.tr( + "Some essential helper files are missing in your system.") + msgstr.EXPLAIN = msgstr.tr( + "Reinstall your debian packages, or make sure you place them by hand.") + + class ComplainDialog(QtGui.QDialog): + + def __init__(self, parent=None): + super(ComplainDialog, self).__init__(parent) + + label = QtGui.QLabel(msgstr.NO_HELPERS) + label.setAlignment(QtCore.Qt.AlignLeft) + + label2 = QtGui.QLabel(msgstr.EXPLAIN) + label2.setAlignment(QtCore.Qt.AlignLeft) + + textedit = QtGui.QTextEdit() + textedit.setText("\n".join(stuff)) + + ok = QtGui.QPushButton() + ok.setText(self.tr("Ok, thanks")) + self.ok = ok + self.ok.clicked.connect(self.close) + + mainLayout = QtGui.QGridLayout() + mainLayout.addWidget(label, 0, 0) + mainLayout.addWidget(label2, 1, 0) + mainLayout.addWidget(textedit, 2, 0) + mainLayout.addWidget(ok, 3, 0) + + self.setLayout(mainLayout) + + msg = ComplainDialog() + msg.setWindowTitle(msg.tr("Missing Bitmask helpers")) + return msg + + def _linux_check_resolvconf(): """ Raise a dialog warning about the lack of the resolvconf framework. @@ -401,17 +464,18 @@ def _linux_install_missing_scripts(badexec, notfound): os.path.join(os.getcwd(), "apps", "eip", "files")) launcher = LinuxVPNLauncher - install_helper = "linux-install-helper.sh" + install_helper = "leap-install-helper.sh" install_helper_path = os.path.join(installer_path, install_helper) - install_opts = ("--from-path %s --install-bitmask-root YES" - "--install-polkit-file YES --install-openvpn YES" % ( - installer_path,)) + install_opts = ("--from-path %s --install-bitmask-root YES " + "--install-polkit-file YES --install-openvpn YES " + "--remove-old-files YES" % (installer_path,)) if os.path.isdir(installer_path): try: pkexec = first(launcher.maybe_pkexec()) - cmdline = ["%s %s" % (pkexec, install_helper_path, install_opts)] + cmdline = ["%s %s %s" % ( + pkexec, install_helper_path, install_opts)] ret = subprocess.call( cmdline, stdout=subprocess.PIPE, -- cgit v1.2.3 From 3a6e0e69cdfb8ee88808002b316c40c4a338f2e1 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Tue, 17 Jun 2014 13:14:56 -0500 Subject: changes file --- changes/feature_install-helpers-util | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changes/feature_install-helpers-util diff --git a/changes/feature_install-helpers-util b/changes/feature_install-helpers-util new file mode 100644 index 00000000..4facc1d3 --- /dev/null +++ b/changes/feature_install-helpers-util @@ -0,0 +1,3 @@ +- Remove deprecated policy files. Closes: #5651 +- Install helper files only if standalone=True. Related: #5625 +- Use installer helper from within bundle path. Related: #5634 -- cgit v1.2.3 From c0d200b486cfe90b695d8bf1475cccbfe679b0f7 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Tue, 17 Jun 2014 16:04:28 -0500 Subject: update the strings file --- data/ts/en_US.ts | 686 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 396 insertions(+), 290 deletions(-) diff --git a/data/ts/en_US.ts b/data/ts/en_US.ts index 562df1a3..cf74d7b6 100644 --- a/data/ts/en_US.ts +++ b/data/ts/en_US.ts @@ -68,96 +68,114 @@ - - <span style='color:#0000FF;'>NOTE</span>: To use this, you need to enable/start {0}. - - - - + Open keys file - + Input/Output error - + There was an error accessing the file. Import canceled. - + Data mismatch - + The public and private key should have the same address and fingerprint. Import canceled. - + Missing key - + You need to provide the public AND private key in the same file. Import canceled. - + Address mismatch - + The identity for the key needs to be the same as your user address. Import canceled. - + Are you sure that you want to replace the current key pair whith the imported? - + Import Successful - + The key pair was imported successfully. - + Save keys file - + Export Successful - + The key pair was exported successfully. Please, store your private key in a safe place. - + There was an error accessing the file. Export canceled. + + + The provider that you are using does not support {0}. + + + + + To use this, you need to enable/start {0}. + + + + + <span style='color:#0000FF;'>NOTE</span>: + + + + + ComplainDialog + + + Ok, thanks + + EIPPreferences @@ -210,22 +228,22 @@ Export canceled. - + Gateway settings for provider '{0}' saved. - + There was a problem with configuration files. - + (uninitialized) - + This is an uninitialized provider, please log in first. @@ -253,88 +271,158 @@ Export canceled. - + 0.0 KB/s - - - EIPStatusWidget - - Turn OFF + + Turn Off + + + EIPStatusWidget - + Turn ON - - Traffic is being routed in the clear - - - - + Authenticating... - + Retrieving configuration... - + Waiting to start... - + Assigning IP - + Reconnecting... - + Unable to start VPN, it's already running. - - Route traffic through: {0} - - - - + disabled - + {0}: OFF - + You must login to use {0} - + {0}: Starting... - + {0}: ON + + + Encrypted Internet is starting + + + + + Retry + + + + + Traffic is being routed in the clear. + + + + + Network is unreachable. + + + + + Error connecting + + + + + Error connecting. + + + + + Bitmask is blocking unencrypted traffic. + + + + + Routing traffic through: <b>{0}</b> + + + + + Could not load {0} configuration. + + + + + Another openvpn instance is already running, and could not be stopped. + + + + + Another openvpn instance is already running, and could not be stopped because it was not launched by Bitmask. Please stop it and try again. + + + + + We could not find openvpn binary. + + + + + We could not find any authentication agent in your system.<br/>Make sure you have<b>polkit-gnome-authentication-agent-1</b> running andtry again. + + + + + We could not find <b>pkexec</b> in your system. + + + + + {0} cannot be started because the tuntap extension is not installed properly in your system. + + + + + Network is unreachable + + LoggerWindow @@ -399,25 +487,30 @@ Export canceled. - + Your pastebin link <a href='{0}'>{0}</a> - + Pastebin OK - + Sending logs to Pastebin failed! - + Pastebin Error + + + Maximum posts per day reached + + LoginWidget @@ -447,17 +540,17 @@ Export canceled. - + Log In - + Other... - + Cancel @@ -467,32 +560,32 @@ Export canceled. - + Logout - + Please select a valid provider - + Please provide a valid username - + Please provide a valid password - + Logging in... - + Logging out... @@ -515,206 +608,196 @@ Export canceled. - + There was an unexpected problem with Soledad. - + OFF - + Mail is OFF - - Starting.. - - - - + Mail is starting - + ON - + Mail is ON - + Mail is disabled - + Starting... - + Soledad has started... - + Soledad is starting, please wait... - + Looking for key for this user - + Found key! Starting mail... - + Finished generating key! - + Starting mail... - + SMTP failed to start, check the logs. - + About to start, please wait... - + Disabled - + {0}: OFF - + You must be logged in to use {0}. - + Generating new key, this may take a few minutes. - + {0} Unread Emails in your Inbox - + 1 Unread Email in your Inbox - + Disconnecting... + + + Invalid auth token, try logging in again. + + + + + Starting… + + MainWindow - + There are new updates available, please restart. - + More... - + Help - + &Quit - + &Help - + &Wizard - + Hide Main Window - + The following components will be updated: %s - + Updates available - + Show Main Window - - We could not find any authentication agent in your system.<br/>Make sure you have <b>polkit-gnome-authentication-agent-1</b> running and try again. - - - - - We could not find <b>pkexec</b> in your system. - - - - - We could not find openvpn binary. - - - - + Starting... - + Not supported - + Disabled @@ -724,173 +807,203 @@ Export canceled. - + About &Bitmask - + Mail is OFF - + The Bitmask app is ready to update, please restart the application. - + About Bitmask - %s - + Unable to login: Problem with provider - + Log in cancelled by the user. - - Another openvpn instance is already running, and could not be stopped. - - - - - Another openvpn instance is already running, and could not be stopped because it was not launched by Bitmask. Please stop it and try again. - - - - + There was a problem with the provider - + Something went wrong with the logout. - + Unable to connect: Problem with provider - + Login - + &Bitmask - + Show &Log - + Create a new account... - + File - - Network is unreachable - - - - + Please Log In - + Account Preferences... - + Internet Preferences... - + Advanced Key Management - + (offline mode) - + OFF - + Version: <b>%s</b> (%s)<br><br>%sBitmask is the Desktop client application for the LEAP platform, supporting encrypted internet proxy, secure email, and secure chat (coming soon).<br><br>LEAP is a non-profit dedicated to giving all internet users access to secure communication. Our focus is on adapting encryption technology to make it easy to use and widely available. <br><br><a href='https://leap.se'>More about LEAP</a> - + <strong>Instructions to use mail:</strong><br>If you use Thunderbird you can use the Bitmask extension helper. Search for 'Bitmask' in the add-on manager or download it from: {0}.<br><br>You can configure Bitmask manually with these options:<br><em> Incoming -> IMAP, port: {1}<br> Outgoing -> SMTP, port: {2}<br> Username -> your bitmask username.<br> Password -> does not matter, use any text. Just don't leave it empty and don't use your account's password.</em> - + Bitmask Help - + The current client version is not supported by this provider.<br>Please update to latest version.<br><br>You can get the latest version from <a href='{0}'>{1}</a> - + Update Needed - + This provider is not compatible with the client.<br><br>Error: API version incompatible. - + Incompatible Provider - - Could not load {0} configuration. + + Application error - - {0} cannot be started because the tuntap extension is not installed properly in your system. + + You are trying to do an operation that requires logging in first. - - {0} could not be launched because you did not authenticate properly. + + Unknown error. - - {0} finished in an unexpected manner! + + There was a server problem with authentication. + + + + + Could not establish a connection. + + + + + Invalid username or password. + + + + + Hello! + + + + + Bitmask has started in the tray. + + + + + Succeeded + + + + + The server at {0} can't be found, because the DNS lookup failed. DNS is the network service that translates a website's name to its Internet address. Either your computer is having trouble connecting to the network, or you are missing some helper files that are needed to securely use DNS while {1} is active. To install these helper files, quit this application and start it again. + + + + + Connection Error + + + + + Quitting... + + + + + Bitmask is quitting, please wait. @@ -965,47 +1078,47 @@ Export canceled. PreferencesWindow - + Automatic - + Changing password... - + Password changed successfully. - + There was a problem changing the password. - + You did not enter a correct current password. - + Services settings for provider '{0}' saved. - + You need to enable {0} in order to change the password. - + You need to wait until {0} is ready in order to change the password. - + In order to change your password you need to be logged in. @@ -1013,24 +1126,16 @@ Export canceled. ProviderBootstrapper - + Provider certificate could not be verified - + Provider does not support HTTPS - - SRPAuth - - - Succeeded - - - Wizard @@ -1059,7 +1164,7 @@ Export canceled. - + Check @@ -1084,195 +1189,180 @@ Export canceled. - + Provider Information - + Description of services offered by this provider - + Name - + Desc - + <b>Services offered:</b> - + services - + <b>Enrollment policy:</b> - + policy - + <b>URL:</b> - + URL - + <b>Description:</b> - + Provider setup - + Gathering configuration options for this provider - + We are downloading some bits that we need to establish a secure connection with the provider for the first time. - + Setting up provider - + Getting info from the Certificate Authority - + Do we trust this Certificate Authority? - + Establishing a trust relationship with this provider - + Register new user - + Register a new user with provider - + <b>Password:</b> - + <b>Re-enter password:</b> - + Register - + Remember my username and password - + Service selection - + Please select the services you would like to have - + &Next > - + Connect - + Starting registration... - + User %s successfully registered. - + <font color='red'><b>Non-existent provider</b></font> - + <font color='red'><b>%s</b></font> - + Unable to load provider configuration - + <font color='red'><b>Not a valid provider</b></font> - - Services by %s - - - - + Something went wrong while trying to load service %s - - - Description of services offered by %s - - - - - Register a new user with %s - - Bitmask first run @@ -1289,7 +1379,7 @@ Export canceled. - + <b>Username:</b> @@ -1299,7 +1389,7 @@ Export canceled. - + Configure new provider: @@ -1314,114 +1404,130 @@ Export canceled. - + Something has gone wrong. Please try again. - + Gathering configuration options for {0} - - - __impl - - The server did not send the salt parameter + + The requested username is taken, choose another. + + + + + Services by {0} + + + + + Description of services offered by {0} - - The server did not send the B parameter + + Register a new user with {0} + + + msg - - The data sent from the server had errors + + TAP Driver - - Could not connect to the server + + Encrypted Internet uses VPN, which needs a TAP device installed and none has been found. This will ask for administrative privileges. - - Unknown error (%s) + + TUN Driver - - Problem getting data from server + + Encrypted Internet uses VPN, which needs a kernel extension for a TUN device installed, and none has been found. This will ask for administrative privileges. - - Bad data from server + + Problem installing files - - Auth verification failed + + Some of the files could not be copied. - - Session cookie verification failed + + Bitmask needs to install the necessary drivers for Encrypted Internet to work. Would you like to proceed? - - There was a problem with authentication + + Missing helper files - - Invalid username or password. + + Missing resolvconf framework - - - msg - - Missing up/down scripts + + Missing Bitmask helpers + + + msgstr - - TAP Driver + + Could not find <b>resolvconf</b> installed in your system. +Do you want to quit Bitmask now? - - Encrypted Internet uses VPN, which needs a TAP device installed and none has been found. This will ask for administrative privileges. + + Encrypted Internet needs resolvconf installed to work properly. +Please use your package manager to install it. + - - TUN Driver + + Some essential helper files are missing in your system. - - Encrypted Internet uses VPN, which needs a kernel extension for a TUN device installed, and none has been found. This will ask for administrative privileges. + + Reinstall your debian packages, or make sure you place them by hand. + + + self._eip_status - - Problem installing files + + {0} is restarting - - Some of the files could not be copied. + + {0} could not be launched because you did not authenticate properly. - - Bitmask needs to install the necessary drivers for Encrypted Internet to work. Would you like to proceed? + + {0} finished in an unexpected manner! -- cgit v1.2.3 From b7b00f724b5ce1dc9382ec6c44e6b23faadacbb4 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 20 Jun 2014 11:05:54 -0500 Subject: fix bundle path for openvpn --- pkg/linux/bitmask-root | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/linux/bitmask-root b/pkg/linux/bitmask-root index 1929b51b..5367a31c 100755 --- a/pkg/linux/bitmask-root +++ b/pkg/linux/bitmask-root @@ -67,7 +67,7 @@ OPENVPN_USER = "nobody" OPENVPN_GROUP = "nogroup" LEAPOPENVPN = "LEAPOPENVPN" OPENVPN_SYSTEM_BIN = "/usr/sbin/openvpn" # Debian location -OPENVPN_LEAP_BIN = "/usr/sbin/leap-openvpn" # installed by bundle +OPENVPN_LEAP_BIN = "/usr/local/sbin/leap-openvpn" # installed by bundle """ -- cgit v1.2.3