Starting with leveldb database system.
This commit is contained in:
parent
2430d220d1
commit
65a2c5de15
|
@ -26,9 +26,12 @@ dependencies {
|
||||||
implementation 'de.mkammerer:argon2-jvm:2.6'
|
implementation 'de.mkammerer:argon2-jvm:2.6'
|
||||||
include 'de.mkammerer:argon2-jvm:2.6'
|
include 'de.mkammerer:argon2-jvm:2.6'
|
||||||
|
|
||||||
// JDBC SQLite Driver
|
// leveldb
|
||||||
implementation group:'org.xerial', name:'sqlite-jdbc', version:'3.8.11.2'
|
implementation group: 'org.iq80.leveldb', name: 'leveldb', version: '0.12'
|
||||||
include group:'org.xerial', name:'sqlite-jdbc', version:'3.8.11.2'
|
implementation group: 'org.iq80.leveldb', name: 'leveldb-api', version: '0.12'
|
||||||
|
include group: 'org.iq80.leveldb', name: 'leveldb', version: '0.12'
|
||||||
|
include group: 'org.iq80.leveldb', name: 'leveldb-api', version: '0.12'
|
||||||
|
|
||||||
|
|
||||||
// JNA lib
|
// JNA lib
|
||||||
include 'net.java.dev.jna:jna:5.5.0'
|
include 'net.java.dev.jna:jna:5.5.0'
|
||||||
|
|
|
@ -52,15 +52,14 @@ public class SimpleAuth implements DedicatedServerModInitializer {
|
||||||
LOGGER.info("[SimpleAuth] This mod wouldn't exist without the awesome Fabric Community. TYSM guys!");
|
LOGGER.info("[SimpleAuth] This mod wouldn't exist without the awesome Fabric Community. TYSM guys!");
|
||||||
|
|
||||||
// Creating data directory (database and config files are stored there)
|
// Creating data directory (database and config files are stored there)
|
||||||
File file = new File(gameDirectory + "/mods/SimpleAuth");
|
File file = new File(gameDirectory + "/mods/SimpleAuth/levelDBStore");
|
||||||
if (!file.exists() && !file.mkdir())
|
if (!file.exists() && !file.mkdir())
|
||||||
LOGGER.error("[SimpleAuth] Error creating directory!");
|
LOGGER.error("[SimpleAuth] Error creating directory!");
|
||||||
// Loading config
|
// Loading config
|
||||||
config = AuthConfig.load(new File(gameDirectory + "/mods/SimpleAuth/config.json"));
|
config = AuthConfig.load(new File(gameDirectory + "/mods/SimpleAuth/config.json"));
|
||||||
// Connecting to db
|
// Connecting to db
|
||||||
db.openConnection();
|
db.openConnection();
|
||||||
// Making a table in the database
|
|
||||||
db.makeTable();
|
|
||||||
|
|
||||||
// Registering the commands
|
// Registering the commands
|
||||||
CommandRegistry.INSTANCE.register(false, dispatcher -> {
|
CommandRegistry.INSTANCE.register(false, dispatcher -> {
|
||||||
|
|
|
@ -112,7 +112,6 @@ public class AuthCommand {
|
||||||
|
|
||||||
SimpleAuth.db.update(
|
SimpleAuth.db.update(
|
||||||
uuid,
|
uuid,
|
||||||
username,
|
|
||||||
AuthHelper.hashPass(pass.toCharArray())
|
AuthHelper.hashPass(pass.toCharArray())
|
||||||
);
|
);
|
||||||
if(sender != null)
|
if(sender != null)
|
||||||
|
@ -124,7 +123,7 @@ public class AuthCommand {
|
||||||
}
|
}
|
||||||
private static int removeAccount(ServerCommandSource source, String uuid, String username) {
|
private static int removeAccount(ServerCommandSource source, String uuid, String username) {
|
||||||
Entity sender = source.getEntity();
|
Entity sender = source.getEntity();
|
||||||
SimpleAuth.db.delete(uuid, username);
|
SimpleAuth.db.delete(uuid);
|
||||||
|
|
||||||
// TODO -> Kick player that was unregistered?
|
// TODO -> Kick player that was unregistered?
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,6 @@ public class ChangepwCommand {
|
||||||
else if (AuthHelper.checkPass(player.getUuidAsString(), oldPass.toCharArray())) {
|
else if (AuthHelper.checkPass(player.getUuidAsString(), oldPass.toCharArray())) {
|
||||||
SimpleAuth.db.update(
|
SimpleAuth.db.update(
|
||||||
player.getUuidAsString(),
|
player.getUuidAsString(),
|
||||||
null,
|
|
||||||
AuthHelper.hashPass(newPass.toCharArray())
|
AuthHelper.hashPass(newPass.toCharArray())
|
||||||
);
|
);
|
||||||
player.sendMessage(passwordUpdated);
|
player.sendMessage(passwordUpdated);
|
||||||
|
|
|
@ -7,7 +7,6 @@ import net.minecraft.server.network.ServerPlayerEntity;
|
||||||
import net.minecraft.text.LiteralText;
|
import net.minecraft.text.LiteralText;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import org.samo_lego.simpleauth.SimpleAuth;
|
import org.samo_lego.simpleauth.SimpleAuth;
|
||||||
import org.samo_lego.simpleauth.utils.AuthConfig;
|
|
||||||
import org.samo_lego.simpleauth.utils.AuthHelper;
|
import org.samo_lego.simpleauth.utils.AuthHelper;
|
||||||
|
|
||||||
import static com.mojang.brigadier.arguments.StringArgumentType.getString;
|
import static com.mojang.brigadier.arguments.StringArgumentType.getString;
|
||||||
|
@ -51,7 +50,7 @@ public class RegisterCommand {
|
||||||
}
|
}
|
||||||
else if(pass1.equals(pass2)) {
|
else if(pass1.equals(pass2)) {
|
||||||
String hash = AuthHelper.hashPass(pass1.toCharArray());
|
String hash = AuthHelper.hashPass(pass1.toCharArray());
|
||||||
if (SimpleAuth.db.registerUser(player.getUuidAsString(), source.getName(), hash)) {
|
if (SimpleAuth.db.registerUser(player.getUuidAsString(), hash)) {
|
||||||
SimpleAuth.authenticatePlayer(player, registerSuccess);
|
SimpleAuth.authenticatePlayer(player, registerSuccess);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,7 +46,7 @@ public class UnregisterCommand {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
else if (AuthHelper.checkPass(player.getUuidAsString(), pass.toCharArray())) {
|
else if (AuthHelper.checkPass(player.getUuidAsString(), pass.toCharArray())) {
|
||||||
SimpleAuth.db.delete(player.getUuidAsString(), null);
|
SimpleAuth.db.delete(player.getUuidAsString());
|
||||||
player.sendMessage(accountDeleted);
|
player.sendMessage(accountDeleted);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,146 +2,85 @@ package org.samo_lego.simpleauth.database;
|
||||||
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
import org.iq80.leveldb.DB;
|
||||||
|
import org.iq80.leveldb.Options;
|
||||||
import org.samo_lego.simpleauth.SimpleAuth;
|
import org.samo_lego.simpleauth.SimpleAuth;
|
||||||
|
|
||||||
import java.sql.*;
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
/**
|
import static org.iq80.leveldb.impl.Iq80DBFactory.bytes;
|
||||||
* Thanks to
|
import static org.iq80.leveldb.impl.Iq80DBFactory.factory;
|
||||||
* @author sqlitetutorial.net
|
|
||||||
*/
|
|
||||||
|
|
||||||
public class SimpleAuthDatabase {
|
public class SimpleAuthDatabase {
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
|
private DB levelDBStore;
|
||||||
|
|
||||||
// Connects to the DB
|
// Connects to the DB
|
||||||
private Connection conn;
|
|
||||||
|
|
||||||
public void openConnection() {
|
public void openConnection() {
|
||||||
// SQLite connection string
|
|
||||||
String url = "jdbc:sqlite:" + SimpleAuth.gameDirectory + "/mods/SimpleAuth/players.db";
|
|
||||||
try {
|
try {
|
||||||
conn = DriverManager.getConnection(url);
|
|
||||||
} catch (SQLException e) {
|
Options options = new Options();
|
||||||
|
levelDBStore = factory.open(new File(SimpleAuth.gameDirectory + "/mods/SimpleAuth/levelDBStore"), options);
|
||||||
|
} catch (Error | IOException e) {
|
||||||
LOGGER.error("[SimpleAuth] " + e.getMessage());
|
LOGGER.error("[SimpleAuth] " + e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Closing connection
|
// Closing connection
|
||||||
public void close() {
|
public void close() {
|
||||||
if (conn != null) {
|
if (levelDBStore != null) {
|
||||||
try {
|
try {
|
||||||
conn.close();
|
levelDBStore.close();
|
||||||
LOGGER.info("[SimpleAuth] Database connection closed successfully.");
|
LOGGER.info("[SimpleAuth] Database connection closed successfully.");
|
||||||
} catch (SQLException e) {
|
} catch (Error | IOException e) {
|
||||||
LOGGER.info("[SimpleAuth] Error: " + e.getMessage());
|
LOGGER.info("[SimpleAuth] Error: " + e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// If the mod runs for the first time, we need to create the DB table
|
|
||||||
public void makeTable() {
|
|
||||||
try {
|
|
||||||
// Creating database table if it doesn't exist yet
|
|
||||||
String sql = "CREATE TABLE IF NOT EXISTS users (\n" +
|
|
||||||
" `UserID` INTEGER PRIMARY KEY AUTOINCREMENT,\n" +
|
|
||||||
" `UUID` BINARY(16) NOT NULL,\n" +
|
|
||||||
" `Username` VARCHAR(16) NOT NULL,\n" +
|
|
||||||
" `Password` VARCHAR(64) NOT NULL,\n" +
|
|
||||||
" UNIQUE (`UUID`)\n" +
|
|
||||||
" UNIQUE (`Username`)\n" +
|
|
||||||
");";
|
|
||||||
Statement stmt = conn.createStatement();
|
|
||||||
stmt.execute(sql);
|
|
||||||
} catch (SQLException e) {
|
|
||||||
LOGGER.error("[SimpleAuth] Error: " + e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// When player registers, we insert the data into DB
|
// When player registers, we insert the data into DB
|
||||||
public boolean registerUser(String uuid, String username, String password) {
|
public boolean registerUser(String uuid, String password) {
|
||||||
String sql = "INSERT INTO users(uuid, username, password) VALUES(?,?,?)";
|
System.out.println(Arrays.toString(levelDBStore.get(bytes("UUID:" + uuid))));
|
||||||
String sqlCheck = "SELECT UUID "
|
|
||||||
+ "FROM users WHERE UUID = ?";
|
|
||||||
|
|
||||||
try (PreparedStatement pstmt = conn.prepareStatement(sql);
|
|
||||||
PreparedStatement pstmtCheck = conn.prepareStatement(sqlCheck)) {
|
|
||||||
|
|
||||||
pstmtCheck.setString(1, uuid);
|
|
||||||
ResultSet rs = pstmtCheck.executeQuery();
|
|
||||||
|
|
||||||
// Getting the password
|
|
||||||
//String dbUuid = null;
|
|
||||||
try {
|
try {
|
||||||
rs.getString("UUID");
|
if(levelDBStore.get(bytes("UUID:" + uuid)) == null) {
|
||||||
return false;
|
levelDBStore.put(bytes("UUID:" + uuid), bytes("password:" + password));
|
||||||
} catch(SQLException ignored) {
|
|
||||||
// User is not registered
|
|
||||||
} finally {
|
|
||||||
pstmt.setString(1, uuid);
|
|
||||||
pstmt.setString(2, username);
|
|
||||||
pstmt.setString(3, password);
|
|
||||||
|
|
||||||
pstmt.executeUpdate();
|
|
||||||
}
|
|
||||||
return true;
|
return true;
|
||||||
} catch (SQLException e) {
|
}
|
||||||
|
return false;
|
||||||
|
} catch (Error e) {
|
||||||
LOGGER.error("[SimpleAuth] Register error: " + e.getMessage());
|
LOGGER.error("[SimpleAuth] Register error: " + e.getMessage());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Deletes row containing the username provided
|
// Deletes row containing the username provided
|
||||||
public void delete(String uuid, String username) {
|
public void delete(String uuid) {
|
||||||
String sql = "DELETE FROM users WHERE uuid = ? OR username = ?";
|
try {
|
||||||
|
levelDBStore.delete(bytes("UUID:" + uuid));
|
||||||
try (PreparedStatement pstmt = conn.prepareStatement(sql)) {
|
} catch (Error e) {
|
||||||
|
|
||||||
// set the corresponding param
|
|
||||||
pstmt.setString(1, uuid);
|
|
||||||
pstmt.setString(2, username);
|
|
||||||
// execute the delete statement
|
|
||||||
pstmt.executeUpdate();
|
|
||||||
|
|
||||||
} catch (SQLException e) {
|
|
||||||
LOGGER.error("[SimpleAuth] " + e.getMessage());
|
LOGGER.error("[SimpleAuth] " + e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Updates the password of the user
|
// Updates the password of the user
|
||||||
public void update(String uuid, String username, String pass) {
|
public void update(String uuid, String password) {
|
||||||
String sql = "UPDATE users SET password = ? "
|
try {
|
||||||
+ "WHERE uuid = ? OR username = ?";
|
levelDBStore.put(bytes("UUID:" + uuid),bytes("password:" + password));
|
||||||
|
} catch (Error e) {
|
||||||
try (PreparedStatement pstmt = conn.prepareStatement(sql)) {
|
|
||||||
|
|
||||||
// set the corresponding param
|
|
||||||
pstmt.setString(1, pass);
|
|
||||||
pstmt.setString(2, uuid);
|
|
||||||
pstmt.setString(3, username);
|
|
||||||
|
|
||||||
// update
|
|
||||||
pstmt.executeUpdate();
|
|
||||||
} catch (SQLException e) {
|
|
||||||
LOGGER.error("[SimpleAuth] " + e.getMessage());
|
LOGGER.error("[SimpleAuth] " + e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Gets the hashed password from DB
|
// Gets the hashed password from DB
|
||||||
public String getPassword(String uuid){
|
public String getPassword(String uuid){
|
||||||
String sql = "SELECT UUID, Password "
|
String password = null;
|
||||||
+ "FROM users WHERE UUID = ?";
|
try {
|
||||||
String pass = null;
|
// Gets password from db and removes "password:" prefix from it
|
||||||
|
password = new String(levelDBStore.get(bytes("UUID:" + uuid))).substring(9);
|
||||||
try (PreparedStatement pstmt = conn.prepareStatement(sql)) {
|
} catch (Error e) {
|
||||||
// Setting statement
|
|
||||||
pstmt.setString(1, uuid);
|
|
||||||
ResultSet rs = pstmt.executeQuery();
|
|
||||||
|
|
||||||
// Getting the password
|
|
||||||
pass = rs.getString("Password");
|
|
||||||
} catch (SQLException e) {
|
|
||||||
LOGGER.error("[SimpleAuth] Error getting password: " + e.getMessage());
|
LOGGER.error("[SimpleAuth] Error getting password: " + e.getMessage());
|
||||||
}
|
}
|
||||||
return pass;
|
return password;
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue