Skip to content

Commit

Permalink
Merge pull request #74 from greatfire/randomizer_fixes
Browse files Browse the repository at this point in the history 
improved randomization of testing
  • Loading branch information
@mnbogner
mnbogner authored Jul 10, 2023
2 parents c526c86 + 806499d commit 28bd2d0
Showing 1 changed file with 75 additions and 30 deletions.
105 changes: 75 additions & 30 deletions android/envoy/src/main/kotlin/org/greatfire/envoy/NetworkIntentService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ import java.util.concurrent.Executor
import java.util.concurrent.Executors
import kotlin.collections.ArrayList

const val SHORT_DELAY = 1000L
const val MEDIUM_DELAY = 5000L
const val LONG_DELAY = 10000L
const val PREF_VALID_URLS = "validUrls"
const val LOCAL_URL_BASE = "socks5://127.0.0.1:"
const val TUNNEL_URL_BASE_1 = "envoy://?url="
Expand Down Expand Up @@ -64,6 +67,7 @@ class NetworkIntentService : IntentService("NetworkIntentService") {
private var currentBatchChecked = Collections.synchronizedList(mutableListOf<String>())
private var currentServiceChecked = Collections.synchronizedList(mutableListOf<String>())
private var batchInProgress = false
private var directUrlCount = 0
private var validationStart = 0L
private var additionalUrlSources = Collections.synchronizedList(mutableListOf<String>())

Expand Down Expand Up @@ -93,7 +97,8 @@ class NetworkIntentService : IntentService("NetworkIntentService") {
private val cronetMap = Collections.synchronizedMap(mutableMapOf<String, CronetEngine>())

private val httpPrefixes = Collections.synchronizedList(mutableListOf<String>("https", "http", "envoy"))
private val supportedPrefixes = Collections.synchronizedList(mutableListOf<String>("v2ws", "v2srtp", "v2wechat", "hysteria", "ss", "snowflake"))
private val supportedPrefixes = Collections.synchronizedList(mutableListOf<String>("v2ws", "v2srtp", "v2wechat", "hysteria", "ss"))
private val preferredPrefixes = Collections.synchronizedList(mutableListOf<String>("snowflake"))

fun checkValidationTime(): Boolean {
val validationCheck = System.currentTimeMillis()
Expand Down Expand Up @@ -252,15 +257,21 @@ class NetworkIntentService : IntentService("NetworkIntentService") {
Log.d(TAG, "clear " + submittedUrls.size + " previously submitted urls")
submittedUrls.clear()

Log.d(TAG, "reset previous direct url count")
directUrlCount = 0

Log.d(TAG, "clear " + blockedUrls.size + " previously blocked urls")
blockedUrls.clear()

if (!directUrls.isNullOrEmpty()) {
directUrls.forEach { directUrl ->
Log.d(TAG, "found direct url: " + UrlUtil.sanitizeUrl(directUrl, ENVOY_SERVICE_DIRECT))
submittedUrls.add(directUrl)
directUrlCount = directUrlCount + 1
handleDirectRequest(directUrl, hysteriaCert)
}
} else {
Log.d(TAG, "found no direct urls to test")
}

val urlsToSubmit = mutableListOf<String>()
Expand All @@ -283,6 +294,10 @@ class NetworkIntentService : IntentService("NetworkIntentService") {
broadcastValidationFailure()
}
} else {

// set aside certain urls to test first
var preferredUrls = ArrayList<String>()

urlsToSubmit.forEach() { url ->
val parts = url.split(":")
val prefix = parts[0]
Expand All @@ -292,13 +307,22 @@ class NetworkIntentService : IntentService("NetworkIntentService") {
shuffledHttps.add(url)
} else if (supportedPrefixes.contains(prefix)) {
shuffledUrls.add(url)
} else if (preferredPrefixes.contains(prefix)) {
preferredUrls.add(url)
} else {
Log.w(TAG, "found url with unsupported prefix: " + prefix)
}
}

Log.d(TAG, "shuffle " + (shuffledHttps.size + shuffledUrls.size) + " submitted urls")
Collections.shuffle(shuffledHttps)
Collections.shuffle(shuffledUrls)

Log.d(TAG, "insert " + preferredUrls.size + " preferred urls")
preferredUrls.forEach() { url ->
shuffledUrls.add(0, url)
}

handleBatch(hysteriaCert)
}
}
Expand Down Expand Up @@ -335,9 +359,11 @@ class NetworkIntentService : IntentService("NetworkIntentService") {
Log.d(TAG, "start new batch")
}

val batchSize: Int = (2..5).random()

var max = shuffledUrls.size + shuffledHttps.size
if (max > 3) {
max = 3
if (max > batchSize) {
max = batchSize
}

currentBatch.clear()
Expand Down Expand Up @@ -418,15 +444,8 @@ class NetworkIntentService : IntentService("NetworkIntentService") {
// nothing to parse at this time, leave url in string format

httpsUrls.add(url)

// add a slight delay to give the direct connection a chance
Log.d(TAG, "submit url after a short delay for testing direct connection")
ioScope.launch() {
Log.d(TAG, "start https delay")
delay(5000L) // wait 5 seconds
Log.d(TAG, "end https delay")
handleRequest(url, url, ENVOY_SERVICE_HTTPS, captive_portal_url, hysteriaCert)
}
Log.d(TAG, "submit http(s) url")
handleRequest(url, url, ENVOY_SERVICE_HTTPS, captive_portal_url, hysteriaCert)
}

private fun handleEnvoySubmit(
Expand All @@ -438,15 +457,8 @@ class NetworkIntentService : IntentService("NetworkIntentService") {
// nothing to parse at this time, leave url in string format

httpsUrls.add(url)

// add a slight delay to give the direct connection a chance
Log.d(TAG, "submit url after a short delay for testing direct connection")
ioScope.launch() {
Log.d(TAG, "start envoy delay")
delay(5000L) // wait 5 seconds
Log.d(TAG, "end envoy delay")
handleRequest(url, url, ENVOY_SERVICE_ENVOY, captive_portal_url, hysteriaCert)
}
Log.d(TAG, "submit envoy url")
handleRequest(url, url, ENVOY_SERVICE_ENVOY, captive_portal_url, hysteriaCert)
}

private fun handleShadowsocksSubmit(
Expand All @@ -469,7 +481,7 @@ class NetworkIntentService : IntentService("NetworkIntentService") {
Log.d(TAG, "submit url after a short delay for starting shadowsocks")
ioScope.launch() {
Log.d(TAG, "start shadowsocks delay")
delay(10000L) // wait 10 seconds
delay(MEDIUM_DELAY)
Log.d(TAG, "end shadowsocks delay")
handleRequest(
url,
Expand Down Expand Up @@ -517,7 +529,7 @@ class NetworkIntentService : IntentService("NetworkIntentService") {
Log.d(TAG, "submit url after a short delay for starting hysteria")
ioScope.launch() {
Log.d(TAG, "start hysteria delay")
delay(10000L) // wait 10 seconds
delay(MEDIUM_DELAY)
Log.d(TAG, "end hysteria delay")
handleRequest(
url,
Expand Down Expand Up @@ -563,7 +575,7 @@ class NetworkIntentService : IntentService("NetworkIntentService") {
Log.d(TAG, "submit url after a short delay for starting v2ray websocket")
ioScope.launch() {
Log.d(TAG, "start v2ray websocket delay")
delay(10000L) // wait 10 seconds
delay(MEDIUM_DELAY)
Log.d(TAG, "end v2ray websocket delay")
handleRequest(
url,
Expand Down Expand Up @@ -606,7 +618,7 @@ class NetworkIntentService : IntentService("NetworkIntentService") {
Log.d(TAG, "submit url after a short delay for starting v2ray srtp")
ioScope.launch() {
Log.d(TAG, "start v2ray srtp delay")
delay(10000L) // wait 10 seconds
delay(MEDIUM_DELAY)
Log.d(TAG, "end v2ray srtp delay")
handleRequest(
url,
Expand Down Expand Up @@ -648,7 +660,7 @@ class NetworkIntentService : IntentService("NetworkIntentService") {
Log.d(TAG, "submit url after a short delay for starting v2ray wechat")
ioScope.launch() {
Log.d(TAG, "start v2ray wechat delay")
delay(10000L) // wait 10 seconds
delay(MEDIUM_DELAY)
Log.d(TAG, "end v2ray wechat delay")
handleRequest(
url,
Expand Down Expand Up @@ -695,9 +707,9 @@ class NetworkIntentService : IntentService("NetworkIntentService") {
// if needed, generate randomized host name prefix
if (front.startsWith('.')) {
front = randomString().plus(front)
Log.e(TAG, "front updated with random prefix: " + front)
Log.d(TAG, "front updated with random prefix: " + front)
} else {
Log.e(TAG, "front included as-is: " + front)
Log.d(TAG, "front included as-is: " + front)
}
} else if (queryParts[0].equals("tunnel")) {
// this is purposfully not decocded to add to an Envoy URL
Expand All @@ -724,7 +736,7 @@ class NetworkIntentService : IntentService("NetworkIntentService") {
Log.d(TAG, "submit url after a short delay for starting snowflake")
ioScope.launch() {
Log.d(TAG, "start snowflake delay")
delay(10000L) // wait 10 seconds
delay(SHORT_DELAY)
Log.d(TAG, "end snowflake delay")
handleRequest(
url,
Expand Down Expand Up @@ -993,7 +1005,7 @@ class NetworkIntentService : IntentService("NetworkIntentService") {
companion object {
private const val TAG = "NetworkIntentService"

private const val TIME_LIMIT = 30000
private const val TIME_LIMIT = 60000
private const val ONE_HOUR_MS = 3600000
private const val ONE_DAY_MS = 86400000
private const val ONE_WEEK_MS = 604800000
Expand Down Expand Up @@ -1119,6 +1131,27 @@ class NetworkIntentService : IntentService("NetworkIntentService") {
// TODO: do we continue to return all urls or can we start cronet here?
override fun onSucceeded(request: UrlRequest?, info: UrlResponseInfo?) {

// delay processing of proxy results if results for direct urls have not been received

if (envoyService.equals(ENVOY_SERVICE_DIRECT)) {
directUrlCount = directUrlCount - 1
Log.d(TAG, "got direct url result, " + directUrlCount + " direct urls remaining")
processSuccess(request, info)
} else if (directUrlCount == 0) {
Log.d(TAG, "skip onSucceeded delay")
processSuccess(request, info)
} else {
ioScope.launch() {
Log.d(TAG, "start onSucceeded delay, " + directUrlCount + " direct urls remaining")
delay(MEDIUM_DELAY)
Log.d(TAG, "end onSucceeded delay")
processSuccess(request, info)
}
}
}

private fun processSuccess(request: UrlRequest?, info: UrlResponseInfo?) {

val sanitizedUrl = UrlUtil.sanitizeUrl(originalUrl, envoyService)

// update batch
Expand Down Expand Up @@ -1192,6 +1225,18 @@ class NetworkIntentService : IntentService("NetworkIntentService") {
info: UrlResponseInfo?,
error: CronetException?
) {
if (envoyService.equals(ENVOY_SERVICE_DIRECT)) {
directUrlCount = directUrlCount - 1
Log.d(TAG, "got direct url result, " + directUrlCount + " direct urls remaining")
}
processFailure(request, info, error)
}

fun processFailure(
request: UrlRequest?,
info: UrlResponseInfo?,
error: CronetException?
) {

val sanitizedUrl = UrlUtil.sanitizeUrl(originalUrl, envoyService)

Expand Down

0 comments on commit 28bd2d0

Please sign in to comment.