fix some broken PortalLiberators

Co-authored-by: programminghoch10 <16062290+programminghoch10@users.noreply.github.com>

Author: binarynoise

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

@@ -171,9 +171,9 @@ class Liberator(
                 return recurse(response, depth + 1)
             }
 
-            log("solver ${solver::class.simpleName} found for $response.requestUrl")
+            log("solver ${solver::class.simpleName} found for ${response.requestUrl}")
             solver.solve(client, response, cookies)
-            log("solver ${solver::class.simpleName} finished processing $response.requestUrl")
+            log("solver ${solver::class.simpleName} finished processing ${response.requestUrl}")
 
             return LiberationResult.Success(response.requestUrl.toString())
         } catch (e: Exception) {

liberator/src/main/kotlin/de/binarynoise/liberator/portals/CloudWifi.kt

@@ -13,6 +13,7 @@ import de.binarynoise.util.okhttp.readText
 import de.binarynoise.util.okhttp.requestUrl
 import okhttp3.Cookie
 import okhttp3.HttpUrl.Companion.toHttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Response
 
@@ -73,13 +74,13 @@ object CloudWifiRedirect : PortalLiberator {
             .getElementsByTag("script")
             .map { it.attr("src") }
             .filter { it.isNotEmpty() }
-            .map { it.toHttpUrl() }
+            .mapNotNull { it.toHttpUrlOrNull() }
             .any { url -> url.host == "start.cloudwifi.de" && url.pathSegments.any { it == "redirect" } }
     }
 
     override fun solve(client: OkHttpClient, response: Response, cookies: Set<Cookie>) {
         val html1 = response.parseHtml()
-        val script1 = html1.getElementsByTag("body").single().getElementsByTag("script").single().wholeText()
+        val script1 = html1.getElementsByTag("body").single().getElementsByTag("script").single().data()
         val assignments = RhinoParser().parseAssignments(script1)
 
         val deviceMac = assignments["FX_redirect.0"] ?: error("no deviceMac")

liberator/src/main/kotlin/de/binarynoise/liberator/portals/Conn4.kt

@@ -202,7 +202,7 @@ object Conn4 : PortalLiberator {
     }
 
     fun getTariffPreference(session: JSONObject): List<JSONObject> {
-        val tariffs = session.getJSONArray("tariffs").filterIsInstance<JSONObject>()
+        val tariffs = session.getJSONArray("tariffs").asIterable().filterIsInstance<JSONObject>()
         if (tariffs.hasOneEntry) return tariffs
         fun JSONObject.isBooleanEqualTo(key: String, value: Boolean, default: Boolean): Boolean {
             if (!this.has(key)) return default
@@ -359,7 +359,7 @@ object Conn4 : PortalLiberator {
         cookies: Set<Cookie>,
     ) {
         val token = cookies.find { it.name == "wbs-token" }?.value ?: error("no wbs-token cookie")
-        val apiBase = response.requestUrl.resolveOrThrow("/wbs/api/v1") // TODO: properly parse wbs api base from scrips
+        val apiBase = response.requestUrl.resolveOrThrow("/wbs/api/v1/") // TODO: properly parse wbs api base from scrips
         tryPossibleTariffs(client, apiBase, token, site_id)
     }
 }

liberator/src/main/kotlin/de/binarynoise/liberator/portals/DBWifi.kt

@@ -39,10 +39,9 @@ object DBWifi : PortalLiberator {
                 check(JSONObject(response2.readText()).getString("result") == "success") { "response does not contain success" }
             }
             "sp" == response1.requestUrl.firstPathSegment -> {
-                // works
                 log("sp")
                 client.postForm(
-                    response.requestUrl, "/login", mapOf(
+                    response1.requestUrl, "/login", mapOf(
                         "login" to "oneclick",
                         "oneSubscriptionForm_connect_policy_accept" to "on",
                     )

liberator/src/main/kotlin/de/binarynoise/liberator/portals/SocialwiBox.kt

@@ -34,11 +34,11 @@ object SocialwiBox : PortalLiberator {
         val response3 = client.get(response.requestUrl, location2).followRedirects(client)
         val html3 = response3.parseHtml()
 
-        val script3 = html3.getElementsByTag("script").find { it.wholeText().contains("redirectPost") }
+        val script3 = html3.getElementsByTag("script").find { it.data().contains("redirectPost") }
             ?: error("no script with redirectPost")
 
         val regex = "redirectPost\\('([^']+)',\\s*(\\{.*\\})\\);".toRegex()
-        val match = regex.find(script3.wholeText()) ?: error("no match for redirectPost regex")
+        val match = regex.find(script3.data()) ?: error("no match for redirectPost regex")
         val url = match.groups[1]?.value ?: error("no url in match")
         val data = match.groups[2]?.value ?: error("no data in match")
         val json = JSONObject(data)

liberator/src/main/kotlin/de/binarynoise/liberator/portals/Unwired.kt

@@ -3,6 +3,7 @@ package de.binarynoise.liberator.portals
 import de.binarynoise.liberator.PortalLiberator
 import de.binarynoise.liberator.PortalLiberatorConfig
 import de.binarynoise.liberator.SSID
+import de.binarynoise.liberator.asIterable
 import de.binarynoise.liberator.cast
 import de.binarynoise.util.okhttp.checkSuccess
 import de.binarynoise.util.okhttp.postJson
@@ -61,7 +62,7 @@ object Unwired : PortalLiberator {
         )
         val json1 = JSONObject(response1.readText())
 
-        val pages = json1.getJSONObject("data").getJSONObject("splashpage").getJSONArray("pages")
+        val pages = json1.getJSONObject("data").getJSONObject("splashpage").getJSONArray("pages").asIterable()
 
         val widgets = pages.flatMap { it.cast<JSONObject>().getJSONArray("widgets") }
 

liberator/src/main/kotlin/de/binarynoise/liberator/portals/VodafoneHotspot.kt

@@ -3,6 +3,7 @@ package de.binarynoise.liberator.portals
 import de.binarynoise.liberator.Experimental
 import de.binarynoise.liberator.PortalLiberator
 import de.binarynoise.liberator.SSID
+import de.binarynoise.liberator.asIterable
 import de.binarynoise.liberator.tryOrNull
 import de.binarynoise.util.okhttp.get
 import de.binarynoise.util.okhttp.parseJsonObject
@@ -28,7 +29,7 @@ object VodafoneHotspot : PortalLiberator {
     override fun solve(client: OkHttpClient, response: Response, cookies: Set<Cookie>) {
         val session = client.get(response.requestUrl, "/api/v4/session").parseJsonObject()
         val sessionToken = session.getString("session")
-        val landingPageElements = session.getJSONArray("landingPageElements")
+        val landingPageElements = session.getJSONArray("landingPageElements").asIterable()
         val landingPageLoginProfileId = landingPageElements.filterIsInstance<JSONObject>()
             .first { tryOrNull { it.getString("type") } == "loginProfile" }
             .getString("value")