Skip to content

Commit ab4ddb1

Browse files
committed
Permit to enable and disable http filters
1 parent 8d5db1d commit ab4ddb1

File tree

3 files changed

+6
-15
lines changed

3 files changed

+6
-15
lines changed

thehive-backend/app/global/Filters.scala

+2-9
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,15 @@ package global
22

33
import javax.inject.{ Inject, Provider, Singleton }
44

5-
import scala.collection.immutable
6-
75
import play.api.Logger
8-
import play.api.http.{ HttpFilters, SessionConfiguration }
6+
import play.api.http.SessionConfiguration
97
import play.api.libs.crypto.CSRFTokenSigner
10-
import play.api.mvc.{ EssentialFilter, RequestHeader }
8+
import play.api.mvc.RequestHeader
119
import play.filters.csrf.CSRF.{ ErrorHandler, TokenProvider }
1210
import play.filters.csrf.CSRFConfig
1311

1412
import akka.stream.Materializer
1513

16-
@Singleton
17-
class TheHiveFilters @Inject() (injectedFilters: immutable.Set[EssentialFilter]) extends HttpFilters {
18-
override val filters: Seq[EssentialFilter] = injectedFilters.toSeq
19-
}
20-
2114
object CSRFFilter {
2215
private[CSRFFilter] lazy val logger = Logger(getClass)
2316

thehive-backend/app/global/TheHive.scala

-5
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,6 @@ class TheHive(
6565
authBindings.addBinding.to(authSrvClass)
6666
}
6767

68-
val filterBindings = ScalaMultibinder.newSetBinder[EssentialFilter](binder)
69-
filterBindings.addBinding.to[StreamFilter]
70-
filterBindings.addBinding.to[TempFilter]
71-
filterBindings.addBinding.to[CSRFFilter]
72-
7368
bind[MigrationOperations].to[Migration]
7469
bind[AuthSrv].to[TheHiveAuthSrv]
7570

thehive-backend/conf/reference.conf

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ play.modules.enabled += global.TheHive
1616
# handler for requests (check if database is in maintenance or not)
1717
#play.http.requestHandler = TheHiveHostRequestHandler
1818

19-
play.http.filters = global.TheHiveFilters
19+
play.filters.enabled += services.StreamFilter
20+
play.filters.enabled += org.elastic4play.services.TempFilter
21+
play.filters.enabled += global.CSRFFilter
22+
play.filters.disabled += play.filters.csrf.CSRFFilter
2023

2124
# ElasticSearch
2225
search {

0 commit comments

Comments
 (0)