diff --git a/plugins/encrypted_webinterface/root_action.py b/plugins/encrypted_webinterface/root_action.py index 5cc7b79..4d63947 100755 --- a/plugins/encrypted_webinterface/root_action.py +++ b/plugins/encrypted_webinterface/root_action.py @@ -55,8 +55,11 @@ def run_stunnel(cert_file, src_port, dst_port, pid_file): if not username: sys.stderr.write("Could not retrieve the username with uid=%d." % os.getuid()) return False + ## the environment (especially PATH) should be clean, as 'stunnel' cares about + ## this in a setuid situation proc = subprocess.Popen( shell = False, + env = {}, args = [ STUNNEL_BIN, "-P", pid_file, "-p", cert_file, diff --git a/plugins/network/unittests.py b/plugins/network/unittests.py index 1b9ca46..3e5e587 100644 --- a/plugins/network/unittests.py +++ b/plugins/network/unittests.py @@ -74,5 +74,5 @@ class unittests(WebInterfaceTestClass): self.cmd.go(self.url + "network" + "?redirected=1") self.cmd.notfind("problem") self.cmd.go(self.url + "network" + "?store=set_ip") - self.cmd.find("invalid network address") + self.cmd.find("server address is not valid") diff --git a/plugins/volume_mount/intl/cryptobox-server-feature-volume_mount.pot b/plugins/volume_mount/intl/cryptobox-server-feature-volume_mount.pot index d5f9468..bd7a34e 100644 --- a/plugins/volume_mount/intl/cryptobox-server-feature-volume_mount.pot +++ b/plugins/volume_mount/intl/cryptobox-server-feature-volume_mount.pot @@ -59,7 +59,7 @@ msgid "View event log" msgstr "" #: WarningMessage.MountCryptoFailed.Text -msgid "Maybe you entered the wrong password?" +msgid "Maybe you entered a wrong password?" msgstr "" #: WarningMessage.InvalidContainerType.Title diff --git a/plugins/volume_mount/intl/cs/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/cs/cryptobox-server-feature-volume_mount.po index 0f30abe..759771d 100644 --- a/plugins/volume_mount/intl/cs/cryptobox-server-feature-volume_mount.po +++ b/plugins/volume_mount/intl/cs/cryptobox-server-feature-volume_mount.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: CryptoBox-Server 0.3\n" "Report-Msgid-Bugs-To: translate@cryptobox.org\n" -"POT-Creation-Date: 2007-02-03 12:00+0100\n" +"POT-Creation-Date: 2007-02-03 19:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -74,7 +74,7 @@ msgid "View event log" msgstr "" #: WarningMessage.MountCryptoFailed.Text -msgid "Maybe you entered the wrong password?" +msgid "Maybe you entered a wrong password?" msgstr "" #: WarningMessage.InvalidContainerType.Title diff --git a/plugins/volume_mount/intl/da/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/da/cryptobox-server-feature-volume_mount.po index 0f30abe..759771d 100644 --- a/plugins/volume_mount/intl/da/cryptobox-server-feature-volume_mount.po +++ b/plugins/volume_mount/intl/da/cryptobox-server-feature-volume_mount.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: CryptoBox-Server 0.3\n" "Report-Msgid-Bugs-To: translate@cryptobox.org\n" -"POT-Creation-Date: 2007-02-03 12:00+0100\n" +"POT-Creation-Date: 2007-02-03 19:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -74,7 +74,7 @@ msgid "View event log" msgstr "" #: WarningMessage.MountCryptoFailed.Text -msgid "Maybe you entered the wrong password?" +msgid "Maybe you entered a wrong password?" msgstr "" #: WarningMessage.InvalidContainerType.Title diff --git a/plugins/volume_mount/intl/de/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/de/cryptobox-server-feature-volume_mount.po index e578b76..77b3fa1 100644 --- a/plugins/volume_mount/intl/de/cryptobox-server-feature-volume_mount.po +++ b/plugins/volume_mount/intl/de/cryptobox-server-feature-volume_mount.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: CryptoBox-Server 0.3\n" "Report-Msgid-Bugs-To: translate@cryptobox.org\n" -"POT-Creation-Date: 2007-02-03 12:00+0100\n" +"POT-Creation-Date: 2007-02-03 19:19+0100\n" "PO-Revision-Date: 2007-01-12 04:23+0100\n" "Last-Translator: Lars Kruse \n" "Language-Team: LANGUAGE \n" @@ -74,7 +74,7 @@ msgid "View event log" msgstr "" #: WarningMessage.MountCryptoFailed.Text -msgid "Maybe you entered the wrong password?" +msgid "Maybe you entered a wrong password?" msgstr "" #: WarningMessage.InvalidContainerType.Title diff --git a/plugins/volume_mount/intl/en/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/en/cryptobox-server-feature-volume_mount.po index c951ea1..bf3cf5a 100644 --- a/plugins/volume_mount/intl/en/cryptobox-server-feature-volume_mount.po +++ b/plugins/volume_mount/intl/en/cryptobox-server-feature-volume_mount.po @@ -62,8 +62,9 @@ msgid "View event log" msgstr "View event log" #: WarningMessage.MountCryptoFailed.Text -msgid "Maybe you entered the wrong password?" -msgstr "Maybe you entered the wrong password?" +#, fuzzy +msgid "Maybe you entered a wrong password?" +msgstr "Maybe you entered a wrong password?" #: WarningMessage.InvalidContainerType.Title msgid "Unknown format" diff --git a/plugins/volume_mount/intl/es/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/es/cryptobox-server-feature-volume_mount.po index 0f30abe..759771d 100644 --- a/plugins/volume_mount/intl/es/cryptobox-server-feature-volume_mount.po +++ b/plugins/volume_mount/intl/es/cryptobox-server-feature-volume_mount.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: CryptoBox-Server 0.3\n" "Report-Msgid-Bugs-To: translate@cryptobox.org\n" -"POT-Creation-Date: 2007-02-03 12:00+0100\n" +"POT-Creation-Date: 2007-02-03 19:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -74,7 +74,7 @@ msgid "View event log" msgstr "" #: WarningMessage.MountCryptoFailed.Text -msgid "Maybe you entered the wrong password?" +msgid "Maybe you entered a wrong password?" msgstr "" #: WarningMessage.InvalidContainerType.Title diff --git a/plugins/volume_mount/intl/fi/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/fi/cryptobox-server-feature-volume_mount.po index 0f30abe..759771d 100644 --- a/plugins/volume_mount/intl/fi/cryptobox-server-feature-volume_mount.po +++ b/plugins/volume_mount/intl/fi/cryptobox-server-feature-volume_mount.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: CryptoBox-Server 0.3\n" "Report-Msgid-Bugs-To: translate@cryptobox.org\n" -"POT-Creation-Date: 2007-02-03 12:00+0100\n" +"POT-Creation-Date: 2007-02-03 19:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -74,7 +74,7 @@ msgid "View event log" msgstr "" #: WarningMessage.MountCryptoFailed.Text -msgid "Maybe you entered the wrong password?" +msgid "Maybe you entered a wrong password?" msgstr "" #: WarningMessage.InvalidContainerType.Title diff --git a/plugins/volume_mount/intl/fr/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/fr/cryptobox-server-feature-volume_mount.po index 0f30abe..759771d 100644 --- a/plugins/volume_mount/intl/fr/cryptobox-server-feature-volume_mount.po +++ b/plugins/volume_mount/intl/fr/cryptobox-server-feature-volume_mount.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: CryptoBox-Server 0.3\n" "Report-Msgid-Bugs-To: translate@cryptobox.org\n" -"POT-Creation-Date: 2007-02-03 12:00+0100\n" +"POT-Creation-Date: 2007-02-03 19:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -74,7 +74,7 @@ msgid "View event log" msgstr "" #: WarningMessage.MountCryptoFailed.Text -msgid "Maybe you entered the wrong password?" +msgid "Maybe you entered a wrong password?" msgstr "" #: WarningMessage.InvalidContainerType.Title diff --git a/plugins/volume_mount/intl/hu/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/hu/cryptobox-server-feature-volume_mount.po index 0f30abe..759771d 100644 --- a/plugins/volume_mount/intl/hu/cryptobox-server-feature-volume_mount.po +++ b/plugins/volume_mount/intl/hu/cryptobox-server-feature-volume_mount.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: CryptoBox-Server 0.3\n" "Report-Msgid-Bugs-To: translate@cryptobox.org\n" -"POT-Creation-Date: 2007-02-03 12:00+0100\n" +"POT-Creation-Date: 2007-02-03 19:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -74,7 +74,7 @@ msgid "View event log" msgstr "" #: WarningMessage.MountCryptoFailed.Text -msgid "Maybe you entered the wrong password?" +msgid "Maybe you entered a wrong password?" msgstr "" #: WarningMessage.InvalidContainerType.Title diff --git a/plugins/volume_mount/intl/it/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/it/cryptobox-server-feature-volume_mount.po index 0f30abe..759771d 100644 --- a/plugins/volume_mount/intl/it/cryptobox-server-feature-volume_mount.po +++ b/plugins/volume_mount/intl/it/cryptobox-server-feature-volume_mount.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: CryptoBox-Server 0.3\n" "Report-Msgid-Bugs-To: translate@cryptobox.org\n" -"POT-Creation-Date: 2007-02-03 12:00+0100\n" +"POT-Creation-Date: 2007-02-03 19:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -74,7 +74,7 @@ msgid "View event log" msgstr "" #: WarningMessage.MountCryptoFailed.Text -msgid "Maybe you entered the wrong password?" +msgid "Maybe you entered a wrong password?" msgstr "" #: WarningMessage.InvalidContainerType.Title diff --git a/plugins/volume_mount/intl/ja/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/ja/cryptobox-server-feature-volume_mount.po index 0f30abe..759771d 100644 --- a/plugins/volume_mount/intl/ja/cryptobox-server-feature-volume_mount.po +++ b/plugins/volume_mount/intl/ja/cryptobox-server-feature-volume_mount.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: CryptoBox-Server 0.3\n" "Report-Msgid-Bugs-To: translate@cryptobox.org\n" -"POT-Creation-Date: 2007-02-03 12:00+0100\n" +"POT-Creation-Date: 2007-02-03 19:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -74,7 +74,7 @@ msgid "View event log" msgstr "" #: WarningMessage.MountCryptoFailed.Text -msgid "Maybe you entered the wrong password?" +msgid "Maybe you entered a wrong password?" msgstr "" #: WarningMessage.InvalidContainerType.Title diff --git a/plugins/volume_mount/intl/nl/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/nl/cryptobox-server-feature-volume_mount.po index 0f30abe..759771d 100644 --- a/plugins/volume_mount/intl/nl/cryptobox-server-feature-volume_mount.po +++ b/plugins/volume_mount/intl/nl/cryptobox-server-feature-volume_mount.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: CryptoBox-Server 0.3\n" "Report-Msgid-Bugs-To: translate@cryptobox.org\n" -"POT-Creation-Date: 2007-02-03 12:00+0100\n" +"POT-Creation-Date: 2007-02-03 19:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -74,7 +74,7 @@ msgid "View event log" msgstr "" #: WarningMessage.MountCryptoFailed.Text -msgid "Maybe you entered the wrong password?" +msgid "Maybe you entered a wrong password?" msgstr "" #: WarningMessage.InvalidContainerType.Title diff --git a/plugins/volume_mount/intl/pl/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/pl/cryptobox-server-feature-volume_mount.po index 0f30abe..759771d 100644 --- a/plugins/volume_mount/intl/pl/cryptobox-server-feature-volume_mount.po +++ b/plugins/volume_mount/intl/pl/cryptobox-server-feature-volume_mount.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: CryptoBox-Server 0.3\n" "Report-Msgid-Bugs-To: translate@cryptobox.org\n" -"POT-Creation-Date: 2007-02-03 12:00+0100\n" +"POT-Creation-Date: 2007-02-03 19:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -74,7 +74,7 @@ msgid "View event log" msgstr "" #: WarningMessage.MountCryptoFailed.Text -msgid "Maybe you entered the wrong password?" +msgid "Maybe you entered a wrong password?" msgstr "" #: WarningMessage.InvalidContainerType.Title diff --git a/plugins/volume_mount/intl/pt/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/pt/cryptobox-server-feature-volume_mount.po index 0f30abe..759771d 100644 --- a/plugins/volume_mount/intl/pt/cryptobox-server-feature-volume_mount.po +++ b/plugins/volume_mount/intl/pt/cryptobox-server-feature-volume_mount.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: CryptoBox-Server 0.3\n" "Report-Msgid-Bugs-To: translate@cryptobox.org\n" -"POT-Creation-Date: 2007-02-03 12:00+0100\n" +"POT-Creation-Date: 2007-02-03 19:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -74,7 +74,7 @@ msgid "View event log" msgstr "" #: WarningMessage.MountCryptoFailed.Text -msgid "Maybe you entered the wrong password?" +msgid "Maybe you entered a wrong password?" msgstr "" #: WarningMessage.InvalidContainerType.Title diff --git a/plugins/volume_mount/intl/ru/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/ru/cryptobox-server-feature-volume_mount.po index 0f30abe..759771d 100644 --- a/plugins/volume_mount/intl/ru/cryptobox-server-feature-volume_mount.po +++ b/plugins/volume_mount/intl/ru/cryptobox-server-feature-volume_mount.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: CryptoBox-Server 0.3\n" "Report-Msgid-Bugs-To: translate@cryptobox.org\n" -"POT-Creation-Date: 2007-02-03 12:00+0100\n" +"POT-Creation-Date: 2007-02-03 19:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -74,7 +74,7 @@ msgid "View event log" msgstr "" #: WarningMessage.MountCryptoFailed.Text -msgid "Maybe you entered the wrong password?" +msgid "Maybe you entered a wrong password?" msgstr "" #: WarningMessage.InvalidContainerType.Title diff --git a/plugins/volume_mount/intl/sl/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/sl/cryptobox-server-feature-volume_mount.po index 89b93c2..e5b5ea6 100644 --- a/plugins/volume_mount/intl/sl/cryptobox-server-feature-volume_mount.po +++ b/plugins/volume_mount/intl/sl/cryptobox-server-feature-volume_mount.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: CryptoBox-Server 0.3\n" "Report-Msgid-Bugs-To: translate@cryptobox.org\n" -"POT-Creation-Date: 2007-02-03 12:00+0100\n" +"POT-Creation-Date: 2007-02-03 19:19+0100\n" "PO-Revision-Date: 2007-01-09 14:44+0100\n" "Last-Translator: tenzin \n" "Language-Team: LANGUAGE \n" @@ -75,7 +75,8 @@ msgid "View event log" msgstr "Preglej dnevnik dogodkov" #: WarningMessage.MountCryptoFailed.Text -msgid "Maybe you entered the wrong password?" +#, fuzzy +msgid "Maybe you entered a wrong password?" msgstr "Morda ste vnesli napačno geslo?" #: WarningMessage.InvalidContainerType.Title diff --git a/plugins/volume_mount/intl/sv/cryptobox-server-feature-volume_mount.po b/plugins/volume_mount/intl/sv/cryptobox-server-feature-volume_mount.po index 0f30abe..759771d 100644 --- a/plugins/volume_mount/intl/sv/cryptobox-server-feature-volume_mount.po +++ b/plugins/volume_mount/intl/sv/cryptobox-server-feature-volume_mount.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: CryptoBox-Server 0.3\n" "Report-Msgid-Bugs-To: translate@cryptobox.org\n" -"POT-Creation-Date: 2007-02-03 12:00+0100\n" +"POT-Creation-Date: 2007-02-03 19:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -74,7 +74,7 @@ msgid "View event log" msgstr "" #: WarningMessage.MountCryptoFailed.Text -msgid "Maybe you entered the wrong password?" +msgid "Maybe you entered a wrong password?" msgstr "" #: WarningMessage.InvalidContainerType.Title diff --git a/plugins/volume_mount/language.hdf b/plugins/volume_mount/language.hdf index 44b2917..14e3387 100644 --- a/plugins/volume_mount/language.hdf +++ b/plugins/volume_mount/language.hdf @@ -48,7 +48,7 @@ WarningMessage { MountCryptoFailed { Title = Opening failed - Text = Maybe you entered the wrong password? + Text = Maybe you entered a wrong password? } InvalidContainerType { diff --git a/plugins/volume_mount/unittests.py b/plugins/volume_mount/unittests.py index b345094..93c190e 100644 --- a/plugins/volume_mount/unittests.py +++ b/plugins/volume_mount/unittests.py @@ -59,7 +59,7 @@ class unittests(WebInterfaceTestClass): self.__format_luks() ## mount the volume self.cmd.go(url) - self.cmd.find('Open volume') + self.cmd.find('Open this volume') # the following _should_ work, but it does not - probably a parsing problem # of twill - for now we use the direct link instead #self.cmd.formvalue("mount", "pw", "foo") @@ -88,7 +88,7 @@ class unittests(WebInterfaceTestClass): ## wrong password supplied self.cmd.go(url + "&action=mount_luks&pw=bar") self.cmd.find('Data.Status.Plugins.volume_mount=passive') - self.cmd.find('Maybe you entered the wrong password?') + self.cmd.find('Maybe you entered a wrong password?') def __do_tests_with_plain(self): @@ -98,7 +98,7 @@ class unittests(WebInterfaceTestClass): self.__format_plain() ## open plain volume self.cmd.go(url) - self.cmd.find('Open volume') + self.cmd.find('Open this volume') # the following _should_ work, but it does not - probably a parsing problem # of twill - for now we use the direct link instead #self.cmd.submit()