Remove warnings

TheHive-Project · Sep 2, 2021 · 508b2b7 · 508b2b7
1 parent fff8464
commit 508b2b7
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/misp/connector/src/main/scala/org/thp/thehive/connector/misp/services/MispImportSrv.scala b/misp/connector/src/main/scala/org/thp/thehive/connector/misp/services/MispImportSrv.scala
@@ -288,7 +288,7 @@ class MispImportSrv(
     val deletedAttributes = client
       .searchAttributes(event.id, lastSynchro, deletedOnly = true)
       .mapConcat(attributeToObservable)
-      .runWith(Sink.queue[(Observable, Either[String, (String, String, Source[ByteString, _])])])
+      .runWith(Sink.queue[(Observable, Either[String, (String, String, Source[ByteString, _])])]())
 
     QueueIterator(deletedAttributes)
       .flatMap {

diff --git a/thehive/app/org/thp/thehive/controllers/v1/AdminCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/AdminCtrl.scala
@@ -180,6 +180,12 @@ class AdminCtrl(
             case (_: RemoveProperty, _) =>
               filter.contains("RemoveProperty") || filter
                 .contains("schema") || (filters.contains("all") && !filter.contains("!schema") && !filter.contains("!RemoveProperty"))
+            case (_: RemoveVertexLabel, _) =>
+              filter.contains("RemoveVertexLabel") || filter
+                .contains("schema") || (filters.contains("all") && !filter.contains("!schema") && !filter.contains("!RemoveVertexLabel"))
+            case (_: RemoveEdgeLabel, _) =>
+              filter.contains("RemoveEdgeLabel") || filter
+                .contains("schema") || (filters.contains("all") && !filter.contains("!schema") && !filter.contains("!RemoveEdgeLabel"))
             case (_: UpdateGraphVertices, _) =>
               filter.contains("UpdateGraph") || filter.contains("UpdateGraphVertices") || filter
                 .contains("data") || (filters.contains("all") && !filter.contains("!data") && !filter.contains("!UpdateGraph"))
@@ -189,6 +195,9 @@ class AdminCtrl(
             case (_: AddIndex, _) =>
               filter.contains("AddIndex") || filter
                 .contains("index") || (filters.contains("all") && !filter.contains("!index") && !filter.contains("!AddIndex"))
+            case (_: AddIndexedProperty, _) =>
+              filter.contains("AddIndexedProperty") || filter
+                .contains("index") || (filters.contains("all") && !filter.contains("!index") && !filter.contains("!AddIndexedProperty"))
             case (RebuildIndexes, _) =>
               filter.contains("RebuildIndexes") || filter
                 .contains("index") || (filters.contains("all") && !filter.contains("!index") && !filter.contains("!RebuildIndexes"))

diff --git a/thehive/app/org/thp/thehive/services/StreamSrv.scala b/thehive/app/org/thp/thehive/services/StreamSrv.scala
@@ -1,6 +1,6 @@
 package org.thp.thehive.services
 
-import akka.actor.{actorRef2Scala, Actor, ActorIdentity, ActorRef, ActorSystem, Cancellable, Identify, PoisonPill, Props}
+import akka.actor.{Actor, ActorIdentity, ActorRef, ActorSystem, Cancellable, Identify, PoisonPill, Props}
 import akka.pattern.{ask, AskTimeoutException}
 import akka.serialization.Serializer
 import akka.util.Timeout

diff --git a/thehive/test/org/thp/thehive/services/CaseSrvTest.scala b/thehive/test/org/thp/thehive/services/CaseSrvTest.scala
@@ -211,12 +211,9 @@ class CaseSrvTest extends PlaySpecification with TestAppBuilder with TheHiveOpsN
     }
 
     "get correct next case number" in testApp { app =>
-      import app._
       import app.thehiveModule._
 
-      database.roTransaction { implicit graph =>
-        caseSrv.nextCaseNumber shouldEqual 36
-      }
+      caseSrv.nextCaseNumber shouldEqual 36
     }
 
     "close a case properly" in testApp { app =>

diff --git a/thehive/test/org/thp/thehive/services/LocalPasswordAuthSrvTest.scala b/thehive/test/org/thp/thehive/services/LocalPasswordAuthSrvTest.scala
@@ -31,36 +31,36 @@ class LocalPasswordAuthSrvTest extends PlaySpecification with TestAppBuilder {
       import com.softwaremill.macwire._
 
       val localPasswordAuthProvider = wire[LocalPasswordAuthProvider]
-      implicit val authCtx = LocalUserSrv.getSystemAuthContext
+      implicit val authCtx          = LocalUserSrv.getSystemAuthContext
 
       {
-        val policyConfig = Configuration("passwordPolicy.enabled" -> true, "passwordPolicy.minLength" -> 12)
+        val policyConfig         = Configuration("passwordPolicy.enabled" -> true, "passwordPolicy.minLength" -> 12)
         val localPasswordAuthSrv = localPasswordAuthProvider.apply(policyConfig withFallback configuration).get.asInstanceOf[LocalPasswordAuthSrv]
 
         val result = localPasswordAuthSrv.setPassword("foo", "foo")
-        result must beFailedTry.withThrowable[BadRequestError]
+        result                       must beFailedTry.withThrowable[BadRequestError]
         result.failed.get.getMessage must contain("Password must be 12 or more characters in length")
       }
 
       {
-        val policyConfig = Configuration("passwordPolicy.enabled" -> true, "passwordPolicy.minUpperCase" -> 1)
+        val policyConfig         = Configuration("passwordPolicy.enabled" -> true, "passwordPolicy.minUpperCase" -> 1)
         val localPasswordAuthSrv = localPasswordAuthProvider.apply(policyConfig withFallback configuration).get.asInstanceOf[LocalPasswordAuthSrv]
 
         val result = localPasswordAuthSrv.setPassword("foo", "foo")
-        result must beFailedTry.withThrowable[BadRequestError]
+        result                       must beFailedTry.withThrowable[BadRequestError]
         result.failed.get.getMessage must contain("Password must contain 1 or more uppercase characters")
       }
 
       {
         val policyConfig = Configuration(
-          "passwordPolicy.enabled" -> true,
-          "passwordPolicy.minSpecial" -> 1,
+          "passwordPolicy.enabled"               -> true,
+          "passwordPolicy.minSpecial"            -> 1,
           "passwordPolicy.cannotContainUsername" -> true
         )
         val localPasswordAuthSrv = localPasswordAuthProvider.apply(policyConfig withFallback configuration).get.asInstanceOf[LocalPasswordAuthSrv]
 
         val result = localPasswordAuthSrv.setPassword("foo", "foo123")
-        result must beFailedTry.withThrowable[BadRequestError]
+        result                       must beFailedTry.withThrowable[BadRequestError]
         result.failed.get.getMessage must contain("Password must contain 1 or more special characters")
         result.failed.get.getMessage must contain("Password contains the user id 'foo'")
       }