deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

add UGC logging

Browse source
This commit is contained in:
Thibault Duplessis 2018-12-05 14:10:44 +07:00
parent 12b1496655
commit c5979b83f8
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/security/src/main/GarbageCollector.scala
View file

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