BLOCKFANTASY
/
LOOHP-Limbo
Template
mirror of https://github.com/LOOHP/Limbo.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

change allowlist implementation to HashMap & don't leak the implementation outside of the ServerProperties class

This commit is contained in:
Tad Hunt 2022-11-06 09:54:54 -07:00
parent 2c2285b54c
commit a797e89c14
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/loohp/limbo/Limbo.java
View File

@ -442,14 +442,12 @@ public class Limbo {
return true;
}
for (UUID allowedUuid : properties.getAllowlist()) {
if (requestedUuid.equals(allowedUuid)) {
if (properties.uuidIsAllowed(requestedUuid)) {
if(!properties.isReducedDebugInfo()) {
Limbo.getInstance().getConsole().sendMessage(String.format("allowlist: %s allowed", requestedUuid.toString()));
}
return true;
}
}
if(!properties.isReducedDebugInfo()) {
Limbo.getInstance().getConsole().sendMessage(String.format("allowlist: %s not allowed", requestedUuid.toString()));

14
src/main/java/com/loohp/limbo/file/ServerProperties.java
View File

@ -31,6 +31,7 @@ import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
@ -84,7 +85,7 @@ public class ServerProperties {
private double ticksPerSecond;
private boolean handshakeVerbose;
private boolean enforceAllowlist;
private ArrayList<UUID> allowlist;
private HashMap<UUID, Boolean> allowlist;
private String resourcePackSHA1;
private String resourcePackLink;
@ -208,7 +209,7 @@ public class ServerProperties {
public void reloadAllowlist() {
Console console = Limbo.getInstance().getConsole();
allowlist = new ArrayList<UUID>();
allowlist = new HashMap<UUID, Boolean>();
try {
JSONParser parser = new JSONParser();
Object obj = parser.parse(new FileReader("allowlist.json"));
@ -241,7 +242,7 @@ public class ServerProperties {
String uuidStr = (String) o;
UUID allowedUuid = UUID.fromString(uuidStr);
allowlist.add(allowedUuid);
allowlist.put(allowedUuid, true);
}
} catch (IllegalArgumentException e) {
console.sendMessage(e.toString());
@ -368,8 +369,11 @@ public class ServerProperties {
return enforceAllowlist;
}
public ArrayList<UUID> getAllowlist() {
return allowlist;
public boolean uuidIsAllowed(UUID requestedUuid) {
if (allowlist.containsKey(requestedUuid)) {
return true;
}
return false;
}
public String getResourcePackLink() {