Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unify ban handling on login

Browse Source
This commit is contained in:
P0nk
2024-09-29 17:55:51 +02:00
parent 50524a7740
commit a307afae3c
7 changed files with 35 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/client/Client.java
-48
View File
@@ -61,7 +61,6 @@ import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Timestamp;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Arrays; import java.util.Arrays;
import java.util.Calendar; import java.util.Calendar;
@@ -504,37 +503,6 @@ public class Client extends ChannelInboundHandlerAdapter {
return ++failedLoginAttempts < MAX_FAILED_LOGIN_ATTEMPTS; return ++failedLoginAttempts < MAX_FAILED_LOGIN_ATTEMPTS;
} }
// TODO: check tempban directly on loaded account
@Deprecated
public Calendar getTempBanCalendarFromDB() {
final Calendar lTempban = Calendar.getInstance();
try (Connection con = DatabaseConnection.getConnection();
PreparedStatement ps = con.prepareStatement("SELECT `tempban` FROM accounts WHERE id = ?")) {
ps.setInt(1, getAccID());
final Timestamp tempban;
try (ResultSet rs = ps.executeQuery()) {
if (!rs.next()) {
return null;
}
tempban = rs.getTimestamp("tempban");
if (tempban.toLocalDateTime().equals(DefaultDates.getTempban())) {
return null;
}
}
lTempban.setTimeInMillis(tempban.getTime());
tempBanCalendar = lTempban;
return lTempban;
} catch (SQLException e) {
e.printStackTrace();
}
return null;//why oh why!?!
}
public Calendar getTempBanCalendar() { public Calendar getTempBanCalendar() {
return tempBanCalendar; return tempBanCalendar;
} }
@@ -800,22 +768,6 @@ public class Client extends ChannelInboundHandlerAdapter {
return false; return false;
} }
public final byte getGReason() {
try (Connection con = DatabaseConnection.getConnection();
PreparedStatement ps = con.prepareStatement("SELECT `greason` FROM `accounts` WHERE id = ?")) {
ps.setInt(1, accId);
try (ResultSet rs = ps.executeQuery()) {
if (rs.next()) {
return rs.getByte("greason");
}
}
} catch (SQLException e) {
e.printStackTrace();
}
return 0;
}
public byte getGender() { public byte getGender() {
return gender; return gender;
} }
src/main/java/database/account/Account.java
+2 -1
View File
@@ -3,6 +3,7 @@ package database.account;
import client.LoginState; import client.LoginState;
import lombok.Builder; import lombok.Builder;
import java.time.Instant;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Objects; import java.util.Objects;
@@ -13,7 +14,7 @@ import java.util.Objects;
@Builder @Builder
public record Account(int id, String name, String password, boolean acceptedTos, Byte gender, LocalDate birthdate, public record Account(int id, String name, String password, boolean acceptedTos, Byte gender, LocalDate birthdate,
String pin, String pic, byte chrSlots, LoginState loginState, LocalDateTime lastLogin, String pin, String pic, byte chrSlots, LoginState loginState, LocalDateTime lastLogin,
boolean banned, Byte banReason, String banDescription, LocalDateTime tempBannedUntil) { boolean banned, Instant bannedUntil, Byte banReason, String banDescription) {
public Account { public Account {
Objects.requireNonNull(name); Objects.requireNonNull(name);
Objects.requireNonNull(password); Objects.requireNonNull(password);
src/main/java/database/account/AccountRepository.java
+2 -2
View File
@@ -20,7 +20,7 @@ public class AccountRepository {
public Optional<Account> findByNameIgnoreCase(String name) { public Optional<Account> findByNameIgnoreCase(String name) {
String sql = """ String sql = """
SELECT id, name, password, pin, pic, birthdate, gender, tos_accepted, chr_slots, login_state, SELECT id, name, password, pin, pic, birthdate, gender, tos_accepted, chr_slots, login_state,
last_login, banned, ban_reason, ban_description, temp_banned_until last_login, banned, banned_until, ban_reason, ban_description
FROM account FROM account
WHERE lower(name) = lower(:name)"""; WHERE lower(name) = lower(:name)""";
try (Handle handle = connection.getHandle()) { try (Handle handle = connection.getHandle()) {
@@ -34,7 +34,7 @@ public class AccountRepository {
public Optional<Account> findById(int accountId) { public Optional<Account> findById(int accountId) {
String sql = """ String sql = """
SELECT id, name, password, pin, pic, birthdate, gender, tos_accepted, chr_slots, login_state, SELECT id, name, password, pin, pic, birthdate, gender, tos_accepted, chr_slots, login_state,
last_login, banned, ban_reason, ban_description, temp_banned_until last_login, banned, banned_until, ban_reason, ban_description
FROM account FROM account
WHERE id = :id"""; WHERE id = :id""";
try (Handle handle = connection.getHandle()) { try (Handle handle = connection.getHandle()) {
src/main/java/database/account/AccountRowMapper.java
+3 -3
View File
@@ -35,11 +35,11 @@ public class AccountRowMapper implements RowMapper<Account> {
.map(Timestamp::toLocalDateTime) .map(Timestamp::toLocalDateTime)
.orElse(null)) .orElse(null))
.banned(rs.getBoolean("banned")) .banned(rs.getBoolean("banned"))
.bannedUntil(Optional.ofNullable(rs.getTimestamp("banned_until"))
.map(Timestamp::toInstant)
.orElse(null))
.banReason(rs.getByte("ban_reason")) .banReason(rs.getByte("ban_reason"))
.banDescription(rs.getString("ban_description")) .banDescription(rs.getString("ban_description"))
.tempBannedUntil(Optional.ofNullable(rs.getTimestamp("temp_banned_until"))
.map(Timestamp::toLocalDateTime)
.orElse(null))
.build(); .build();
} }
src/main/java/net/server/handlers/login/LoginPasswordHandler.java
+5 -19
View File
@@ -48,7 +48,6 @@ import java.sql.Date;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.Calendar;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
@@ -109,17 +108,12 @@ public final class LoginPasswordHandler implements PacketHandler {
if (account.banned()) { if (account.banned()) {
byte banReason = Objects.requireNonNullElse(account.banReason(), (byte) 0); byte banReason = Objects.requireNonNullElse(account.banReason(), (byte) 0);
c.sendPacket(PacketCreator.getPermBan(banReason)); if (account.bannedUntil() != null) {
return; c.sendPacket(PacketCreator.getTempBan(banReason, account.bannedUntil().toEpochMilli()));
} } else {
c.sendPacket(PacketCreator.getPermBan(banReason));
boolean tempBanDisabled = false;
Calendar tempban = null;
if (!tempBanDisabled && (tempban = c.getTempBanCalendarFromDB()) != null) {
if (tempban.getTimeInMillis() > Calendar.getInstance().getTimeInMillis()) {
c.sendPacket(PacketCreator.getTempBan(tempban.getTimeInMillis(), c.getGReason()));
return;
} }
return;
} }
boolean banCheckDisabled = false; boolean banCheckDisabled = false;
@@ -128,14 +122,6 @@ public final class LoginPasswordHandler implements PacketHandler {
return; return;
} }
/* TODO: check temp ban from account, something like this:
LocalDateTime tempBan = account.tempBanTimestamp();
if (tempBan != null && tempBan.isAfter(LocalDateTime.now())) {
Duration remainingTempBan = Duration.between(LocalDateTime.now(), tempBan);
c.sendPacket(PacketCreator.getTempBan());
}
*/
if (account.loginState() != LoginState.LOGGED_OUT) { if (account.loginState() != LoginState.LOGGED_OUT) {
c.sendPacket(PacketCreator.getLoginFailed(7)); c.sendPacket(PacketCreator.getLoginFailed(7));
return; return;
src/main/java/tools/PacketCreator.java
+1 -1
View File
@@ -711,7 +711,7 @@ public class PacketCreator {
return p; return p;
} }
public static Packet getTempBan(long timestampTill, byte reason) { public static Packet getTempBan(byte reason, long timestampTill) {
OutPacket p = OutPacket.create(SendOpcode.LOGIN_STATUS); OutPacket p = OutPacket.create(SendOpcode.LOGIN_STATUS);
p.writeByte(2); p.writeByte(2);
p.writeByte(0); p.writeByte(0);
src/main/resources/db/migration/postgresql/V0.2__account.sql
+22 -23
View File
@@ -1,28 +1,27 @@
CREATE TABLE account CREATE TABLE account
( (
id serial NOT NULL, id serial NOT NULL,
name varchar(30) NOT NULL, name varchar(30) NOT NULL,
password varchar(200) NOT NULL, password varchar(200) NOT NULL,
pin varchar(4), pin varchar(4),
pic varchar(26), pic varchar(26),
created_at timestamp DEFAULT now() NOT NULL, created_at timestamp DEFAULT now() NOT NULL,
birthdate date NOT NULL, birthdate date NOT NULL,
tos_accepted boolean DEFAULT false NOT NULL, tos_accepted boolean DEFAULT false NOT NULL,
gender smallint, gender smallint,
chr_slots smallint NOT NULL, chr_slots smallint NOT NULL,
nx_credit integer DEFAULT 0 NOT NULL, nx_credit integer DEFAULT 0 NOT NULL,
maple_point integer DEFAULT 0 NOT NULL, maple_point integer DEFAULT 0 NOT NULL,
nx_prepaid integer DEFAULT 0 NOT NULL, nx_prepaid integer DEFAULT 0 NOT NULL,
login_state smallint NOT NULL, login_state smallint NOT NULL,
last_login timestamp, last_login timestamp,
banned boolean DEFAULT false NOT NULL, banned boolean DEFAULT false NOT NULL,
ban_reason smallint, banned_until timestamp,
ban_description text, ban_reason smallint,
temp_banned_until timestamp, ban_description text,
greason smallint, ip text,
ip text, hwid text,
hwid text, macs text,
macs text,
PRIMARY KEY (id), PRIMARY KEY (id),
UNIQUE (name) UNIQUE (name)
); );