coral/Sentinel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved auth security

Browse Source
This commit is contained in:
TheTrouper
2023-08-16 15:56:43 -05:00
parent 0553509730
commit 68d737a08c
2 changed files with 68 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/io/github/thetrouper/sentinel/Sentinel.java
View File

@@ -11,6 +11,7 @@ import io.github.thetrouper.sentinel.server.functions.AntiSpam;
import io.github.thetrouper.sentinel.server.functions.Authenticator;
import io.github.thetrouper.sentinel.server.functions.ProfanityFilter;
import io.github.thetrouper.sentinel.server.util.FileUtils;
import io.github.thetrouper.sentinel.server.util.Randomizer;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.plugin.PluginManager;
@@ -37,24 +38,21 @@ public final class Sentinel extends JavaPlugin {
*/
@Override
public void onEnable() {
log.info("\n]======------ Pre-load started! ------======[");
instance = this;
Config.loadConfiguration();
String serverID = Authenticator.getServerID();
log.info("Your license key is: " + key + " Your server ID is: " + serverID);
switch (Authenticator.authorize(key, serverID)) {
case "AUTHORIZED":
log.info("Authentication Success!");
break;
case "INVALID-ID":
log.info("Authentication Failure, You have not whitelisted this server ID yet.");
getServer().getPluginManager().disablePlugin(this);
break;
case "UNREGISTERED":
log.warning("Authentication Failure, YOU SHALL NOT PASS! License: " + key + " Server ID: " + serverID);
getServer().getPluginManager().disablePlugin(this);
return;
log.info("\n]====---- Requesting Authentication ----====[ \n- license Key: " + key + " \n- Server ID: " + serverID);
String authStatus = "ERROR";
try {
authStatus = Authenticator.authorize(key, serverID);
} catch (Exception e) {
e.printStackTrace();
}
// Files
switch (authStatus) {
case "AUTHORIZED" -> {
log.info("]======----- Auth Success! -----======[");
// Init
getConfig().options().copyDefaults();
saveDefaultConfig();
@@ -98,6 +96,20 @@ public final class Sentinel extends JavaPlugin {
" \\/_____/\\/____/\\/_/\\/_/\\/__/ \\/_/\\/_/\\/_/\\/____/\\/____/\n" +
" ]====---- Advanced Anti-Grief & Chat Filter ----====[");
}
case "INVALID-ID" -> {
log.info("Authentication Failure, You have not whitelisted this server ID yet.");
getServer().getPluginManager().disablePlugin(this);
}
case "UNREGISTERED" -> {
log.warning("Authentication Failure, YOU SHALL NOT PASS! License: " + key + " Server ID: " + serverID);
getServer().getPluginManager().disablePlugin(this);
}
case "ERROR" -> {
log.warning("Hmmmmmm thats not right... License: " + key + " Server ID: " + serverID + "\nPlease report the above stacktrace.");
getServer().getPluginManager().disablePlugin(this);
}
}
}
/**
* Plugin shutdown logic

13
src/main/java/io/github/thetrouper/sentinel/events/NBTEvents.java
View File

@@ -88,6 +88,10 @@ public class NBTEvents implements Listener {
}
// ARMOR
if (meta.hasEnchant(Enchantment.BINDING_CURSE)) {
final int level = meta.getEnchantLevel(Enchantment.BINDING_CURSE);
return level > Config.maxCurseOfBinding || level > Config.globalMaxEnchant;
}
if (meta.hasEnchant(Enchantment.WATER_WORKER)) {
final int level = meta.getEnchantLevel(Enchantment.WATER_WORKER);
return level > Config.maxAquaAffinity || level > Config.globalMaxEnchant;
@@ -100,10 +104,6 @@ public class NBTEvents implements Listener {
final int level = meta.getEnchantLevel(Enchantment.PROTECTION_EXPLOSIONS);
return level > Config.maxBlastProtection || level > Config.globalMaxEnchant;
}
if (meta.hasEnchant(Enchantment.BINDING_CURSE)) {
final int level = meta.getEnchantLevel(Enchantment.BINDING_CURSE);
return level > Config.maxCurseOfBinding || level > Config.globalMaxEnchant;
}
if (meta.hasEnchant(Enchantment.DEPTH_STRIDER)) {
final int level = meta.getEnchantLevel(Enchantment.DEPTH_STRIDER);
return level > Config.maxDepthStrider || level > Config.globalMaxEnchant;
@@ -150,10 +150,6 @@ public class NBTEvents implements Listener {
final int level = meta.getEnchantLevel(Enchantment.DAMAGE_ARTHROPODS);
return level > Config.maxBaneOfArthropods || level > Config.globalMaxEnchant;
}
if (meta.hasEnchant(Enchantment.DIG_SPEED)) {
final int level = meta.getEnchantLevel(Enchantment.DIG_SPEED);
return level > Config.maxEfficiency || level > Config.globalMaxEnchant;
}
if (meta.hasEnchant(Enchantment.FIRE_ASPECT)) {
final int level = meta.getEnchantLevel(Enchantment.FIRE_ASPECT);
return level > Config.maxFireAspect || level > Config.globalMaxEnchant;
@@ -242,7 +238,6 @@ public class NBTEvents implements Listener {
final int level = meta.getEnchantLevel(Enchantment.SILK_TOUCH);
return level > Config.maxSilkTouch || level > Config.globalMaxEnchant;
}
}
return false;
}