diff --git a/src/java/MavenGradleMetadataParser.test.ts b/src/java/MavenGradleMetadataParser.test.ts index c80a521830..6cd98a3669 100644 --- a/src/java/MavenGradleMetadataParser.test.ts +++ b/src/java/MavenGradleMetadataParser.test.ts @@ -1020,3 +1020,34 @@ it("refuses a POM past the XML node allowance before building its tree", () => { }, }); }); + +it.each([ + ["gradle-module", gradleModuleFixture, "/artifacts/demo.module"], + ["maven-pom", mavenPomFixture, "/artifacts/pom.xml"], +] as const)( + "reads %s with a UTF-8 signature and retains the input identity", + (format, source, path) => { + const signed = "\ufeff" + source; + const report = parse(signed, path); + const original = parse(source, path); + expect(report).toEqual({ + ...original, + artifact: { + path, + bytes: Buffer.byteLength(signed), + sha256: createHash("sha256").update(signed, "utf8").digest("hex"), + }, + coverage: { + ...original.coverage, + examined_bytes: Buffer.byteLength(signed), + }, + }); + expect(report.format).toBe(format); + }, +); + +it("still rejects duplicate fields after a Gradle UTF-8 signature", () => { + expect(() => + parse('\ufeff{"formatVersion":"1.1","formatVersion":"1.1"}'), + ).toThrow(/declares a field more than once/u); +}); diff --git a/src/java/MavenGradleMetadataParser.ts b/src/java/MavenGradleMetadataParser.ts index 1af50aaea7..500c1f293e 100644 --- a/src/java/MavenGradleMetadataParser.ts +++ b/src/java/MavenGradleMetadataParser.ts @@ -643,8 +643,7 @@ export const parseMavenGradleMetadata = ( ); let source: string; try { - // ignoreBOM: true kept a leading U+FEFF; "preserve" is that same policy. - source = decodeStrictUtf8(bytes, "preserve"); + source = decodeStrictUtf8(bytes, "strip-signature"); } catch { throw malformedInput( MAVEN_GRADLE_METADATA_FORMAT,