Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docs/src/reference/manifest.md
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,8 @@ must be quoted, as above; a nested block spells the same key, so

Keys managed by mc are rejected: an entry for a key that a `server` field
or the top-level `name` and `description` already drive is an error naming
the field to use instead. `enable-rcon` is rejected too — RCON is enabled
the field to use instead. Every managed entry is reported in the same
error, so one pass fixes them all. `enable-rcon` is rejected too — RCON is enabled
exactly when an RCON password is configured (see
[Environment Variables](./environment-variables.md)).

Expand Down
19 changes: 12 additions & 7 deletions src/manifest/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -425,14 +425,19 @@ impl RawServer {
flatten_properties(None, raw_properties, &mut properties)?;
}

for (key, hint) in MANAGED_PROPERTY_KEYS {
if properties.contains_key(key) {
anyhow::bail!(
let managed: Vec<String> = MANAGED_PROPERTY_KEYS
.iter()
.filter(|(key, _)| properties.contains_key(*key))
.map(|(key, hint)| {
format!(
"the `{}` entry in `properties` is managed by mc; {}",
key,
hint
);
}
key, hint
)
})
.collect();

if !managed.is_empty() {
anyhow::bail!("{}", managed.join("\n"));
}

Ok(ManifestServer {
Expand Down
21 changes: 21 additions & 0 deletions src/manifest/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,27 @@ fn managed_property_is_rejected() {
);
}

#[test]
fn every_managed_property_is_reported_at_once() {
let source = with_section(
"server {\n properties {\n server-port 25566\n white-list #false\n enable-rcon #true\n }\n}"
);
let message = error_message(Manifest::from_kdl_str(&source));

assert!(
message.contains("the `server-port` entry in `properties` is managed by mc; set `port` in `server` instead"),
"{message}"
);
assert!(
message.contains("the `white-list` entry in `properties` is managed by mc; set `allow-list` in `server` instead"),
"{message}"
);
assert!(
message.contains("the `enable-rcon` entry in `properties` is managed by mc; rcon is enabled when a rcon password is configured"),
"{message}"
);
}

#[test]
fn rcon_password_property_is_rejected() {
let source =
Expand Down