Web Manifest: parsing the id member should strip the hash

marcoscaceres · marcoscaceres · commit 4a635aa2c910 · 2024-05-13T17:41:14.000-07:00
rdar://127864531 https://bugs.webkit.org/show_bug.cgi?id=273991 Reviewed by Sihui Liu. Strips the hash from the id member when parsing the Web Manifest. Part of w3c/manifest#1122 * Source/WebCore/Modules/applicationmanifest/ApplicationManifestParser.cpp: (WebCore::ApplicationManifestParser::parseId): * Tools/TestWebKitAPI/Tests/WebCore/ApplicationManifestParser.cpp: (TEST_F): Canonical link: https://commits.webkit.org/278724@main
diff --git a/Source/WebCore/Modules/applicationmanifest/ApplicationManifestParser.cpp b/Source/WebCore/Modules/applicationmanifest/ApplicationManifestParser.cpp
@@ -448,6 +448,8 @@ URL ApplicationManifestParser::parseId(const JSON::Object& manifest, const URL&
     if (!protocolHostAndPortAreEqual(idURL, startURL))
         return startURL;
 
+    idURL.removeFragmentIdentifier();
+
     return idURL;
 }
 
diff --git a/Tools/TestWebKitAPI/Tests/WebCore/ApplicationManifestParser.cpp b/Tools/TestWebKitAPI/Tests/WebCore/ApplicationManifestParser.cpp
@@ -380,9 +380,12 @@ TEST_F(ApplicationManifestParserTest, Id)
     testId("./foo"_s, m_startURL, "https://example.com/foo"_s);
     testId("foo/"_s, m_startURL, "https://example.com/foo/"_s);
     testId("../../foo/bar"_s, m_startURL, "https://example.com/foo/bar"_s);
-    testId("../../foo/bar?query=hi#hi"_s, m_startURL, "https://example.com/foo/bar?query=hi#hi"_s);
+    testId("../../foo/bar?query=hi#fragment"_s, m_startURL, "https://example.com/foo/bar?query=hi"_s);
+    testId("../../foo/bar?query=hi#"_s, m_startURL, "https://example.com/foo/bar?query=hi"_s);
 
     testId("https://example.com/foo"_s, m_startURL, "https://example.com/foo"_s);
+    testId("https://example.com/foo#"_s, m_startURL, "https://example.com/foo"_s);
+    testId("https://example.com/foo#fragment"_s, m_startURL, "https://example.com/foo"_s);
     testId("https://anothersite.com/foo"_s, m_startURL, m_startURL.string());
     testId("https://invalid.com:a"_s, m_startURL, m_startURL.string());
 }

Original file line number	Diff line number	Diff line change
`@@ -448,6 +448,8 @@ URL ApplicationManifestParser::parseId(const JSON::Object& manifest, const URL&`
`448`	`448`	`if (!protocolHostAndPortAreEqual(idURL, startURL))`
`449`	`449`	`return startURL;`
`450`	`450`
	`451`	`+ idURL.removeFragmentIdentifier();`
	`452`	`+`
`451`	`453`	`return idURL;`
`452`	`454`	`}`
`453`	`455`