fixed the last unittest failures

encrypted_webinterface: clean up the environment setting before running 'stunnel'
This commit is contained in:
lars 2007-02-03 19:44:12 +00:00
parent 929cd5636c
commit 7dd792afbb
21 changed files with 43 additions and 38 deletions

View file

@ -55,8 +55,11 @@ def run_stunnel(cert_file, src_port, dst_port, pid_file):
if not username: if not username:
sys.stderr.write("Could not retrieve the username with uid=%d." % os.getuid()) sys.stderr.write("Could not retrieve the username with uid=%d." % os.getuid())
return False return False
## the environment (especially PATH) should be clean, as 'stunnel' cares about
## this in a setuid situation
proc = subprocess.Popen( proc = subprocess.Popen(
shell = False, shell = False,
env = {},
args = [ STUNNEL_BIN, args = [ STUNNEL_BIN,
"-P", pid_file, "-P", pid_file,
"-p", cert_file, "-p", cert_file,

View file

@ -74,5 +74,5 @@ class unittests(WebInterfaceTestClass):
self.cmd.go(self.url + "network" + "?redirected=1") self.cmd.go(self.url + "network" + "?redirected=1")
self.cmd.notfind("problem") self.cmd.notfind("problem")
self.cmd.go(self.url + "network" + "?store=set_ip") self.cmd.go(self.url + "network" + "?store=set_ip")
self.cmd.find("invalid network address") self.cmd.find("server address is not valid")

View file

@ -59,7 +59,7 @@ msgid "View event log"
msgstr "" msgstr ""
#: WarningMessage.MountCryptoFailed.Text #: WarningMessage.MountCryptoFailed.Text
msgid "Maybe you entered the wrong password?" msgid "Maybe you entered a wrong password?"
msgstr "" msgstr ""
#: WarningMessage.InvalidContainerType.Title #: WarningMessage.InvalidContainerType.Title

View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CryptoBox-Server 0.3\n" "Project-Id-Version: CryptoBox-Server 0.3\n"
"Report-Msgid-Bugs-To: translate@cryptobox.org\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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -74,7 +74,7 @@ msgid "View event log"
msgstr "" msgstr ""
#: WarningMessage.MountCryptoFailed.Text #: WarningMessage.MountCryptoFailed.Text
msgid "Maybe you entered the wrong password?" msgid "Maybe you entered a wrong password?"
msgstr "" msgstr ""
#: WarningMessage.InvalidContainerType.Title #: WarningMessage.InvalidContainerType.Title

View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CryptoBox-Server 0.3\n" "Project-Id-Version: CryptoBox-Server 0.3\n"
"Report-Msgid-Bugs-To: translate@cryptobox.org\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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -74,7 +74,7 @@ msgid "View event log"
msgstr "" msgstr ""
#: WarningMessage.MountCryptoFailed.Text #: WarningMessage.MountCryptoFailed.Text
msgid "Maybe you entered the wrong password?" msgid "Maybe you entered a wrong password?"
msgstr "" msgstr ""
#: WarningMessage.InvalidContainerType.Title #: WarningMessage.InvalidContainerType.Title

View file

@ -2,7 +2,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CryptoBox-Server 0.3\n" "Project-Id-Version: CryptoBox-Server 0.3\n"
"Report-Msgid-Bugs-To: translate@cryptobox.org\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" "PO-Revision-Date: 2007-01-12 04:23+0100\n"
"Last-Translator: Lars Kruse <lars@systemausfall.org>\n" "Last-Translator: Lars Kruse <lars@systemausfall.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -74,7 +74,7 @@ msgid "View event log"
msgstr "" msgstr ""
#: WarningMessage.MountCryptoFailed.Text #: WarningMessage.MountCryptoFailed.Text
msgid "Maybe you entered the wrong password?" msgid "Maybe you entered a wrong password?"
msgstr "" msgstr ""
#: WarningMessage.InvalidContainerType.Title #: WarningMessage.InvalidContainerType.Title

View file

@ -62,8 +62,9 @@ msgid "View event log"
msgstr "View event log" msgstr "View event log"
#: WarningMessage.MountCryptoFailed.Text #: WarningMessage.MountCryptoFailed.Text
msgid "Maybe you entered the wrong password?" #, fuzzy
msgstr "Maybe you entered the wrong password?" msgid "Maybe you entered a wrong password?"
msgstr "Maybe you entered a wrong password?"
#: WarningMessage.InvalidContainerType.Title #: WarningMessage.InvalidContainerType.Title
msgid "Unknown format" msgid "Unknown format"

View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CryptoBox-Server 0.3\n" "Project-Id-Version: CryptoBox-Server 0.3\n"
"Report-Msgid-Bugs-To: translate@cryptobox.org\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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -74,7 +74,7 @@ msgid "View event log"
msgstr "" msgstr ""
#: WarningMessage.MountCryptoFailed.Text #: WarningMessage.MountCryptoFailed.Text
msgid "Maybe you entered the wrong password?" msgid "Maybe you entered a wrong password?"
msgstr "" msgstr ""
#: WarningMessage.InvalidContainerType.Title #: WarningMessage.InvalidContainerType.Title

View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CryptoBox-Server 0.3\n" "Project-Id-Version: CryptoBox-Server 0.3\n"
"Report-Msgid-Bugs-To: translate@cryptobox.org\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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -74,7 +74,7 @@ msgid "View event log"
msgstr "" msgstr ""
#: WarningMessage.MountCryptoFailed.Text #: WarningMessage.MountCryptoFailed.Text
msgid "Maybe you entered the wrong password?" msgid "Maybe you entered a wrong password?"
msgstr "" msgstr ""
#: WarningMessage.InvalidContainerType.Title #: WarningMessage.InvalidContainerType.Title

View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CryptoBox-Server 0.3\n" "Project-Id-Version: CryptoBox-Server 0.3\n"
"Report-Msgid-Bugs-To: translate@cryptobox.org\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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -74,7 +74,7 @@ msgid "View event log"
msgstr "" msgstr ""
#: WarningMessage.MountCryptoFailed.Text #: WarningMessage.MountCryptoFailed.Text
msgid "Maybe you entered the wrong password?" msgid "Maybe you entered a wrong password?"
msgstr "" msgstr ""
#: WarningMessage.InvalidContainerType.Title #: WarningMessage.InvalidContainerType.Title

View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CryptoBox-Server 0.3\n" "Project-Id-Version: CryptoBox-Server 0.3\n"
"Report-Msgid-Bugs-To: translate@cryptobox.org\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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -74,7 +74,7 @@ msgid "View event log"
msgstr "" msgstr ""
#: WarningMessage.MountCryptoFailed.Text #: WarningMessage.MountCryptoFailed.Text
msgid "Maybe you entered the wrong password?" msgid "Maybe you entered a wrong password?"
msgstr "" msgstr ""
#: WarningMessage.InvalidContainerType.Title #: WarningMessage.InvalidContainerType.Title

View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CryptoBox-Server 0.3\n" "Project-Id-Version: CryptoBox-Server 0.3\n"
"Report-Msgid-Bugs-To: translate@cryptobox.org\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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -74,7 +74,7 @@ msgid "View event log"
msgstr "" msgstr ""
#: WarningMessage.MountCryptoFailed.Text #: WarningMessage.MountCryptoFailed.Text
msgid "Maybe you entered the wrong password?" msgid "Maybe you entered a wrong password?"
msgstr "" msgstr ""
#: WarningMessage.InvalidContainerType.Title #: WarningMessage.InvalidContainerType.Title

View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CryptoBox-Server 0.3\n" "Project-Id-Version: CryptoBox-Server 0.3\n"
"Report-Msgid-Bugs-To: translate@cryptobox.org\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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -74,7 +74,7 @@ msgid "View event log"
msgstr "" msgstr ""
#: WarningMessage.MountCryptoFailed.Text #: WarningMessage.MountCryptoFailed.Text
msgid "Maybe you entered the wrong password?" msgid "Maybe you entered a wrong password?"
msgstr "" msgstr ""
#: WarningMessage.InvalidContainerType.Title #: WarningMessage.InvalidContainerType.Title

View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CryptoBox-Server 0.3\n" "Project-Id-Version: CryptoBox-Server 0.3\n"
"Report-Msgid-Bugs-To: translate@cryptobox.org\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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -74,7 +74,7 @@ msgid "View event log"
msgstr "" msgstr ""
#: WarningMessage.MountCryptoFailed.Text #: WarningMessage.MountCryptoFailed.Text
msgid "Maybe you entered the wrong password?" msgid "Maybe you entered a wrong password?"
msgstr "" msgstr ""
#: WarningMessage.InvalidContainerType.Title #: WarningMessage.InvalidContainerType.Title

View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CryptoBox-Server 0.3\n" "Project-Id-Version: CryptoBox-Server 0.3\n"
"Report-Msgid-Bugs-To: translate@cryptobox.org\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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -74,7 +74,7 @@ msgid "View event log"
msgstr "" msgstr ""
#: WarningMessage.MountCryptoFailed.Text #: WarningMessage.MountCryptoFailed.Text
msgid "Maybe you entered the wrong password?" msgid "Maybe you entered a wrong password?"
msgstr "" msgstr ""
#: WarningMessage.InvalidContainerType.Title #: WarningMessage.InvalidContainerType.Title

View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CryptoBox-Server 0.3\n" "Project-Id-Version: CryptoBox-Server 0.3\n"
"Report-Msgid-Bugs-To: translate@cryptobox.org\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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -74,7 +74,7 @@ msgid "View event log"
msgstr "" msgstr ""
#: WarningMessage.MountCryptoFailed.Text #: WarningMessage.MountCryptoFailed.Text
msgid "Maybe you entered the wrong password?" msgid "Maybe you entered a wrong password?"
msgstr "" msgstr ""
#: WarningMessage.InvalidContainerType.Title #: WarningMessage.InvalidContainerType.Title

View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CryptoBox-Server 0.3\n" "Project-Id-Version: CryptoBox-Server 0.3\n"
"Report-Msgid-Bugs-To: translate@cryptobox.org\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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -74,7 +74,7 @@ msgid "View event log"
msgstr "" msgstr ""
#: WarningMessage.MountCryptoFailed.Text #: WarningMessage.MountCryptoFailed.Text
msgid "Maybe you entered the wrong password?" msgid "Maybe you entered a wrong password?"
msgstr "" msgstr ""
#: WarningMessage.InvalidContainerType.Title #: WarningMessage.InvalidContainerType.Title

View file

@ -2,7 +2,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CryptoBox-Server 0.3\n" "Project-Id-Version: CryptoBox-Server 0.3\n"
"Report-Msgid-Bugs-To: translate@cryptobox.org\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" "PO-Revision-Date: 2007-01-09 14:44+0100\n"
"Last-Translator: tenzin <clavdiaa@yahoo.com>\n" "Last-Translator: tenzin <clavdiaa@yahoo.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -75,7 +75,8 @@ msgid "View event log"
msgstr "Preglej dnevnik dogodkov" msgstr "Preglej dnevnik dogodkov"
#: WarningMessage.MountCryptoFailed.Text #: 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?" msgstr "Morda ste vnesli napačno geslo?"
#: WarningMessage.InvalidContainerType.Title #: WarningMessage.InvalidContainerType.Title

View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: CryptoBox-Server 0.3\n" "Project-Id-Version: CryptoBox-Server 0.3\n"
"Report-Msgid-Bugs-To: translate@cryptobox.org\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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -74,7 +74,7 @@ msgid "View event log"
msgstr "" msgstr ""
#: WarningMessage.MountCryptoFailed.Text #: WarningMessage.MountCryptoFailed.Text
msgid "Maybe you entered the wrong password?" msgid "Maybe you entered a wrong password?"
msgstr "" msgstr ""
#: WarningMessage.InvalidContainerType.Title #: WarningMessage.InvalidContainerType.Title

View file

@ -48,7 +48,7 @@ WarningMessage {
MountCryptoFailed { MountCryptoFailed {
Title = Opening failed Title = Opening failed
Text = Maybe you entered the wrong password? Text = Maybe you entered a wrong password?
} }
InvalidContainerType { InvalidContainerType {

View file

@ -59,7 +59,7 @@ class unittests(WebInterfaceTestClass):
self.__format_luks() self.__format_luks()
## mount the volume ## mount the volume
self.cmd.go(url) 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 # the following _should_ work, but it does not - probably a parsing problem
# of twill - for now we use the direct link instead # of twill - for now we use the direct link instead
#self.cmd.formvalue("mount", "pw", "foo") #self.cmd.formvalue("mount", "pw", "foo")
@ -88,7 +88,7 @@ class unittests(WebInterfaceTestClass):
## wrong password supplied ## wrong password supplied
self.cmd.go(url + "&action=mount_luks&pw=bar") self.cmd.go(url + "&action=mount_luks&pw=bar")
self.cmd.find('Data.Status.Plugins.volume_mount=passive') 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): def __do_tests_with_plain(self):
@ -98,7 +98,7 @@ class unittests(WebInterfaceTestClass):
self.__format_plain() self.__format_plain()
## open plain volume ## open plain volume
self.cmd.go(url) 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 # the following _should_ work, but it does not - probably a parsing problem
# of twill - for now we use the direct link instead # of twill - for now we use the direct link instead
#self.cmd.submit() #self.cmd.submit()