Fix URL handling bug when path is a substring of host (#8880)

Author: paulb777

FirebaseDatabase/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v8.10.0
+- [fixed] Fixed URL handling bug when path is a substring of host. (#8874)
+
 # v8.7.0
 - [fixed] Fixed Firebase App Check token periodic refresh. (#8544)
 

FirebaseDatabase/Sources/Utilities/FUtilities.m

@@ -154,9 +154,13 @@ + (FParsedUrl *)parseUrl:(NSString *)url {
 
     // Sanitize the database URL by removing the path component, which may
     // contain invalid URL characters.
+    NSRange lastMatch = [url rangeOfString:originalPathString
+                                   options:NSBackwardsSearch];
     NSString *sanitizedUrlWithoutPath =
-        [url stringByReplacingOccurrencesOfString:originalPathString
-                                       withString:@""];
+        (lastMatch.location != NSNotFound)
+            ? [url substringToIndex:lastMatch.location]
+            : url;
+
     NSURLComponents *urlComponents =
         [NSURLComponents componentsWithString:sanitizedUrlWithoutPath];
     if (!urlComponents) {

FirebaseDatabase/Tests/Unit/FUtilitiesTest.m

@@ -84,6 +84,30 @@ - (void)testUrlParsedWithSslDetection {
   XCTAssertTrue(parsedUrl.repoInfo.secure);
 }
 
+- (void)testUrlParsedWithPathPartOfHost {
+  FParsedUrl *parsedUrl = [FUtilities parseUrl:@"https://sample.firebaseio.com/a"];
+  XCTAssertEqualObjects(parsedUrl.repoInfo.host, @"sample.firebaseio.com");
+  XCTAssertEqualObjects(parsedUrl.repoInfo.namespace, @"sample");
+  XCTAssertTrue(parsedUrl.repoInfo.secure);
+  XCTAssertEqualObjects(parsedUrl.path, [FPath pathWithString:@"a"]);
+}
+
+- (void)testUrlParsedWithPathPartOfHost2 {
+  FParsedUrl *parsedUrl = [FUtilities parseUrl:@"https://sample.firebaseio.com/"];
+  XCTAssertEqualObjects(parsedUrl.repoInfo.host, @"sample.firebaseio.com");
+  XCTAssertEqualObjects(parsedUrl.repoInfo.namespace, @"sample");
+  XCTAssertTrue(parsedUrl.repoInfo.secure);
+  XCTAssertEqualObjects(parsedUrl.path, [FPath pathWithString:@""]);
+}
+
+- (void)testUrlParsedWithPathPartOfHost3 {
+  FParsedUrl *parsedUrl = [FUtilities parseUrl:@"https://sample.firebaseio.com"];
+  XCTAssertEqualObjects(parsedUrl.repoInfo.host, @"sample.firebaseio.com");
+  XCTAssertEqualObjects(parsedUrl.repoInfo.namespace, @"sample");
+  XCTAssertTrue(parsedUrl.repoInfo.secure);
+  XCTAssertEqualObjects(parsedUrl.path, [FPath pathWithString:@""]);
+}
+
 - (void)testDefaultCacheSizeIs10MB {
   XCTAssertEqual([FTestHelpers defaultConfig].persistenceCacheSizeBytes,
                  (NSUInteger)10 * 1024 * 1024);