Skip to content

Fix relative xsl:import path resolution when stylesheet load #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Laurettta wants to merge 1 commit into
base: develop-7.x.x
Choose a base branch
from
Open

Fix relative xsl:import path resolution when stylesheet load #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion exist-core/src/main/java/org/exist/xquery/functions/fn/transform/URIResolution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,13 @@ static AnyURIValue resolveURI(final AnyURIValue relative, final AnyURIValue base
if (relativeURI.isAbsolute()) {
return relative;
}
var baseURI = new URI(base.getStringValue() );
var baseURI = new URI(base.getStringValue());
if (!baseURI.isAbsolute()) {
var basePath = base.getStringValue();
if (basePath.startsWith("/")) {
var baseDir = basePath.substring(0, basePath.lastIndexOf('/') + 1);
return new AnyURIValue(XmldbURI.EMBEDDED_SERVER_URI_PREFIX + baseDir + relative.getStringValue());
}
return relative;
}
try {
Expand Down
57 changes: 57 additions & 0 deletions exist-core/src/test/java/org/exist/xquery/TransformTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,38 @@ public void transform() throws XMLDBException {
"<p>End Template 1</p>" +
"</doc>", result);
}

/**
* Tests that a stylesheet can import another stylesheet stored in the
* same database collection using a relative path (filename only, no directory).
* Stylesheet passed as a URI string.
*/
@Test
public void transformWithSameDirectoryImport() throws XMLDBException {
String query =
"import module namespace transform='http://exist-db.org/xquery/transform';\n" +
"let $xml := <empty/>\n" +
"let $xsl := 'xmldb:exist:///db/"+TEST_COLLECTION_NAME+"/same-dir/a.xsl'\n" +
"return transform:transform($xml, $xsl, ())";
String result = execQuery(query);
assertEquals("<doc><p>From A</p><p>From B</p></doc>", result);
}

/**
* Tests that a stylesheet can import another stylesheet stored in the
* same database collection using a relative path (filename only, no directory).
* Stylesheet passed as a node via doc().
*/
@Test
public void transformWithSameDirectoryImportViaNode() throws XMLDBException {
String query =
"import module namespace transform='http://exist-db.org/xquery/transform';\n" +
"let $xml := <empty/>\n" +
"let $xsl := doc('xmldb:exist:///db/"+TEST_COLLECTION_NAME+"/same-dir/a.xsl')\n" +
"return transform:transform($xml, $xsl, ())";
String result = execQuery(query);
assertEquals("<doc><p>From A</p><p>From B</p></doc>", result);
}


private String execQuery(String query) throws XMLDBException {
Expand Down Expand Up @@ -171,6 +203,31 @@ public void setUp() throws ClassNotFoundException, IllegalAccessException, Insta
addXMLDocument(xsl1, doc1, "1.xsl");
addXMLDocument(xsl2, doc2, "2.xsl");
addXMLDocument(xsl3, doc3, "3.xsl");

service =
testCollection.getService(
CollectionManagementService.class);

Collection sameDir = service.createCollection("same-dir");
assertNotNull(sameDir);

String docA = "<?xml version='1.0' encoding='UTF-8'?>\n" +
"<xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>\n"+
"<xsl:import href='b.xsl'/>\n" +
"<xsl:template match='/'>" +
"<doc><p>From A</p><xsl:call-template name='from-b'/></doc>" +
"</xsl:template>" +
"</xsl:stylesheet>";

String docB = "<?xml version='1.0' encoding='UTF-8'?>\n" +
"<xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>\n"+
"<xsl:template name='from-b'>" +
"<p>From B</p>" +
"</xsl:template>" +
"</xsl:stylesheet>";

addXMLDocument(sameDir, docA, "a.xsl");
addXMLDocument(sameDir, docB, "b.xsl");
}

@After
Expand Down
54 changes: 54 additions & 0 deletions exist-core/src/test/java/org/exist/xquery/functions/fn/transform/FunTransformITTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,35 @@
*/
public class FunTransformITTest {

private static final XmldbURI TEST_IMPORT_XSLT_COLLECTION = XmldbURI.create("/db/fn-transform-import-test");
private static final XmldbURI IMPORT_A_XSLT_NAME = XmldbURI.create("a.xsl");
private static final XmldbURI IMPORT_B_XSLT_NAME = XmldbURI.create("b.xsl");

private static final String IMPORT_A_XSLT =
"<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\">\n" +
" <xsl:import href=\"b.xsl\"/>\n" +
" <xsl:template match=\"/\">\n" +
" <doc><p>From A</p><xsl:call-template name=\"from-b\"/></doc>\n" +
" </xsl:template>\n" +
"</xsl:stylesheet>";

private static final String IMPORT_B_XSLT =
"<xsl:stylesheet xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" version=\"1.0\">\n" +
" <xsl:template name=\"from-b\"><p>From B</p></xsl:template>\n" +
"</xsl:stylesheet>";

private static final String SAME_DIR_IMPORT_QUERY =
"fn:transform(map {\n" +
" \"stylesheet-location\": \"xmldb:exist:///db/fn-transform-import-test/a.xsl\",\n" +
" \"source-node\": document { <empty/> }\n" +
"})?output";

private static final String SAME_DIR_IMPORT_VIA_NODE_QUERY =
"fn:transform(map {\n" +
" \"stylesheet-node\": doc(\"xmldb:exist:///db/fn-transform-import-test/a.xsl\"),\n" +
" \"source-node\": document { <empty/> }\n" +
"})?output";

private static final XmldbURI TEST_IDENTITY_XSLT_COLLECTION = XmldbURI.create("/db/transform-identity-test");
private static final XmldbURI IDENTITY_XSLT_NAME = XmldbURI.create("xsl-identity.xslt");

Expand Down Expand Up @@ -143,6 +172,26 @@ public class FunTransformITTest {
@ClassRule
public static ExistEmbeddedServer existEmbeddedServer = new ExistEmbeddedServer(true, true);

/**
* Tests that fn:transform can resolve a relative xsl:import (same directory)
* when the stylesheet is given as a URI location.
*/
@Test
public void sameDirectoryImportViaLocation() throws XPathException, PermissionDeniedException, EXistException {
final Source expected = Input.fromString("<doc><p>From A</p><p>From B</p></doc>").build();
expectQuery(SAME_DIR_IMPORT_QUERY, expected);
}

/**
* Tests that fn:transform can resolve a relative xsl:import (same directory)
* when the stylesheet is given as a node loaded from the database.
*/
@Test
public void sameDirectoryImportViaNode() throws XPathException, PermissionDeniedException, EXistException {
final Source expected = Input.fromString("<doc><p>From A</p><p>From B</p></doc>").build();
expectQuery(SAME_DIR_IMPORT_VIA_NODE_QUERY, expected);
}

@Test
public void identityPersistentDom() throws XPathException, PermissionDeniedException, EXistException {
final Source expected = Input.fromString(IDENTITY_XML).build();
Expand Down Expand Up @@ -212,6 +261,11 @@ public static void storeResources() throws EXistException, PermissionDeniedExcep
Tuple(IDENTITY_XML_NAME, IDENTITY_XML)
);

createCollection(broker, transaction, TEST_IMPORT_XSLT_COLLECTION,
Tuple(IMPORT_A_XSLT_NAME, IMPORT_A_XSLT),
Tuple(IMPORT_B_XSLT_NAME, IMPORT_B_XSLT)
);

transaction.commit();
}
}
Expand Down
Loading