Merge r/17.x into r/18.x

Author: lkiesow

.github/workflows/create-release.yml

@@ -57,4 +57,4 @@ jobs:
             For further information, please take a look at:
 
             - [Release notes](https://docs.opencast.org/r/${{ steps.get_version.outputs.VERSION_MAIN }}.x/admin/#releasenotes/#opencast-${{ steps.get_version.outputs.VERSION_COMBINED }})
-            - [Changelog](https://docs.opencast.org/r/${{ steps.get_version.outputs.VERSION_MAIN }}.x/admin/#changelog/#opencast-${{ steps.get_version.outputs.VERSION_COMBINED }})
+            - [Changelog](https://docs.opencast.org/r/${{ steps.get_version.outputs.VERSION_MAIN }}.x/admin/#changelog/opencast-${{ steps.get_version.outputs.VERSION_MAIN }})

assemblies/resources/bin/setenv

@@ -41,7 +41,4 @@
 export EXTRA_JAVA_OPTS="${EXTRA_JAVA_OPTS} -Dorg.eclipse.jetty.server.Request.maxFormContentSize=1500000 -Dfile.encoding=UTF-8 -Dlog4j2.formatMsgNoLookups=true -Djava.awt.headless=true"
 export KARAF_NOROOT=true
 
-# Mitigation for new Tesseract 4.x locking up the system
-export OMP_THREAD_LIMIT=1
-
 . "$DIRNAME/check_ports"

docs/guides/admin/docs/installation/java-version.md

@@ -5,6 +5,7 @@ This is a list of Opencast versions and the versions of OpenJDK they require:
 
 | Opencast    | Java |
 |-------------|------|
-| ≥ 16.x      | 17   |
+| ≥ 17.x      | 21   |
+| 16.x - 17.x | 17   |
 | 9.x - 16.x  | 11   |
 | ≤ 9.x       | 8    |

modules/asset-manager-storage-fs/src/main/java/org/opencastproject/assetmanager/storage/impl/fs/AbstractFileSystemAssetStore.java

@@ -148,6 +148,15 @@ public boolean contains(StoragePath path) throws AssetStoreException {
   @Override
   public boolean delete(DeletionSelector sel) throws AssetStoreException {
     File dir = getDeletionSelectorDir(sel);
+    if (dir == null) {
+      // MediaPackage could not be found locally. This could mean
+      //   - all snapshots live in a remote asset store
+      //   - mount failed and files are temporary not available
+      //   - file was deleted out-of-band
+      //   - other fs problem
+      // In any case, we cannot continue and return "false" to indicate that the files could not be found.
+      return false;
+    }
     try {
       FileUtils.deleteDirectory(dir);
       // also delete the media package directory if all versions have been deleted
@@ -169,11 +178,14 @@ public boolean delete(DeletionSelector sel) throws AssetStoreException {
    *
    * @param sel
    *          the deletion selector
-   * @return the directory file
+   * @return the directory file or null if it does not exist (e.g. MediaPackage does not exist locally)
    */
   private File getDeletionSelectorDir(DeletionSelector sel) {
-    final String basePath = path(getRootDirectory(sel.getOrganizationId(), sel.getMediaPackageId()),
-            sel.getOrganizationId(), sel.getMediaPackageId());
+    final String rootPath = getRootDirectory(sel.getOrganizationId(), sel.getMediaPackageId());
+    if (rootPath == null) {
+      return null;
+    }
+    final String basePath = path(rootPath, sel.getOrganizationId(), sel.getMediaPackageId());
     if (sel.getVersion().isPresent()) {
       return file(basePath, sel.getVersion().get().toString());
     }

modules/security-aai/src/main/java/org/opencastproject/security/aai/api/AttributeMapper.java

@@ -90,10 +90,19 @@ public List<String> getMappedAttributes(
       Expression exp = null;
       try {
         exp = parser.parseExpression(expression);
-        String res = (String) exp.getValue(sourceAttributes);
+        Object res = exp.getValue(sourceAttributes);
         logger.debug("Mapping {} to {}", exp.getExpressionString(), res);
-        if (res != null) {
-          mappedAttributes.add(res);
+        if (res == null) {
+          continue;
+        }
+        if (res instanceof String) {
+          mappedAttributes.add((String) res);
+        } else if (res instanceof List<?>) {
+          for (Object resListItem : (List<?>) res) {
+            if (resListItem instanceof String) {
+              mappedAttributes.add((String) resListItem);
+            }
+          }
         }
       } catch (Exception e) {
         logger.warn("Mapping for '{}' with expression {} exp.getExpressionString() failed: {}",

modules/textextractor-tesseract/src/main/java/org/opencastproject/textextractor/tesseract/TesseractTextExtractor.java

@@ -141,6 +141,8 @@ public List<String> extract(File image) throws TextExtractorException {
     try {
       ProcessBuilder processBuilder = new ProcessBuilder(command);
       processBuilder.redirectErrorStream(true);
+      // Mitigation for new Tesseract 4.x spawning too many threads locking up the system. Limit to one thread.
+      processBuilder.environment().put("OMP_THREAD_LIMIT", "1");
       Process tesseractProcess = processBuilder.start();
 
       // listen to output

modules/userdirectory-studip/src/main/java/org/opencastproject/userdirectory/studip/StudipUserProviderInstance.java

@@ -38,11 +38,12 @@
 import com.google.common.util.concurrent.ExecutionError;
 import com.google.common.util.concurrent.UncheckedExecutionException;
 
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
@@ -278,7 +279,7 @@ protected User loadUserFromStudip(String userName) {
       logger.error("Exception while parsing response from provider for user {}", userName, e);
       return null;
     } catch (IOException e) {
-      logger.error(e.getMessage());
+      logger.error("Error requesting user data for user `{}`: {}", userName, e.getMessage());
       return null;
     } catch (URISyntaxException e) {
       logger.error("Misspelled URI", e);
@@ -306,7 +307,12 @@ private JSONObject getStudipUser(String uid) throws URISyntaxException, IOExcept
     HttpGet get = new HttpGet(url);
     get.setHeader("User-Agent", OC_USERAGENT);
 
-    try (CloseableHttpClient client = HttpClients.createDefault()) {
+    // Don't wait for responses indefinitely
+    RequestConfig config = RequestConfig.custom()
+        .setConnectTimeout(5000)
+        .setSocketTimeout(10000).build();
+
+    try (CloseableHttpClient client = HttpClientBuilder.create().setDefaultRequestConfig(config).build();) {
       try (CloseableHttpResponse resp = client.execute(get)) {
         var statusCode = resp.getStatusLine().getStatusCode();
         if (statusCode == 404) {