Various fixes

This commit is contained in:
crschnick committed 2026-09-26 09:56:40 +00:00
1 parent 70ded90291
commit 52135eb2b6
40 files changed
+220 -8

No files matched your search

@@ -29,7 +29,9 @@ public class FsBlobExchange extends BeaconInterface<FsBlobExchange.Request> {
public Object handle(HttpExchange exchange, Request msg) {
var id = UUID.randomUUID();
var size = exchange.getRequestBody().available();
var contentLength = exchange.getRequestHeaders().getFirst("Content-Length");
// Store it as a blob if we don't know the size
var size = contentLength != null ? Long.parseLong(contentLength) : Long.MAX_VALUE;
if (size > 100_000_000) {
BlobManager.get().store(id, exchange.getRequestBody());
} else {
@@ -4,12 +4,13 @@ import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
public class DataStorageQuery {
public static List<DataStoreEntry> queryUserInput(String input) {
var connectionFilter = input != null && !input.isEmpty() && !input.equals("*") && !input.equals("**")
? "**" + Pattern.quote(input) + "**"
? "**" + input + "**"
: "**";
var found = queryEntry("**", connectionFilter, "*");
if (found.size() > 1) {
@@ -38,7 +39,7 @@ public class DataStorageQuery {
return List.of();
}
var catMatcher = Pattern.compile(toRegex(categoryFilter.toLowerCase()));
var catMatcher = compilePattern(categoryFilter);
List<DataStoreCategory> found = new ArrayList<>();
for (DataStoreCategory cat : DataStorage.get().getStoreCategories()) {
@@ -57,9 +58,9 @@ public class DataStorageQuery {
return List.of();
}
var catMatcher = Pattern.compile(toRegex(categoryFilter.toLowerCase()));
var conMatcher = Pattern.compile(toRegex(connectionFilter.toLowerCase()));
var typeMatcher = Pattern.compile(toRegex(typeFilter.toLowerCase()));
var catMatcher = compilePattern(categoryFilter);
var conMatcher = compilePattern(connectionFilter);
var typeMatcher = compilePattern(typeFilter);
List<DataStoreEntry> found = new ArrayList<>();
for (DataStoreEntry storeEntry : DataStorage.get().getStoreEntries()) {
@@ -197,4 +198,12 @@ public class DataStorageQuery {
}
return sb.toString();
}
private static Pattern compilePattern(String pattern) {
try {
return Pattern.compile(toRegex(pattern.toLowerCase()));
} catch (Throwable e) {
return Pattern.compile(Pattern.quote(pattern));
}
}
}