Merge pull request #357 from clowder-framework/release/1.20.2

Release/1.20.2

Author: robkooper

.github/workflows/swagger.yml

@@ -23,6 +23,6 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: openapi-lint 
-        uses: mhiew/redoc-lint-github-action@v2
+        uses: mbowman100/swagger-validator-action@master
         with:
-          args: 'public/swagger.yml --skip-rule operation-operationId'
+          files: public/swagger.yml

CHANGELOG.md

@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.20.2 - 2022-04-30
+
+### Fixed
+- swagger lint action
+- When downloading a file with a `'` in the name it would save the file as blob
+- Fix for a rare race condition with masonry where tiles could end up overlapping in space page.
+- Fixes bug where same extractor shows up multiple times and all Clowder instances index db on reindex [#327](https://github.com/clowder-framework/clowder/issues/327)
+
+### Changed
+- Changed `Enabled By SuperAdmin` to read `Enabled by Server Admin` [#344](https://github.com/clowder-framework/clowder/issues/344)
+
 ## 1.20.1 - 2022-04-04
 
 ### Fixed

app/services/mongodb/MongoDBQueueService.scala

@@ -93,7 +93,8 @@ trait MongoDBQueueService {
 
   // start pool to being processing queue actions
   def listen() = {
-    if (queueTimer == null) {
+    //only if this is the primary clowder instance
+    if (queueTimer == null && configuration.getBoolean("clowder.primary").getOrElse(true)) {
       // TODO: Need to make these in a separate pool
       queueTimer = Akka.system().scheduler.schedule(0 seconds, 5 millis) {
         getNextQueuedAction match {

app/services/rabbitmq/RabbitMQMessageService.scala

@@ -128,24 +128,27 @@ class RabbitMQMessageService extends MessageService {
         new MsgConsumer(channel.get, event_filter.get)
       )
 
-      // Start actor to listen to extractor heartbeats
-      Logger.info("Starting extractor heartbeat listener")
-      // create fanout exchange if it doesn't already exist
-      channel.get.exchangeDeclare("extractors", "fanout", true)
-      // anonymous queue
-      val heartbeatsQueue = channel.get.queueDeclare().getQueue
-      // bind queue to exchange
-      channel.get.queueBind(heartbeatsQueue, "extractors", "*")
-      extractorsHeartbeats = Some(Akka.system.actorOf(
-        Props(new ExtractorsHeartbeats(channel.get, heartbeatsQueue)), name = "ExtractorsHeartbeats"
-      ))
-      Logger.debug("Initializing a MsgConsumer for the ExtractorsHeartbeats")
-      channel.get.basicConsume(
-        heartbeatsQueue,
-        false, // do not auto ack
-        "ExtractorsHeartbeats", // tagging the consumer is important if you want to stop it later
-        new MsgConsumer(channel.get, extractorsHeartbeats.get)
-      )
+      //register new extractor only if this is the primary clowder instance
+      if (configuration.getBoolean("clowder.primary").getOrElse(true)) {
+        // Start actor to listen to extractor heartbeats
+        Logger.info("Starting extractor heartbeat listener")
+        // create fanout exchange if it doesn't already exist
+        channel.get.exchangeDeclare("extractors", "fanout", true)
+        // anonymous queue
+        val heartbeatsQueue = channel.get.queueDeclare().getQueue
+        // bind queue to exchange
+        channel.get.queueBind(heartbeatsQueue, "extractors", "*")
+        extractorsHeartbeats = Some(Akka.system.actorOf(
+          Props(new ExtractorsHeartbeats(channel.get, heartbeatsQueue)), name = "ExtractorsHeartbeats"
+        ))
+        Logger.debug("Initializing a MsgConsumer for the ExtractorsHeartbeats")
+        channel.get.basicConsume(
+          heartbeatsQueue,
+          false, // do not auto ack
+          "ExtractorsHeartbeats", // tagging the consumer is important if you want to stop it later
+          new MsgConsumer(channel.get, extractorsHeartbeats.get)
+        )
+      }
 
       // Setup Actor to submit new extractions to broker
       extractQueue = Some(Akka.system.actorOf(Props(new PublishDirectActor(channel = channel.get,

app/util/FileUtils.scala

@@ -856,37 +856,20 @@ object FileUtils {
   //Download CONTENT-DISPOSITION encoding
   //
   def encodeAttachment(filename: String, userAgent: String) : String = {
-    val filenameStar = if (userAgent.indexOf("MSIE") > -1) {
-                              URLEncoder.encode(filename, "UTF-8")
-                            } else if (userAgent.indexOf("Edge") > -1){
-                              MimeUtility.encodeText(filename
-                                  .replaceAll(",","%2C")
-                                  .replaceAll("\"","%22")
-                                  .replaceAll("/","%2F")
-                                  .replaceAll("=","%3D")
-                                  .replaceAll("&","%26")
-                                  .replaceAll(":","%3A")
-                                  .replaceAll(";","%3B")
-                                  .replaceAll("\\?","%3F")
-                                  .replaceAll("\\*","%2A")
+    val filenameStar = MimeUtility.encodeText(filename
+                                    .replaceAll("%","%25")
+                                    .replaceAll(" ","%20")
+                                    .replaceAll("\"","%22")
+                                    .replaceAll("'","%27")
+                                    .replaceAll(",","%2C")
+                                    .replaceAll("/","%2F")
+                                    .replaceAll("=","%3D")
+                                    .replaceAll(":","%3A")
+                                    .replaceAll(";","%3B")
+                                    .replaceAll("\\*","%2A")
                                   ,"utf-8","Q")
-                            } else {
-                              MimeUtility.encodeText(filename
-                                  .replaceAll("%","%25")
-                                  .replaceAll(" ","%20")
-                                  .replaceAll("\"","%22")
-                                  .replaceAll(",","%2C")
-                                  .replaceAll("/","%2F")
-                                  .replaceAll("=","%3D")
-                                  .replaceAll(":","%3A")
-                                  .replaceAll(";","%3B")
-                                  .replaceAll("\\*","%2A")
-                                  ,"utf-8","Q")
-                            }
-    Logger.debug(userAgent + ": " + filenameStar)
 
     //Return the complete attachment header info
     "attachment; filename*=UTF-8''" + filenameStar
   }
-
 }

app/views/spaces/space.scala.html

@@ -148,7 +148,7 @@ <h3>@Messages("collections.title")</h3>
             match.masonry();
 
             // layout Masonry again after all images have loaded
-            imagesLoaded( '.tiled-image', function() {
+            imagesLoaded( match, function() {
                 match.masonry({
                     itemSelector: '.tiled-image',
                     columnWidth: '.post-box',

app/views/spaces/updateExtractors.scala.html

@@ -35,8 +35,8 @@ <h1>Space Extractors</h1>
 					<th>Name</th>
 					<th>Description</th>
 					<th>Process Triggers</th>
-					<th class="text-center" title="Extractors marked for execution in all spaces">Enabled By SuperAdmin</th>
-					<th class="text-center" title="Follow selection in 'Enabled By SuperAdmin' column">Use Default</th>
+					<th class="text-center" title="Extractors marked for execution in all spaces">Enabled by Server Admin</th>
+					<th class="text-center" title="Follow selection in 'Enabled by Server Admin' column">Use Default</th>
 					<th class="text-center" title="Always trigger execution in this space">Enable in Space</th>
 					<th class="text-center" title="Never trigger execution in this space">Disable in Space</th>
 				</tr>

conf/application.conf

@@ -183,6 +183,13 @@ api.version="beta"
 # mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database][?options]]
 mongodbURI = "mongodb://127.0.0.1:27017/clowder"
 
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Clowder Primary Instance
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# This is required if there are multiple clowder instances. This config variable indicates
+# the primary clowder instance who takes care of special actions like registering new extractors,
+# indexing db on a reindex etc. The default value is true which means only one instance of clowder running.
+clowder.primary=true
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # RabbitMQ

doc/src/sphinx/conf.py

@@ -22,7 +22,7 @@
 author = 'Luigi Marini'
 
 # The full version, including alpha/beta/rc tags
-release = '1.20.1'
+release = '1.20.2'
 
 
 # -- General configuration ---------------------------------------------------

docker/custom.conf

@@ -37,6 +37,10 @@ smtp.host=${?SMTP_SERVER}
 service.byteStorage=services.filesystem.DiskByteStorageService
 service.byteStorage=${?CLOWDER_STORAGE}
 
+#primary Clowder instance
+clowder.primary=true
+clowder.primary=${?CLOWDER_PRIMARY}
+
 # location in case of services.filesystem.DiskByteStorageService
 clowder.diskStorage.path="/home/clowder/data"
 clowder.diskStorage.path=${?CLOWDER_DISKPATH}