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

Remove SHA-512 password migration

Browse Source
This commit is contained in:
P0nk
2024-09-26 06:48:13 +02:00
parent b85233359f
commit 1d5c26e67c
4 changed files with 3 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/net/server/handlers/login/LoginPasswordHandler.java
View File

@@ -39,10 +39,6 @@ import tools.DatabaseConnection;
import tools.HexTool;
import tools.PacketCreator;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.sql.Connection;
import java.sql.Date;
import java.sql.PreparedStatement;
@@ -65,12 +61,6 @@ public final class LoginPasswordHandler implements PacketHandler {
return !c.isLoggedIn();
}
private static String hashpwSHA512(String pwd) throws NoSuchAlgorithmException, UnsupportedEncodingException {
MessageDigest digester = MessageDigest.getInstance("SHA-512");
digester.update(pwd.getBytes(StandardCharsets.UTF_8), 0, pwd.length());
return HexTool.toHexString(digester.digest()).replace(" ", "").toLowerCase();
}
@Override
public final void handlePacket(InPacket p, Client c) {
String remoteHost = c.getRemoteAddress();
@@ -93,7 +83,7 @@ public final class LoginPasswordHandler implements PacketHandler {
try (Connection con = DatabaseConnection.getConnection();
PreparedStatement ps = con.prepareStatement("INSERT INTO accounts (name, password, birthday, tempban) VALUES (?, ?, ?, ?);", Statement.RETURN_GENERATED_KEYS)) { //Jayd: Added birthday, tempban
ps.setString(1, login);
ps.setString(2, YamlConfig.config.server.BCRYPT_MIGRATION ? BCrypt.hashpw(pwd, BCrypt.gensalt(12)) : hashpwSHA512(pwd));
ps.setString(2, BCrypt.hashpw(pwd, BCrypt.gensalt(12)));
ps.setDate(3, Date.valueOf(DefaultDates.getBirthday()));
ps.setTimestamp(4, Timestamp.valueOf(DefaultDates.getTempban()));
ps.executeUpdate();
@@ -102,7 +92,7 @@ public final class LoginPasswordHandler implements PacketHandler {
rs.next();
c.setAccID(rs.getInt(1));
}
} catch (SQLException | NoSuchAlgorithmException | UnsupportedEncodingException e) {
} catch (SQLException e) {
c.setAccID(-1);
e.printStackTrace();
} finally {
@@ -110,19 +100,6 @@ public final class LoginPasswordHandler implements PacketHandler {
}
}
if (YamlConfig.config.server.BCRYPT_MIGRATION && (loginok <= -10)) { // -10 means migration to bcrypt, -23 means TOS wasn't accepted
try (Connection con = DatabaseConnection.getConnection();
PreparedStatement ps = con.prepareStatement("UPDATE accounts SET password = ? WHERE name = ?;")) {
ps.setString(1, BCrypt.hashpw(pwd, BCrypt.gensalt(12)));
ps.setString(2, login);
ps.executeUpdate();
} catch (SQLException e) {
e.printStackTrace();
} finally {
loginok = (loginok == -10) ? 0 : 23;
}
}
if (c.hasBannedIP() || c.hasBannedMac()) {
c.sendPacket(PacketCreator.getLoginFailed(3));
return;