Check if database is ready before starting MISP synchronization

Author: To-om

thehive-backend/app/models/Audit.scala

@@ -6,7 +6,7 @@ import javax.inject.{ Inject, Singleton }
 import scala.collection.immutable
 import play.api.{ Configuration, Logger }
 import play.api.libs.json.JsObject
-import org.elastic4play.models.{ Attribute, AttributeFormat, AttributeDef, EntityDef, EnumerationAttributeFormat, ListEnumeration, ModelDef, MultiAttributeFormat, ObjectAttributeFormat, OptionalAttributeFormat, StringAttributeFormat, AttributeOption ⇒ O }
+import org.elastic4play.models.{ Attribute, AttributeFormat, AttributeDef, EntityDef, EnumerationAttributeFormat, ListEnumerationAttributeFormat, ModelDef, MultiAttributeFormat, ObjectAttributeFormat, OptionalAttributeFormat, StringAttributeFormat, AttributeOption ⇒ O }
 import org.elastic4play.services.AuditableAction
 import org.elastic4play.services.JsonFormat.auditableActionFormat
 import services.AuditedModel
@@ -44,8 +44,8 @@ class AuditModel(
       case (OptionalAttributeFormat(f1), f2)                                              ⇒ mergeAttributeFormat(context, f1, f2)
       case (f1, OptionalAttributeFormat(f2))                                              ⇒ mergeAttributeFormat(context, f1, f2)
       case (MultiAttributeFormat(f1), MultiAttributeFormat(f2))                           ⇒ mergeAttributeFormat(context, f1, f2).map(MultiAttributeFormat(_))
-      case (f1, EnumerationAttributeFormat(_) | ListEnumeration(_))                       ⇒ mergeAttributeFormat(context, f1, StringAttributeFormat)
-      case (EnumerationAttributeFormat(_) | ListEnumeration(_), f2)                       ⇒ mergeAttributeFormat(context, StringAttributeFormat, f2)
+      case (f1, EnumerationAttributeFormat(_) | ListEnumerationAttributeFormat(_))        ⇒ mergeAttributeFormat(context, f1, StringAttributeFormat)
+      case (EnumerationAttributeFormat(_) | ListEnumerationAttributeFormat(_), f2)        ⇒ mergeAttributeFormat(context, StringAttributeFormat, f2)
       case (ObjectAttributeFormat(subAttributes1), ObjectAttributeFormat(subAttributes2)) ⇒ mergeAttributes(context, subAttributes1 ++ subAttributes2)
       case (f1, f2) if f1 == f2                                                           ⇒ Some(f1)
       case (f1, f2) ⇒

thehive-misp/app/connectors/misp/MispSrv.scala

@@ -14,7 +14,7 @@ import net.lingala.zip4j.core.ZipFile
 import net.lingala.zip4j.exception.ZipException
 import net.lingala.zip4j.model.FileHeader
 import org.elastic4play.controllers.{ Fields, FileInputValue }
-import org.elastic4play.services.{ AttachmentSrv, AuthContext, EventSrv, TempSrv }
+import org.elastic4play.services.{ UserSrv ⇒ _, _ }
 import org.elastic4play.utils.RichJson
 import org.elastic4play.{ InternalError, NotFoundError }
 import play.api.inject.ApplicationLifecycle
@@ -92,6 +92,7 @@ class MispSrv @Inject() (
     attachmentSrv: AttachmentSrv,
     tempSrv: TempSrv,
     eventSrv: EventSrv,
+    migrationSrv: MigrationSrv,
     httpSrv: CustomWSAPI,
     environment: Environment,
     lifecycle: ApplicationLifecycle,
@@ -110,19 +111,24 @@ class MispSrv @Inject() (
 
   private[misp] def initScheduler() = {
     val task = system.scheduler.schedule(0.seconds, mispConfig.interval) {
-      logger.info("Update of MISP events is starting ...")
-      userSrv
-        .inInitAuthContext { implicit authContext ⇒
-          synchronize().andThen { case _ ⇒ tempSrv.releaseTemporaryFiles() }
-        }
-        .onComplete {
-          case Success(a) ⇒
-            logger.info("Misp synchronization completed")
-            a.collect {
-              case Failure(t) ⇒ logger.warn(s"Update MISP error", t)
-            }
-          case Failure(t) ⇒ logger.info("Misp synchronization failed", t)
-        }
+      if (migrationSrv.isReady) {
+        logger.info("Update of MISP events is starting ...")
+        userSrv
+          .inInitAuthContext { implicit authContext ⇒
+            synchronize().andThen { case _ ⇒ tempSrv.releaseTemporaryFiles() }
+          }
+          .onComplete {
+            case Success(a) ⇒
+              logger.info("Misp synchronization completed")
+              a.collect {
+                case Failure(t) ⇒ logger.warn(s"Update MISP error", t)
+              }
+            case Failure(t) ⇒ logger.info("Misp synchronization failed", t)
+          }
+      }
+      else {
+        logger.info("MISP synchronization cancel, database is not ready")
+      }
     }
     lifecycle.addStopHook { () ⇒
       logger.info("Stopping MISP fetching ...")