commit 4e0ace736614e3d2b56e1f3df7cd1f5bf222fc3f
author Helen Qin <helenqin@google.com> Tue Jun 06 20:08:01 2023 +0000
committer Helen Qin <helenqin@google.com> Tue Jun 06 20:08:01 2023 +0000
tree 9f531285a1c968de5f00df66315754224d5e0b4f
parent 94e4aeef4659315562fad7bc7d4879575211d398

[Partner request] Remove https and trailing slash in an https origin

For example, "https://something/" should be just "something".

Bug: 286103811
Fix: 286103811
Test: local verification (see bug for screenshots)
Change-Id: Ib6b3b9e99163235f7ae73bc7ebd66571f254ea86

packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt

diff --git a/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt b/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt
index 2dafbcb..a78509d 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt
@@ -66,8 +66,9 @@
         )
 
         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 @@
     }
 
     companion object {
+        private const val HTTPS = "https://"
+        private const val FORWARD_SLASH = "/"
+
         fun sendCancellationCode(
             cancelCode: Int,
             requestToken: IBinder?,
@@ -266,5 +270,17 @@
                 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
+        }
     }
 }