summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-07-29 13:42:34 +0000
committerintrigeri <intrigeri@boum.org>2016-07-29 13:42:34 +0000
commitdc344082538d46e08e8d13e345a4c8d44807921a (patch)
treeaa3077ec9f21c70d0753a9897a1e6ff6348692af
parent2c4c6434c0c6bdcf2534f966434bf92230af3698 (diff)
parentd1ebfbd5f5fd8d39d20436311d512101552be41b (diff)
Merge remote-tracking branch 'origin/stable' into bugfix/11590-installer-robustness
-rw-r--r--config/chroot_local-includes/etc/default/htpdate.pools4
-rwxr-xr-xconfig/chroot_local-includes/usr/local/sbin/htpdate1
-rw-r--r--features/evince.feature6
-rw-r--r--features/persistence.feature7
-rw-r--r--features/step_definitions/common_steps.rb4
-rw-r--r--features/step_definitions/electrum.rb2
-rw-r--r--features/step_definitions/usb.rb20
-rw-r--r--features/time_syncing.feature2
-rw-r--r--features/tor_stream_isolation.feature2
-rw-r--r--features/torified_browsing.feature14
-rw-r--r--features/totem.feature4
11 files changed, 51 insertions, 15 deletions
diff --git a/config/chroot_local-includes/etc/default/htpdate.pools b/config/chroot_local-includes/etc/default/htpdate.pools
index 68b79b4..e91d876 100644
--- a/config/chroot_local-includes/etc/default/htpdate.pools
+++ b/config/chroot_local-includes/etc/default/htpdate.pools
@@ -1,3 +1,3 @@
-HTP_POOL_PAL="boum.org,chavez.indymedia.org,db.debian.org,epic.org,mail.riseup.net,sarava.org,squat.net,tachanka.org,www.1984.is,www.eff.org,www.immerda.ch,www.privacyinternational.org,www.torproject.org"
+HTP_POOL_PAL="boum.org,espiv.net,db.debian.org,epic.org,mail.riseup.net,www.sarava.org,squat.net,tachanka.org,www.1984.is,www.eff.org,www.immerda.ch,www.privacyinternational.org,www.torproject.org"
HTP_POOL_NEUTRAL="cve.mitre.org,en.wikipedia.org,lkml.org,thepiratebay.org,www.apache.org,www.centos.org,www.democracynow.org,www.duckduckgo.com,www.gnu.org,www.kernel.org,www.mozilla.org,www.stackexchange.com,www.startpage.com,www.xkcd.com"
-HTP_POOL_FOE="encrypted.google.com,github.com,login.live.com,login.yahoo.com,secure.flickr.com,tumblr.com,twitter.com,www.adobe.com,www.gandi.net,www.myspace.com,www.paypal.com,www.rsa.com,www.sony.com"
+HTP_POOL_FOE="encrypted.google.com,github.com,login.live.com,login.yahoo.com,secure.flickr.com,tumblr.com,twitter.com,www.adobe.com,www.gandi.net,www.myspace.com,www.paypal.com,www.rackspace.com,www.sony.com"
diff --git a/config/chroot_local-includes/usr/local/sbin/htpdate b/config/chroot_local-includes/usr/local/sbin/htpdate
index 41f2b2f..454ba8b 100755
--- a/config/chroot_local-includes/usr/local/sbin/htpdate
+++ b/config/chroot_local-includes/usr/local/sbin/htpdate
@@ -223,6 +223,7 @@ sub getUrlDateDiff {
my @curl_options = (
'--user-agent', $useragent, '--silent',
'--proto', '=https', '--tlsv1',
+ '--max-time', '30',
'--head', '--output', catfile($tmpdir, 'headers'),
);
push @curl_options, ('--socks5-hostname', $proxy) if defined $proxy;
diff --git a/features/evince.feature b/features/evince.feature
index 6fd27ec..581e53e 100644
--- a/features/evince.feature
+++ b/features/evince.feature
@@ -9,7 +9,7 @@ Feature: Using Evince
Scenario: I can view and print a PDF file stored in /usr/share
Given I have started Tails from DVD without network and logged in
When I open "/usr/share/cups/data/default-testpage.pdf" with Evince
- Then I see "CupsTestPage.png" after at most 20 seconds
+ Then I see "CupsTestPage.png" after at most 40 seconds
And I can print the current document to "/home/amnesia/output.pdf"
#10994
@@ -18,7 +18,7 @@ Feature: Using Evince
Given I have started Tails from DVD without network and logged in
And I copy "/usr/share/cups/data/default-testpage.pdf" to "/home/amnesia" as user "amnesia"
When I open "/home/amnesia/default-testpage.pdf" with Evince
- Then I see "CupsTestPage.png" after at most 20 seconds
+ Then I see "CupsTestPage.png" after at most 40 seconds
And I can print the current document to "/home/amnesia/output.pdf"
Scenario: I cannot view a PDF file stored in non-persistent /home/amnesia/.gnupg
@@ -51,7 +51,7 @@ Feature: Using Evince
And I copy "/usr/share/cups/data/default-testpage.pdf" to "/home/amnesia/Persistent" as user "amnesia"
Then the file "/home/amnesia/Persistent/default-testpage.pdf" exists
When I open "/home/amnesia/Persistent/default-testpage.pdf" with Evince
- Then I see "CupsTestPage.png" after at most 20 seconds
+ Then I see "CupsTestPage.png" after at most 40 seconds
And I can print the current document to "/home/amnesia/Persistent/output.pdf"
#10720: Tails Installer freezes on Jenkins
diff --git a/features/persistence.feature b/features/persistence.feature
index 42f91de..507f05e 100644
--- a/features/persistence.feature
+++ b/features/persistence.feature
@@ -55,3 +55,10 @@ Feature: Tails persistence
And all notifications have disappeared
When I delete the persistent partition
Then there is no persistence partition on USB drive "__internal"
+
+ Scenario: Dotfiles persistence
+ Given I have started Tails without network from a USB drive with a persistent partition enabled and logged in
+ When I write some dotfile expected to persist
+ And I shutdown Tails and wait for the computer to power off
+ And I start Tails from USB drive "__internal" with network unplugged and I login with persistence enabled
+ Then the expected persistent dotfile is present in the filesystem
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index 250700f..d0b26cd 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -326,7 +326,7 @@ end
Given /^Tails Greeter has dealt with the sudo password$/ do
f1 = "/etc/sudoers.d/tails-greeter"
f2 = "#{f1}-no-password-lecture"
- try_for(30) {
+ try_for(120) {
$vm.execute("test -e '#{f1}' -o -e '#{f2}'").success?
}
end
@@ -613,7 +613,7 @@ end
When /^I start and focus GNOME Terminal$/ do
step 'I start "Terminal" via the GNOME "Utilities" applications menu'
- @screen.wait('GnomeTerminalWindow.png', 20)
+ @screen.wait('GnomeTerminalWindow.png', 40)
end
When /^I run "([^"]+)" in GNOME Terminal$/ do |command|
diff --git a/features/step_definitions/electrum.rb b/features/step_definitions/electrum.rb
index 85bcf0f..4c02d82 100644
--- a/features/step_definitions/electrum.rb
+++ b/features/step_definitions/electrum.rb
@@ -6,7 +6,7 @@ When /^a bitcoin wallet is (|not )present$/ do |existing|
wallet = "/home/#{LIVE_USER}/.electrum/wallets/default_wallet"
case existing
when ""
- step "the file \"#{wallet}\" exists after at most 10 seconds"
+ step "the file \"#{wallet}\" exists after at most 30 seconds"
when "not "
step "the file \"#{wallet}\" does not exist"
else
diff --git a/features/step_definitions/usb.rb b/features/step_definitions/usb.rb
index eff96f9..e68589b 100644
--- a/features/step_definitions/usb.rb
+++ b/features/step_definitions/usb.rb
@@ -179,7 +179,7 @@ Given /^I enable all persistence presets$/ do
@screen.type(Sikuli::Key.TAB + Sikuli::Key.SPACE)
end
@screen.wait_and_click('PersistenceWizardSave.png', 10)
- @screen.wait('PersistenceWizardDone.png', 30)
+ @screen.wait('PersistenceWizardDone.png', 60)
@screen.type(Sikuli::Key.F4, Sikuli::KeyModifier.ALT)
end
@@ -194,7 +194,7 @@ end
Given /^I create a persistent partition$/ do
step 'I start "Configure persistent volume" via the GNOME "Tails" applications menu'
- @screen.wait('PersistenceWizardStart.png', 20)
+ @screen.wait('PersistenceWizardStart.png', 60)
@screen.type(@persistence_password + "\t" + @persistence_password + Sikuli::Key.ENTER)
@screen.wait('PersistenceWizardPresets.png', 300)
step "I enable all persistence presets"
@@ -517,6 +517,12 @@ When /^I write some files expected to persist$/ do
end
end
+When /^I write some dotfile expected to persist$/ do
+ assert($vm.execute("touch /live/persistence/TailsData_unlocked/dotfiles/.XXX_persist",
+ :user => LIVE_USER).success?,
+ "Could not create a file in the dotfiles persistence.")
+end
+
When /^I remove some files expected to persist$/ do
persistent_mounts.each do |_, dir|
owner = $vm.execute("stat -c %U #{dir}").stdout.chomp
@@ -553,6 +559,14 @@ Then /^the expected persistent files(| created with the old Tails version) are p
end
end
+Then /^the expected persistent dotfile is present in the filesystem$/ do
+ expected_dirs = persistent_dirs
+ assert($vm.execute("test -L #{expected_dirs['dotfiles']}/.XXX_persist").success?,
+ "Could not find expected persistent dotfile link.")
+ assert($vm.execute("test -e $(readlink -f #{expected_dirs['dotfiles']}/.XXX_persist)").success?,
+ "Could not find expected persistent dotfile link target.")
+end
+
Then /^only the expected files are present on the persistence partition on USB drive "([^"]+)"$/ do |name|
assert(!$vm.is_running?)
disk = {
@@ -593,7 +607,7 @@ end
When /^I delete the persistent partition$/ do
step 'I start "Delete persistent volume" via the GNOME "Tails" applications menu'
- @screen.wait("PersistenceWizardDeletionStart.png", 20)
+ @screen.wait("PersistenceWizardDeletionStart.png", 120)
@screen.type(" ")
@screen.wait("PersistenceWizardDone.png", 120)
end
diff --git a/features/time_syncing.feature b/features/time_syncing.feature
index cda75f6..cd835bc 100644
--- a/features/time_syncing.feature
+++ b/features/time_syncing.feature
@@ -10,6 +10,8 @@ Feature: Time syncing
And Tor is ready
Then Tails clock is less than 5 minutes incorrect
+ #11589
+ @fragile
Scenario: Clock with host's time in bridge mode
Given I have started Tails from DVD without network and logged in with bridge mode enabled
When the network is plugged
diff --git a/features/tor_stream_isolation.feature b/features/tor_stream_isolation.feature
index 59aa34d..129707e 100644
--- a/features/tor_stream_isolation.feature
+++ b/features/tor_stream_isolation.feature
@@ -21,6 +21,8 @@ Feature: Tor stream isolation is effective
And I re-run tails-upgrade-frontend-wrapper
Then I see that tails-upgrade-frontend-wrapper is properly stream isolated
+ #11592
+ @fragile
Scenario: The Tor Browser is using the web browser-specific SocksPort
When I monitor the network connections of Tor Browser
And I start the Tor Browser
diff --git a/features/torified_browsing.feature b/features/torified_browsing.feature
index cc4ead5..3811968 100644
--- a/features/torified_browsing.feature
+++ b/features/torified_browsing.feature
@@ -4,6 +4,8 @@ Feature: Browsing the web using the Tor Browser
when I browse the web using the Tor Browser
all Internet traffic should flow only through Tor
+ #11591, #11592
+ @fragile
Scenario: The Tor Browser cannot access the LAN
Given I have started Tails from DVD and logged in and the network is connected
And a web server is running on the LAN
@@ -14,7 +16,8 @@ Feature: Browsing the web using the Tor Browser
Then the Tor Browser shows the "Unable to connect" error
And no traffic was sent to the web server on the LAN
- @check_tor_leaks
+ #11592
+ @check_tor_leaks @fragile
Scenario: The Tor Browser directory is usable
Given I have started Tails from DVD and logged in and the network is connected
Then the amnesiac Tor Browser directory exists
@@ -25,6 +28,7 @@ Feature: Browsing the web using the Tor Browser
Then I can save the current page as "index.html" to the default downloads directory
And I can print the current page as "output.pdf" to the default downloads directory
+ #11592
@check_tor_leaks @fragile
Scenario: Downloading files with the Tor Browser
Given I have started Tails from DVD and logged in and the network is connected
@@ -35,6 +39,7 @@ Feature: Browsing the web using the Tor Browser
When I save the file to the default Tor Browser download directory
Then the file is saved to the default Tor Browser download directory
+ #11592
@check_tor_leaks @fragile
Scenario: Playing HTML5 audio
Given I have started Tails from DVD and logged in and the network is connected
@@ -45,6 +50,8 @@ Feature: Browsing the web using the Tor Browser
And I click the HTML5 play button
And 1 application is playing audio after 10 seconds
+ #11592
+ @fragile
Scenario: I can view a file stored in "~/Tor Browser" but not in ~/.gnupg
Given I have started Tails from DVD and logged in and the network is connected
And I copy "/usr/share/synaptic/html/index.html" to "/home/amnesia/Tor Browser/synaptic.html" as user "amnesia"
@@ -96,6 +103,7 @@ Feature: Browsing the web using the Tor Browser
And the Tor Browser has started
Then the Tor Browser uses all expected TBB shared libraries
+ #11592
@check_tor_leaks @fragile
Scenario: The Tor Browser's "New identity" feature works as expected
Given I have started Tails from DVD and logged in and the network is connected
@@ -107,13 +115,15 @@ Feature: Browsing the web using the Tor Browser
And I acknowledge Torbutton's New Identity confirmation prompt
Then the Tor Browser loads the startup page
+ #11592
+ @fragile
Scenario: The Tor Browser should not have any plugins enabled
Given I have started Tails from DVD and logged in and the network is connected
When I start the Tor Browser
And the Tor Browser has started and loaded the startup page
Then the Tor Browser has no plugins installed
- #10720
+ #10720, #11592
@fragile
Scenario: The persistent Tor Browser directory is usable
Given I have started Tails without network from a USB drive with a persistent partition enabled and logged in
diff --git a/features/totem.feature b/features/totem.feature
index c5fb37a..c702694 100644
--- a/features/totem.feature
+++ b/features/totem.feature
@@ -16,7 +16,7 @@ Feature: Using Totem
And the file "/home/amnesia/video.mp4" exists
Given I start monitoring the AppArmor log of "/usr/bin/totem"
When I open "/home/amnesia/video.mp4" with Totem
- Then I see "SampleLocalMp4VideoFrame.png" after at most 20 seconds
+ Then I see "SampleLocalMp4VideoFrame.png" after at most 40 seconds
And AppArmor has not denied "/usr/bin/totem" from opening "/home/amnesia/video.mp4"
Given I close Totem
And I copy the sample videos to "/home/amnesia/.gnupg" as user "amnesia"
@@ -60,7 +60,7 @@ Feature: Using Totem
And I start Tails from USB drive "__internal" with network unplugged and I login with persistence enabled
And the file "/home/amnesia/Persistent/video.mp4" exists
When I open "/home/amnesia/Persistent/video.mp4" with Totem
- Then I see "SampleLocalMp4VideoFrame.png" after at most 10 seconds
+ Then I see "SampleLocalMp4VideoFrame.png" after at most 40 seconds
Given I close Totem
And the file "/home/amnesia/.gnupg/video.mp4" exists
And I start monitoring the AppArmor log of "/usr/bin/totem"