Web Manifest: scope url should strip both query and fragment components

marcoscaceres · marcoscaceres · commit a79153bc4ac3 · 2024-05-14T21:39:56.000-07:00
https://bugs.webkit.org/show_bug.cgi?id=273989 rdar://127863839 Reviewed by Brady Eidson. Removes the query and fragment components from the scope URL. Part of w3c/manifest#1122 * Source/WebCore/Modules/applicationmanifest/ApplicationManifestParser.cpp: (WebCore::ApplicationManifestParser::parseScope): * Tools/TestWebKitAPI/Tests/WebCore/ApplicationManifestParser.cpp: (TEST_F): Canonical link: https://commits.webkit.org/278795@main
diff --git a/Source/WebCore/Modules/applicationmanifest/ApplicationManifestParser.cpp b/Source/WebCore/Modules/applicationmanifest/ApplicationManifestParser.cpp
@@ -486,6 +486,8 @@ std::optional<URL> ApplicationManifestParser::parseScope(const JSON::Object& man
         return std::nullopt;
     }
 
+    scopeURL.removeQueryAndFragmentIdentifier();
+
     return scopeURL;
 }
 
diff --git a/Tools/TestWebKitAPI/Tests/WebCore/ApplicationManifestParser.cpp b/Tools/TestWebKitAPI/Tests/WebCore/ApplicationManifestParser.cpp
@@ -564,6 +564,18 @@ TEST_F(ApplicationManifestParserTest, Scope)
     m_startURL = URL { "https://example.com/documents/home"_s };
     m_manifestURL = URL { "https://example.com/resources/manifest.json"_s };
 
+    // Removes query
+    testScope("\"https://example.com/documents/home?query\""_s, "https://example.com/documents/home"_s, false);
+    testScope("\"https://example.com/documents/home?query=whatever\""_s, "https://example.com/documents/home"_s, false);
+
+    // Removes fragment
+    testScope("\"https://example.com/documents/home#\""_s, "https://example.com/documents/home"_s, false);
+    testScope("\"https://example.com/documents/home#fragment\""_s, "https://example.com/documents/home"_s, false);
+
+    // Removes query and fragment
+    testScope("\"https://example.com/documents/home?#\""_s, "https://example.com/documents/home"_s, false);
+    testScope("\"https://example.com/documents/home?query#fragment\""_s, "https://example.com/documents/home"_s, false);
+
     // It's fine if the document URL or manifest URL aren't within the application scope - only the start URL needs to be.
     testScope("\"https://example.com/other\""_s, "https://example.com/other/start-url"_s, "https://example.com/other"_s, false);
 }

Original file line number	Diff line number	Diff line change
`@@ -486,6 +486,8 @@ std::optional<URL> ApplicationManifestParser::parseScope(const JSON::Object& man`
`486`	`486`	`return std::nullopt;`
`487`	`487`	`}`
`488`	`488`
	`489`	`+ scopeURL.removeQueryAndFragmentIdentifier();`
	`490`	`+`
`489`	`491`	`return scopeURL;`
`490`	`492`	`}`
`491`	`493`