From c5979b83f822915aa154b2b8c4a8eacd0eece401 Mon Sep 17 00:00:00 2001
From: Thibault Duplessis <thibault.duplessis@gmail.com>
Date: Wed, 5 Dec 2018 14:10:44 +0700
Subject: [PATCH] add UGC logging

---
 modules/security/src/main/GarbageCollector.scala | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/security/src/main/GarbageCollector.scala b/modules/security/src/main/GarbageCollector.scala
index 16214f6a86..39d92aee3a 100644
--- a/modules/security/src/main/GarbageCollector.scala
+++ b/modules/security/src/main/GarbageCollector.scala
@@ -16,9 +16,13 @@ final class GarbageCollector(
     system: akka.actor.ActorSystem
 ) {
 
+  private val logger = lila.security.logger.branch("GarbageCollector")
+
   private val done = new lila.memo.ExpireSetMemo(10 minutes)
 
-  private case class ApplyData(user: User, ip: IpAddress, email: EmailAddress, req: RequestHeader)
+  private case class ApplyData(user: User, ip: IpAddress, email: EmailAddress, req: RequestHeader) {
+    override def toString = s"${user.username} $ip $email $req"
+  }
 
   // User just signed up and doesn't have security data yet, so wait a bit
   def delay(user: User, email: EmailAddress, req: RequestHeader): Unit =
@@ -26,6 +30,7 @@ final class GarbageCollector(
       val ip = HTTPRequest lastRemoteAddress req
       system.scheduler.scheduleOnce(6 seconds) {
         val applyData = ApplyData(user, ip, email, req)
+        logger.info(s"delay $applyData")
         lila.common.Future.retry(
           () => ensurePrintAvailable(applyData),
           delay = 10 seconds,
@@ -44,11 +49,14 @@ final class GarbageCollector(
   private def apply(data: ApplyData): Funit = data match {
     case ApplyData(user, ip, email, req) =>
       userSpy(user) flatMap { spy =>
+        val print = spy.prints.headOption
+        logger.info(s"apply ${data.user.username} print=${print}")
         system.lilaBus.publish(
-          lila.security.Signup(user, email, req, spy.prints.headOption.map(_.value)),
+          lila.security.Signup(user, email, req, print.map(_.value)),
           'userSignup
         )
         badOtherAccounts(spy.otherUsers.map(_.user)) ?? { others =>
+          logger.info(s"other ${data.user.username} others=${others.map(_.username)}")
           lila.common.Future.exists(spy.ips)(ipTrust.isSuspicious).map {
             _ ?? {
               val ipBan = spy.usersSharingIp.forall { u =>
@@ -79,7 +87,7 @@ final class GarbageCollector(
     val wait = (30 + scala.util.Random.nextInt(300)).seconds
     val othersStr = others.map(o => "@" + o.username).mkString(", ")
     val message = s"Will dispose of @${user.username} in $wait. Email: $email. Prev users: $othersStr${!armed ?? " [SIMULATION]"}"
-    logger.branch("GarbageCollector").info(message)
+    logger.info(message)
     slack.garbageCollector(message) >>- {
       if (armed) {
         doInitialSb(user)