big update

Author: Mirik9724

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 }
 
 group = "net.Mirik9724"
-version = "0.1.5"
+version = "0.2.0"
 
 repositories {
     mavenCentral()
@@ -29,6 +29,8 @@ dependencies {
     compileOnly("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")
     kapt("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")
 
+    implementation("com.nulab-inc:zxcvbn:1.9.0")
+
     compileOnly("com.github.Mirik9724:MirikAPI:v0.1.5.10")
     compileOnly("net.elytrium.limboapi:api:1.1.26")
 }

src/main/kotlin/net/Mirik9724/MiLogin/MiCommands.kt

@@ -2,42 +2,72 @@ package net.Mirik9724.MiLogin
 
 import com.velocitypowered.api.command.SimpleCommand
 import com.velocitypowered.api.proxy.Player
+import net.Mirik9724.MiLogin.MiLogin.Companion.authTimers
 import net.Mirik9724.MiLogin.MiLogin.Companion.cache
 import net.Mirik9724.MiLogin.MiLogin.Companion.data
 import net.Mirik9724.MiLogin.MiLogin.Companion.isRegistered
-import net.Mirik9724.MiLogin.MiLogin.Companion.lFactory
 import net.Mirik9724.MiLogin.MiLogin.Companion.notLoged
+import net.Mirik9724.MiLogin.PasswordGuard.isSimple
 import net.kyori.adventure.text.Component
 import net.kyori.adventure.text.format.NamedTextColor
 import java.time.LocalDateTime
 
-class LogC {
+class LogC() {
     fun li(player: Player, args: Array<String>) {
+        if (MiLogin.isOnCooldown(player.username.toString())) {
+            player.sendMessage(Component.text(data["wait3Sec"]!!).color(NamedTextColor.RED))
+            return
+        }
+        MiLogin.updateCooldown(player.username.toString())
+
         if (args.size != 1) {
             return
         }
 
-        if(Hash(args[0]) != MiLogin.cache[player.username]?.pass){
+        val attempts = MiLogin.loginAttempts.getOrDefault(player.username.toString(), 0)
+        if (attempts >= MiLogin.maxAttempts) {
+            MiLogin.loginAttempts.remove(player.username.toString())
+            player.disconnect(Component.text(data["tooMoreTrys"]!!).color(NamedTextColor.RED))
+            return
+        }
+
+        if(Hash(args[0]) != cache[player.username.toString()]?.pass){
             player.sendMessage(Component.text(data["log.wrP"]!!).color(NamedTextColor.RED))
+
+            val newAttempts = attempts + 1
+            MiLogin.loginAttempts[player.username.toString()] = newAttempts
+            return
         }
 
         player.sendMessage(Component.text(data["log.logged"]!!).color(NamedTextColor.GOLD))
         player.resetTitle()
 
+        MiLogin.loginAttempts.remove(player.username.toString())
+
         cache[player.username.toString()]  = MiData(
             time = LocalDateTime.now().toString()
         )
         MiLogin.saveData()
-
-
         notLoged.remove(player.username.toString())
-        lFactory.respawnPlayer(player)
+        authTimers[player.username.toString()]?.cancel()
+        authTimers.remove(player.username.toString())
+        MiLogin.bossBars[player.username.toString()]?.let {
+            player.hideBossBar(it)
+            MiLogin.bossBars.remove(player.username.toString())
+        }
+
+        MiLogin.factory.passLoginLimbo(player);
     }
 }
 
-class RegC {
+class RegC() {
     fun li(player: Player, args: Array<String>) {
         if(isRegistered(player.username.toString())){return}
+        if (MiLogin.isOnCooldown(player.username.toString())) {
+            player.sendMessage(Component.text(data["wait3Sec"]!!).color(NamedTextColor.RED))
+            return
+        }
+        MiLogin.updateCooldown(player.username.toString())
 
         if (args.size != 2) {
             return
@@ -48,7 +78,7 @@ class RegC {
             return
         }
 
-        if (isSimple(args[0])) {
+        if (isSimple(args[0], player.username.toString())) {
             return
         }
 
@@ -62,7 +92,14 @@ class RegC {
         MiLogin.saveData()
 
         notLoged.remove(player.username.toString())
-        lFactory.respawnPlayer(player)
+        authTimers[player.username.toString()]?.cancel()
+        authTimers.remove(player.username.toString())
+        MiLogin.bossBars[player.username.toString()]?.let {
+            player.hideBossBar(it)
+            MiLogin.bossBars.remove(player.username.toString())
+        }
+
+        MiLogin.factory.passLoginLimbo(player);
     }
 }
 

src/main/kotlin/net/Mirik9724/MiLogin/MiHash.kt

@@ -1,13 +1,26 @@
 package net.Mirik9724.MiLogin
 
-import java.security.MessageDigest
 import java.security.SecureRandom
 import net.Mirik9724.MiLogin.MiLogin.Companion.salt
+import javax.crypto.SecretKeyFactory
+import javax.crypto.spec.PBEKeySpec
+import com.nulabinc.zxcvbn.Strength
+import com.nulabinc.zxcvbn.Zxcvbn
 
 fun Hash(password: String): String {
-    val digest = MessageDigest.getInstance("SHA-256")
-    digest.update(salt)
-    val hashBytes = digest.digest(password.toByteArray(Charsets.UTF_8))
+    val iterations = 10000
+    val keyLength = 256
+
+    val spec = PBEKeySpec(
+        password.toCharArray(),
+        salt,
+        iterations,
+        keyLength
+    )
+
+    val factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256")
+    val hashBytes = factory.generateSecret(spec).encoded
+
     return hashBytes.joinToString("") { "%02x".format(it) }
 }
 
@@ -18,6 +31,14 @@ fun generateSalt(length: Int = 32): ByteArray {
     return salt
 }
 
-fun isSimple(password: String) : Boolean {
-    return false
-}
+object PasswordGuard {
+    private val zxcvbn by lazy { Zxcvbn() }
+
+    fun isSimple(password: String, username: String): Boolean {
+        if (password.length < 6) return true
+
+        val strength: Strength = zxcvbn.measure(password, listOf(username))
+
+        return strength.score < 2
+    }
+}