yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented support for overriding daily account limits via new config file Server/data/configs/account_limit_exceptions.conf (this file is hot reloaded automatically upon modification)

Browse Source
This commit is contained in:
Ceikry
2023-03-02 12:14:28 +00:00
committed by Ryan
parent 64a12fe5c8
commit 214ba50ecc
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/data/configs/account_limit_exceptions.conf
+2
View File
@@ -0,0 +1,2 @@
[exceptions]
"127.0.0.1" = 5
Server/src/main/core/net/packet/in/Login.kt
+24 -1
View File
@@ -1,5 +1,6 @@
package core.net.packet.`in` package core.net.packet.`in`
import com.moandjiezana.toml.Toml
import core.cache.crypto.ISAACCipher import core.cache.crypto.ISAACCipher
import core.cache.crypto.ISAACPair import core.cache.crypto.ISAACPair
import core.cache.misc.buffer.ByteBufferUtils import core.cache.misc.buffer.ByteBufferUtils
@@ -24,6 +25,7 @@ import core.game.world.GameWorld
import core.game.world.repository.Repository import core.game.world.repository.Repository
import core.tools.Log import core.tools.Log
import core.worker.ManagementEvents.publish import core.worker.ManagementEvents.publish
import java.io.File
import java.math.BigInteger import java.math.BigInteger
import java.nio.BufferUnderflowException import java.nio.BufferUnderflowException
import java.nio.ByteBuffer import java.nio.ByteBuffer
@@ -34,6 +36,9 @@ object Login {
private const val RECONNECT_LOGIN_OP = 18 private const val RECONNECT_LOGIN_OP = 18
const val CACHE_INDEX_COUNT = 29 const val CACHE_INDEX_COUNT = 29
private var exceptionData: Toml? = null
private var lastModifiedData = 0L
fun decodeFromBuffer(buffer: ByteBuffer) : Pair<AuthResponse, LoginInfo?> { fun decodeFromBuffer(buffer: ByteBuffer) : Pair<AuthResponse, LoginInfo?> {
try { try {
val info = LoginInfo.createDefault() val info = LoginInfo.createDefault()
@@ -164,11 +169,29 @@ object Login {
} }
private fun checkAccountLimit(ipAddress: String, username: String): Boolean { private fun checkAccountLimit(ipAddress: String, username: String): Boolean {
var accountLimit = ServerConstants.DAILY_ACCOUNT_LIMIT
if (File(ServerConstants.CONFIG_PATH + "account_limit_exceptions.conf").exists()) {
try {
val f = File(ServerConstants.CONFIG_PATH + "account_limit_exceptions.conf")
if (f.lastModified() != lastModifiedData) {
exceptionData = Toml().read(f)
lastModifiedData = f.lastModified()
}
if (exceptionData?.contains("exceptions.\"${ipAddress}\"") == true) {
accountLimit = exceptionData?.getLong("exceptions.\"${ipAddress}\"", 0L)?.toInt() ?: accountLimit
}
} catch (e: Exception) {
e.printStackTrace()
}
}
val archive = ServerStore.getArchive("daily-accounts") val archive = ServerStore.getArchive("daily-accounts")
val accounts = archive.getList<String>(ipAddress) val accounts = archive.getList<String>(ipAddress)
if (username in accounts) return true if (username in accounts) return true
if (accounts.size >= ServerConstants.DAILY_ACCOUNT_LIMIT) if (accounts.size >= accountLimit)
return false return false
archive.addToList(ipAddress, username) archive.addToList(ipAddress, username)