Skip to content

VPN flags are now opt-in #3227

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

Merged
Mygod merged 1 commit into from
Jan 20, 2026
Merged

VPN flags are now opt-in #3227

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion core/src/main/java/com/github/shadowsocks/acl/AclSyncer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import androidx.work.WorkerParameters
import com.github.shadowsocks.Core
import com.github.shadowsocks.Core.app
import com.github.shadowsocks.core.BuildConfig
import com.github.shadowsocks.preference.DataStore
import com.github.shadowsocks.utils.useCancellable
import kotlinx.coroutines.Dispatchers
import timber.log.Timber
Expand Down Expand Up @@ -68,7 +69,8 @@ class AclSyncer(context: Context, workerParams: WorkerParameters) : CoroutineWor

override suspend fun doWork(): Result = try {
val route = inputData.getString(KEY_ROUTE)!!
val connection = URL("https://shadowsocks.org/acl/android/v1/$route.acl").openConnection() as HttpURLConnection
val connection = URL("https://shadowsocks.org/acl/android/v1/$route.acl")
.openConnection(DataStore.proxy) as HttpURLConnection
val acl = connection.useCancellable { inputStream.bufferedReader().use { it.readText() } }
Acl.getFile(route).printWriter().use { it.write(acl) }
Result.success()
Expand Down
6 changes: 4 additions & 2 deletions core/src/main/java/com/github/shadowsocks/bg/VpnService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ class VpnService : BaseVpnService(), BaseService.Interface {

if (profile.ipv6) builder.addAddress(PRIVATE_VLAN6_CLIENT, 126)

val me = packageName
if (profile.proxyApps) {
val me = packageName
profile.individual.split('\n')
.filter { it != me }
.forEach {
Expand All @@ -178,7 +178,9 @@ class VpnService : BaseVpnService(), BaseService.Interface {
Timber.w(ex)
}
}
if (!profile.bypass) builder.addAllowedApplication(me)
if (profile.bypass) builder.addDisallowedApplication(me)
} else {
builder.addDisallowedApplication(me)
}

when (profile.route) {
Expand Down
6 changes: 1 addition & 5 deletions core/src/main/java/com/github/shadowsocks/net/HttpsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,13 @@ import androidx.lifecycle.ViewModel
import com.github.shadowsocks.Core.app
import com.github.shadowsocks.core.R
import com.github.shadowsocks.preference.DataStore
import com.github.shadowsocks.utils.Key
import com.github.shadowsocks.utils.useCancellable
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.launch
import java.io.IOException
import java.net.HttpURLConnection
import java.net.Proxy
import java.net.URL
import java.net.URLConnection

Expand Down Expand Up @@ -83,9 +81,7 @@ class HttpsTest : ViewModel() {
cancelTest()
status.value = Status.Testing
val url = URL("https://cp.cloudflare.com")
val conn = (if (DataStore.serviceMode != Key.modeVpn) {
url.openConnection(Proxy(Proxy.Type.SOCKS, DataStore.proxyAddress))
} else url.openConnection()) as HttpURLConnection
val conn = url.openConnection(DataStore.proxy) as HttpURLConnection
conn.setRequestProperty("Connection", "close")
conn.instanceFollowRedirects = false
conn.useCaches = false
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/com/github/shadowsocks/preference/DataStore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import com.github.shadowsocks.utils.DirectBoot
import com.github.shadowsocks.utils.Key
import com.github.shadowsocks.utils.parsePort
import java.net.InetSocketAddress
import java.net.Proxy

object DataStore : OnPreferenceDataStoreChangeListener {
val publicStore = RoomPreferenceDataStore(PublicDatabase.kvPairDao)
Expand Down Expand Up @@ -68,7 +69,7 @@ object DataStore : OnPreferenceDataStoreChangeListener {
var portProxy: Int
get() = getLocalPort(Key.portProxy, 1080)
set(value) = publicStore.putString(Key.portProxy, value.toString())
val proxyAddress get() = InetSocketAddress("127.0.0.1", portProxy)
val proxy get() = Proxy(Proxy.Type.SOCKS, InetSocketAddress("127.0.0.1", portProxy))
var portLocalDns: Int
get() = getLocalPort(Key.portLocalDns, 5450)
set(value) = publicStore.putString(Key.portLocalDns, value.toString())
Expand Down