Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Partner request] Remove https and trailing slash in an https origin" into udc-dev am: f90961ff23

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23591487

Change-Id: I5922a6c18988cd01c341e19fd0e3f9be39deb7a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-06-06 21:52:13 +00:00
committed by Automerger Merge Worker
parent 9f4181f6cb f90961ff23
commit 18570c5fdb
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt
View File

@@ -66,8 +66,9 @@ class CredentialManagerRepo(
)
val originName: String? = when (requestInfo?.type) {
RequestInfo.TYPE_CREATE -> requestInfo.createCredentialRequest?.origin
RequestInfo.TYPE_GET -> requestInfo.getCredentialRequest?.origin
RequestInfo.TYPE_CREATE -> processHttpsOrigin(
requestInfo.createCredentialRequest?.origin)
RequestInfo.TYPE_GET -> processHttpsOrigin(requestInfo.getCredentialRequest?.origin)
else -> null
}
@@ -247,6 +248,9 @@ class CredentialManagerRepo(
}
companion object {
private const val HTTPS = "https://"
private const val FORWARD_SLASH = "/"
fun sendCancellationCode(
cancelCode: Int,
requestToken: IBinder?,
@@ -266,5 +270,17 @@ class CredentialManagerRepo(
CancelUiRequest::class.java
)
}
/** Removes "https://", and the trailing slash if present for an https request. */
private fun processHttpsOrigin(origin: String?): String? {
var processed = origin
if (processed?.startsWith(HTTPS) == true) { // Removes "https://"
processed = processed.substring(HTTPS.length)
if (processed?.endsWith(FORWARD_SLASH) == true) { // Removes the trailing slash
processed = processed.substring(0, processed.length - 1)
}
}
return processed
}
}
}