Add banip and unbanip commands, fix minor issues
This commit is contained in:
Tomasz Kuraczyk
parent
4fd4cc81f9
commit
3f4a9f6f36
8 changed files with 868 additions and 7 deletions
339
src/main/java/net/kuraczyk/banhammer/cmds/BanIP.java
Normal file
339
src/main/java/net/kuraczyk/banhammer/cmds/BanIP.java
Normal file
|
|
@ -0,0 +1,339 @@
|
|||
package net.kuraczyk.banhammer.cmds;
|
||||
|
||||
import net.kuraczyk.banhammer.BanHammer;
|
||||
import net.kuraczyk.banhammer.utils.IPBan;
|
||||
import net.kuraczyk.banhammer.utils.PlayerBan;
|
||||
import net.kuraczyk.banhammer.utils.TextUtils;
|
||||
import net.kyori.adventure.text.Component;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import java.net.InetAddress;
|
||||
import java.net.UnknownHostException;
|
||||
import java.sql.*;
|
||||
import java.util.Objects;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
public class BanIP implements CommandExecutor {
|
||||
|
||||
BanHammer plugin;
|
||||
|
||||
public BanIP(BanHammer p){
|
||||
plugin = p;
|
||||
p.getCommand("banip").setExecutor(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCommand(CommandSender sender, Command cmd, String lab, String[] args) {
|
||||
if(sender instanceof Player) return banIpCommand((Player)sender, args);
|
||||
else return banIpCommand(args);
|
||||
}
|
||||
|
||||
private boolean banIpCommand(Player p, String[] args) {
|
||||
if(!p.hasPermission("banhammer.banip")) {
|
||||
p.sendMessage(TextUtils.colorString(addPrefix(plugin.translations.getString("command.banip.noPermission"))));
|
||||
return false;
|
||||
}
|
||||
if(args.length==0) p.sendMessage(TextUtils.colorString(addPrefix(plugin.translations.getString("command.banip.usage"))));
|
||||
else if(args.length>=1) {
|
||||
Timestamp banEndDate=null;
|
||||
String scope = "*", reason = plugin.translations.getString("default.reason"), duration="-1";
|
||||
|
||||
if(args.length>=2) scope=args[1];
|
||||
if(args.length>=3) {
|
||||
duration=args[2];
|
||||
String regex = "^(perm)|(-1)|\\d+:(s|m|h|d)$";
|
||||
String regexOnlyNum = "^\\d+$";
|
||||
if(!(duration.matches(regex) || duration.matches(regexOnlyNum))) {
|
||||
p.sendMessage(TextUtils.colorString(addPrefix(plugin.translations.getString("command.banip.durationFormatError"))));
|
||||
return false;
|
||||
}
|
||||
char type = plugin.config.getString("defaultDurationType").charAt(0);
|
||||
Integer time=0;
|
||||
boolean chk = false;
|
||||
for(int i = 0; i < duration.length(); i++){
|
||||
if(duration.charAt(i)==':'){
|
||||
chk = true;
|
||||
time = Integer.parseInt(duration.substring(0, i));
|
||||
if(i+1 < duration.length()) type = duration.charAt(i+1);
|
||||
}
|
||||
}
|
||||
if(!chk) time = Integer.parseInt(duration);
|
||||
switch (type){
|
||||
case 'd':
|
||||
banEndDate = new Timestamp(System.currentTimeMillis()+ TimeUnit.DAYS.toMillis(time));
|
||||
break;
|
||||
case 'h':
|
||||
banEndDate = new Timestamp(System.currentTimeMillis()+TimeUnit.HOURS.toMillis(time));
|
||||
break;
|
||||
case 'm':
|
||||
banEndDate = new Timestamp(System.currentTimeMillis()+TimeUnit.MINUTES.toMillis(time));
|
||||
break;
|
||||
case 's':
|
||||
banEndDate = new Timestamp(System.currentTimeMillis()+TimeUnit.SECONDS.toMillis(time));
|
||||
break;
|
||||
default:
|
||||
p.sendMessage(TextUtils.colorString(addPrefix(plugin.translations.getString("command.banip.durationFormatError"))));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
StringBuilder newReason = new StringBuilder();
|
||||
for(int i = 3; i < args.length; i++){
|
||||
newReason.append(args[i]).append(" ");
|
||||
}
|
||||
if(!newReason.isEmpty()) reason=newReason.toString();
|
||||
|
||||
if(Objects.equals(duration, "-1") || Objects.equals(duration, "perm")) banEndDate = null;
|
||||
|
||||
InetAddress addr;
|
||||
try {
|
||||
addr = InetAddress.getByName(args[0]);
|
||||
} catch (UnknownHostException e){
|
||||
plugin.getLogger().severe(e.toString());
|
||||
p.sendMessage(TextUtils.colorString(addPrefix(plugin.translations.getString("command.banip.unexpectedError"))));
|
||||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
Connection conn = plugin.db.getConnection();
|
||||
PreparedStatement stmt = conn.prepareStatement("SELECT * FROM ip_bans WHERE (ip_address = ?::inet) AND scope = ?");
|
||||
stmt.setObject(1, addr.getHostAddress());
|
||||
stmt.setString(2, scope);
|
||||
ResultSet rs = stmt.executeQuery();
|
||||
if(rs.next()){
|
||||
p.sendMessage(TextUtils.colorString(addPrefix(plugin.translations.getString("command.banip.alreadyBannedInScopeError"))));
|
||||
return false;
|
||||
}
|
||||
} catch (SQLException e){
|
||||
plugin.getLogger().severe(e.toString());
|
||||
p.sendMessage(TextUtils.colorString(addPrefix(plugin.translations.getString("command.banip.unexpectedError"))));
|
||||
return false;
|
||||
}
|
||||
|
||||
IPBan b = banIp(addr, reason, scope, banEndDate, p.getName(), p.getUniqueId());
|
||||
|
||||
if(b != null) {
|
||||
if(banEndDate == null) {
|
||||
for(Player target : Bukkit.getOnlinePlayers()) {
|
||||
if (target.getAddress().getAddress().equals(addr))
|
||||
if(Objects.equals(plugin.config.getString("serverID"), scope) || Objects.equals(scope, "*")) target.kick(TextUtils.colorString(TextUtils.resolvePlaceholders(plugin.translations.getString("banKickMessage.playerBanPerm"), b)));
|
||||
}
|
||||
p.sendMessage(TextUtils.colorString(resolveIpBanMessagePlaceholders(addPrefix(plugin.translations.getString("command.banip.successfulBanMessagePerm")), args[0], scope, reason, p.getName())));
|
||||
String bcMess = plugin.translations.getString("command.banip.banPublicAnnouncementPerm");
|
||||
if(bcMess!=null) Bukkit.broadcast(TextUtils.colorString(resolveIpBanMessagePlaceholders(bcMess, args[0], scope, reason, p.getName())));
|
||||
}
|
||||
else {
|
||||
long timeLeft = banEndDate.getTime() - new Timestamp(System.currentTimeMillis()).getTime();
|
||||
long timeLeftDays = TimeUnit.MILLISECONDS.toDays(timeLeft);
|
||||
timeLeft-=TimeUnit.DAYS.toMillis(timeLeftDays);
|
||||
long timeLeftHours = TimeUnit.MILLISECONDS.toHours(timeLeft);
|
||||
timeLeft-=TimeUnit.HOURS.toMillis(timeLeftHours);
|
||||
long timeLeftMinutes = TimeUnit.MILLISECONDS.toMinutes(timeLeft);
|
||||
timeLeft-=TimeUnit.MINUTES.toMillis(timeLeftMinutes);
|
||||
long timeLeftSeconds = TimeUnit.MILLISECONDS.toSeconds(timeLeft);
|
||||
String parsedBanDuration = TextUtils.parsePolishDate(timeLeftDays, timeLeftHours, timeLeftMinutes, timeLeftSeconds);
|
||||
|
||||
for(Player target : Bukkit.getOnlinePlayers()) {
|
||||
if (target.getAddress().getAddress().equals(addr))
|
||||
if (Objects.equals(plugin.config.getString("serverID"), scope) || Objects.equals(scope, "*"))
|
||||
target.kick(TextUtils.colorString(TextUtils.resolvePlaceholders(plugin.translations.getString("banKickMessage.playerBanTemp"), b)));
|
||||
}
|
||||
p.sendMessage(TextUtils.colorString(resolveIpBanMessagePlaceholders(addPrefix(plugin.translations.getString("command.banip.successfulBanMessageTemp")), args[0], scope, reason, p.getName(), parsedBanDuration)));
|
||||
String bcMess = plugin.translations.getString("command.banip.banPublicAnnouncementTemp");
|
||||
if(bcMess!=null) Bukkit.broadcast(TextUtils.colorString(resolveIpBanMessagePlaceholders(bcMess, args[0], scope, reason, p.getName(), parsedBanDuration)));
|
||||
|
||||
}
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
plugin.getLogger().severe("BanHammer: Something went wrong while user used ban command... Maybe DB or Technician has skill issue???");
|
||||
p.sendMessage(TextUtils.colorString(addPrefix(plugin.translations.getString("command.banip.unexpectedError"))));
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
return false;
|
||||
}
|
||||
private boolean banIpCommand(String[] args) {
|
||||
if(args.length==0) Bukkit.getConsoleSender().sendMessage(TextUtils.colorString(addPrefix(plugin.translations.getString("command.banip.usage"))));
|
||||
else if(args.length>=1) {
|
||||
Timestamp banEndDate=null;
|
||||
String scope = "*", reason = plugin.translations.getString("default.reason"), duration="-1";
|
||||
|
||||
if(args.length>=2) scope=args[1];
|
||||
if(args.length>=3) {
|
||||
duration=args[2];
|
||||
String regex = "^(perm)|(-1)|\\d+:(s|m|h|d)$";
|
||||
String regexOnlyNum = "^\\d+$";
|
||||
if(!(duration.matches(regex) || duration.matches(regexOnlyNum))) {
|
||||
Bukkit.getConsoleSender().sendMessage(TextUtils.colorString(addPrefix(plugin.translations.getString("command.banip.durationFormatError"))));
|
||||
return false;
|
||||
}
|
||||
char type = plugin.config.getString("defaultDurationType").charAt(0);
|
||||
Integer time=0;
|
||||
boolean chk = false;
|
||||
for(int i = 0; i < duration.length(); i++){
|
||||
if(duration.charAt(i)==':'){
|
||||
chk = true;
|
||||
time = Integer.parseInt(duration.substring(0, i));
|
||||
if(i+1 < duration.length()) type = duration.charAt(i+1);
|
||||
}
|
||||
}
|
||||
if(!chk) time = Integer.parseInt(duration);
|
||||
switch (type){
|
||||
case 'd':
|
||||
banEndDate = new Timestamp(System.currentTimeMillis()+ TimeUnit.DAYS.toMillis(time));
|
||||
break;
|
||||
case 'h':
|
||||
banEndDate = new Timestamp(System.currentTimeMillis()+TimeUnit.HOURS.toMillis(time));
|
||||
break;
|
||||
case 'm':
|
||||
banEndDate = new Timestamp(System.currentTimeMillis()+TimeUnit.MINUTES.toMillis(time));
|
||||
break;
|
||||
case 's':
|
||||
banEndDate = new Timestamp(System.currentTimeMillis()+TimeUnit.SECONDS.toMillis(time));
|
||||
break;
|
||||
default:
|
||||
Bukkit.getConsoleSender().sendMessage(TextUtils.colorString(addPrefix(plugin.translations.getString("command.banip.durationFormatError"))));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
StringBuilder newReason = new StringBuilder();
|
||||
for(int i = 3; i < args.length; i++){
|
||||
newReason.append(args[i]).append(" ");
|
||||
}
|
||||
if(!newReason.isEmpty()) reason=newReason.toString();
|
||||
|
||||
if(Objects.equals(duration, "-1") || Objects.equals(duration, "perm")) banEndDate = null;
|
||||
|
||||
InetAddress addr;
|
||||
try {
|
||||
addr = InetAddress.getByName(args[0]);
|
||||
} catch (UnknownHostException e){
|
||||
plugin.getLogger().severe(e.toString());
|
||||
Bukkit.getConsoleSender().sendMessage(TextUtils.colorString(addPrefix(plugin.translations.getString("command.banip.unexpectedError"))));
|
||||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
Connection conn = plugin.db.getConnection();
|
||||
PreparedStatement stmt = conn.prepareStatement("SELECT * FROM ip_bans WHERE (ip_address = ?::inet) AND scope = ?");
|
||||
stmt.setObject(1, addr.getHostAddress());
|
||||
stmt.setString(2, scope);
|
||||
ResultSet rs = stmt.executeQuery();
|
||||
if(rs.next()){
|
||||
Bukkit.getConsoleSender().sendMessage(TextUtils.colorString(addPrefix(plugin.translations.getString("command.banip.alreadyBannedInScopeError"))));
|
||||
return false;
|
||||
}
|
||||
} catch (SQLException e){
|
||||
plugin.getLogger().severe(e.toString());
|
||||
Bukkit.getConsoleSender().sendMessage(TextUtils.colorString(addPrefix(plugin.translations.getString("command.banip.unexpectedError"))));
|
||||
return false;
|
||||
}
|
||||
|
||||
IPBan b = banIp(addr, reason, scope, banEndDate, "CONSOLE", null);
|
||||
|
||||
if(b != null) {
|
||||
if(banEndDate == null) {
|
||||
for(Player target : Bukkit.getOnlinePlayers()) {
|
||||
if (target.getAddress().getAddress().equals(addr))
|
||||
if(Objects.equals(plugin.config.getString("serverID"), scope) || Objects.equals(scope, "*")) target.kick(TextUtils.colorString(TextUtils.resolvePlaceholders(plugin.translations.getString("banKickMessage.playerBanPerm"), b)));
|
||||
}
|
||||
Bukkit.getConsoleSender().sendMessage(TextUtils.colorString(resolveIpBanMessagePlaceholders(addPrefix(plugin.translations.getString("command.banip.successfulBanMessagePerm")), args[0], scope, reason, "CONSOLE")));
|
||||
String bcMess = plugin.translations.getString("command.banip.banPublicAnnouncementPerm");
|
||||
if(bcMess!=null) Bukkit.broadcast(TextUtils.colorString(resolveIpBanMessagePlaceholders(bcMess, args[0], scope, reason, "CONSOLE")));
|
||||
}
|
||||
else {
|
||||
long timeLeft = banEndDate.getTime() - new Timestamp(System.currentTimeMillis()).getTime();
|
||||
long timeLeftDays = TimeUnit.MILLISECONDS.toDays(timeLeft);
|
||||
timeLeft-=TimeUnit.DAYS.toMillis(timeLeftDays);
|
||||
long timeLeftHours = TimeUnit.MILLISECONDS.toHours(timeLeft);
|
||||
timeLeft-=TimeUnit.HOURS.toMillis(timeLeftHours);
|
||||
long timeLeftMinutes = TimeUnit.MILLISECONDS.toMinutes(timeLeft);
|
||||
timeLeft-=TimeUnit.MINUTES.toMillis(timeLeftMinutes);
|
||||
long timeLeftSeconds = TimeUnit.MILLISECONDS.toSeconds(timeLeft);
|
||||
String parsedBanDuration = TextUtils.parsePolishDate(timeLeftDays, timeLeftHours, timeLeftMinutes, timeLeftSeconds);
|
||||
|
||||
for(Player target : Bukkit.getOnlinePlayers()) {
|
||||
if (target.getAddress().getAddress().equals(addr))
|
||||
if (Objects.equals(plugin.config.getString("serverID"), scope) || Objects.equals(scope, "*"))
|
||||
target.kick(TextUtils.colorString(TextUtils.resolvePlaceholders(plugin.translations.getString("banKickMessage.playerBanTemp"), b)));
|
||||
}
|
||||
Bukkit.getConsoleSender().sendMessage(TextUtils.colorString(resolveIpBanMessagePlaceholders(addPrefix(plugin.translations.getString("command.banip.successfulBanMessageTemp")), args[0], scope, reason, "CONSOLE", parsedBanDuration)));
|
||||
String bcMess = plugin.translations.getString("command.banip.banPublicAnnouncementTemp");
|
||||
if(bcMess!=null) Bukkit.broadcast(TextUtils.colorString(resolveIpBanMessagePlaceholders(bcMess, args[0], scope, reason, "CONSOLE", parsedBanDuration)));
|
||||
|
||||
}
|
||||
return true;
|
||||
}
|
||||
else {
|
||||
plugin.getLogger().severe("BanHammer: Something went wrong while user used ban command... Maybe DB or Technician has skill issue???");
|
||||
Bukkit.getConsoleSender().sendMessage(TextUtils.colorString(addPrefix(plugin.translations.getString("command.banip.unexpectedError"))));
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private String addPrefix(String s) {
|
||||
return (String)(plugin.translations.getString("prefix")+s);
|
||||
}
|
||||
|
||||
private IPBan banIp(InetAddress ipAddr, String reason, String scope, Timestamp endDate, String op, UUID opUuid) {
|
||||
try {
|
||||
Connection conn = plugin.db.getConnection();
|
||||
PreparedStatement ps = conn.prepareStatement("INSERT INTO ip_bans (ip_address, reason, scope, operator_name, operator_uuid, end_time) VALUES (?, ?, ?, ?, ?, ?)", Statement.RETURN_GENERATED_KEYS);
|
||||
ps.setObject(1, ipAddr.getHostAddress(), Types.OTHER);
|
||||
ps.setString(2, reason);
|
||||
ps.setString(3, scope);
|
||||
ps.setString(4, op);
|
||||
ps.setObject(5, opUuid);
|
||||
ps.setObject(6, endDate);
|
||||
if(ps.executeUpdate() == 0) return null;
|
||||
|
||||
ResultSet rs = ps.getGeneratedKeys();
|
||||
rs.next();
|
||||
|
||||
Timestamp ts = (Timestamp)rs.getObject("end_time");
|
||||
String parsedDate = null;
|
||||
|
||||
if(ts!=null) {
|
||||
long timeLeft = (ts).getTime() - new Timestamp(System.currentTimeMillis()).getTime();
|
||||
long timeLeftDays = TimeUnit.MILLISECONDS.toDays(timeLeft);
|
||||
timeLeft-=TimeUnit.DAYS.toMillis(timeLeftDays);
|
||||
long timeLeftHours = TimeUnit.MILLISECONDS.toHours(timeLeft);
|
||||
timeLeft-=TimeUnit.HOURS.toMillis(timeLeftHours);
|
||||
long timeLeftMinutes = TimeUnit.MILLISECONDS.toMinutes(timeLeft);
|
||||
timeLeft-=TimeUnit.MINUTES.toMillis(timeLeftMinutes);
|
||||
long timeLeftSeconds = TimeUnit.MILLISECONDS.toSeconds(timeLeft);
|
||||
parsedDate = TextUtils.parsePolishDate(timeLeftDays, timeLeftHours, timeLeftMinutes, timeLeftSeconds);
|
||||
}
|
||||
|
||||
IPBan b = new IPBan(ipAddr, reason, parsedDate, op, rs.getObject("id", UUID.class));
|
||||
return b;
|
||||
}
|
||||
catch (SQLException e) {
|
||||
plugin.getLogger().severe(e.toString());
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private String resolveIpBanMessagePlaceholders(String s, String ipAddr, String scope, String reason, String operator) {
|
||||
return s.replace("{ipAddr}", ipAddr)
|
||||
.replace("{scope}", scope)
|
||||
.replace("{reason}", reason)
|
||||
.replace("{operator}", operator)
|
||||
.replace("{prefix}", plugin.translations.getString("prefix"));
|
||||
}
|
||||
private String resolveIpBanMessagePlaceholders(String s, String player, String scope, String reason, String operator, String duration) {
|
||||
return resolveIpBanMessagePlaceholders(s, player, scope, reason, operator).replace("{duration}", duration);
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue