sorceress
/
EasyAuth
1
0
Fork 1
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Starting with leveldb database system.

This commit is contained in:
samo_lego 2020-04-10 14:57:15 +02:00
parent 2430d220d1
commit 65a2c5de15
7 changed files with 48 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.gradle
View File

@ -26,9 +26,12 @@ dependencies {
implementation 'de.mkammerer:argon2-jvm:2.6'
include 'de.mkammerer:argon2-jvm:2.6'
// JDBC SQLite Driver
implementation group:'org.xerial', name:'sqlite-jdbc', version:'3.8.11.2'
include group:'org.xerial', name:'sqlite-jdbc', version:'3.8.11.2'
// leveldb
implementation group: 'org.iq80.leveldb', name: 'leveldb', version: '0.12'
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
include 'net.java.dev.jna:jna:5.5.0'

5
src/main/java/org/samo_lego/simpleauth/SimpleAuth.java
View File

@ -52,15 +52,14 @@ public class SimpleAuth implements DedicatedServerModInitializer {
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)
File file = new File(gameDirectory + "/mods/SimpleAuth");
File file = new File(gameDirectory + "/mods/SimpleAuth/levelDBStore");
if (!file.exists() && !file.mkdir())
LOGGER.error("[SimpleAuth] Error creating directory!");
// Loading config
config = AuthConfig.load(new File(gameDirectory + "/mods/SimpleAuth/config.json"));
// Connecting to db
db.openConnection();
// Making a table in the database
db.makeTable();
// Registering the commands
CommandRegistry.INSTANCE.register(false, dispatcher -> {

3
src/main/java/org/samo_lego/simpleauth/commands/AuthCommand.java
View File

@ -112,7 +112,6 @@ public class AuthCommand {
SimpleAuth.db.update(
uuid,
username,
AuthHelper.hashPass(pass.toCharArray())
);
if(sender != null)
@ -124,7 +123,7 @@ public class AuthCommand {
}
private static int removeAccount(ServerCommandSource source, String uuid, String username) {
Entity sender = source.getEntity();
SimpleAuth.db.delete(uuid, username);
SimpleAuth.db.delete(uuid);
// TODO -> Kick player that was unregistered?

1
src/main/java/org/samo_lego/simpleauth/commands/ChangepwCommand.java
View File

@ -57,7 +57,6 @@ public class ChangepwCommand {
else if (AuthHelper.checkPass(player.getUuidAsString(), oldPass.toCharArray())) {
SimpleAuth.db.update(
player.getUuidAsString(),
null,
AuthHelper.hashPass(newPass.toCharArray())
);
player.sendMessage(passwordUpdated);

3
src/main/java/org/samo_lego/simpleauth/commands/RegisterCommand.java
View File

@ -7,7 +7,6 @@ import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.LiteralText;
import net.minecraft.text.Text;
import org.samo_lego.simpleauth.SimpleAuth;
import org.samo_lego.simpleauth.utils.AuthConfig;
import org.samo_lego.simpleauth.utils.AuthHelper;
import static com.mojang.brigadier.arguments.StringArgumentType.getString;
@ -51,7 +50,7 @@ public class RegisterCommand {
}
else if(pass1.equals(pass2)) {
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);
return 1;
}

2
src/main/java/org/samo_lego/simpleauth/commands/UnregisterCommand.java
View File

@ -46,7 +46,7 @@ public class UnregisterCommand {
return 0;
}
else if (AuthHelper.checkPass(player.getUuidAsString(), pass.toCharArray())) {
SimpleAuth.db.delete(player.getUuidAsString(), null);
SimpleAuth.db.delete(player.getUuidAsString());
player.sendMessage(accountDeleted);
return 1;
}

135
src/main/java/org/samo_lego/simpleauth/database/SimpleAuthDatabase.java
View File

@ -2,146 +2,85 @@ package org.samo_lego.simpleauth.database;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.iq80.leveldb.DB;
import org.iq80.leveldb.Options;
import org.samo_lego.simpleauth.SimpleAuth;
import java.sql.*;
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
/**
* Thanks to
* @author sqlitetutorial.net
*/
import static org.iq80.leveldb.impl.Iq80DBFactory.bytes;
import static org.iq80.leveldb.impl.Iq80DBFactory.factory;
public class SimpleAuthDatabase {
private static final Logger LOGGER = LogManager.getLogger();
private DB levelDBStore;
// Connects to the DB
private Connection conn;
public void openConnection() {
// SQLite connection string
String url = "jdbc:sqlite:" + SimpleAuth.gameDirectory + "/mods/SimpleAuth/players.db";
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());
}
}
// Closing connection
public void close() {
if (conn != null) {
if (levelDBStore != null) {
try {
conn.close();
levelDBStore.close();
LOGGER.info("[SimpleAuth] Database connection closed successfully.");
} catch (SQLException e) {
} catch (Error | IOException e) {
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
public boolean registerUser(String uuid, String username, String password) {
String sql = "INSERT INTO users(uuid, username, password) VALUES(?,?,?)";
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 {
rs.getString("UUID");
return false;
} catch(SQLException ignored) {
// User is not registered
} finally {
pstmt.setString(1, uuid);
pstmt.setString(2, username);
pstmt.setString(3, password);
pstmt.executeUpdate();
public boolean registerUser(String uuid, String password) {
System.out.println(Arrays.toString(levelDBStore.get(bytes("UUID:" + uuid))));
try {
if(levelDBStore.get(bytes("UUID:" + uuid)) == null) {
levelDBStore.put(bytes("UUID:" + uuid), bytes("password:" + password));
return true;
}
return true;
} catch (SQLException e) {
return false;
} catch (Error e) {
LOGGER.error("[SimpleAuth] Register error: " + e.getMessage());
return false;
}
}
// Deletes row containing the username provided
public void delete(String uuid, String username) {
String sql = "DELETE FROM users WHERE uuid = ? OR username = ?";
try (PreparedStatement pstmt = conn.prepareStatement(sql)) {
// set the corresponding param
pstmt.setString(1, uuid);
pstmt.setString(2, username);
// execute the delete statement
pstmt.executeUpdate();
} catch (SQLException e) {
public void delete(String uuid) {
try {
levelDBStore.delete(bytes("UUID:" + uuid));
} catch (Error e) {
LOGGER.error("[SimpleAuth] " + e.getMessage());
}
}
// Updates the password of the user
public void update(String uuid, String username, String pass) {
String sql = "UPDATE users SET password = ? "
+ "WHERE uuid = ? OR username = ?";
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) {
public void update(String uuid, String password) {
try {
levelDBStore.put(bytes("UUID:" + uuid),bytes("password:" + password));
} catch (Error e) {
LOGGER.error("[SimpleAuth] " + e.getMessage());
}
}
// Gets the hashed password from DB
public String getPassword(String uuid){
String sql = "SELECT UUID, Password "
+ "FROM users WHERE UUID = ?";
String pass = null;
try (PreparedStatement pstmt = conn.prepareStatement(sql)) {
// Setting statement
pstmt.setString(1, uuid);
ResultSet rs = pstmt.executeQuery();
// Getting the password
pass = rs.getString("Password");
} catch (SQLException e) {
String password = null;
try {
// Gets password from db and removes "password:" prefix from it
password = new String(levelDBStore.get(bytes("UUID:" + uuid))).substring(9);
} catch (Error e) {
LOGGER.error("[SimpleAuth] Error getting password: " + e.getMessage());
}
return pass;
return password;
}
}