add wiretap

app/core/Global.scala

@@ -31,6 +31,7 @@ object Global extends GlobalSettings {
  }
  else {
  env.monitor.rpsProvider.countRequest()
+ env.security.wiretap(req)
  env.security.firewall.requestHandler(req) orElse
  env.i18n.requestHandler(req) orElse
  super.onRouteRequest(req)

app/core/Settings.scala

@@ -3,6 +3,7 @@ package core
 
 import com.typesafe.config.Config
 import scalaz.{ Success, Failure }
+import scala.collection.JavaConversions._
 
 final class Settings(config: Config, val IsDev: Boolean) {
 
@@ -128,6 +129,7 @@ final class Settings(config: Config, val IsDev: Boolean) {
  val CoreCronEnabled = getBoolean("core.cron.enabled")
 
  val SecurityCollectionSecurity = getString("security.collection.security")
+ val SecurityWiretapIps = getStringList("security.wiretap.ips").toList
 
  val ActorReporting = "reporting"
  val ActorSiteHub = "site_hub"

app/round/Socket.scala

@@ -152,7 +152,7 @@ final class Socket(
  ) map {
  case Connected(enumerator, member) ⇒ {
  if (owner && !member.owner) {
- println("Websocket hijacking detected %s %s".format(pov.gameId, ctx.toString))
+ println("Websocket hijacking detected %s %s".format(pov.fullId, ctx.toString))
  }
  (Iteratee.foreach[JsValue](
  controller(hub, uid, member, PovRef(pov.gameId, member.color))

app/security/Firewall.scala

@@ -69,7 +69,7 @@ final class Firewall(
  }
 
  private def formatReq(req: RequestHeader) =
- "%s %s %s".format(req.uri, req.remoteAddress, req.headers.get("User-Agent") | "?")
+ "%s %s %s".format(req.remoteAddress, req.uri, req.headers.get("User-Agent") | "?")
 
  private def blocksIp(ip: String) = ips contains ip
 

app/security/SecurityEnv.scala

@@ -25,6 +25,8 @@ final class SecurityEnv(
 
  lazy val flood = new security.Flood
 
+ lazy val wiretap = new security.Wiretap(SecurityWiretapIps.toSet)
+
  lazy val forms = new DataForm(
  userRepo = userRepo,
  captcher = captcha)

app/security/Wiretap.scala

@@ -0,0 +1,15 @@
+package lila
+package security
+
+import play.api.mvc.RequestHeader
+
+final class Wiretap(ips: Set[String]) {
+
+ def apply(req: RequestHeader) {
+ if (ips(req.remoteAddress)) println("[wiretap] %s %s %s".format(
+ req.remoteAddress,
+ "http:https://" + req.host + req.uri,
+ req.headers.get("User-Agent") | "?"
+ ))
+ }
+}