Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-15094 Handle both HTTP and HTTPS versions of DTDs in LocalXmlResourceResolver

This commit is contained in:
Yoann Rodière 2022-03-01 11:02:01 +01:00 committed by Sanne Grinovero
parent a3be8c00c5
commit 24df531d73
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java
View File

@ -181,22 +181,22 @@ public class LocalXmlResourceResolver implements javax.xml.stream.XMLResolver {
);
public static final DtdMapping HBM_DTD_MAPPING = new DtdMapping(
"http://www.hibernate.org/dtd/hibernate-mapping",
"www.hibernate.org/dtd/hibernate-mapping",
"org/hibernate/hibernate-mapping-3.0.dtd"
);
public static final DtdMapping LEGACY_HBM_DTD_MAPPING = new DtdMapping(
"http://hibernate.sourceforge.net/hibernate-mapping",
"hibernate.sourceforge.net/hibernate-mapping",
"org/hibernate/hibernate-mapping-3.0.dtd"
);
public static final DtdMapping CFG_DTD_MAPPING = new DtdMapping(
"http://www.hibernate.org/dtd/hibernate-configuration",
"www.hibernate.org/dtd/hibernate-configuration",
"org/hibernate/hibernate-configuration-3.0.dtd"
);
public static final DtdMapping LEGACY_CFG_DTD_MAPPING = new DtdMapping(
"http://hibernate.sourceforge.net/hibernate-configuration",
"hibernate.sourceforge.net/hibernate-configuration",
"org/hibernate/hibernate-configuration-3.0.dtd"
);
@ -220,27 +220,31 @@ public class LocalXmlResourceResolver implements javax.xml.stream.XMLResolver {
}
public static class DtdMapping {
private final String identifierBase;
private final String httpBase;
private final String httpsBase;
private final URL localSchemaUrl;
public DtdMapping(String identifierBase, String resourceName) {
this.identifierBase = identifierBase;
this.httpBase = "http://" + identifierBase;
this.httpsBase = "https://" + identifierBase;
this.localSchemaUrl = LocalSchemaLocator.resolveLocalSchemaUrl( resourceName );
}
public String getIdentifierBase() {
return identifierBase;
return httpBase;
}
public boolean matches(String publicId, String systemId) {
if ( publicId != null ) {
if ( publicId.startsWith( identifierBase ) ) {
if ( publicId.startsWith( httpBase )
|| publicId.matches( httpsBase ) ) {
return true;
}
}
if ( systemId != null ) {
if ( systemId.startsWith( identifierBase ) ) {
if ( systemId.startsWith( httpBase )
|| systemId.matches( httpsBase ) ) {
return true;
}
}

9
hibernate-core/src/test/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolverTest.java
View File

@ -57,9 +57,16 @@ public class LocalXmlResourceResolverTest {
@ParameterizedTest
@CsvSource({
"http://www.hibernate.org/dtd/hibernate-mapping,org/hibernate/hibernate-mapping-3.0.dtd",
"https://www.hibernate.org/dtd/hibernate-mapping,org/hibernate/hibernate-mapping-3.0.dtd",
"http://hibernate.sourceforge.net/hibernate-mapping,org/hibernate/hibernate-mapping-3.0.dtd",
"https://hibernate.sourceforge.net/hibernate-mapping,org/hibernate/hibernate-mapping-3.0.dtd",
"http://www.hibernate.org/dtd/hibernate-configuration,org/hibernate/hibernate-configuration-3.0.dtd",
"http://hibernate.sourceforge.net/hibernate-configuration,org/hibernate/hibernate-configuration-3.0.dtd"
"https://www.hibernate.org/dtd/hibernate-configuration,org/hibernate/hibernate-configuration-3.0.dtd",
"http://hibernate.sourceforge.net/hibernate-configuration,org/hibernate/hibernate-configuration-3.0.dtd",
"https://hibernate.sourceforge.net/hibernate-configuration,org/hibernate/hibernate-configuration-3.0.dtd"
})
void resolve_dtd_localResource(String id, String expectedLocalResource) throws XMLStreamException {
// publicId