From b6f36412d885db62817f9aff72da5a0de13f2e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= <martynas@atomgraph.com>
Date: Fri, 15 May 2026 01:17:22 +0200
Subject: [PATCH 1/2] Derive server-side acl:mode() from Link response headers
 via $ldh:httpHeaders

Java pushes outgoing response headers to XSLT as a $ldh:httpHeaders
XdmMap (map(xs:string, xs:string*)) and the server-side acl:mode()
parses Link entries with rel=acl#mode out of it, replacing the
pre-aggregated $acl:mode param push. Drops the now-dead $acl:mode XSLT
param default (and its ldh:listSuperClasses supertype-closure helper),
the empty layout.xsl declaration, and converts the lone direct
$acl:mode reference in admin/layout.xsl to acl:mode().

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../linkeddatahub/vocabulary/LDH.java         |  3 ++
 .../linkeddatahub/writer/XSLTWriterBase.java  | 13 +++++++--
 .../xsl/bootstrap/2.3.2/admin/layout.xsl      |  2 +-
 .../xsl/bootstrap/2.3.2/document.xsl          |  3 +-
 .../xsl/bootstrap/2.3.2/imports/default.xsl   | 29 ++-----------------
 .../xsl/bootstrap/2.3.2/layout.xsl            |  4 +--
 6 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/atomgraph/linkeddatahub/vocabulary/LDH.java b/src/main/java/com/atomgraph/linkeddatahub/vocabulary/LDH.java
index e8dcaebfe..629fe4d4a 100644
--- a/src/main/java/com/atomgraph/linkeddatahub/vocabulary/LDH.java
+++ b/src/main/java/com/atomgraph/linkeddatahub/vocabulary/LDH.java
@@ -94,6 +94,9 @@ public static String getURI()
     
     /** Request URI property */
     public static final ObjectProperty requestUri = m_model.createObjectProperty(NS + "requestUri");
+
+    /** HTTP headers property */
+    public static final ObjectProperty httpHeaders = m_model.createObjectProperty(NS + "httpHeaders");
     
     /** Service property */
     public static final ObjectProperty service = m_model.createObjectProperty( NS + "service" );
diff --git a/src/main/java/com/atomgraph/linkeddatahub/writer/XSLTWriterBase.java b/src/main/java/com/atomgraph/linkeddatahub/writer/XSLTWriterBase.java
index f8a744e4d..af34a2035 100644
--- a/src/main/java/com/atomgraph/linkeddatahub/writer/XSLTWriterBase.java
+++ b/src/main/java/com/atomgraph/linkeddatahub/writer/XSLTWriterBase.java
@@ -54,6 +54,7 @@
 import net.sf.saxon.s9api.QName;
 import net.sf.saxon.s9api.SaxonApiException;
 import net.sf.saxon.s9api.XdmAtomicValue;
+import net.sf.saxon.s9api.XdmMap;
 import net.sf.saxon.s9api.XdmValue;
 import net.sf.saxon.s9api.XsltExecutable;
 import org.apache.http.HttpHeaders;
@@ -144,9 +145,15 @@ public <T extends XdmValue> Map<QName, XdmValue> getParameters(MultivaluedMap<St
                 params.put(new QName("foaf", FOAF.Agent.getNameSpace(), FOAF.Agent.getLocalName()),
                     getXsltExecutable().getProcessor().newDocumentBuilder().build(source));
             }
