sebse/android-fuplanner2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed login errors

Browse Source
This commit is contained in:
Sebastian Seedorf
2021-11-08 00:23:26 +01:00
parent cf7c7afe61
commit 43220bd076
2 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/java/de/sebse/fuplanner2/auth/FUAuthModule.kt
View File

@@ -32,11 +32,18 @@ abstract class FUAuthModule {
val relLocation = response.headers?.get("Location") val relLocation = response.headers?.get("Location")
?: throw invalidResponse(100110, "No IDP form location!") ?: throw invalidResponse(100110, "No IDP form location!")
val formUri = URI(samlUrl).resolve(relLocation).toString() val formUri = URI(samlUrl).resolve(relLocation).toString()
requester.head(formUri, getCookies(user)) val csrfToken = requester.get(formUri, getCookies(user)).body.let {
getRegexGroup("name=\"csrf_token\" value=\"(.*?)\"", 1, it)
} ?: throw invalidPassword(100112, "No CSRF token found!")
response = requester.post( response = requester.post(
formUri, formUri,
cookies = getCookies(user), cookies = getCookies(user),
data = hashMapOf("j_username" to name, "j_password" to password, "_eventId_proceed" to "") data = hashMapOf(
"j_username" to name,
"j_password" to password,
"_eventId_proceed" to "",
"csrf_token" to csrfToken
)
) )
if (response.networkResponse.statusCode != 200) { if (response.networkResponse.statusCode != 200) {
throw invalidPassword(100111, "Password or username invalid!") throw invalidPassword(100111, "Password or username invalid!")
@@ -56,21 +63,25 @@ abstract class FUAuthModule {
} }
private fun parseResponse(body: String): SamlReponse { private fun parseResponse(body: String): SamlReponse {
var matcher = "name=\"SAMLResponse\" value=\"(.*?)\"".toRegex().find(body) val samlResponse = getRegexGroup(
val samlResponse = matcher?.groupValues?.let { "name=\"SAMLResponse\" value=\"(.*?)\"", 1, body
if (it.size >= 2) it[1] else null ) ?: throw invalidResponse(100100, "No SAML response found!")
} ?: throw invalidResponse(100100, "No SAML response found!") val relayState = getRegexGroup(
matcher = "name=\"RelayState\" value=\"(.*?)\"".toRegex().find(body) "name=\"RelayState\" value=\"(.*?)\"", 1, body
val relayState = matcher?.groupValues?.let { ) ?: throw invalidResponse(100101, "No Relay State found!")
if (it.size >= 2) it[1] else null val url = getRegexGroup(
} ?: throw invalidResponse(100100, "No Relay State found!") "form action=\"(.*?)\"", 1, body
matcher = "form action=\"(.*?)\"".toRegex().find(body) ) ?: throw invalidResponse(100102, "No SAML Url found!")
val url = matcher?.groupValues?.let {
if (it.size >= 2) it[1] else null
} ?: throw invalidResponse(100100, "No SAML Url found!")
return SamlReponse(xml.decode(url), xml.decode(relayState), xml.decode(samlResponse)) return SamlReponse(xml.decode(url), xml.decode(relayState), xml.decode(samlResponse))
} }
private fun getRegexGroup(regex: String, group: Int, text: String): String? {
val matcher = Regex(regex).find(text)
return matcher?.groupValues?.let {
if (it.size >= group+1) it[group] else null
}
}
private fun updateCookies(user: User, response: NetData) { private fun updateCookies(user: User, response: NetData) {
val setCookies = response.networkResponse.allHeaders?.let { parseCookies(it) } val setCookies = response.networkResponse.allHeaders?.let { parseCookies(it) }
setCookies?.get("JSESSIONID")?.let { setCookies?.get("JSESSIONID")?.let {

4
app/src/main/java/de/sebse/fuplanner2/whiteboard/Whiteboard.kt
View File

@@ -78,7 +78,7 @@ object Whiteboard: FUAuthModule() {
private fun updateCookies(user: User, response: NetData) { private fun updateCookies(user: User, response: NetData) {
val setCookies = response.networkResponse.allHeaders?.let { parseCookies(it) } val setCookies = response.networkResponse.allHeaders?.let { parseCookies(it) }
setCookies?.get("JSESSIONID")?.let { setCookies?.get("SAKAI2SESSIONID")?.let {
user.cookies.wbJsessionId = it user.cookies.wbJsessionId = it
} }
setCookies setCookies
@@ -91,7 +91,7 @@ object Whiteboard: FUAuthModule() {
} }
internal fun getCookies(user: User, shib: Boolean = false): HashMap<String, String>? { internal fun getCookies(user: User, shib: Boolean = false): HashMap<String, String>? {
val cookies = user.cookies.wbJsessionId?.let { key -> hashMapOf("JSESSIONID" to key) } ?: hashMapOf() val cookies = user.cookies.wbJsessionId?.let { key -> hashMapOf("SAKAI2SESSIONID" to key) } ?: hashMapOf()
if (shib && user.cookies.wbShibValue != null) { if (shib && user.cookies.wbShibValue != null) {
user.cookies.wbShibKey?.let { cookies[it] = user.cookies.wbShibValue ?: "" } user.cookies.wbShibKey?.let { cookies[it] = user.cookies.wbShibValue ?: "" }
} }