authorization by ip

MeiNanziiii · MeiNanziiii · commit a5013a0ad266 · 2024-10-08T17:36:10.000+03:00
diff --git a/src/main/java/ua/mei/minekord/mixin/PlayerManagerMixin.java b/src/main/java/ua/mei/minekord/mixin/PlayerManagerMixin.java
@@ -8,23 +8,35 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import ua.mei.minekord.bot.DiscordUtils;
+import ua.mei.minekord.cache.IPCache;
 import ua.mei.minekord.config.AuthSpec;
 import ua.mei.minekord.config.MinekordConfigKt;
 import ua.mei.minekord.event.IPCheckEvent;
 
+import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 
 @Mixin(PlayerManager.class)
 public class PlayerManagerMixin {
     @Inject(method = "checkCanJoin", at = @At("RETURN"), cancellable = true)
     private void minekord$checkRoles(SocketAddress socketAddress, GameProfile gameProfile, CallbackInfoReturnable<Text> cir) {
         if (cir.getReturnValue() == null) {
-            if (!MinekordConfigKt.getConfig().get(AuthSpec.INSTANCE.getUuidFromSnowflake()) && !MinekordConfigKt.getConfig().get(AuthSpec.INSTANCE.getRequiredRoles()).isEmpty()) {
-                if (DiscordUtils.INSTANCE.getPlayer(gameProfile.getName()) == null) {
+            boolean uuidFromSnowflake = MinekordConfigKt.getConfig().get(AuthSpec.INSTANCE.getUuidFromSnowflake());
+            boolean requiredRoles = !MinekordConfigKt.getConfig().get(AuthSpec.INSTANCE.getRequiredRoles()).isEmpty();
+            boolean loginByIp = MinekordConfigKt.getConfig().get(AuthSpec.INSTANCE.getLoginByIp());
+            String playerName = gameProfile.getName();
+            String cachedIp = IPCache.INSTANCE.getFromCache(playerName);
+
+            if (!uuidFromSnowflake && requiredRoles) {
+                if (DiscordUtils.INSTANCE.getPlayer(playerName) == null) {
                     cir.setReturnValue(Text.translatable("multiplayer.disconnect.generic"));
                 }
             }
-            IPCheckEvent.Companion.getEvent().invoker().request(socketAddress, gameProfile);
+
+            if (loginByIp && socketAddress instanceof InetSocketAddress inet && !cachedIp.equals(inet.getHostName())) {
+                IPCheckEvent.Companion.getEvent().invoker().request(socketAddress, gameProfile);
+                cir.setReturnValue(Text.translatable("multiplayer.disconnect.generic"));
+            }
         }
     }
 }
diff --git a/src/main/kotlin/ua/mei/minekord/Minekord.kt b/src/main/kotlin/ua/mei/minekord/Minekord.kt
@@ -1,7 +1,6 @@
 package ua.mei.minekord
 
 import net.fabricmc.api.ModInitializer
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents
 import net.fabricmc.loader.api.FabricLoader
 import org.apache.logging.log4j.LogManager
 import org.apache.logging.log4j.Logger
diff --git a/src/main/kotlin/ua/mei/minekord/bot/MinekordBot.kt b/src/main/kotlin/ua/mei/minekord/bot/MinekordBot.kt
@@ -7,9 +7,9 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import ua.mei.minekord.bot.extensions.IPCheckExtension
+import ua.mei.minekord.bot.extensions.SetupExtension
 import ua.mei.minekord.config.BotSpec
 import ua.mei.minekord.config.config
-import ua.mei.minekord.bot.extensions.SetupExtension
 import kotlin.coroutines.CoroutineContext
 
 object MinekordBot : CoroutineScope {
diff --git a/src/main/kotlin/ua/mei/minekord/bot/extensions/IPCheckExtension.kt b/src/main/kotlin/ua/mei/minekord/bot/extensions/IPCheckExtension.kt
@@ -2,16 +2,18 @@ package ua.mei.minekord.bot.extensions
 
 import dev.kord.common.entity.ButtonStyle
 import dev.kord.common.entity.Snowflake
-import dev.kord.core.behavior.channel.createEmbed
 import dev.kord.core.behavior.channel.createMessage
 import dev.kord.core.entity.User
-import dev.kord.rest.builder.message.actionRow
 import dev.kord.rest.builder.message.embed
 import dev.kordex.core.components.components
+import dev.kordex.core.components.disabledButton
 import dev.kordex.core.components.publicButton
 import dev.kordex.core.extensions.Extension
+import dev.kordex.core.time.TimestampType
+import dev.kordex.core.time.toDiscord
 import io.ktor.util.network.address
 import kotlinx.coroutines.launch
+import kotlinx.datetime.Clock
 import ua.mei.minekord.bot.DiscordUtils
 import ua.mei.minekord.bot.MinekordBot
 import ua.mei.minekord.cache.IPCache
@@ -29,18 +31,32 @@ class IPCheckExtension : Extension() {
 
                     user?.getDmChannelOrNull()?.createMessage {
                         embed {
-                            title = "Join with new IP"
-                            description = "This is your IP?\n> ${address.address}"
+                            title = "This is your IP?"
+
+                            field {
+                                name = "> IP"
+                                value = "> ${address.address}"
+                            }
+                            field {
+                                name = "> Time"
+                                value = "> ${Clock.System.now().toDiscord(TimestampType.Default)}"
+                            }
                         }
                         components {
                             publicButton {
                                 label = "Yes"
                                 style = ButtonStyle.Success
 
                                 action {
-                                    IPCache.putIntoCache(profile.id, address.address)
-                                    respond {
-                                        content = "ІДІ НАХУЙ"
+                                    IPCache.putIntoCache(profile.name, address.address)
+
+                                    edit {
+                                        components {
+                                            disabledButton {
+                                                label = "Yes"
+                                                style = ButtonStyle.Success
+                                            }
+                                        }
                                     }
                                 }
                             }
@@ -49,8 +65,13 @@ class IPCheckExtension : Extension() {
                                 style = ButtonStyle.Danger
 
                                 action {
-                                    respond {
-                                        content = "ІДІ НАХУЙ"
+                                    edit {
+                                        components {
+                                            disabledButton {
+                                                label = "No"
+                                                style = ButtonStyle.Danger
+                                            }
+                                        }
                                     }
                                 }
                             }
diff --git a/src/main/kotlin/ua/mei/minekord/cache/IPCache.kt b/src/main/kotlin/ua/mei/minekord/cache/IPCache.kt
@@ -7,10 +7,9 @@ import net.fabricmc.loader.api.FabricLoader
 import java.io.FileReader
 import java.nio.file.Files
 import java.nio.file.Path
-import java.util.UUID
 
 object IPCache {
-    private var cache: MutableMap<UUID, String> = mutableMapOf()
+    private var cache: MutableMap<String, String> = mutableMapOf()
     val path: Path = FabricLoader.getInstance().gameDir.resolve("ip-cache.json")
     val gson: Gson = GsonBuilder()
         .setPrettyPrinting()
@@ -22,7 +21,7 @@ object IPCache {
             Files.write(path, "{}".toByteArray())
         }
         val reader: JsonReader = JsonReader(FileReader(path.toFile()))
-        cache = gson.fromJson(reader, MutableMap::class.java)
+        cache = gson.fromJson(reader, Map::class.java)
         reader.close()
     }
 
@@ -33,12 +32,12 @@ object IPCache {
         Files.write(path, gson.toJson(cache).toByteArray())
     }
 
-    fun putIntoCache(uuid: UUID, ip: String) {
-        cache[uuid] = ip
+    fun putIntoCache(nickname: String, ip: String) {
+        cache[nickname] = ip
         save()
     }
 
-    fun getFromCache(uuid: UUID): String {
-        return cache[uuid] ?: ""
+    fun getFromCache(nickname: String): String {
+        return cache[nickname] ?: ""
     }
 }
diff --git a/src/main/kotlin/ua/mei/minekord/config/AuthSpec.kt b/src/main/kotlin/ua/mei/minekord/config/AuthSpec.kt
@@ -7,5 +7,4 @@ object AuthSpec : ConfigSpec() {
     val allowOfflinePlayers by required<Boolean>()
     val requiredRoles by required<List<ULong>>()
     val loginByIp by required<Boolean>()
-    val ignorePremiumIp by required<Boolean>()
 }
diff --git a/src/main/resources/minekord.toml b/src/main/resources/minekord.toml
@@ -30,6 +30,3 @@ requiredRoles = []
 # Option made for players, who are lazy to type /login and /register,
 # or for best safety.
 loginByIp = false
-
-# Don't request IP confirmation to premium players.
-ignorePremiumIp = false

Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,9 @@ import net.fabricmc.loader.api.FabricLoader`
`7`	`7`	`import java.io.FileReader`
`8`	`8`	`import java.nio.file.Files`
`9`	`9`	`import java.nio.file.Path`
`10`		`-import java.util.UUID`
`11`	`10`
`12`	`11`	`object IPCache {`
`13`		`- private var cache: MutableMap<UUID, String> = mutableMapOf()`
	`12`	`+ private var cache: MutableMap<String, String> = mutableMapOf()`
`14`	`13`	`val path: Path = FabricLoader.getInstance().gameDir.resolve("ip-cache.json")`
`15`	`14`	`val gson: Gson = GsonBuilder()`
`16`	`15`	`.setPrettyPrinting()`
`@@ -22,7 +21,7 @@ object IPCache {`
`22`	`21`	`Files.write(path, "{}".toByteArray())`
`23`	`22`	`}`
`24`	`23`	`val reader: JsonReader = JsonReader(FileReader(path.toFile()))`
`25`		`- cache = gson.fromJson(reader, MutableMap::class.java)`
	`24`	`+ cache = gson.fromJson(reader, Map::class.java)`
`26`	`25`	`reader.close()`
`27`	`26`	`}`
`28`	`27`
`@@ -33,12 +32,12 @@ object IPCache {`
`33`	`32`	`Files.write(path, gson.toJson(cache).toByteArray())`
`34`	`33`	`}`
`35`	`34`
`36`		`- fun putIntoCache(uuid: UUID, ip: String) {`
`37`		`- cache[uuid] = ip`
	`35`	`+ fun putIntoCache(nickname: String, ip: String) {`
	`36`	`+ cache[nickname] = ip`
`38`	`37`	`save()`
`39`	`38`	`}`
`40`	`39`
`41`		`- fun getFromCache(uuid: UUID): String {`
`42`		`- return cache[uuid] ?: ""`
	`40`	`+ fun getFromCache(nickname: String): String {`
	`41`	`+ return cache[nickname] ?: ""`
`43`	`42`	`}`
`44`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,4 @@ object AuthSpec : ConfigSpec() {`
`7`	`7`	`val allowOfflinePlayers by required<Boolean>()`
`8`	`8`	`val requiredRoles by required<List<ULong>>()`
`9`	`9`	`val loginByIp by required<Boolean>()`
`10`		`- val ignorePremiumIp by required<Boolean>()`
`11`	`10`	`}`