MCR-3551 Allow hiding of publicly available derivates

mycore-base/src/main/java/org/mycore/common/xml/MCRXMLFunctions.java

@@ -369,6 +369,10 @@ public static String decodeURIPath(String path) throws URISyntaxException {
         return relativeURI.getPath();
     }
 
+    /**
+     * @deprecated Use {@link MCRAccessManager#checkDerivateDisplayPermission(String)} instead.
+     */
+    @Deprecated(forRemoval = true)
     public static boolean isDisplayedEnabledDerivate(String derivateId) {
         return MCRAccessManager.checkDerivateDisplayPermission(derivateId);
     }
@@ -407,7 +411,7 @@ private static boolean checkReadPermissionOfDerivates(MCRObjectID mcrObjectID) {
         Set<String> displayableDerivates = derivateIds
             .stream()
             .map(MCRObjectID::toString)
-            .filter(MCRXMLFunctions::isDisplayedEnabledDerivate)
+            .filter(MCRAccessManager::checkDerivateDisplayPermission)
             .collect(Collectors.toSet());
         return !displayableDerivates.isEmpty() && displayableDerivates.stream()
             .allMatch(derId -> MCRAccessManager.checkPermission(derId, MCRAccessManager.PERMISSION_READ));

mycore-base/src/main/java/org/mycore/services/zipper/MCRCompressServlet.java

@@ -40,14 +40,20 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.jdom2.Attribute;
 import org.jdom2.Element;
+import org.jdom2.filter.Filters;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
 import org.mycore.access.MCRAccessManager;
+import org.mycore.common.MCRConstants;
 import org.mycore.common.MCRException;
 import org.mycore.common.MCRXlink;
 import org.mycore.common.content.MCRContent;
 import org.mycore.common.content.transformer.MCRContentTransformer;
 import org.mycore.common.content.transformer.MCRParameterizedTransformer;
 import org.mycore.common.xml.MCRLayoutService;
+import org.mycore.common.xml.MCRURIResolver;
 import org.mycore.common.xsl.MCRParameterCollector;
 import org.mycore.datamodel.common.MCRISO8601Date;
 import org.mycore.datamodel.common.MCRXMLMetadataManager;
@@ -182,13 +188,32 @@ private void sendObject(MCRObjectID id, MCRServletJob job, T container) throws E
             .getChild(MCRObjectStructure.ELEMENT_DERIVATE_OBJECTS)
             .getChildren("derobject");
 
+        XPathFactory xpathFactory = XPathFactory.instance();
+        XPathExpression<Attribute> derivateTypeXpath = xpathFactory
+            .compile("classification[@classid='derivate_types']/@categid",
+                Filters.attribute(), null, MCRConstants.XML_NAMESPACE);
+        XPathExpression<Boolean> exportedXpath = xpathFactory
+            .compile(".//category/label[lang('x-export')]/@text='false'",
+                Filters.fboolean(), null, MCRConstants.XML_NAMESPACE);
+
         for (Element el : li) {
             if (el.getAttributeValue(MCRXMLConstants.INHERITED).equals("0")) {
                 String ownerID = el.getAttributeValue(MCRXlink.HREF, XLINK_NAMESPACE);
                 MCRObjectID derId = MCRObjectID.getInstance(ownerID);
                 // here the access check is tested only against the derivate
                 if (MCRAccessManager.checkDerivateContentPermission(derId, PERMISSION_READ)) {
-                    sendDerivate(derId, null, container);
+
+                    // export derivate if no derivate type has an 'x-export' property of 'false'
+                    boolean exported = derivateTypeXpath.evaluate(el).stream().noneMatch(derivateTypeAttribute -> {
+                        String derivateType = derivateTypeAttribute.getValue();
+                        Element derivateTypeElement = MCRURIResolver.obtainInstance()
+                            .resolve("classification:metadata:0:children:derivate_types:" + derivateType);
+                        return exportedXpath.evaluate(derivateTypeElement).get(0);
+                    });
+
+                    if (exported) {
+                        sendDerivate(derId, null, container);
+                    }
                 }
             }
         }

mycore-base/src/main/resources/xsl/layout-utils.xsl

@@ -399,7 +399,7 @@
   <xsl:template name="derivateLink">
     <xsl:for-each select="derivateLink">
       <xsl:variable name="derivateId" select="substring-before(@xlink:href, '/')" />
-      <xsl:variable name="isDisplayedEnabled" select="mcrxsl:isDisplayedEnabledDerivate($derivateId)" />
+      <xsl:variable name="isDisplayedEnabled" select="acl:checkDerivateDisplayPermission($derivateId)" />
       <xsl:variable name="mayWriteDerivate" select="acl:checkPermission($derivateId,'writedb')" />
       <xsl:choose>
         <xsl:when test="acl:checkDerivateDisplayPermission($derivateId) and $isDisplayedEnabled = 'true' or $mayWriteDerivate">

mycore-classeditor/src/main/resources/components/classeditor/config/mycore.properties

@@ -3,7 +3,7 @@ MCR.LayoutTransformerFactory.Default.Ignore=%MCR.LayoutTransformerFactory.Defaul
 
 MCR.Module-solr.linkQuery=category.top:{0}
 
-MCR.classeditor.additionalLanguages=x-disable,x-display,x-group,x-logo,x-uri
+MCR.classeditor.additionalLanguages=x-disable,x-display,x-export,x-group,x-logo,x-uri
 
 MCR.JSON.Manager.TypeAdapters.categoryType.Class=org.mycore.frontend.classeditor.MCRCategoryTypeAdapter
 MCR.JSON.Manager.TypeAdapters.categoryIdType.Class=org.mycore.frontend.classeditor.MCRCategoryIDTypeAdapter

mycore-iview2/src/main/resources/xsl/iview2-solrresponse.xsl

@@ -110,7 +110,7 @@
 
       <xsl:if test="$pageToDisplay != ''">
         <xsl:variable name="object-view-derivate" select="acl:checkPermission($derivate,'view')" />
-        <xsl:variable name="isDisplayedEnabled" select="mcrxsl:isDisplayedEnabledDerivate($derivate)" />
+        <xsl:variable name="isDisplayedEnabled" select="acl:checkDerivateDisplayPermission($derivate)" />
         <xsl:variable name="mayWriteDerivate" select="acl:checkPermission($derivate,'writedb')" />
         <xsl:choose>
           <xsl:when test="($object-view-derivate and $isDisplayedEnabled = 'true') or $mayWriteDerivate">

mycore-mods/src/main/resources/xsl/mods-enhancer.xsl

@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0" xmlns:mods="http://www.loc.gov/mods/v3" xmlns:xalan="http://xml.apache.org/xalan" xmlns:xlink="http://www.w3.org/1999/xlink"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:mcrxsl="xalan://org.mycore.common.xml.MCRXMLFunctions" exclude-result-prefixes="xalan mcrxsl">
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:acl="xalan://org.mycore.access.MCRAccessManager" exclude-result-prefixes="xalan acl">
   <xsl:param name="WebApplicationBaseURL" />
   <xsl:param name="ServletsBaseURL" select="''" />
   <xsl:variable name="relacode" select="document('resource:relacode.xml')/relacode" />
   <xsl:key name="relacode" match="code" use="@key" />
 
   <xsl:variable name="ifsTemp">
-    <xsl:for-each select="mycoreobject/structure/derobjects/derobject[mcrxsl:isDisplayedEnabledDerivate(@xlink:href)]">
-      <der id="{@xlink:href}">
-        <xsl:copy-of select="document(concat('xslStyle:mcr_directory-recursive:ifs:',@xlink:href,'/'))" />
-      </der>
+    <xsl:for-each select="mycoreobject/structure/derobjects/derobject[acl:checkDerivateContentPermission(@xlink:href, 'read')]">
+      <xsl:variable name="derivateType" select="classification[@classid='derivate_types']/@categid" />
+      <xsl:variable name="derivateExported" select="not(document(concat('classification:metadata:0:children:derivate_types:',$derivateType))//category/label[lang('x-export')]/@text='false')" />
+      <xsl:if test="$derivateExported">
+        <der id="{@xlink:href}">
+          <xsl:copy-of select="document(concat('xslStyle:mcr_directory-recursive:ifs:',@xlink:href,'/'))" />
+        </der>
+      </xsl:if>
     </xsl:for-each>
   </xsl:variable>
   <xsl:variable name="ifs" select="xalan:nodeset($ifsTemp)" />

mycore-mods/src/main/resources/xsl/mods.xsl

@@ -187,7 +187,7 @@
         <xsl:for-each select="./structure/derobjects/derobject">
           <derivate>
             <id><xsl:value-of select="@xlink:href" /></id>
-            <display><xsl:value-of select="mcrxsl:isDisplayedEnabledDerivate(@xlink:href)" /></display>
+            <display><xsl:value-of select="acl:checkDerivateDisplayPermission(@xlink:href)" /></display>
           </derivate>
         </xsl:for-each>
         </derivates>

mycore-mods/src/main/resources/xslt/utils/mods-enhancer.xsl

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="3.0" xmlns:mods="http://www.loc.gov/mods/v3" 
   xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:mcracl="http://www.mycore.de/xslt/acl"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <xsl:param name="WebApplicationBaseURL" />
@@ -10,10 +11,14 @@
   <xsl:key name="relacode" match="code" use="@key" />
 
   <xsl:variable name="ifs">
-    <xsl:for-each select="mycoreobject/structure/derobjects/derobject[document(concat('userobjectrights:isWorldReadable:', @xlink:href))/boolean/text() = 'true']">
-      <der id="{@xlink:href}">
-        <xsl:copy-of select="document(concat('xslStyle:mcr_directory-recursive:ifs:',@xlink:href,'/'))" />
-      </der>
+    <xsl:for-each select="mycoreobject/structure/derobjects/derobject[mcracl:check-permission(@xlink:href,'view')]">
+      <xsl:variable name="derivateType" select="classification[@classid='derivate_types']/@categid" />
+      <xsl:variable name="derivateExported" select="not(document(concat('classification:metadata:0:children:derivate_types:',$derivateType))//category/label[lang('x-export')]/@text='false')" />
+      <xsl:if test="$derivateExported">
+        <der id="{@xlink:href}">
+          <xsl:copy-of select="document(concat('xslStyle:mcr_directory-recursive:ifs:',@xlink:href,'/'))" />
+        </der>
+      </xsl:if>
     </xsl:for-each>
   </xsl:variable>
 

mycore-solr/src/main/resources/xsl/response-utils.xsl

@@ -363,7 +363,7 @@
           <xsl:for-each select="$files[count(.|key('files-by-derivate',str[@name='derivateID'])[1]) = 1]">
             <xsl:sort select="str[@name='derivateID']" />
             <xsl:variable name="derivateId" select="str[@name='derivateID']" />
-            <xsl:variable name="isDisplayedEnabled" select="mcrxsl:isDisplayedEnabledDerivate($derivateId)" />
+            <xsl:variable name="isDisplayedEnabled" select="acl:checkDerivateDisplayPermission($derivateId)" />
             <xsl:variable name="mayWriteDerivate" select="acl:checkPermission($derivateId,'writedb')" />
             <xsl:choose>
               <xsl:when