-            if (getAuthorizationContext().get().isPresent())
-                params.put(new QName("acl", ACL.mode.getNameSpace(), ACL.mode.getLocalName()),
-                    XdmValue.makeSequence(getAuthorizationContext().get().get().getModeURIs()));
+            XdmMap responseHeaders = new XdmMap();
+            for (Map.Entry<String, List<Object>> entry : headerMap.entrySet())
+            {
+                List<XdmAtomicValue> values = entry.getValue().stream().
+                    map(v -> new XdmAtomicValue(v.toString())).
+                    collect(Collectors.toList());
+                responseHeaders = responseHeaders.put(new XdmAtomicValue(entry.getKey()), XdmValue.makeSequence(values));
+            }
+            params.put(new QName("ldh", LDH.httpHeaders.getNameSpace(), LDH.httpHeaders.getLocalName()), responseHeaders);
 
             if (getHttpHeaders().getRequestHeader(HttpHeaders.REFERER) != null)
             {
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/layout.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/layout.xsl
index 10a74c813..c69e8ea64 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/layout.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/admin/layout.xsl
@@ -71,7 +71,7 @@ exclude-result-prefixes="#all">
     
     <!-- ADD DATA -->
     
-    <xsl:template match="rdf:RDF[$acl:mode = '&acl;Append']" mode="bs2:AddData" priority="1">
+    <xsl:template match="rdf:RDF[acl:mode() = '&acl;Append']" mode="bs2:AddData" priority="1">
         <div class="btn-group pull-left">
             <button type="button" class="btn btn-primary dropdown-toggle" title="{ac:label(key('resources', 'add', document('../translations.rdf')))}">
                 <xsl:value-of>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl
index 88fd77f20..59225f296 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl
@@ -68,8 +68,7 @@ extension-element-prefixes="ixsl"
 
     <xsl:param name="main-doc" select="/" as="document-node()"/>
     <xsl:param name="acl:Agent" as="document-node()?"/>
-    <xsl:param name="acl:mode" select="$foaf:Agent//*[acl:accessToClass/@rdf:resource = (key('resources', ac:absolute-path(ldh:base-uri(.)), $main-doc)/rdf:type/@rdf:resource, key('resources', ac:absolute-path(ldh:base-uri(.)), $main-doc)/rdf:type/@rdf:resource/ldh:listSuperClasses(.))]/acl:mode/@rdf:resource" as="xs:anyURI*"/>
-    
+
     <!-- schema.org BREADCRUMBS -->
     
     <xsl:template match="rdf:RDF" mode="schema:BreadCrumbList">
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl
index f99b04ec8..bd14cc3a7 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl
@@ -116,7 +116,8 @@ exclude-result-prefixes="#all"
     </xsl:template>
     
     <xsl:function name="acl:mode" as="xs:anyURI*" use-when="system-property('xsl:product-name') = 'SAXON'">
-        <xsl:sequence select="$acl:mode"/>
+        <xsl:variable name="entries" select="for $line in $ldh:httpHeaders('Link') return tokenize($line, ',\s*(?=&lt;)')" as="xs:string*"/>
+        <xsl:sequence select="for $entry in $entries return if (matches($entry, '^&lt;[^&gt;]+&gt;\s*;.*\brel\s*=\s*&quot;?[^&quot;\s,;]*acl#mode&quot;?')) then xs:anyURI(replace($entry, '^&lt;([^&gt;]+)&gt;.*$', '$1')) else ()"/>
     </xsl:function>
 
     <xsl:function name="ac:uri" as="xs:anyURI?">
@@ -290,33 +291,7 @@ exclude-result-prefixes="#all"
             <xsl:apply-templates select="@* | node()" mode="#current"/>
         </xsl:copy>
     </xsl:template>
-    
-    <xsl:function name="ldh:listSuperClasses" as="attribute()*" cache="yes">
-        <xsl:param name="class" as="xs:anyURI"/>
-        
-        <xsl:sequence select="ldh:listSuperClasses($class, false())"/>
-    </xsl:function>
-    
-    <xsl:function name="ldh:listSuperClasses" as="attribute()*" cache="yes">
-        <xsl:param name="class" as="xs:anyURI"/>
-        <xsl:param name="direct" as="xs:boolean"/>
-        
-        <xsl:if test="doc-available(ac:document-uri($class))">
-            <xsl:variable name="document" select="document(ac:document-uri($class))" as="document-node()"/>
-
-            <xsl:for-each select="$document">
-                <xsl:variable name="superclasses" select="key('resources', $class)/rdfs:subClassOf/@rdf:resource[not(. = $class)]" as="attribute()*"/>
-                <xsl:sequence select="$superclasses"/>
 
-                <xsl:if test="not($direct)">
-                    <xsl:for-each select="$superclasses">
-                        <xsl:sequence select="ldh:listSuperClasses(., $direct)"/>
-                    </xsl:for-each>
-                </xsl:if>
-            </xsl:for-each>
-        </xsl:if>
-    </xsl:function>
-    
     <xsl:function name="ldh:ontologyImports" as="attribute()*" cache="yes">
         <xsl:param name="ontology" as="xs:anyURI"/>
         
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
index bacd0b8f9..fb843e2b5 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
@@ -105,9 +105,9 @@ exclude-result-prefixes="#all">
     <xsl:param name="acl:agent" as="xs:anyURI?"/>
     <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="ac:httpHeaders" as="xs:string"/> 
+    <xsl:param name="ac:httpHeaders" as="xs:string"/>
     <xsl:param name="ac:method" as="xs:string"/>
-    <xsl:param name="acl:mode" as="xs:anyURI*"/>
+    <xsl:param name="ldh:httpHeaders" as="map(xs:string, xs:string*)" select="map{}"/>
     <xsl:param name="ldh:ajaxRendering" select="true()" as="xs:boolean"/>
     <xsl:param name="ldhc:enableWebIDSignUp" as="xs:boolean"/>
     <xsl:param name="ldh:renderSystemResources" select="false()" as="xs:boolean"/>

From 28f47925ccc7c5aa48df94df1f4cbe9e8e2a22fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= <martynas@atomgraph.com>
Date: Fri, 15 May 2026 01:19:25 +0200
Subject: [PATCH 2/2] Removed dead code

---
 .../xsl/bootstrap/2.3.2/imports/default.xsl   | 25 -------------------
 .../xsl/bootstrap/2.3.2/layout.xsl            | 16 +-----------
 2 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl
index bd14cc3a7..2bea7575d 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl
@@ -292,31 +292,6 @@ exclude-result-prefixes="#all"
         </xsl:copy>
     </xsl:template>
 
-    <xsl:function name="ldh:ontologyImports" as="attribute()*" cache="yes">
-        <xsl:param name="ontology" as="xs:anyURI"/>
-        
-        <xsl:sequence select="ldh:ontologyImports($ontology, false())"/>
-    </xsl:function>
-    
-    <xsl:function name="ldh:ontologyImports" as="attribute()*" cache="yes">
-        <xsl:param name="ontology" as="xs:anyURI"/>
-        <xsl:param name="direct" as="xs:boolean"/>
-
-        <xsl:if test="doc-available(ac:document-uri($ontology))">
-            <xsl:variable name="document" select="document(ac:document-uri($ontology))" as="document-node()"/>
-            <xsl:for-each select="$document">
-                <xsl:variable name="imports" select="key('resources', $ontology)/owl:imports/@rdf:resource[not(. = $ontology)]" as="attribute()*"/>
-                <xsl:sequence select="$imports"/>
-                
-                <xsl:if test="not($direct)">
-                    <xsl:for-each select="$imports">
-                        <xsl:sequence select="ldh:ontologyImports(., $direct)"/>
-                    </xsl:for-each>
-                </xsl:if>
-            </xsl:for-each>
-        </xsl:if>
-    </xsl:function>
-
     <xsl:function name="ac:value-intersect" as="xs:anyAtomicType*">
         <xsl:param name="arg1" as="xs:anyAtomicType*"/>
         <xsl:param name="arg2" as="xs:anyAtomicType*"/>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
index fb843e2b5..e12bcc026 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
@@ -107,7 +107,7 @@ exclude-result-prefixes="#all">
     <xsl:param name="foaf:Agent" select="if ($acl:agent) then document(ac:document-uri($acl:agent)) else ()" as="document-node()?"/>
     <xsl:param name="ac:httpHeaders" as="xs:string"/>
     <xsl:param name="ac:method" as="xs:string"/>
-    <xsl:param name="ldh:httpHeaders" as="map(xs:string, xs:string*)" select="map{}"/>
+    <xsl:param name="ldh:httpHeaders" select="map{}" as="map(xs:string, xs:string*)"/>
     <xsl:param name="ldh:ajaxRendering" select="true()" as="xs:boolean"/>
     <xsl:param name="ldhc:enableWebIDSignUp" as="xs:boolean"/>
     <xsl:param name="ldh:renderSystemResources" select="false()" as="xs:boolean"/>
@@ -409,20 +409,6 @@ exclude-result-prefixes="#all">
                                     <xsl:text>,&#xa;</xsl:text>
                                 </xsl:if>
                             </xsl:for-each>
-                            <!--<xsl:variable name="ontology-imports" select="for $value in distinct-values(ldh:ontologyImports($ldt:ontology)) return xs:anyURI($value)" as="xs:anyURI*"/>
-                            <xsl:if test="exists($ontology-imports)">
-                                <xsl:text>,</xsl:text>
-                                <xsl:for-each select="$ontology-imports">
-                                    <xsl:text>{ name: "</xsl:text>
-                                    <xsl:value-of select="ac:document-uri(.)"/>
-                                    <xsl:text>", altName: baseUri + "?uri=" + encodeURIComponent("</xsl:text>
-                                    <xsl:value-of select="ac:document-uri(.)"/>
-                                    <xsl:text>") + "&amp;accept=" + encodeURIComponent("application/rdf+xml") }</xsl:text>
-                                    <xsl:if test="position() != last()">
-                                        <xsl:text>,&#xa;</xsl:text>
-                                    </xsl:if>
-                                </xsl:for-each>
-                            </xsl:if> -->
                             <xsl:text disable-output-escaping="yes">
                             <![CDATA[
                         ];