summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2020-08-07 06:46:20 +0000
committerintrigeri <intrigeri@boum.org>2020-08-07 06:46:20 +0000
commit2ac1bf4f74e1848c38de5967d40d259d26f92524 (patch)
tree0ad8317c81c3a4f53f196be2273246a0b8a9ced0
parent077a9150bbc8a199322152970572f7088f456e0c (diff)
parent59b6035c5bc76b2b7877300503ac1489be88a597 (diff)
Merge branch 'bugfix/17820-disable-mac-spoofing-for-iphone-tethering' into 'stable'stable
Disable MAC spoofing for iPhone tethering Closes #17820 See merge request tails/tails!95
-rw-r--r--config/chroot_local-includes/etc/udev/rules.d/00-mac-spoof.rules12
-rw-r--r--wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.mdwn3
2 files changed, 12 insertions, 3 deletions
diff --git a/config/chroot_local-includes/etc/udev/rules.d/00-mac-spoof.rules b/config/chroot_local-includes/etc/udev/rules.d/00-mac-spoof.rules
index f1c6666..4160d69 100644
--- a/config/chroot_local-includes/etc/udev/rules.d/00-mac-spoof.rules
+++ b/config/chroot_local-includes/etc/udev/rules.d/00-mac-spoof.rules
@@ -1,3 +1,15 @@
# Note: ATTR{type}=="1" means ethernet (ARPHDR_ETHER, see Linux'
# sources, beginning of include/linux/if_arp.h)
+
+# Disable MAC spoofing for the following devices
+# iPhone tethering ethernet over USB
+SUBSYSTEM=="net", ACTION=="add", ATTR{type}=="1", DRIVERS=="ipheth", GOTO="mac_spoof_ignore"
+
+# Perform MAC spoofing otherwise
SUBSYSTEM=="net", ACTION=="add", ATTR{type}=="1", RUN+="/usr/local/lib/tails-spoof-mac $name"
+SUBSYSTEM=="net", ACTION=="add", ATTR{type}=="1", GOTO="mac_spoof_end"
+
+LABEL="mac_spoof_ignore"
+SUBSYSTEM=="net", ACTION=="add", ATTR{type}=="1", RUN+="/usr/bin/logger -t spoof-mac \"MAC spoofing discarded by udev rule for $name ($driver)\""
+
+LABEL="mac_spoof_end"
diff --git a/wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.mdwn b/wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.mdwn
index cd06d11..15cd9f5 100644
--- a/wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.mdwn
+++ b/wiki/src/doc/anonymous_internet/networkmanager/no-wifi.inline.mdwn
@@ -30,9 +30,6 @@ To connect to the Internet, you can try to:
* [iPhones or iPads](https://support.apple.com/en-us/HT204023)<br/>
Only sharing mobile data works on iPhones and iPads; sharing Wi-Fi does not work.
- For mobile data sharing to work, you need to [[disable MAC address
- spoofing|first_steps/welcome_screen/mac_spoofing#disable]] in the
- Welcome Screen.
<div class="caution">
<p>Tails cannot hide the information that identifies your phone on the network.