Skip to content

Commit 508b2b7

Browse files
committed
Remove warnings
1 parent fff8464 commit 508b2b7

File tree

5 files changed

+20
-14
lines changed

5 files changed

+20
-14
lines changed

misp/connector/src/main/scala/org/thp/thehive/connector/misp/services/MispImportSrv.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ class MispImportSrv(
288288
val deletedAttributes = client
289289
.searchAttributes(event.id, lastSynchro, deletedOnly = true)
290290
.mapConcat(attributeToObservable)
291-
.runWith(Sink.queue[(Observable, Either[String, (String, String, Source[ByteString, _])])])
291+
.runWith(Sink.queue[(Observable, Either[String, (String, String, Source[ByteString, _])])]())
292292

293293
QueueIterator(deletedAttributes)
294294
.flatMap {

thehive/app/org/thp/thehive/controllers/v1/AdminCtrl.scala

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,12 @@ class AdminCtrl(
180180
case (_: RemoveProperty, _) =>
181181
filter.contains("RemoveProperty") || filter
182182
.contains("schema") || (filters.contains("all") && !filter.contains("!schema") && !filter.contains("!RemoveProperty"))
183+
case (_: RemoveVertexLabel, _) =>
184+
filter.contains("RemoveVertexLabel") || filter
185+
.contains("schema") || (filters.contains("all") && !filter.contains("!schema") && !filter.contains("!RemoveVertexLabel"))
186+
case (_: RemoveEdgeLabel, _) =>
187+
filter.contains("RemoveEdgeLabel") || filter
188+
.contains("schema") || (filters.contains("all") && !filter.contains("!schema") && !filter.contains("!RemoveEdgeLabel"))
183189
case (_: UpdateGraphVertices, _) =>
184190
filter.contains("UpdateGraph") || filter.contains("UpdateGraphVertices") || filter
185191
.contains("data") || (filters.contains("all") && !filter.contains("!data") && !filter.contains("!UpdateGraph"))
@@ -189,6 +195,9 @@ class AdminCtrl(
189195
case (_: AddIndex, _) =>
190196
filter.contains("AddIndex") || filter
191197
.contains("index") || (filters.contains("all") && !filter.contains("!index") && !filter.contains("!AddIndex"))
198+
case (_: AddIndexedProperty, _) =>
199+
filter.contains("AddIndexedProperty") || filter
200+
.contains("index") || (filters.contains("all") && !filter.contains("!index") && !filter.contains("!AddIndexedProperty"))
192201
case (RebuildIndexes, _) =>
193202
filter.contains("RebuildIndexes") || filter
194203
.contains("index") || (filters.contains("all") && !filter.contains("!index") && !filter.contains("!RebuildIndexes"))

thehive/app/org/thp/thehive/services/StreamSrv.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.thp.thehive.services
22

3-
import akka.actor.{actorRef2Scala, Actor, ActorIdentity, ActorRef, ActorSystem, Cancellable, Identify, PoisonPill, Props}
3+
import akka.actor.{Actor, ActorIdentity, ActorRef, ActorSystem, Cancellable, Identify, PoisonPill, Props}
44
import akka.pattern.{ask, AskTimeoutException}
55
import akka.serialization.Serializer
66
import akka.util.Timeout

thehive/test/org/thp/thehive/services/CaseSrvTest.scala

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,9 @@ class CaseSrvTest extends PlaySpecification with TestAppBuilder with TheHiveOpsN
211211
}
212212

213213
"get correct next case number" in testApp { app =>
214-
import app._
215214
import app.thehiveModule._
216215

217-
database.roTransaction { implicit graph =>
218-
caseSrv.nextCaseNumber shouldEqual 36
219-
}
216+
caseSrv.nextCaseNumber shouldEqual 36
220217
}
221218

222219
"close a case properly" in testApp { app =>

thehive/test/org/thp/thehive/services/LocalPasswordAuthSrvTest.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,36 +31,36 @@ class LocalPasswordAuthSrvTest extends PlaySpecification with TestAppBuilder {
3131
import com.softwaremill.macwire._
3232

3333
val localPasswordAuthProvider = wire[LocalPasswordAuthProvider]
34-
implicit val authCtx = LocalUserSrv.getSystemAuthContext
34+
implicit val authCtx = LocalUserSrv.getSystemAuthContext
3535

3636
{
37-
val policyConfig = Configuration("passwordPolicy.enabled" -> true, "passwordPolicy.minLength" -> 12)
37+
val policyConfig = Configuration("passwordPolicy.enabled" -> true, "passwordPolicy.minLength" -> 12)
3838
val localPasswordAuthSrv = localPasswordAuthProvider.apply(policyConfig withFallback configuration).get.asInstanceOf[LocalPasswordAuthSrv]
3939

4040
val result = localPasswordAuthSrv.setPassword("foo", "foo")
41-
result must beFailedTry.withThrowable[BadRequestError]
41+
result must beFailedTry.withThrowable[BadRequestError]
4242
result.failed.get.getMessage must contain("Password must be 12 or more characters in length")
4343
}
4444

4545
{
46-
val policyConfig = Configuration("passwordPolicy.enabled" -> true, "passwordPolicy.minUpperCase" -> 1)
46+
val policyConfig = Configuration("passwordPolicy.enabled" -> true, "passwordPolicy.minUpperCase" -> 1)
4747
val localPasswordAuthSrv = localPasswordAuthProvider.apply(policyConfig withFallback configuration).get.asInstanceOf[LocalPasswordAuthSrv]
4848

4949
val result = localPasswordAuthSrv.setPassword("foo", "foo")
50-
result must beFailedTry.withThrowable[BadRequestError]
50+
result must beFailedTry.withThrowable[BadRequestError]
5151
result.failed.get.getMessage must contain("Password must contain 1 or more uppercase characters")
5252
}
5353

5454
{
5555
val policyConfig = Configuration(
56-
"passwordPolicy.enabled" -> true,
57-
"passwordPolicy.minSpecial" -> 1,
56+
"passwordPolicy.enabled" -> true,
57+
"passwordPolicy.minSpecial" -> 1,
5858
"passwordPolicy.cannotContainUsername" -> true
5959
)
6060
val localPasswordAuthSrv = localPasswordAuthProvider.apply(policyConfig withFallback configuration).get.asInstanceOf[LocalPasswordAuthSrv]
6161

6262
val result = localPasswordAuthSrv.setPassword("foo", "foo123")
63-
result must beFailedTry.withThrowable[BadRequestError]
63+
result must beFailedTry.withThrowable[BadRequestError]
6464
result.failed.get.getMessage must contain("Password must contain 1 or more special characters")
6565
result.failed.get.getMessage must contain("Password contains the user id 'foo'")
6666
}

0 commit comments

Comments
 (0)