mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-01-12 02:10:30 +00:00
Code Issues Releases Wiki Activity

Fix address rules reading the wrong config key

Browse Source 
Should be max_websocket_message, not just websocket_message.

Also add some additional validation to address rules, to check no
unrecognised keys are present.

Closes #1566.
This commit is contained in:
Jonathan Coates 2023-08-23 18:04:22 +01:00
parent 8c8924f54e
commit 25776abf61
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
projects/common/src/main/java/dan200/computercraft/shared/config/AddressRuleConfig.java
View File

@ -26,6 +26,10 @@ class AddressRuleConfig {
private static final AddressRule REJECT_ALL = AddressRule.parse("*", OptionalInt.empty(), Action.DENY.toPartial()); private static final AddressRule REJECT_ALL = AddressRule.parse("*", OptionalInt.empty(), Action.DENY.toPartial());
private static final Set<String> knownKeys = Set.of(
"host", "action", "max_download", "max_upload", "max_websocket_message", "use_proxy"
);
public static List<UnmodifiableConfig> defaultRules() { public static List<UnmodifiableConfig> defaultRules() {
return List.of( return List.of(
makeRule(config -> { makeRule(config -> {
@ -88,9 +92,20 @@ class AddressRuleConfig {
var port = unboxOptInt(get(builder, "port", Number.class)); var port = unboxOptInt(get(builder, "port", Number.class));
var maxUpload = unboxOptLong(get(builder, "max_upload", Number.class).map(Number::longValue)); var maxUpload = unboxOptLong(get(builder, "max_upload", Number.class).map(Number::longValue));
var maxDownload = unboxOptLong(get(builder, "max_download", Number.class).map(Number::longValue)); var maxDownload = unboxOptLong(get(builder, "max_download", Number.class).map(Number::longValue));
var websocketMessage = unboxOptInt(get(builder, "websocket_message", Number.class).map(Number::intValue)); var websocketMessage = unboxOptInt(
get(builder, "max_websocket_message", Number.class)
// Fallback to (incorrect) websocket_message option.
.or(() -> get(builder, "websocket_message", Number.class))
.map(Number::intValue)
);
var useProxy = get(builder, "use_proxy", Boolean.class); var useProxy = get(builder, "use_proxy", Boolean.class);
// Find unknown keys and warn about them.
var unknownKeys = builder.entrySet().stream().map(UnmodifiableConfig.Entry::getKey).filter(x -> !knownKeys.contains(x)).toList();
if (!unknownKeys.isEmpty()) {
LOG.warn("Unknown config {} {} in address rule.", unknownKeys.size() == 1 ? "option" : "options", String.join(", ", unknownKeys));
}
var options = new PartialOptions( var options = new PartialOptions(
action, action,
maxUpload, maxUpload,