diff --git a/app/src/main/java/cc/skysparkle/sparkledns/DnsTileService.kt b/app/src/main/java/cc/skysparkle/sparkledns/DnsTileService.kt index 0ff9937..5668098 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/DnsTileService.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/DnsTileService.kt @@ -59,6 +59,15 @@ class DnsTileService : TileService() { return } } + // Turning protection off needs an unlocked phone, like other security toggles + if (running && isLocked) { + unlockAndRun { toggle(running) } + return + } + toggle(running) + } + + private fun toggle(running: Boolean) { val action = if (running) DohVpnService.ACTION_STOP else DohVpnService.ACTION_START try { startService(Intent(this, DohVpnService::class.java).setAction(action)) diff --git a/app/src/main/java/cc/skysparkle/sparkledns/DohVpnService.kt b/app/src/main/java/cc/skysparkle/sparkledns/DohVpnService.kt index b865526..edd3866 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/DohVpnService.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/DohVpnService.kt @@ -20,6 +20,7 @@ import android.system.StructPollfd import android.util.Log import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow +import okhttp3.HttpUrl.Companion.toHttpUrlOrNull import java.io.FileInputStream import java.io.FileOutputStream import java.io.IOException @@ -34,7 +35,11 @@ private const val WORKERS = 16 private const val TAG = "SparkleDNS" private const val CHANNEL_ID = "vpn_status" private const val NOTIFICATION_ID = 1 +// Separate channel with normal importance: losing protection must not go unnoticed +private const val ALERT_CHANNEL_ID = "vpn_alerts" +private const val ALERT_NOTIFICATION_ID = 2 private const val MAX_BAD_PACKETS = 100 +private const val READER_JOIN_MS = 1000L // Android's resolver retries after 5 s, so an older lookup no longer has anyone waiting for it private const val QUEUE_TIMEOUT_MS = 5000L @@ -96,6 +101,16 @@ class DohVpnService : VpnService() { val provider = prefs.resolve() val excluded = prefs.excludedApps + // The app checks the address before connecting, but always-on VPN and a restart by the + // system start the service directly. A tunnel with a broken URL would fail every lookup. + if (provider.url.toHttpUrlOrNull()?.isHttps != true) { + Log.e(TAG, "Server address is not a valid HTTPS URL, not starting") + stopSession() + showAlert(R.string.alert_bad_url_title, R.string.alert_bad_url_text) + stopSelf() + return + } + val builder = Builder() .setSession(provider.displayName(this)) .addAddress(TUN_ADDRESS, 32) @@ -138,6 +153,14 @@ class DohVpnService : VpnService() { _activeExcluded.value = excluded showNotification(provider) DnsTileService.refresh(this) + getSystemService(NotificationManager::class.java)?.cancel(ALERT_NOTIFICATION_ID) + + // With "Block connections without VPN" the app, excluded from its own tunnel, cannot reach + // the DoH server, so every lookup would fail + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && isLockdownEnabled) { + Log.w(TAG, "Lockdown mode is on, the DoH server is not reachable") + showAlert(R.string.alert_lockdown_title, R.string.alert_lockdown_text) + } } private fun stopSession() { @@ -157,10 +180,34 @@ class DohVpnService : VpnService() { if (session !== failed) return@post Log.e(TAG, "Tunnel stopped working, disconnecting") stopSession() + // DNS goes unencrypted from here on; the user has to know + showAlert(R.string.alert_stopped_title, R.string.alert_stopped_text) stopSelf() } } + private fun showAlert(titleRes: Int, textRes: Int) { + val manager = getSystemService(NotificationManager::class.java) ?: return + manager.createNotificationChannel( + NotificationChannel(ALERT_CHANNEL_ID, getString(R.string.alert_channel), NotificationManager.IMPORTANCE_DEFAULT) + ) + val openApp = PendingIntent.getActivity( + this, 2, + Intent(this, MainActivity::class.java).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), + PendingIntent.FLAG_IMMUTABLE, + ) + val text = getString(textRes) + val notification = Notification.Builder(this, ALERT_CHANNEL_ID) + .setSmallIcon(R.drawable.ic_notification) + .setContentTitle(getString(titleRes)) + .setContentText(text) + .setStyle(Notification.BigTextStyle().bigText(text)) + .setContentIntent(openApp) + .setAutoCancel(true) + .build() + runCatching { manager.notify(ALERT_NOTIFICATION_ID, notification) } + } + private fun showNotification(provider: DohProvider) { val manager = getSystemService(NotificationManager::class.java) ?: return manager.createNotificationChannel( @@ -196,7 +243,7 @@ class DohVpnService : VpnService() { try { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { - startForeground(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE) + startForeground(NOTIFICATION_ID, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_SYSTEM_EXEMPTED) } else { startForeground(NOTIFICATION_ID, notification) } @@ -229,6 +276,9 @@ private class Session( if (!alive.getAndSet(false)) return pool.shutdownNow() runCatching { wakeup[1].close() } + // The pipe wakes the reader at once; let it leave before its descriptor is closed and + // possibly reused by something else + if (Thread.currentThread() !== reader) runCatching { reader.join(READER_JOIN_MS) } runCatching { tun.close() } closer.execute { try { diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 4831f9f..a971dda 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -131,4 +131,11 @@ Einschalten Wird geladen… Server wechseln + Schutzwarnungen + DNS-Schutz beendet + Der Tunnel funktioniert nicht mehr, DNS ist nicht mehr verschlüsselt. Öffne SparkleDNS, um dich erneut zu verbinden. + DNS-Schutz nicht gestartet + Die Serveradresse ist keine gültige HTTPS-URL. Öffne SparkleDNS und prüfe den Server. + DNS-Server nicht erreichbar + „Verbindungen ohne VPN blockieren“ ist aktiv, daher erreicht SparkleDNS den DNS-Server nicht und Anfragen schlagen fehl. Schalte es in den VPN-Einstellungen von Android aus. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 6c80281..d915628 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -131,4 +131,11 @@ オンにする ダウンロード中… サーバーを変更 + 保護に関する警告 + DNS 保護が停止しました + トンネルが動作しなくなったため、DNS は暗号化されていません。SparkleDNS を開いて再接続してください。 + DNS 保護を開始できません + サーバーのアドレスが有効な HTTPS URL ではありません。SparkleDNS を開いてサーバーを確認してください。 + DNS サーバーに接続できません + 「VPN なしの接続をブロック」がオンのため、SparkleDNS は DNS サーバーに接続できず、名前解決に失敗します。Android の VPN 設定でオフにしてください。 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index f5c3021..6f1fe8d 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -131,4 +131,11 @@ Įjungti Atsisiunčiama… Keisti serverį + Apsaugos įspėjimai + DNS apsauga išjungta + Tunelis nustojo veikti, DNS nebešifruojamas. Atidarykite SparkleDNS, kad prisijungtumėte iš naujo. + DNS apsauga nepaleista + Serverio adresas nėra tinkamas HTTPS adresas. Atidarykite SparkleDNS ir patikrinkite serverį. + DNS serveris nepasiekiamas + Įjungta „Blokuoti ryšius be VPN“, todėl SparkleDNS negali pasiekti DNS serverio ir užklausos nepavyksta. Išjunkite tai Android VPN nustatymuose. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 84f7ac3..2d99afa 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -131,4 +131,11 @@ Включить Загрузка… Сменить сервер + Предупреждения о защите + Защита DNS отключена + Туннель перестал работать, DNS больше не шифруется. Откройте SparkleDNS, чтобы подключиться снова. + Защита DNS не запущена + Адрес сервера не является корректным HTTPS-адресом. Откройте SparkleDNS и проверьте сервер. + DNS-сервер недоступен + Включено «Блокировать соединения без VPN», поэтому SparkleDNS не может связаться с DNS-сервером и запросы не проходят. Отключите это в настройках VPN Android. diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 056d0f7..afe0a35 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -131,4 +131,11 @@ 开启 正在下载… 更换服务器 + 保护警告 + DNS 保护已停止 + 隧道已停止工作,DNS 不再加密。请打开 SparkleDNS 重新连接。 + DNS 保护未启动 + 服务器地址不是有效的 HTTPS 网址。请打开 SparkleDNS 检查服务器。 + 无法连接 DNS 服务器 + 已开启“屏蔽未使用 VPN 的连接”,SparkleDNS 无法连接 DNS 服务器,解析会失败。请在 Android 的 VPN 设置中关闭该选项。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ad91536..608f296 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -132,4 +132,11 @@ Turn on Downloading… Change server + Protection alerts + DNS protection stopped + The tunnel stopped working, so DNS is no longer encrypted. Open SparkleDNS to connect again. + DNS protection not started + The server address is not a valid HTTPS URL. Open SparkleDNS and check the server. + DNS server unreachable + \"Block connections without VPN\" is on, so SparkleDNS cannot reach the DNS server and lookups fail. Turn it off in Android VPN settings.