simplify away net.ip config

pull/8456/head
Niklas Fiekas 2021-03-23 16:06:14 +01:00
parent 13b8872a96
commit 188e1b8e42
5 changed files with 4 additions and 13 deletions

View File

@ -11,7 +11,6 @@ net {
asset.base_url = "http://"${net.asset.domain}
asset.minified = false
base_url = "http://"${net.domain}
ip = "127.0.0.1"
email = ""
crawlable = false
ratelimit = true

View File

@ -7,7 +7,6 @@ object ThreadLocalRandom {
import java.util.concurrent.ThreadLocalRandom.current
def nextBoolean(): Boolean = current.nextBoolean()
def nextByte(): Byte = current.nextInt(256).toByte
def nextBytes(bytes: Array[Byte]): Unit = current.nextBytes(bytes)
def nextDouble(): Double = current.nextDouble()
def nextFloat(): Float = current.nextFloat()

View File

@ -42,8 +42,7 @@ object config {
@ConfigName("socket.domains") socketDomains: List[String],
crawlable: Boolean,
@ConfigName("ratelimit") rateLimit: RateLimit,
email: EmailAddress,
ip: IpAddress
email: EmailAddress
) {
def isProd = domain == prodDomain
}
@ -57,7 +56,6 @@ object config {
implicit val emailAddressLoader = strLoader(EmailAddress.apply)
implicit val netDomainLoader = strLoader(NetDomain.apply)
implicit val assetDomainLoader = strLoader(AssetDomain.apply)
implicit val ipLoader = strLoader(IpAddress.unchecked)
implicit val rateLimitLoader = boolLoader(RateLimit.apply)
implicit val netLoader = AutoConfig.loader[NetConfig]

View File

@ -58,7 +58,7 @@ final class Env(
lazy val userLogins = wire[UserLoginsApi]
lazy val store = new Store(db(config.collection.security), cacheApi, net.ip)
lazy val store = new Store(db(config.collection.security), cacheApi)
lazy val ip2proxy: Ip2Proxy =
if (config.ip2Proxy.enabled) {

View File

@ -13,7 +13,7 @@ import lila.db.dsl._
import lila.user.User
import reactivemongo.api.bson.BSONNull
final class Store(val coll: Coll, cacheApi: lila.memo.CacheApi, localIp: IpAddress)(implicit
final class Store(val coll: Coll, cacheApi: lila.memo.CacheApi)(implicit
ec: scala.concurrent.ExecutionContext
) {
@ -64,12 +64,7 @@ final class Store(val coll: Coll, cacheApi: lila.memo.CacheApi, localIp: IpAddre
$doc(
"_id" -> sessionId,
"user" -> userId,
"ip" -> (HTTPRequest.ipAddress(req) match {
// randomize stresser IPs to relieve mod tools
case ip if ip == localIp =>
IpV4Address(127, 0, ThreadLocalRandom.nextByte(), ThreadLocalRandom.nextByte())
case ip => ip
}),
"ip" -> HTTPRequest.ipAddress(req),
"ua" -> HTTPRequest.userAgent(req).|("?"),
"date" -> DateTime.now,
"up" -> up,