Fixed ip whitelisting

This commit is contained in:
funkemunky
2022-02-21 09:15:43 -05:00
parent a6aac8fce7
commit 619b61fe55
8 changed files with 17 additions and 10 deletions
@@ -53,6 +53,7 @@ public class AntiVPN {
switch(INSTANCE.config.getDatabaseType().toLowerCase()) {
case "mysql":
case "h2":
case "sql":{
AntiVPN.getInstance().getExecutor().log("Using databaseType MySQL...");
INSTANCE.database = new MySqlVPN();
@@ -237,7 +237,9 @@ public class MySqlVPN implements VPNDatabase {
if (!AntiVPN.getInstance().getConfig().isDatabaseEnabled())
return;
AntiVPN.getInstance().getExecutor().log("Initializing MySQL...");
MySQL.init();
if(AntiVPN.getInstance().getConfig().getDatabaseType().contains("sql")) {
MySQL.init();
} else MySQL.initH2();
AntiVPN.getInstance().getExecutor().log("Creating tables...");
@@ -1,10 +1,13 @@
package dev.brighten.antivpn.database.sql.utils;
import org.h2.jdbc.JdbcConnection;
import dev.brighten.antivpn.AntiVPN;
import java.io.File;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.Properties;
public class MySQL {
private static Connection conn;
@@ -35,12 +38,13 @@ public class MySQL {
}
}
/*public static void initH2() {
public static void initH2() {
File dataFolder = new File(AntiVPN.getInstance().getPluginFolder(), "databases" + File.separator + "database");
try {
Class.forName("org.h2.Driver");
conn = new NonClosableConnection(new JdbcConnection("jdbc:h2:file:" +
dataFolder.getAbsolutePath(), new Properties()));
conn = new NonClosableConnection(DriverManager.getConnection ("jdbc:h2:file:" +
dataFolder.getAbsolutePath(),
AntiVPN.getInstance().getConfig().getUsername(),AntiVPN.getInstance().getConfig().getPassword()));
conn.setAutoCommit(true);
Query.use(conn);
AntiVPN.getInstance().getExecutor().log("Connection to SQlLite has been established.");
@@ -50,7 +54,7 @@ public class MySQL {
} catch (ClassNotFoundException ex) {
AntiVPN.getInstance().getExecutor().log("No H2 library found!");
}
}*/
}
public static void use() {
try {
@@ -15,7 +15,7 @@ import java.util.regex.Pattern;
public class MiscUtils {
private static final Pattern ipv4 = Pattern.compile("[1-9]{1,3}\\.[1-9]{1,3}\\.[1-9]{1,3}.[1-9]{1,3}");
private static final Pattern ipv4 = Pattern.compile("[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}");
public static void close(Closeable... closeables) {
try {