funkemunky/AntiVPN
1
0
Fork 0
mirror of https://github.com/funkemunky/AntiVPN.git synced 2026-05-31 09:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from brysondev/master

Browse Source
This commit is contained in:
Dawson
2021-07-26 20:55:20 -04:00
committed by GitHub
parent 68b6335ad5 88dfcc3349
commit 73bddca5c3
2 changed files with 89 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/src/main/java/dev/brighten/antivpn/database/sql/MySqlVPN.java
+88 -44
View File
@@ -8,9 +8,7 @@ import dev.brighten.antivpn.database.sql.utils.Query;
import dev.brighten.antivpn.utils.VPNResponse;
import lombok.SneakyThrows;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.sql.*;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
@@ -26,9 +24,9 @@ public class MySqlVPN implements VPNDatabase {
} catch (InterruptedException e) {
e.printStackTrace();
}
while(true) {
//Updating from database
if(AntiVPN.getInstance().getConfig().isDatabaseEnabled()) {
while (true) {
// Updating from database
if (AntiVPN.getInstance().getConfig().isDatabaseEnabled()) {
AntiVPN.getInstance().getExecutor().getWhitelisted().clear();
AntiVPN.getInstance().getExecutor().getWhitelisted()
.addAll(AntiVPN.getInstance().getDatabase().getAllWhitelisted());
@@ -41,22 +39,22 @@ public class MySqlVPN implements VPNDatabase {
}
});
whitelistedThread.start();;
whitelistedThread.start();
;
}
@Override
public Optional<VPNResponse> getStoredResponse(String ip) {
if(!AntiVPN.getInstance().getConfig().isDatabaseEnabled()) return Optional.empty();
ResultSet rs = Query.prepare("select * from `responses` where `ip` = ? limit 1")
.append(ip).executeQuery();
if (!AntiVPN.getInstance().getConfig().isDatabaseEnabled())
return Optional.empty();
ResultSet rs = Query.prepare("select * from `responses` where `ip` = ? limit 1").append(ip).executeQuery();
try {
if(rs != null && !rs.wasNull() && rs.next()) {
if (rs != null && rs.next()) {
VPNResponse response = new VPNResponse(rs.getString("asn"), rs.getString("ip"),
rs.getString("countryName"), rs.getString("countryCode"),
rs.getString("city"), rs.getString("timeZone"),
rs.getString("method"), rs.getString("isp"),
rs.getBoolean("proxy"), rs.getBoolean("cached"), true,
rs.getDouble("latitude"), rs.getDouble("longitude"),
rs.getString("countryName"), rs.getString("countryCode"), rs.getString("city"),
rs.getString("timeZone"), rs.getString("method"), rs.getString("isp"), rs.getBoolean("proxy"),
rs.getBoolean("cached"), true, rs.getDouble("latitude"), rs.getDouble("longitude"),
System.currentTimeMillis(), -1);
return Optional.of(response);
}
@@ -67,37 +65,43 @@ public class MySqlVPN implements VPNDatabase {
return Optional.empty();
}
/*Query.prepare("create table if not exists `responses` (`ip` varchar(45) not null, " +
"`countryName` varchar(64), `countryCode` varchar(10), `city` varchar(64), `timeZone` varchar(64), " +
"`method` varchar(32), `isp` varchar(32), `proxy` boolean, `cached` boolean " +
"`latitude` double, `longitude` double)");*/
/*
* Query.
* prepare("create table if not exists `responses` (`ip` varchar(45) not null, "
* +
* "`countryName` varchar(64), `countryCode` varchar(10), `city` varchar(64), `timeZone` varchar(64), "
* +
* "`method` varchar(32), `isp` varchar(32), `proxy` boolean, `cached` boolean "
* + "`latitude` double, `longitude` double)");
*/
@Override
public void cacheResponse(VPNResponse toCache) {
if(!AntiVPN.getInstance().getConfig().isDatabaseEnabled()) return;
Query.prepare("insert into `responses` (`ip`,`asn`,`countryName`,`countryCode`,`city`,`timeZone`," +
"`method`,`isp`,`proxy`,`cached`,`inserted`,`latitude`,`longitude`) values (?,?,?,?,?,?,?,?,?,?,?,?,?)")
if (!AntiVPN.getInstance().getConfig().isDatabaseEnabled())
return;
Query.prepare("insert into `responses` (`ip`,`asn`,`countryName`,`countryCode`,`city`,`timeZone`,"
+ "`method`,`isp`,`proxy`,`cached`,`inserted`,`latitude`,`longitude`) values (?,?,?,?,?,?,?,?,?,?,?,?,?)")
.append(toCache.getIp()).append(toCache.getAsn()).append(toCache.getCountryName())
.append(toCache.getCountryCode()).append(toCache.getCity())
.append(toCache.getTimeZone()).append(toCache.getMethod()).append(toCache.getIsp())
.append(toCache.isProxy()).append(toCache.isCached()).append(new Timestamp(System.currentTimeMillis()))
.append(toCache.getCountryCode()).append(toCache.getCity()).append(toCache.getTimeZone())
.append(toCache.getMethod()).append(toCache.getIsp()).append(toCache.isProxy())
.append(toCache.isCached()).append(new Timestamp(System.currentTimeMillis()))
.append(toCache.getLatitude()).append(toCache.getLongitude()).execute();
}
@SneakyThrows
@Override
public boolean isWhitelisted(UUID uuid) {
if(!AntiVPN.getInstance().getConfig().isDatabaseEnabled()) return false;
ResultSet set = Query.prepare("select uuid from `whitelisted` where `uuid` = ? limit 1")
.append(uuid.toString()).executeQuery();
if (!AntiVPN.getInstance().getConfig().isDatabaseEnabled())
return false;
ResultSet set = Query.prepare("select uuid from `whitelisted` where `uuid` = ? limit 1").append(uuid.toString())
.executeQuery();
return set != null && !set.wasNull() && set.next() && set.getString("uuid") != null;
}
@Override
public void setWhitelisted(UUID uuid, boolean whitelisted) {
if(whitelisted) {
if(!isWhitelisted(uuid)) {
if (whitelisted) {
if (!isWhitelisted(uuid)) {
Query.prepare("insert into `whitelisted` (`uuid`) values (?)").append(uuid.toString()).execute();
}
AntiVPN.getInstance().getExecutor().getWhitelisted().add(uuid);
@@ -113,10 +117,10 @@ public class MySqlVPN implements VPNDatabase {
ResultSet set = Query.prepare("select uuid from `whitelisted`").executeQuery();
try {
while(set.next()) {
while (set.next()) {
uuids.add(UUID.fromString(set.getString("uuid")));
}
} catch(SQLException e) {
} catch (SQLException e) {
e.printStackTrace();
}
return uuids;
@@ -134,27 +138,67 @@ public class MySqlVPN implements VPNDatabase {
@Override
public void init() {
if(!AntiVPN.getInstance().getConfig().isDatabaseEnabled()) return;
if (!AntiVPN.getInstance().getConfig().isDatabaseEnabled())
return;
System.out.println("Initializing MySQL...");
MySQL.init();
System.out.println("Creating tables...");
Query.prepare("create table if not exists `whitelisted` (`uuid` varchar(36) not null)").execute();
Query.prepare("create table if not exists `responses` (`ip` varchar(45) not null, `asn` varchar(12)," +
"`countryName` varchar(64), `countryCode` varchar(10), `city` varchar(64), `timeZone` varchar(64), " +
"`method` varchar(32), `isp` varchar(64), `proxy` boolean, `cached` boolean, `inserted` timestamp," +
"`latitude` double, `longitude` double)").execute();
Query.prepare("create table if not exists `responses` (`ip` varchar(45) not null, `asn` varchar(12),"
+ "`countryName` varchar(64), `countryCode` varchar(10), `city` varchar(64), `timeZone` varchar(64), "
+ "`method` varchar(32), `isp` varchar(64), `proxy` boolean, `cached` boolean, `inserted` timestamp,"
+ "`latitude` double, `longitude` double)").execute();
System.out.println("Creating indexes...");
Query.prepare("create index if not exists `uuid_1` on `whitelisted` (`uuid`)").execute();
Query.prepare("create index if not exists `ip_1` on `responses` (`ip`)").execute();
Query.prepare("create index if not exists `proxy_1` on `responses` (`proxy`)").execute();
Query.prepare("create index if not exists `inserted_1` on `responses` (`inserted`)").execute();
try {
// Ref:
// https://dba.stackexchange.com/questions/24531/mysql-create-index-if-not-exists
String query = "SELECT COUNT(1) IndexExists FROM INFORMATION_SCHEMA.STATISTICS WHERE table_schema=DATABASE() AND table_name='whitelisted' AND index_name='uuid_1';";
ResultSet rs = Query.prepare(query).executeQuery();
int id = 0;
while (rs.next()) {
id = rs.getInt("IndexExists");
}
if (id == 0) {
Query.prepare("create index `uuid_1` on `whitelisted` (`uuid`)").execute();
}
id = 0;
query = "SELECT COUNT(1) IndexExists FROM INFORMATION_SCHEMA.STATISTICS WHERE table_schema=DATABASE() AND table_name='responses' AND index_name='ip_1';";
rs = Query.prepare(query).executeQuery();
while (rs.next()) {
id = rs.getInt("IndexExists");
}
if (id == 0) {
Query.prepare("create index `ip_1` on `responses` (`ip`)").execute();
}
id = 0;
query = "SELECT COUNT(1) IndexExists FROM INFORMATION_SCHEMA.STATISTICS WHERE table_schema=DATABASE() AND table_name='responses' AND index_name='proxy_1';";
rs = Query.prepare(query).executeQuery();
while (rs.next()) {
id = rs.getInt("IndexExists");
}
if (id == 0) {
Query.prepare("create index `proxy_1` on `responses` (`proxy`)").execute();
}
id = 0;
query = "SELECT COUNT(1) IndexExists FROM INFORMATION_SCHEMA.STATISTICS WHERE table_schema=DATABASE() AND table_name='responses' AND index_name='inserted_1';";
rs = Query.prepare(query).executeQuery();
while (rs.next()) {
id = rs.getInt("IndexExists");
}
if (id == 0) {
Query.prepare("create index `inserted_1` on `responses` (`inserted`)").execute();
}
} catch (Exception e) {
System.err.println("MySQL Excepton created" + e.getMessage());
}
}
@Override
public void shutdown() {
if(!AntiVPN.getInstance().getConfig().isDatabaseEnabled()) return;
if (!AntiVPN.getInstance().getConfig().isDatabaseEnabled())
return;
MySQL.shutdown();
}
}
Common/src/main/java/dev/brighten/antivpn/database/sql/utils/MySQL.java
+1 -1
View File
@@ -11,7 +11,7 @@ public class MySQL {
public static void init() {
try {
if (conn == null || conn.isClosed()) {
Class.forName("com.mysql.jdbc.Driver");
Class.forName("com.mysql.cj.jdbc.Driver");
conn = DriverManager.getConnection("jdbc:mysql://" + AntiVPN.getInstance().getConfig().getIp()
+ ":" + AntiVPN.getInstance().getConfig().getPort()
+ "/?useSSL=true&autoReconnect=true",