Skip to content

Commit e7173da

Browse files
fix requiresSuccess inverted check
Co-Authored-By: binarynoise <binarynoise@mail.de>
1 parent a0d8de2 commit e7173da

File tree

1 file changed

+4
-4
lines changed
  • liberator/src/main/kotlin/de/binarynoise/liberator

1 file changed

+4
-4
lines changed

liberator/src/main/kotlin/de/binarynoise/liberator/Liberator.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ class Liberator(
167167
private fun recurse(response: Response, depth: Int): LiberationResult {
168168
try {
169169
val solvers: List<PortalLiberator> = allPortalLiberators //
170-
.filter { solver -> PortalLiberatorConfig.experimental || !solver.isExperimental() }
170+
.filter { solver -> !solver.isExperimental() || PortalLiberatorConfig.experimental }
171171
.filter { solver -> !solver.ssidMustMatch() || (ssid != null && solver.ssidMatches(ssid)) }
172172
.filter { solver ->
173173
try {
@@ -182,7 +182,7 @@ class Liberator(
182182
if (solvers.isEmpty()) {
183183

184184
val redirectedResponse = getRedirectedResponse(client, response, cookies)
185-
log("locationUrl: ${redirectedResponse?.requestUrl}")
185+
log("redirectedResponse.requestUrl: ${redirectedResponse?.requestUrl}")
186186
if (redirectedResponse == null) {
187187
if (isCaptivePortalTestUrl(response.requestUrl) && response.isSuccessful) {
188188
return LiberationResult.NotCaught
@@ -229,9 +229,9 @@ class Liberator(
229229

230230
private fun getRedirectedResponse(client: OkHttpClient, response: Response, cookies: Set<Cookie>): Response? {
231231
val redirectors = (allPortalRedirectors + LocationRedirector) //
232-
.filter { redirector -> PortalLiberatorConfig.experimental || !redirector.isExperimental() }
232+
.filter { redirector -> !redirector.isExperimental() || PortalLiberatorConfig.experimental }
233233
.filter { redirector -> !redirector.ssidMustMatch() || (ssid != null && redirector.ssidMatches(ssid)) }
234-
.filter { redirector -> !redirector.requiresSuccess || response.code !in 200..399 }
234+
.filter { redirector -> !redirector.requiresSuccess || response.code in 200..399 }
235235
.filter { redirector ->
236236
try {
237237
redirector.canRedirect(response)

0 commit comments

Comments
 (0)