Prepare release

Update version Update dependencies Remove Cortex key in configuration Fix error handler
TheHive-Project · Jan 12, 2017 · de5e38f · de5e38f
1 parent bc7a2f4
commit de5e38f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -29,7 +29,7 @@ object Dependencies {
     val reflections = "org.reflections" % "reflections" % "0.9.10"
     val zip4j = "net.lingala.zip4j" % "zip4j" % "1.3.2"
     val akkaTest = "com.typesafe.akka" %% "akka-stream-testkit" % "2.4.4"
-    val elastic4play = "org.cert-bdf" %% "elastic4play" % "1.1.2-SNAPSHOT"
+    val elastic4play = "org.cert-bdf" %% "elastic4play" % "1.1.2"
 
     object Elastic4s {
       private val version = "2.3.0"

diff --git a/thehive-cortex/app/connectors/cortex/services/CortexSrv.scala b/thehive-cortex/app/connectors/cortex/services/CortexSrv.scala
@@ -34,11 +34,13 @@ object CortexConfig {
   def getCortexClient(name: String, configuration: Configuration): Option[CortexClient] = {
     try {
       val url = configuration.getString("url").getOrElse(sys.error("url is missing")).replaceFirst("/*$", "")
-      val key = configuration.getString("key").getOrElse(sys.error("key is missing"))
+      val key = "" // configuration.getString("key").getOrElse(sys.error("key is missing"))
       Some(new CortexClient(name, url, key))
     }
     catch {
-      case NonFatal(_) ⇒ None
+      case NonFatal(e) ⇒
+        Logger.error("Error while loading cortex configuration", e)
+        None
     }
   }
 

diff --git a/ui/app/scripts/controllers/AuthenticationCtrl.js b/ui/app/scripts/controllers/AuthenticationCtrl.js
@@ -17,7 +17,7 @@
                     if (status === 520) {
                         AlertSrv.error('AuthenticationCtrl', data, status);
                     } else {
-                        AlertSrv.log(data, 'error');
+                        AlertSrv.log(data.message, 'error');
                     }
                 });
             };

diff --git a/ui/app/scripts/services/AlertSrv.js b/ui/app/scripts/services/AlertSrv.js
@@ -17,7 +17,7 @@
                     } else if (angular.isString(data) && data !== '') {
                         log(moduleName + ': ' + data, 'error');
                     } else if (angular.isObject(data)) {
-                        log(moduleName + ': ' + (data.message || data.error), 'error');
+                        log(moduleName + ': ' + data.message, 'error');
                     }
                 }
             };