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

Fixing whitelist checking for users

Browse Source
This commit is contained in:
Dawson Hessler
2022-07-10 12:57:05 -04:00
parent ff25c75055
commit db49d400a0
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/src/main/java/dev/brighten/antivpn/api/VPNExecutor.java
+6
View File
@@ -35,10 +35,16 @@ public abstract class VPNExecutor {
public abstract void log(String log, Object... objects);
public boolean isWhitelisted(UUID uuid) {
if(AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled()) {
return AntiVPN.getInstance().getDatabase().isWhitelisted(uuid);
}
return whitelisted.contains(uuid);
}
public boolean isWhitelisted(String ip) {
if(AntiVPN.getInstance().getVpnConfig().isDatabaseEnabled()) {
return AntiVPN.getInstance().getDatabase().isWhitelisted(ip);
}
return whitelistedIps.contains(ip);
}
Common/src/main/java/dev/brighten/antivpn/database/mongo/MongoVPN.java
+4
View File
@@ -86,8 +86,10 @@ public class MongoVPN implements VPNDatabase {
if(whitelisted) {
Document wdoc = new Document("setting", "whitelist");
wdoc.put("uuid", uuid.toString());
AntiVPN.getInstance().getExecutor().getWhitelisted().add(uuid);
VPNExecutor.threadExecutor.execute(() -> settingsDocument.insertOne(wdoc));
} else {
AntiVPN.getInstance().getExecutor().getWhitelisted().remove(uuid);
VPNExecutor.threadExecutor.execute(() -> settingsDocument.deleteMany(Filters
.and(
Filters.eq("setting", "whitelist"),
@@ -100,8 +102,10 @@ public class MongoVPN implements VPNDatabase {
if(whitelisted) {
Document wdoc = new Document("setting", "whitelist");
wdoc.put("ip", ip);
AntiVPN.getInstance().getExecutor().getWhitelistedIps().add(ip);
VPNExecutor.threadExecutor.execute(() -> settingsDocument.insertOne(wdoc));
} else {
AntiVPN.getInstance().getExecutor().getWhitelistedIps().remove(ip);
VPNExecutor.threadExecutor.execute(() -> settingsDocument.deleteMany(Filters
.and(
Filters.eq("setting", "whitelist"),