Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
tails
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
947
Issues
947
List
Boards
Labels
Service Desk
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tails
tails
Commits
ac0c989b
Commit
ac0c989b
authored
Oct 21, 2014
by
Tails developers
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor code checking if windows camouflage is enabled.
parent
6c06f760
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
10 deletions
+12
-10
config/chroot_local-includes/usr/local/lib/tails-shell-library/tails-greeter.sh
...cludes/usr/local/lib/tails-shell-library/tails-greeter.sh
+4
-0
config/chroot_local-includes/usr/local/sbin/i2p-browser
config/chroot_local-includes/usr/local/sbin/i2p-browser
+4
-5
config/chroot_local-includes/usr/local/sbin/unsafe-browser
config/chroot_local-includes/usr/local/sbin/unsafe-browser
+4
-5
No files found.
config/chroot_local-includes/usr/local/lib/tails-shell-library/tails-greeter.sh
View file @
ac0c989b
...
...
@@ -20,6 +20,10 @@ mac_spoof_is_enabled() {
[
"
$(
_get_tg_setting
"
${
PHYSICAL_SECURITY_SETTINGS
}
"
TAILS_MACSPOOF_ENABLED
)
"
!=
false
]
}
windows_camouflage_is_enabled
()
{
[
-e
/var/lib/gdm3/tails.camouflage
]
}
tails_netconf
()
{
_get_tg_setting
"
${
PHYSICAL_SECURITY_SETTINGS
}
"
TAILS_NETCONF
}
config/chroot_local-includes/usr/local/sbin/i2p-browser
View file @
ac0c989b
...
...
@@ -26,16 +26,15 @@ START_PAGE="http://127.0.0.1:7657"
# guess_best_tor_browser_locale()
.
/usr/local/lib/tails-shell-library/tor-browser.sh
# Import windows_camouflage_is_enabled()
.
/usr/local/lib/tails-shell-library/tor-browser.sh
.
/usr/local/lib/tails-shell-library/chroot-browser.sh
NOSCRIPT_EXT_XPI
=
"
${
TBB_EXT
}
/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
TORBUTTON_EXT_DIR
=
"
${
TBB_EXT
}
/torbutton@torproject.org"
NAME
=
"
`
gettext
\"
I2P Browser
\"
`
"
if
[
-e
/var/lib/gdm3/tails.camouflage
]
;
then
CAMOUFLAGE
=
yes
fi
cleanup
()
{
try_cleanup_browser_chroot
${
CHROOT
}
${
COW
}
${
BROWSER_USER
}
}
...
...
@@ -125,7 +124,7 @@ configure_chroot () {
chown
-R
${
BROWSER_USER
}
:
${
BROWSER_USER
}
"
${
BROWSER_CONF
}
"
# Change the theme when not using Windows camouflage
if
[
-z
"
${
CAMOUFLAGE
}
"
]
;
then
if
!
windows_camouflage_is_enabled
;
then
cat
/usr/share/tails/i2p-browser/i2p-browser-theme.js
>>
"
${
BROWSER_PREFS
}
"
else
# The camouflage activation script requires a dbus server for
...
...
config/chroot_local-includes/usr/local/sbin/unsafe-browser
View file @
ac0c989b
...
...
@@ -22,6 +22,9 @@ BROWSER_USER=clearnet
# guess_best_tor_browser_locale()
.
/usr/local/lib/tails-shell-library/tor-browser.sh
# Import windows_camouflage_is_enabled()
.
/usr/local/lib/tails-shell-library/tor-browser.sh
.
/usr/local/lib/tails-shell-library/chroot-browser.sh
WARNING_PAGE
=
'/usr/share/doc/tails/website/misc/unsafe_browser_warning'
...
...
@@ -32,10 +35,6 @@ else
START_PAGE
=
"
${
WARNING_PAGE
}
.en.html"
fi
if
[
-e
/var/lib/gdm3/tails.camouflage
]
;
then
CAMOUFLAGE
=
yes
fi
cleanup
()
{
try_cleanup_browser_chroot
${
CHROOT
}
${
COW
}
${
BROWSER_USER
}
}
...
...
@@ -118,7 +117,7 @@ configure_chroot () {
# camouflage). Note that the tails-activate-win8-theme script that
# we may run below requires that the browser profile is writable
# by the user running the script (i.e. clearnet).
if
[
-z
"
${
CAMOUFLAGE
}
"
]
;
then
if
!
windows_camouflage_is_enabled
;
then
cat
/usr/share/tails/unsafe-browser/unsafe-browser-theme.js
>>
"
${
BROWSER_PREFS
}
"
else
# The camouflage activation script requires a dbus server for
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment