Skip to content

android: fix include-mode DNS by inverting to exclude strategy #784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fengzzyun wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −3
Open

android: fix include-mode DNS by inverting to exclude strategy #784

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions android/src/main/java/com/tailscale/ipn/IPNService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,36 @@ open class IPNService : VpnService(), libtailscale.IPNService {
}

if (allowPackages) {
for (packageName in packagesList) {
TSLog.d(TAG, "Including app: $packageName")
allowApp(b, packageName)
TSLog.d(TAG, "Include mode enabled -- using inverted-exclude strategy")

// Build the set of packages to DISALLOW (everything except user-selected ones)
val packagesToExclude = mutableSetOf<String>()

// 1. Get all installed apps
val allInstalled = packageManager.getInstalledApplications(0)
.mapNotNull { applicationInfo ->
try { applicationInfo.packageName } catch (_: Exception) { null }
}
.toSet()
TSLog.d(TAG, "Total installed packages: ${allInstalled.size}")

// 2. Remove user-selected packages (these should go through the tunnel)
val userSelected = packagesList.toSet()
packagesToExclude.addAll(allInstalled - userSelected)

// 3. Also exclude built-in disallowed packages (voicemail, etc.)
val builtinExcluded = UninitializedApp.get().builtInDisallowedPackageNames.toSet()
packagesToExclude.addAll(builtinExcluded)

TSLog.d(TAG, "Inverted exclude: selected=${userSelected.size}, " +
"excluded=${packagesToExclude.size - builtinExcluded.size}, " +
"builtin=${builtinExcluded.size}")

// 4. Disallow all apps not in the user's include list
// This avoids addAllowedApplication() which breaks DNS for non-VPN apps
for (packageName in packagesToExclude) {
TSLog.d(TAG, "Disallowing app (inverted include): $packageName")
disallowApp(b, packageName)
}
} else {
// Make sure to also exclude hard-coded apps that are known to cause issues
Expand Down