summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-12-23 17:27:31 +0000
committerintrigeri <intrigeri@boum.org>2016-12-23 17:27:31 +0000
commita07fddcccbbca06301f2be9ce4847087d6023607 (patch)
treeba44947e459e91fb4f63783315613987fce1699f
parente83696397ae1c09dd56ec4b67d17c97d0a232f4b (diff)
parent60b30c8be78a1058652ae9abebf24a72c514f236 (diff)
Merge branch 'feature/8230-greeter-revamp-phase1' into feature/stretch (refs: #8230)
-rw-r--r--config/APT_overlays.d/feature-8230-greeter-revamp-phase10
-rw-r--r--config/chroot_local-includes/etc/ferm/ferm.conf2
-rw-r--r--config/chroot_local-packageslists/tails-common.list3
-rw-r--r--features/images/TailsGreeter.pngbin2154 -> 1779 bytes
-rw-r--r--features/images/TailsGreeterAddMoreOptions.pngbin0 -> 220 bytes
-rw-r--r--features/images/TailsGreeterAdditionalSettingsAdd.pngbin0 -> 747 bytes
-rw-r--r--features/images/TailsGreeterAdditionalSettingsDialog.pngbin0 -> 1367 bytes
-rw-r--r--features/images/TailsGreeterAdminPassword.pngbin1940 -> 1280 bytes
-rw-r--r--features/images/TailsGreeterDisableAllNetworking.pngbin2046 -> 852 bytes
-rw-r--r--features/images/TailsGreeterDisableMACSpoofing.pngbin0 -> 939 bytes
-rw-r--r--features/images/TailsGreeterForward.pngbin1455 -> 0 bytes
-rw-r--r--features/images/TailsGreeterLanguage.pngbin610 -> 1254 bytes
-rw-r--r--features/images/TailsGreeterLanguagePopover.pngbin0 -> 492 bytes
-rw-r--r--features/images/TailsGreeterLoginButton.pngbin1108 -> 1360 bytes
-rw-r--r--features/images/TailsGreeterLoginButtonGerman.pngbin1121 -> 1362 bytes
-rw-r--r--features/images/TailsGreeterMACSpoofing.pngbin2242 -> 1723 bytes
-rw-r--r--features/images/TailsGreeterMoreOptions.pngbin1422 -> 0 bytes
-rw-r--r--features/images/TailsGreeterNetworkConnection.pngbin0 -> 1344 bytes
-rw-r--r--features/images/TailsGreeterPersistence.pngbin1399 -> 0 bytes
-rw-r--r--features/images/TailsGreeterPersistencePassphrase.pngbin1145 -> 1151 bytes
-rw-r--r--features/images/TailsGreeterPersistenceUnlocked.pngbin0 -> 2294 bytes
-rw-r--r--features/images/TailsGreeterSpecificTorConfiguration.pngbin0 -> 792 bytes
-rw-r--r--features/images/TailsGreeterTorConf.pngbin6050 -> 0 bytes
-rw-r--r--features/images/TailsGreeterWindowsCamouflage.pngbin4150 -> 0 bytes
-rw-r--r--features/mac_spoofing.feature3
-rw-r--r--features/networking.feature1
-rw-r--r--features/step_definitions/checks.rb10
-rw-r--r--features/step_definitions/common_steps.rb26
-rw-r--r--features/step_definitions/mac_spoofing.rb3
-rw-r--r--features/step_definitions/snapshots.rb2
-rw-r--r--features/step_definitions/untrusted_partitions.rb2
-rw-r--r--features/step_definitions/usb.rb9
-rw-r--r--wiki/src/contribute/release_process/test/automated_tests.mdwn4
33 files changed, 33 insertions, 32 deletions
diff --git a/config/APT_overlays.d/feature-8230-greeter-revamp-phase1 b/config/APT_overlays.d/feature-8230-greeter-revamp-phase1
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/config/APT_overlays.d/feature-8230-greeter-revamp-phase1
diff --git a/config/chroot_local-includes/etc/ferm/ferm.conf b/config/chroot_local-includes/etc/ferm/ferm.conf
index 7f41489..09504de 100644
--- a/config/chroot_local-includes/etc/ferm/ferm.conf
+++ b/config/chroot_local-includes/etc/ferm/ferm.conf
@@ -82,6 +82,7 @@ domain ip {
# White-list access to the accessibility daemon
daddr 127.0.0.1 proto tcp syn dport 4101 {
mod owner uid-owner $amnesia_uid ACCEPT;
+ mod owner uid-owner Debian-gdm ACCEPT;
}
# White-list access to I2P services for the amnesia user (IRC, SAM, POP3, SMTP, and Monotone)
@@ -204,6 +205,7 @@ domain ip6 {
# White-list access to the accessibility daemon
outerface lo saddr ::1 daddr ::1 proto tcp {
dport 4101 mod owner uid-owner $amnesia_uid ACCEPT;
+ dport 4101 mod owner uid-owner Debian-gdm ACCEPT;
sport 4101 mod state state (ESTABLISHED) ACCEPT;
}
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index 954c4d2..7701c88 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -96,12 +96,11 @@ gkbd-capplet
gnome-calculator
gnome-control-center
gnome-disk-utility
-gnome-flashback
+gnome-menus
gnome-power-manager
gnome-search-tool
gnome-screenshot
gnome-session
-gnome-session-flashback
gnome-shell-extension-top-icons-plus
gnome-shell-extensions
gnome-system-log
diff --git a/features/images/TailsGreeter.png b/features/images/TailsGreeter.png
index ad01bfc..80629c6 100644
--- a/features/images/TailsGreeter.png
+++ b/features/images/TailsGreeter.png
Binary files differ
diff --git a/features/images/TailsGreeterAddMoreOptions.png b/features/images/TailsGreeterAddMoreOptions.png
new file mode 100644
index 0000000..9c19635
--- /dev/null
+++ b/features/images/TailsGreeterAddMoreOptions.png
Binary files differ
diff --git a/features/images/TailsGreeterAdditionalSettingsAdd.png b/features/images/TailsGreeterAdditionalSettingsAdd.png
new file mode 100644
index 0000000..b944152
--- /dev/null
+++ b/features/images/TailsGreeterAdditionalSettingsAdd.png
Binary files differ
diff --git a/features/images/TailsGreeterAdditionalSettingsDialog.png b/features/images/TailsGreeterAdditionalSettingsDialog.png
new file mode 100644
index 0000000..292846b
--- /dev/null
+++ b/features/images/TailsGreeterAdditionalSettingsDialog.png
Binary files differ
diff --git a/features/images/TailsGreeterAdminPassword.png b/features/images/TailsGreeterAdminPassword.png
index 7da007f..db53075 100644
--- a/features/images/TailsGreeterAdminPassword.png
+++ b/features/images/TailsGreeterAdminPassword.png
Binary files differ
diff --git a/features/images/TailsGreeterDisableAllNetworking.png b/features/images/TailsGreeterDisableAllNetworking.png
index 67e24c1..4ad898d 100644
--- a/features/images/TailsGreeterDisableAllNetworking.png
+++ b/features/images/TailsGreeterDisableAllNetworking.png
Binary files differ
diff --git a/features/images/TailsGreeterDisableMACSpoofing.png b/features/images/TailsGreeterDisableMACSpoofing.png
new file mode 100644
index 0000000..2cc56be
--- /dev/null
+++ b/features/images/TailsGreeterDisableMACSpoofing.png
Binary files differ
diff --git a/features/images/TailsGreeterForward.png b/features/images/TailsGreeterForward.png
deleted file mode 100644
index 1a2153a..0000000
--- a/features/images/TailsGreeterForward.png
+++ /dev/null
Binary files differ
diff --git a/features/images/TailsGreeterLanguage.png b/features/images/TailsGreeterLanguage.png
index 537a7d6..f0afb95 100644
--- a/features/images/TailsGreeterLanguage.png
+++ b/features/images/TailsGreeterLanguage.png
Binary files differ
diff --git a/features/images/TailsGreeterLanguagePopover.png b/features/images/TailsGreeterLanguagePopover.png
new file mode 100644
index 0000000..abad6f4
--- /dev/null
+++ b/features/images/TailsGreeterLanguagePopover.png
Binary files differ
diff --git a/features/images/TailsGreeterLoginButton.png b/features/images/TailsGreeterLoginButton.png
index 2c30856..8b55428 100644
--- a/features/images/TailsGreeterLoginButton.png
+++ b/features/images/TailsGreeterLoginButton.png
Binary files differ
diff --git a/features/images/TailsGreeterLoginButtonGerman.png b/features/images/TailsGreeterLoginButtonGerman.png
index 119f126..097d165 100644
--- a/features/images/TailsGreeterLoginButtonGerman.png
+++ b/features/images/TailsGreeterLoginButtonGerman.png
Binary files differ
diff --git a/features/images/TailsGreeterMACSpoofing.png b/features/images/TailsGreeterMACSpoofing.png
index 017e2f0..58fa3b7 100644
--- a/features/images/TailsGreeterMACSpoofing.png
+++ b/features/images/TailsGreeterMACSpoofing.png
Binary files differ
diff --git a/features/images/TailsGreeterMoreOptions.png b/features/images/TailsGreeterMoreOptions.png
deleted file mode 100644
index 79acfba..0000000
--- a/features/images/TailsGreeterMoreOptions.png
+++ /dev/null
Binary files differ
diff --git a/features/images/TailsGreeterNetworkConnection.png b/features/images/TailsGreeterNetworkConnection.png
new file mode 100644
index 0000000..2e23af5
--- /dev/null
+++ b/features/images/TailsGreeterNetworkConnection.png
Binary files differ
diff --git a/features/images/TailsGreeterPersistence.png b/features/images/TailsGreeterPersistence.png
deleted file mode 100644
index c063065..0000000
--- a/features/images/TailsGreeterPersistence.png
+++ /dev/null
Binary files differ
diff --git a/features/images/TailsGreeterPersistencePassphrase.png b/features/images/TailsGreeterPersistencePassphrase.png
index 0b220b5..6ed1b50 100644
--- a/features/images/TailsGreeterPersistencePassphrase.png
+++ b/features/images/TailsGreeterPersistencePassphrase.png
Binary files differ
diff --git a/features/images/TailsGreeterPersistenceUnlocked.png b/features/images/TailsGreeterPersistenceUnlocked.png
new file mode 100644
index 0000000..f1ff3a4
--- /dev/null
+++ b/features/images/TailsGreeterPersistenceUnlocked.png
Binary files differ
diff --git a/features/images/TailsGreeterSpecificTorConfiguration.png b/features/images/TailsGreeterSpecificTorConfiguration.png
new file mode 100644
index 0000000..408e059
--- /dev/null
+++ b/features/images/TailsGreeterSpecificTorConfiguration.png
Binary files differ
diff --git a/features/images/TailsGreeterTorConf.png b/features/images/TailsGreeterTorConf.png
deleted file mode 100644
index 900f448..0000000
--- a/features/images/TailsGreeterTorConf.png
+++ /dev/null
Binary files differ
diff --git a/features/images/TailsGreeterWindowsCamouflage.png b/features/images/TailsGreeterWindowsCamouflage.png
deleted file mode 100644
index 08fdb83..0000000
--- a/features/images/TailsGreeterWindowsCamouflage.png
+++ /dev/null
Binary files differ
diff --git a/features/mac_spoofing.feature b/features/mac_spoofing.feature
index d603638..c6bdb27 100644
--- a/features/mac_spoofing.feature
+++ b/features/mac_spoofing.feature
@@ -11,8 +11,7 @@ Feature: Spoofing MAC addresses
And the network is plugged
Scenario: MAC address spoofing is disabled
- When I enable more Tails Greeter options
- And I disable MAC spoofing in Tails Greeter
+ When I disable MAC spoofing in Tails Greeter
And I log in to a new session
And Tor is ready
Then 1 network interface is enabled
diff --git a/features/networking.feature b/features/networking.feature
index 4995642..ca80657 100644
--- a/features/networking.feature
+++ b/features/networking.feature
@@ -13,7 +13,6 @@ Feature: Networking
Scenario: The Tails Greeter "disable all networking" option disables networking within Tails
Given I have started Tails from DVD without network and stopped at Tails Greeter's login screen
- And I enable more Tails Greeter options
And I disable all networking in the Tails Greeter
And I log in to a new session
Then no network interfaces are enabled
diff --git a/features/step_definitions/checks.rb b/features/step_definitions/checks.rb
index 2109f92..6ae8815 100644
--- a/features/step_definitions/checks.rb
+++ b/features/step_definitions/checks.rb
@@ -242,12 +242,10 @@ Then /^tails-debugging-info is not susceptible to symlink attacks$/ do
end
When /^I disable all networking in the Tails Greeter$/ do
- begin
- @screen.click('TailsGreeterDisableAllNetworking.png')
- rescue FindFailed
- @screen.type(Sikuli::Key.PAGE_DOWN)
- @screen.click('TailsGreeterDisableAllNetworking.png')
- end
+ open_greeter_additional_settings()
+ @screen.wait_and_click('TailsGreeterNetworkConnection.png', 30)
+ @screen.wait_and_click('TailsGreeterDisableAllNetworking.png', 10)
+ @screen.wait_and_click("TailsGreeterAdditionalSettingsAdd.png", 10)
end
Then /^the Tor Status icon tells me that Tor is( not)? usable$/ do |not_usable|
diff --git a/features/step_definitions/common_steps.rb b/features/step_definitions/common_steps.rb
index 19481c5..151d821 100644
--- a/features/step_definitions/common_steps.rb
+++ b/features/step_definitions/common_steps.rb
@@ -313,7 +313,10 @@ Given /^I log in to a new session(?: in )?(|German)$/ do |lang|
when 'German'
@language = "German"
@screen.wait_and_click('TailsGreeterLanguage.png', 10)
- @screen.wait_and_click("TailsGreeterLanguage#{@language}.png", 10)
+ @screen.wait('TailsGreeterLanguagePopover.png', 10)
+ @screen.type(@language)
+ sleep(2) # Gtk needs some time to filter the results
+ @screen.type(Sikuli::Key.ENTER)
@screen.wait_and_click("TailsGreeterLoginButton#{@language}.png", 10)
when ''
@screen.wait_and_click('TailsGreeterLoginButton.png', 10)
@@ -324,22 +327,29 @@ Given /^I log in to a new session(?: in )?(|German)$/ do |lang|
step 'the Tails desktop is ready'
end
-Given /^I enable more Tails Greeter options$/ do
- match = @screen.find('TailsGreeterMoreOptions.png')
- @screen.click(match.getCenter.offset(match.w/2, match.h*2))
- @screen.wait_and_click('TailsGreeterForward.png', 20)
- @screen.wait('TailsGreeterLoginButton.png', 20)
+def open_greeter_additional_settings
+ @screen.click('TailsGreeterAddMoreOptions.png')
+ @screen.wait('TailsGreeterAdditionalSettingsDialog.png', 10)
+end
+
+Given /^I open Tails Greeter additional settings dialog$/ do
+ open_greeter_additional_settings()
end
Given /^I enable the specific Tor configuration option$/ do
- @screen.click('TailsGreeterTorConf.png')
+ open_greeter_additional_settings()
+ @screen.wait_and_click('TailsGreeterNetworkConnection.png', 30)
+ @screen.wait_and_click("TailsGreeterSpecificTorConfiguration.png", 10)
+ @screen.wait_and_click("TailsGreeterAdditionalSettingsAdd.png", 10)
end
Given /^I set an administration password$/ do
- @screen.wait("TailsGreeterAdminPassword.png", 20)
+ open_greeter_additional_settings()
+ @screen.wait_and_click("TailsGreeterAdminPassword.png", 20)
@screen.type(@sudo_password)
@screen.type(Sikuli::Key.TAB)
@screen.type(@sudo_password)
+ @screen.type(Sikuli::Key.ENTER)
end
Given /^Tails Greeter has applied all settings$/ do
diff --git a/features/step_definitions/mac_spoofing.rb b/features/step_definitions/mac_spoofing.rb
index 443002a..d094568 100644
--- a/features/step_definitions/mac_spoofing.rb
+++ b/features/step_definitions/mac_spoofing.rb
@@ -5,7 +5,10 @@ def all_ethernet_nics
end
When /^I disable MAC spoofing in Tails Greeter$/ do
+ open_greeter_additional_settings()
@screen.wait_and_click("TailsGreeterMACSpoofing.png", 30)
+ @screen.wait_and_click("TailsGreeterDisableMACSpoofing.png", 10)
+ @screen.wait_and_click("TailsGreeterAdditionalSettingsAdd.png", 10)
end
Then /^the network device has (its default|a spoofed) MAC address configured$/ do |mode|
diff --git a/features/step_definitions/snapshots.rb b/features/step_definitions/snapshots.rb
index 4977d60..43e726d 100644
--- a/features/step_definitions/snapshots.rb
+++ b/features/step_definitions/snapshots.rb
@@ -60,7 +60,6 @@ def checkpoints
:description => "I have started Tails from DVD without network and logged in with bridge mode enabled",
:parent_checkpoint => "tails-greeter",
:steps => [
- 'I enable more Tails Greeter options',
'I enable the specific Tor configuration option',
'I log in to a new session',
'all notifications have disappeared',
@@ -72,7 +71,6 @@ def checkpoints
:description => "I have started Tails from DVD without network and logged in with an administration password",
:parent_checkpoint => "tails-greeter",
:steps => [
- 'I enable more Tails Greeter options',
'I set an administration password',
'I log in to a new session',
],
diff --git a/features/step_definitions/untrusted_partitions.rb b/features/step_definitions/untrusted_partitions.rb
index 751986a..603c8b4 100644
--- a/features/step_definitions/untrusted_partitions.rb
+++ b/features/step_definitions/untrusted_partitions.rb
@@ -55,7 +55,7 @@ end
Then /^Tails Greeter has( not)? detected a persistence partition$/ do |no_persistence|
expecting_persistence = no_persistence.nil?
@screen.find('TailsGreeter.png')
- found_persistence = ! @screen.exists('TailsGreeterPersistence.png').nil?
+ found_persistence = ! @screen.exists('TailsGreeterPersistencePassphrase.png').nil?
assert_equal(expecting_persistence, found_persistence,
"Persistence is unexpectedly#{no_persistence} enabled")
end
diff --git a/features/step_definitions/usb.rb b/features/step_definitions/usb.rb
index ce91b15..3ac30c4 100644
--- a/features/step_definitions/usb.rb
+++ b/features/step_definitions/usb.rb
@@ -343,12 +343,9 @@ Then /^a Tails persistence partition exists on USB drive "([^"]+)"$/ do |name|
end
Given /^I enable persistence$/ do
- @screen.wait('TailsGreeterPersistence.png', 10)
- @screen.type(Sikuli::Key.SPACE)
- @screen.wait('TailsGreeterPersistencePassphrase.png', 10)
- match = @screen.find('TailsGreeterPersistencePassphrase.png')
- @screen.click(match.getCenter.offset(match.w*2, match.h/2))
- @screen.type(@persistence_password)
+ @screen.wait_and_click('TailsGreeterPersistencePassphrase.png', 10)
+ @screen.type(@persistence_password + Sikuli::Key.ENTER)
+ @screen.wait('TailsGreeterPersistenceUnlocked.png', 30)
end
def tails_persistence_enabled?
diff --git a/wiki/src/contribute/release_process/test/automated_tests.mdwn b/wiki/src/contribute/release_process/test/automated_tests.mdwn
index ff184f4..6d6f9f9 100644
--- a/wiki/src/contribute/release_process/test/automated_tests.mdwn
+++ b/wiki/src/contribute/release_process/test/automated_tests.mdwn
@@ -217,10 +217,6 @@ This step:
* makes sure that Tails Greeter starts
* makes sure that the remote shell is up and running
- And I enable more Tails Greeter options
-
-This is required for steps enabling Tails Greeter options, like the
-next one.
Note that the "I set sudo password ..." step has to be run before the
other Tails Greeter option steps as it relies on keyboard navigation.