fix NetworkAuth and separate YourSpot

programminghoch10 · programminghoch10 · commit a5bdef85d4b3 · 2026-01-14T22:51:58.000+01:00
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/Liberator.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/Liberator.kt
@@ -161,7 +161,7 @@ class Liberator(
             
             
             val solver: PortalLiberator? = allPortalLiberators.firstOrNull { solver ->
-                solver.canSolve(locationUrl)
+                solver.canSolve(locationUrl, response)
             }
             
             if (solver == null) {
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/PortalLiberator.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/PortalLiberator.kt
@@ -22,7 +22,7 @@ interface UnIndexedPortalLiberator {
      *                    This is typically the URL where the captive portal login page is hosted.
      * @return true if this liberator knows this captive portal and can solve it, false otherwise.
      */
-    fun canSolve(locationUrl: HttpUrl): Boolean
+    fun canSolve(locationUrl: HttpUrl, response: Response): Boolean
     
     /**
      * Attempts to solve the captive portal by performing the necessary authentication actions.
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/AenaES.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/AenaES.kt
@@ -23,7 +23,7 @@ import org.json.JSONObject
 @Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")
 @SSID("AIRPORT FREE WIFI AENA")
 object AenaES : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return PortalLiberatorConfig.experimental && "freewifi.aena.es" == locationUrl.host
     }
     
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/BinarynoisePortalProxy.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/BinarynoisePortalProxy.kt
@@ -12,7 +12,7 @@ import okhttp3.Response
 
 @Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")
 object BinarynoisePortalProxy : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return PortalLiberatorConfig.experimental && locationUrl.host == "binarynoise.de" && locationUrl.port == 8000
     }
     
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/CloudWifiDE.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/CloudWifiDE.kt
@@ -20,7 +20,7 @@ import okhttp3.Response
 @Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")
 @SSID("-free Milaneo Stuttgart")
 object CloudWifiDE : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return "start.cloudwifi.de" == locationUrl.host
     }
     
@@ -66,8 +66,8 @@ object CloudWifiDE : PortalLiberator {
 
 @SSID("-free Koenigsbau Passagen", "-Free -Thier Galerie Dortmund")
 object SomethingDotCloudWifiDE : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
-        return locationUrl.host.endsWith(".cloudwifi.de") && !CloudWifiDE.canSolve(locationUrl)
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
+        return locationUrl.host.endsWith(".cloudwifi.de") && !CloudWifiDE.canSolve(locationUrl, response)
     }
     
     override fun solve(locationUrl: HttpUrl, client: OkHttpClient, response: Response, cookies: Set<Cookie>) {
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/Commerzbank.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/Commerzbank.kt
@@ -10,7 +10,7 @@ import okhttp3.Response
 
 @Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")
 object Commerzbank : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return "wifiaccess.co" == locationUrl.host && locationUrl.pathSegments.lastOrNull() == "portal"
     }
     
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/Conn4.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/Conn4.kt
@@ -20,7 +20,7 @@ import org.json.JSONObject
 // Kaufland, Rewe
 @Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")
 object Conn4 : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return PortalLiberatorConfig.experimental && locationUrl.host.endsWith(".conn4.com") && locationUrl.firstPathSegment == "ident"
     }
     
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/DBWifi.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/DBWifi.kt
@@ -25,7 +25,7 @@ object DBWifi : PortalLiberator {
         "wifi.bahn.de",
     )
     
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return locationUrl.host in domains
     }
     
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/Dokom21Hotspot.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/Dokom21Hotspot.kt
@@ -18,7 +18,7 @@ import okhttp3.Response
 @Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")
 @SSID("DSW21-WLAN", "Hotspot Westfalenhallen")
 object Dokom21Hotspot : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return "hotspot.dokom21.de" == locationUrl.host && "/([^/]+)/Index".toRegex().matches(locationUrl.encodedPath)
     }
     
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/FritzBox.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/FritzBox.kt
@@ -11,7 +11,7 @@ import okhttp3.Response
 
 @Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")
 object FritzBox : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return "untrusted_guest.lua" == locationUrl.firstPathSegment
     }
     
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/Hotsplots.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/Hotsplots.kt
@@ -17,7 +17,7 @@ import okhttp3.Response
 @SSID("WIFI@DB")
 @Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")
 object Hotsplots : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return "www.hotsplots.de" == locationUrl.host && "/auth/login.php" == locationUrl.encodedPath
     }
     
@@ -50,7 +50,7 @@ object Hotsplots : PortalLiberator {
 }
 
 object HotsplotsAuth : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return "auth.hotsplots.de" == locationUrl.host && "/login" == locationUrl.encodedPath
     }
     
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/IKEA.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/IKEA.kt
@@ -19,7 +19,7 @@ import org.json.JSONObject
 @SSID("IKEA WiFi")
 @Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")
 object IKEA : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return "yo-wifi.net" == locationUrl.host && "authen" == locationUrl.firstPathSegment
     }
     
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/IOB.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/IOB.kt
@@ -12,7 +12,7 @@ import okhttp3.Response
 
 @SSID("RRX Hotspot")
 object IOB : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return "portal.iob.de" == locationUrl.host
     }
     
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/MediaMarktSaturn.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/MediaMarktSaturn.kt
@@ -13,7 +13,7 @@ import okhttp3.Response
 @SSID("media-kunden")
 @Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")
 object MediaMarktSaturn : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return "192.0.2.1" == locationUrl.host && locationUrl.decodedPath == "fs/customwebauth/login.html"
     }
     
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/MistCom.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/MistCom.kt
@@ -11,7 +11,7 @@ import okhttp3.Response
 // Rossmann
 @Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")
 object MistCom : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return "portal.\\w+.mist.com".toRegex().matches(locationUrl.host)
     }
     
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/MyPowerspotDE.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/MyPowerspotDE.kt
@@ -13,7 +13,7 @@ import okhttp3.Response
 
 @Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")
 object MyPowerspotDE : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return "login.mypowerspot.de" == locationUrl.host
     }
     
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/NetworkAuth.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/NetworkAuth.kt
@@ -1,46 +1,30 @@
 package de.binarynoise.liberator.portals
 
 import de.binarynoise.liberator.PortalLiberator
+import de.binarynoise.liberator.SSID
 import de.binarynoise.util.okhttp.checkSuccess
 import de.binarynoise.util.okhttp.followRedirects
 import de.binarynoise.util.okhttp.get
-import de.binarynoise.util.okhttp.getInput
-import de.binarynoise.util.okhttp.getLocation
-import de.binarynoise.util.okhttp.parseHtml
-import de.binarynoise.util.okhttp.postForm
-import de.binarynoise.util.okhttp.requestUrl
 import okhttp3.Cookie
 import okhttp3.HttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.Response
 
 @Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")
+@SSID(
+    "BACK-FACTORY Besucher",
+    "MEET ME @ STARBUCKS",
+    "CLIENTES.LME",
+    "Free Wifi Ris8tto",
+    "dm Kunden WLAN",
+    "JD-Gast-WiFi",
+)
 object NetworkAuth : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
-        return locationUrl.host.endsWith("network-auth.com")
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
+        return locationUrl.host.endsWith("network-auth.com") && !response.isRedirect
     }
     
     override fun solve(locationUrl: HttpUrl, client: OkHttpClient, response: Response, cookies: Set<Cookie>) {
-        val response1 = client.get(locationUrl, null)
-        val location1 = response1.getLocation() ?: error("no location1")
-        
-        val response2 = client.get(locationUrl, location1)
-        val html2 = response2.parseHtml()
-        val `csrf-token` = html2.getElementsByAttributeValue("name", "csrf-token").single().attr("content")
-        val `csrf-param` = html2.getElementsByAttributeValue("name", "csrf-param").single().attr("content")
-        
-        val form_action = html2.id("splash-form").attr("action")
-        val base_grant_url = html2.getInput("base_grant_url")
-        val success_url = html2.getInput("success_url")
-        
-        val response3 = client.postForm(
-            response2.requestUrl, form_action,
-            mapOf(
-                `csrf-param` to `csrf-token`,
-                "success_url" to success_url,
-                "base_grant_url" to base_grant_url,
-            ),
-        )
-        response3.followRedirects(client).checkSuccess()
+        client.get(locationUrl, "grant").followRedirects(client).checkSuccess()
     }
 }
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/Nordsee.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/Nordsee.kt
@@ -13,7 +13,7 @@ import okhttp3.Response
 
 @Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")
 object Nordsee : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return "guests.nordsee.com" == locationUrl.host
     }
     
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/RheinRuhr.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/RheinRuhr.kt
@@ -15,7 +15,7 @@ import okhttp3.Response
 @Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")
 @SSID("Hotspot S-Bahn Rhein-Ruhr")
 object RheinRuhr : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return "10.10.10.1" == locationUrl.host && 2050 == locationUrl.port && "splash.html" == locationUrl.firstPathSegment
     }
     
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/SocialwiBox.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/SocialwiBox.kt
@@ -15,7 +15,7 @@ import org.json.JSONObject
 
 @Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")
 object SocialwiBox : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return "hotspot.socialwibox.com" == locationUrl.host
     }
     
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/TMobileHotspot.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/TMobileHotspot.kt
@@ -13,7 +13,7 @@ import org.json.JSONObject
 
 @SSID("Telekom_free", "Airport-Frankfurt", "AIRPORT-FREE-WIFI")
 object TMobileHotspot : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return "hotspot.t-mobile.net" == locationUrl.host && locationUrl.decodedPath == "/wlan/redirect.do"
     }
     
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/UniStuttgartOpen.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/UniStuttgartOpen.kt
@@ -15,7 +15,7 @@ import okhttp3.Response
 @Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")
 @SSID("uni-stuttgart-open")
 object UniStuttgartOpen : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return locationUrl.host == "guest-internet.tik.uni-stuttgart.de"
     }
     
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/Unwired.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/Unwired.kt
@@ -33,7 +33,7 @@ object Unwired : PortalLiberator {
         "wasabi.hotspot-local.unwired.at",
     )
     
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return PortalLiberatorConfig.experimental && locationUrl.host in supportedDomains
     }
     
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/YourSpot.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/YourSpot.kt
@@ -0,0 +1,43 @@
+package de.binarynoise.liberator.portals
+
+import de.binarynoise.liberator.PortalLiberator
+import de.binarynoise.liberator.SSID
+import de.binarynoise.util.okhttp.checkSuccess
+import de.binarynoise.util.okhttp.followRedirects
+import de.binarynoise.util.okhttp.getInput
+import de.binarynoise.util.okhttp.parseHtml
+import de.binarynoise.util.okhttp.postForm
+import de.binarynoise.util.okhttp.requestUrl
+import okhttp3.Cookie
+import okhttp3.HttpUrl
+import okhttp3.OkHttpClient
+import okhttp3.Response
+
+@Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")
+@SSID("EDEKA free-wifi")
+object YourSpot : PortalLiberator {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
+        return "cp1.your-spot.de" == locationUrl.host
+    }
+    
+    override fun solve(locationUrl: HttpUrl, client: OkHttpClient, response: Response, cookies: Set<Cookie>) {
+        
+        val html1 = response.parseHtml()
+        val `csrf-token` = html1.getElementsByAttributeValue("name", "csrf-token").single().attr("content")
+        val `csrf-param` = html1.getElementsByAttributeValue("name", "csrf-param").single().attr("content")
+        
+        val form_action = html1.id("splash-form").attr("action")
+        val base_grant_url = html1.getInput("base_grant_url")
+        val success_url = html1.getInput("success_url")
+        
+        val response2 = client.postForm(
+            response.requestUrl, form_action,
+            mapOf(
+                `csrf-param` to `csrf-token`,
+                "success_url" to success_url,
+                "base_grant_url" to base_grant_url,
+            ),
+        )
+        response2.followRedirects(client).checkSuccess()
+    }
+}
diff --git a/liberator/src/main/kotlin/de/binarynoise/liberator/portals/_Template.kt b/liberator/src/main/kotlin/de/binarynoise/liberator/portals/_Template.kt
@@ -8,7 +8,7 @@ import okhttp3.Response
 
 @Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")
 object _Template : PortalLiberator {
-    override fun canSolve(locationUrl: HttpUrl): Boolean {
+    override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {
         return "" == locationUrl.host
     }
     

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ class Liberator(`
`161`	`161`
`162`	`162`
`163`	`163`	`val solver: PortalLiberator? = allPortalLiberators.firstOrNull { solver ->`
`164`		`- solver.canSolve(locationUrl)`
	`164`	`+ solver.canSolve(locationUrl, response)`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`if (solver == null) {`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import org.json.JSONObject`
`23`	`23`	`@Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")`
`24`	`24`	`@SSID("AIRPORT FREE WIFI AENA")`
`25`	`25`	`object AenaES : PortalLiberator {`
`26`		`- override fun canSolve(locationUrl: HttpUrl): Boolean {`
	`26`	`+ override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {`
`27`	`27`	`return PortalLiberatorConfig.experimental && "freewifi.aena.es" == locationUrl.host`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import okhttp3.Response`
`12`	`12`
`13`	`13`	`@Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")`
`14`	`14`	`object BinarynoisePortalProxy : PortalLiberator {`
`15`		`- override fun canSolve(locationUrl: HttpUrl): Boolean {`
	`15`	`+ override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {`
`16`	`16`	`return PortalLiberatorConfig.experimental && locationUrl.host == "binarynoise.de" && locationUrl.port == 8000`
`17`	`17`	`}`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import okhttp3.Response`
`10`	`10`
`11`	`11`	`@Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")`
`12`	`12`	`object Commerzbank : PortalLiberator {`
`13`		`- override fun canSolve(locationUrl: HttpUrl): Boolean {`
	`13`	`+ override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {`
`14`	`14`	`return "wifiaccess.co" == locationUrl.host && locationUrl.pathSegments.lastOrNull() == "portal"`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import org.json.JSONObject`
`20`	`20`	`// Kaufland, Rewe`
`21`	`21`	`@Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")`
`22`	`22`	`object Conn4 : PortalLiberator {`
`23`		`- override fun canSolve(locationUrl: HttpUrl): Boolean {`
	`23`	`+ override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {`
`24`	`24`	`return PortalLiberatorConfig.experimental && locationUrl.host.endsWith(".conn4.com") && locationUrl.firstPathSegment == "ident"`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ object DBWifi : PortalLiberator {`
`25`	`25`	`"wifi.bahn.de",`
`26`	`26`	`)`
`27`	`27`
`28`		`- override fun canSolve(locationUrl: HttpUrl): Boolean {`
	`28`	`+ override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {`
`29`	`29`	`return locationUrl.host in domains`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ import okhttp3.Response`
`18`	`18`	`@Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")`
`19`	`19`	`@SSID("DSW21-WLAN", "Hotspot Westfalenhallen")`
`20`	`20`	`object Dokom21Hotspot : PortalLiberator {`
`21`		`- override fun canSolve(locationUrl: HttpUrl): Boolean {`
	`21`	`+ override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {`
`22`	`22`	`return "hotspot.dokom21.de" == locationUrl.host && "/([^/]+)/Index".toRegex().matches(locationUrl.encodedPath)`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import okhttp3.Response`
`11`	`11`
`12`	`12`	`@Suppress("SpellCheckingInspection", "GrazieInspection", "LocalVariableName", "RedundantSuppression")`
`13`	`13`	`object FritzBox : PortalLiberator {`
`14`		`- override fun canSolve(locationUrl: HttpUrl): Boolean {`
	`14`	`+ override fun canSolve(locationUrl: HttpUrl, response: Response): Boolean {`
`15`	`15`	`return "untrusted_guest.lua" == locationUrl.firstPathSegment`
`16`	`16`	`}`
`17`	`17`