Skip to content

Resolving relative URLs in XHTML literals against the document's base URI #276

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

Merged
namedgraph merged 1 commit into from
Mar 28, 2026
Merged

Resolving relative URLs in XHTML literals against the document's base URI #276

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
2 changes: 0 additions & 2 deletions src/main/java/com/atomgraph/linkeddatahub/writer/XSLTWriterBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,6 @@ public <T extends XdmValue> Map<QName, XdmValue> getParameters(MultivaluedMap<St
try
{
params.put(new QName("ldh", LDH.requestUri.getNameSpace(), LDH.requestUri.getLocalName()), new XdmAtomicValue(getRequestURI()));
if (getURI() != null) params.put(new QName("ac", AC.uri.getNameSpace(), AC.uri.getLocalName()), new XdmAtomicValue(getURI()));
else params.put(new QName("ac", AC.uri.getNameSpace(), AC.uri.getLocalName()), new XdmAtomicValue(getRequestURI()));

Optional<com.atomgraph.linkeddatahub.apps.model.Application> appOpt = getApplication().get();
if (!appOpt.isPresent())
Expand Down
33 changes: 7 additions & 26 deletions src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,33 +1214,14 @@ exclude-result-prefixes="#all"
</xsl:copy>
</xsl:template>

<!-- rewrite @ids so they don't class with the parent document's when transcluded -->
<xsl:template match="@id" mode="ldh:XHTMLContent" priority="1">
<xsl:param name="transclude" select="false()" as="xs:boolean" tunnel="yes"/>

<xsl:choose>
<xsl:when test="$transclude">
<xsl:attribute name="{name()}" select="generate-id()"/>
</xsl:when>
<xsl:otherwise>
<xsl:copy/>
</xsl:otherwise>
</xsl:choose>
<!-- resolve relative @href URIs against base in proxy mode -->
<xsl:template match="@href[not(ac:absolute-path(ldh:base-uri(.)) = ac:absolute-path(ldh:request-uri()))][not(starts-with(., '/')) and not(starts-with(., '#')) and not(contains(., ':'))]" mode="ldh:XHTMLContent" priority="1">
<xsl:attribute name="{name()}" select="resolve-uri(., ldh:base-uri(.))"/>
</xsl:template>

<!-- resolve relative @href URIs against base when transcluding -->
<xsl:template match="@href[starts-with(., '.')]" mode="ldh:XHTMLContent" priority="1">
<xsl:param name="transclude" select="false()" as="xs:boolean" tunnel="yes"/>
<xsl:param name="base" as="xs:anyURI?" tunnel="yes"/>

<xsl:choose>
<xsl:when test="$transclude">
<xsl:attribute name="{name()}" select="resolve-uri(., $base)"/>
</xsl:when>
<xsl:otherwise>
<xsl:copy/>
</xsl:otherwise>
</xsl:choose>
<!-- resolve relative @src URIs against base in proxy mode -->
<xsl:template match="@src[not(ac:absolute-path(ldh:base-uri(.)) = ac:absolute-path(ldh:request-uri()))][not(starts-with(., '/')) and not(starts-with(., '#')) and not(contains(., ':'))]" mode="ldh:XHTMLContent" priority="1">
<xsl:attribute name="{name()}" select="resolve-uri(., ldh:base-uri(.))"/>
</xsl:template>

</xsl:stylesheet>
3 changes: 1 addition & 2 deletions src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ exclude-result-prefixes="#all">
<xsl:param name="lapp:Context" as="document-node()?"/>
<xsl:param name="foaf:Agent" select="if ($acl:agent) then document(ac:document-uri($acl:agent)) else ()" as="document-node()?"/>
<xsl:param name="force-exclude-all-namespaces" select="true()"/>
<xsl:param name="ac:uri" as="xs:anyURI"/>
<xsl:param name="ac:httpHeaders" as="xs:string"/>
<xsl:param name="ac:method" as="xs:string"/>
<xsl:param name="acl:mode" as="xs:anyURI*"/>
Expand Down Expand Up @@ -588,7 +587,7 @@ exclude-result-prefixes="#all">
</select>

<input type="text" id="uri" name="uri" class="input-xxlarge typeahead">
<xsl:if test="not(starts-with(ac:absolute-path(ldh:base-uri(.)), $ldt:base))">
<xsl:if test="not(ac:absolute-path(ldh:base-uri(.)) = ac:absolute-path(ldh:request-uri()))">
<xsl:attribute name="value" select="ldh:base-uri(.)"/>
</xsl:if>
</input>
Expand Down
8 changes: 1 addition & 7 deletions src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,14 +525,11 @@ extension-element-prefixes="ixsl"

<!-- XHTML content overrides -->
<xsl:template match="*[@rdf:about][rdf:type/@rdf:resource = '&ldh;XHTML'][rdf:value[@rdf:parseType = 'Literal']/xhtml:div]" mode="bs2:Row" priority="1">
<!-- TO-DO: use ldh:request-uri() to resolve URIs server-side -->
<xsl:param name="id" select="if (contains(@rdf:about, ac:absolute-path(ldh:base-uri(.)) || '#')) then substring-after(@rdf:about, ac:absolute-path(ldh:base-uri(.)) || '#') else generate-id()" as="xs:string?"/>
<xsl:param name="class" select="'row-fluid block'" as="xs:string?"/>
<xsl:param name="about" select="@rdf:about" as="xs:anyURI?"/>
<xsl:param name="typeof" select="rdf:type/@rdf:resource/xs:anyURI(.)" as="xs:anyURI*"/>
<xsl:param name="main-class" select="'main span7'" as="xs:string?"/>
<xsl:param name="transclude" select="false()" as="xs:boolean"/>
<xsl:param name="base" as="xs:anyURI?"/>
<xsl:param name="draggable" select="false()" as="xs:boolean?"/>

<xsl:apply-templates select="." mode="bs2:RowContentHeader"/>
Expand Down Expand Up @@ -585,10 +582,7 @@ extension-element-prefixes="ixsl"
<xsl:attribute name="class" select="$main-class"/>
</xsl:if>

<xsl:apply-templates select="rdf:value[@rdf:parseType = 'Literal']/xhtml:div" mode="ldh:XHTMLContent">
<xsl:with-param name="transclude" select="$transclude" tunnel="yes"/>
<xsl:with-param name="base" select="$base" tunnel="yes"/>
</xsl:apply-templates>
<xsl:apply-templates select="rdf:value[@rdf:parseType = 'Literal']/xhtml:div" mode="ldh:XHTMLContent"/>
</div>

<xsl:apply-templates select="." mode="bs2:Right"/>
Expand Down
Loading