mirror of
https://github.com/Corfirean/coa-server-manager.git
synced 2026-11-19 03:25:56 +00:00
Compare commits
43
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1a71f18def | ||
|
|
7d7bc530ec | ||
|
|
d86a1676fe | ||
|
|
53a05820c8 | ||
|
|
58c976a388 | ||
|
|
35c4d03bdc | ||
|
|
c45f962d02 | ||
|
|
f52bd8ba5f | ||
|
|
247159e56c | ||
|
|
cdd5be2365 | ||
|
|
7e170744bf | ||
|
|
10daa9b74d | ||
|
|
ed7bf7262b | ||
|
|
7c866b116d | ||
|
|
cfea54e203 | ||
|
|
57aa97da8a | ||
|
|
b9f89a4ae4 | ||
|
|
6fd2130fc4 | ||
|
|
346d97ee89 | ||
|
|
10a6744192 | ||
|
|
7557b347c5 | ||
|
|
2abd64dfe2 | ||
|
|
9ae5fb471b | ||
|
|
59036867d7 | ||
|
|
949614f11a | ||
|
|
9ee0e9f6af | ||
|
|
3405c89fe8 | ||
|
|
4c4d39f1de | ||
|
|
b101c79e96 | ||
|
|
3b7f77d92e | ||
|
|
0589722e71 | ||
|
|
a3717c08bb | ||
|
|
dc2bffc57e | ||
|
|
e34ab45443 | ||
|
|
40f9feab84 | ||
|
|
5b16842720 | ||
|
|
02843bb6d1 | ||
|
|
a9ab7ced7e | ||
|
|
77318895ae | ||
|
|
115c57f54e | ||
|
|
94fd5fb5b9 | ||
|
|
94d4ade1c7 | ||
|
|
376f1dbb46 |
No files matched your search
@@ -4,3 +4,5 @@ dist
|
|||||||
*.log
|
*.log
|
||||||
.env
|
.env
|
||||||
src-tauri/gen
|
src-tauri/gen
|
||||||
|
# Disposable database fixtures and private recovery data
|
||||||
|
.cache/
|
||||||
Generated
+3
-3
@@ -491,7 +491,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-core"
|
name = "coa-core"
|
||||||
version = "0.6.10"
|
version = "0.6.15"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
"chrono",
|
"chrono",
|
||||||
@@ -520,7 +520,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-release"
|
name = "coa-release"
|
||||||
version = "0.6.10"
|
version = "0.6.15"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"coa-core",
|
"coa-core",
|
||||||
@@ -529,7 +529,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coa-server-manager"
|
name = "coa-server-manager"
|
||||||
version = "0.6.10"
|
version = "0.6.15"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"coa-core",
|
"coa-core",
|
||||||
"serde",
|
"serde",
|
||||||
|
|||||||
+1
-1
@@ -3,7 +3,7 @@ resolver = "2"
|
|||||||
members = ["crates/coa-core", "crates/coa-release", "src-tauri"]
|
members = ["crates/coa-core", "crates/coa-release", "src-tauri"]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
version = "0.6.10"
|
version = "0.6.15"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "AGPL-3.0-only"
|
license = "AGPL-3.0-only"
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: changed
|
||||||
|
audience: admins
|
||||||
|
title: Failed server startup after an update automatically restores the previous version
|
||||||
|
---
|
||||||
|
The Manager restores server files and databases, then checks the recovered server. If recovery cannot be confirmed, it preserves the recovery point and blocks further startup until the problem is resolved.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Windows update recovery preserves database procedures triggers and views
|
||||||
|
---
|
||||||
|
A verified copy of stopped MySQL restores all databases and accounts together. Interrupted restoration can be retried, and the replaced database directory is retained.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Custom races bot setting synchronizes Playerbots excluded race lists
|
||||||
|
---
|
||||||
|
The "Bots can be custom races" setting now configures AiPlayerbot.ExcludedBotRaces in playerbots.conf. Off excludes all added races (recommended), while on allows stable added races (experimental).
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Blocked updates identify database objects that prevent automatic recovery
|
||||||
|
---
|
||||||
|
Diagnostics include the complete list of unsupported database objects across the recovery point, helping resolve update failures without removing user data.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Background world servers no longer stop because the local console is closed
|
||||||
|
---
|
||||||
|
The Manager automatically disables the local interactive console before starting the world server. Its remote console remains available, and no manual configuration changes are needed.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Updates can follow signed channels that select a complete server release
|
||||||
|
---
|
||||||
|
The Manager checks the channel signature and downloads every package part from the same release. Existing installations continue using the previous download source until the new channel is published.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Server updates check startup privately before allowing players to connect
|
||||||
|
---
|
||||||
|
Startup checks use temporary local ports. Original settings are restored before opening the server, and interrupted checks retain a recovery journal.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Updates repair missing database defaults from the verified release schema
|
||||||
|
---
|
||||||
|
Only missing literal defaults are restored when column properties match. Existing rows, custom defaults, types and nullability are preserved; unresolved incompatibilities still block the update.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Server updates no longer replay module installation scripts on existing databases
|
||||||
|
---
|
||||||
|
Update packages contain incremental SQL only. Module table initialization and seed scripts remain available when preparing a clean installation, preventing existing content from being reset during updates.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Windows server updates are tested on a private copy before changing your installation
|
||||||
|
---
|
||||||
|
The Manager tests migrations and server startup using your databases and configurations. A failed rehearsal leaves the installed server unchanged and preserves a diagnostic report.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: admins
|
||||||
|
title: Server updates can require a tested combination of platform and installed version
|
||||||
|
---
|
||||||
|
Signed release metadata identifies core and module revisions, supported starting versions and database contracts. Incompatible packages are rejected before shutdown; changed schema contracts and incompatible databases block installation before migration.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Failed database checks keep a complete report after rollback
|
||||||
|
---
|
||||||
|
Schema errors show readable default values and save every detected difference for troubleshooting, including after the server is restored.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Server and Bots settings open without a blank window
|
||||||
|
---
|
||||||
|
Opening settings no longer crashes the interface after loading. Unsaved changes can still be saved or discarded before leaving the page.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: added
|
||||||
|
audience: players
|
||||||
|
title: Players can install custom race patches when connecting to a friend
|
||||||
|
---
|
||||||
|
Install the custom race client patch directly from the Game client section without hosting a server.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Large server updates no longer repeatedly rewrite the recovery journal
|
||||||
|
---
|
||||||
|
Updates containing rebuilt navigation data now prepare all recovery copies before replacing files. Interrupted updates remain recoverable without rewriting the full journal for every file.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Normalize rehearsal server roots to prevent Windows path prefix errors
|
||||||
|
---
|
||||||
|
Server update rehearsals now canonicalize the installation root before collecting files, resolving a "prefix not found" error during rehearsal preparation on Windows.
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
area: manager
|
||||||
|
type: fixed
|
||||||
|
audience: admins
|
||||||
|
title: Client race patches can be repaired and removed while preserving original files
|
||||||
|
---
|
||||||
|
Every overwritten client file gets an original backup. Switching preserves newer launcher files; checksums detect missing or replaced assets. Repair and removal are always available, with rollback if a file operation fails.
|
||||||
@@ -27,6 +27,7 @@ fn exercise(root: &Path) -> Result<()> {
|
|||||||
MetaDir::create(root, &installed)?;
|
MetaDir::create(root, &installed)?;
|
||||||
backup::with_database(root, |db| {
|
backup::with_database(root, |db| {
|
||||||
db.query("CREATE TABLE acore_characters.manager_recovery_probe (id INT); INSERT INTO acore_characters.manager_recovery_probe VALUES (42); CREATE TABLE acore_world.manager_recovery_probe (id INT); INSERT INTO acore_world.manager_recovery_probe VALUES (43);")?;
|
db.query("CREATE TABLE acore_characters.manager_recovery_probe (id INT); INSERT INTO acore_characters.manager_recovery_probe VALUES (42); CREATE TABLE acore_world.manager_recovery_probe (id INT); INSERT INTO acore_world.manager_recovery_probe VALUES (43);")?;
|
||||||
|
db.query("CREATE VIEW acore_characters.manager_recovery_view AS SELECT id FROM acore_characters.manager_recovery_probe; CREATE TRIGGER acore_characters.manager_recovery_trigger BEFORE INSERT ON acore_characters.manager_recovery_probe FOR EACH ROW SET NEW.id=NEW.id+1; CREATE PROCEDURE acore_characters.manager_recovery_proc() SELECT id FROM acore_characters.manager_recovery_probe;")?;
|
||||||
Ok(())
|
Ok(())
|
||||||
})?;
|
})?;
|
||||||
let source = root.join("fixture-update-source");
|
let source = root.join("fixture-update-source");
|
||||||
@@ -54,13 +55,15 @@ fn exercise(root: &Path) -> Result<()> {
|
|||||||
cancel: Cancel::default(), resolutions: BTreeMap::new(), env: &env, fail_after_ops: None,
|
cancel: Cancel::default(), resolutions: BTreeMap::new(), env: &env, fail_after_ops: None,
|
||||||
}, &|step, pct| println!("{pct}% {step}" )).unwrap_err();
|
}, &|step, pct| println!("{pct}% {step}" )).unwrap_err();
|
||||||
assert!(error.to_string().contains("probe_world"), "{error}");
|
assert!(error.to_string().contains("probe_world"), "{error}");
|
||||||
assert!(error.to_string().contains("were restored"), "{error}");
|
assert!(error.to_string().contains("private update rehearsal failed"), "{error}");
|
||||||
assert!(!root.join("Core/recovery-probe.txt").exists());
|
assert!(!root.join("Core/recovery-probe.txt").exists());
|
||||||
assert!(update::unfinished(&meta).is_none());
|
assert!(update::unfinished(&meta).is_none());
|
||||||
assert_eq!(MetaDir::open(&meta)?.1.core.version.as_deref(), Some("1.0.0"));
|
assert_eq!(MetaDir::open(&meta)?.1.core.version.as_deref(), Some("1.0.0"));
|
||||||
backup::with_database(root, |db| {
|
backup::with_database(root, |db| {
|
||||||
assert_eq!(db.query("SELECT id FROM acore_characters.manager_recovery_probe;")?, "42");
|
assert_eq!(db.query("SELECT id FROM acore_characters.manager_recovery_probe;")?, "42");
|
||||||
assert_eq!(db.query("SELECT id FROM acore_world.manager_recovery_probe;")?, "43");
|
assert_eq!(db.query("SELECT id FROM acore_world.manager_recovery_probe;")?, "43");
|
||||||
|
assert_eq!(db.query("SELECT id FROM acore_characters.manager_recovery_view;")?, "42");
|
||||||
|
assert_eq!(db.recovery_objects("acore_characters")?.iter().filter(|object| object["name"].as_str().is_some_and(|name| name.starts_with("manager_recovery_"))).count(), 3);
|
||||||
assert!(!coa_core::migrations::status(db, &manifest.migrations)?.iter().any(|m| m.status == coa_core::migrations::Status::Applied));
|
assert!(!coa_core::migrations::status(db, &manifest.migrations)?.iter().any(|m| m.status == coa_core::migrations::Status::Applied));
|
||||||
Ok(())
|
Ok(())
|
||||||
})?;
|
})?;
|
||||||
@@ -68,6 +71,6 @@ fn exercise(root: &Path) -> Result<()> {
|
|||||||
let point = backup::list(&meta).into_iter().find(|p| p.trigger == backup::Trigger::BeforeUpdate).ok_or_else(|| Error::Invalid("missing backup".into()))?;
|
let point = backup::list(&meta).into_iter().find(|p| p.trigger == backup::Trigger::BeforeUpdate).ok_or_else(|| Error::Invalid("missing backup".into()))?;
|
||||||
env.restore_snapshot(&point.id)?;
|
env.restore_snapshot(&point.id)?;
|
||||||
assert_eq!(Db::from_repack(root, Account::Admin)?.realm(), coa_core::realms::Mode::Coa);
|
assert_eq!(Db::from_repack(root, Account::Admin)?.realm(), coa_core::realms::Mode::Coa);
|
||||||
println!("PASS: failed SQL restored world, characters, ledger, files and version; repeated recovery succeeded");
|
println!("PASS: private rehearsal caught failed SQL before changing the installed world, characters, ledger, objects, files or version; complete recovery succeeded");
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -31,6 +31,7 @@ fn hidden(key: &str) -> bool {
|
|||||||
k.contains("password")
|
k.contains("password")
|
||||||
|| k.contains("databaseinfo")
|
|| k.contains("databaseinfo")
|
||||||
|| k.ends_with("port")
|
|| k.ends_with("port")
|
||||||
|
|| k == "console.enable"
|
||||||
|| k.starts_with("ra.")
|
|| k.starts_with("ra.")
|
||||||
|| k.starts_with("logger.")
|
|| k.starts_with("logger.")
|
||||||
|| k.starts_with("appender.")
|
|| k.starts_with("appender.")
|
||||||
@@ -229,7 +230,7 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn what_belongs_to_the_manager_is_hidden() {
|
fn what_belongs_to_the_manager_is_hidden() {
|
||||||
for k in ["LoginDatabaseInfo", "WorldServerPort", "BindIP", "Ra.Enable", "Ra.Password", "Logger.root", "Appender.Console", "DataDir", "Updates.EnableDatabases", "LoginDatabase.WorkerThreads", "InstanceServerPort"] {
|
for k in ["LoginDatabaseInfo", "WorldServerPort", "BindIP", "Ra.Enable", "Ra.Password", "Console.Enable", "console.enable", "Logger.root", "Appender.Console", "DataDir", "Updates.EnableDatabases", "LoginDatabase.WorkerThreads", "InstanceServerPort"] {
|
||||||
assert!(hidden(k), "{k}");
|
assert!(hidden(k), "{k}");
|
||||||
}
|
}
|
||||||
for k in ["Rate.XP.Kill", "PlayerLimit", "SupportEnabled", "Instance.ResetTimeHour", "Warden.Enabled", "CharacterCreating.Disabled"] {
|
for k in ["Rate.XP.Kill", "PlayerLimit", "SupportEnabled", "Instance.ResetTimeHour", "Warden.Enabled", "CharacterCreating.Disabled"] {
|
||||||
|
|||||||
@@ -67,6 +67,8 @@ pub struct RecoveryPoint {
|
|||||||
pub components: Vec<Component>,
|
pub components: Vec<Component>,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub realm: crate::realms::Mode,
|
pub realm: crate::realms::Mode,
|
||||||
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||||
|
pub(crate) mysql_snapshot: Option<crate::mysql_snapshot::Snapshot>,
|
||||||
}
|
}
|
||||||
|
|
||||||
const LOCATION_FILE: &str = "backup-location.json";
|
const LOCATION_FILE: &str = "backup-location.json";
|
||||||
@@ -334,6 +336,16 @@ pub fn create(root: &Path, meta: &Path, kind: Kind, trigger: Trigger, label: Opt
|
|||||||
return Err(e);
|
return Err(e);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
let mysql_snapshot = if kind == Kind::Full && trigger == Trigger::BeforeUpdate && cfg!(windows) && !crate::docker::is_docker(root) {
|
||||||
|
progress("Saving a complete stopped MySQL recovery copy");
|
||||||
|
match crate::mysql_snapshot::capture(root, &partial) {
|
||||||
|
Ok(snapshot) => Some(snapshot),
|
||||||
|
Err(error) => {
|
||||||
|
if let Ok(owned) = fsx::ensure_within(&backups_dir(meta), &partial) { let _ = fs::remove_dir_all(owned); }
|
||||||
|
return Err(error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else { None };
|
||||||
let point = RecoveryPoint {
|
let point = RecoveryPoint {
|
||||||
realm: crate::realms::state(root)?.active,
|
realm: crate::realms::state(root)?.active,
|
||||||
schema: 1,
|
schema: 1,
|
||||||
@@ -344,6 +356,7 @@ pub fn create(root: &Path, meta: &Path, kind: Kind, trigger: Trigger, label: Opt
|
|||||||
created_at: chrono::Utc::now().to_rfc3339(),
|
created_at: chrono::Utc::now().to_rfc3339(),
|
||||||
manager_version: crate::MANAGER_VERSION.into(),
|
manager_version: crate::MANAGER_VERSION.into(),
|
||||||
components,
|
components,
|
||||||
|
mysql_snapshot,
|
||||||
};
|
};
|
||||||
fsx::atomic_write_json(&partial.join("backup.json"), &point)?;
|
fsx::atomic_write_json(&partial.join("backup.json"), &point)?;
|
||||||
fs::rename(&partial, &final_dir)?;
|
fs::rename(&partial, &final_dir)?;
|
||||||
@@ -375,6 +388,9 @@ pub fn verify(meta: &Path, id: &str) -> Result<VerifyReport> {
|
|||||||
let point = get(meta, id)?;
|
let point = get(meta, id)?;
|
||||||
let dir = point_dir(meta, id)?;
|
let dir = point_dir(meta, id)?;
|
||||||
let mut problems = Vec::new();
|
let mut problems = Vec::new();
|
||||||
|
if let Some(snapshot) = &point.mysql_snapshot {
|
||||||
|
if let Err(error) = crate::mysql_snapshot::verify(&dir, snapshot) { problems.push(error.to_string()); }
|
||||||
|
}
|
||||||
let mut names = std::collections::BTreeSet::new();
|
let mut names = std::collections::BTreeSet::new();
|
||||||
let mut schemas = std::collections::BTreeSet::new();
|
let mut schemas = std::collections::BTreeSet::new();
|
||||||
for c in &point.components {
|
for c in &point.components {
|
||||||
|
|||||||
@@ -0,0 +1,86 @@
|
|||||||
|
//! Signed channel pointers select one immutable package for an entire transaction.
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use crate::{Error, Result};
|
||||||
|
use crate::pkgsource::{fetch_small, Source};
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
||||||
|
pub struct Pointer {
|
||||||
|
pub schema: u32,
|
||||||
|
pub channel: String,
|
||||||
|
pub version: String,
|
||||||
|
pub release_tag: String,
|
||||||
|
pub snapshot: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize, Serialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct Envelope {
|
||||||
|
pub payload: String,
|
||||||
|
pub signature: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn verify(bytes: &[u8], channel: &str, key: &str) -> Result<Pointer> {
|
||||||
|
let envelope: Envelope = serde_json::from_slice(bytes).map_err(|e| Error::InvalidManifest(e.to_string()))?;
|
||||||
|
crate::signing::verify(envelope.payload.as_bytes(), &envelope.signature, key)?;
|
||||||
|
let pointer: Pointer = serde_json::from_str(&envelope.payload).map_err(|e| Error::InvalidManifest(e.to_string()))?;
|
||||||
|
if pointer.schema != 1 || pointer.channel != channel
|
||||||
|
|| pointer.release_tag != format!("server-{}", pointer.version)
|
||||||
|
|| pointer.version.is_empty()
|
||||||
|
|| !pointer.version.bytes().all(|b| b.is_ascii_digit() || b == b'.')
|
||||||
|
|| pointer.snapshot.len() != 64
|
||||||
|
|| !pointer.snapshot.bytes().all(|b| b.is_ascii_hexdigit()) {
|
||||||
|
return Err(Error::InvalidManifest("Invalid channel pointer".into()));
|
||||||
|
}
|
||||||
|
Ok(pointer)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn resolve(channel: &str) -> Result<Source> {
|
||||||
|
if channel != "stable" && channel != "edge" {
|
||||||
|
return Err(Error::InvalidManifest("Unknown release channel".into()));
|
||||||
|
}
|
||||||
|
let source = Source::Url("https://raw.githubusercontent.com/Corfirean/coa-server-build/channels".into());
|
||||||
|
let bytes = fetch_small(&source, &format!("{channel}.json"))?;
|
||||||
|
let pointer = verify(&bytes, channel, crate::signing::EMBEDDED_PUBLIC_KEY)?;
|
||||||
|
Ok(Source::Url(format!("https://github.com/Corfirean/coa-server-build/releases/download/{}", pointer.release_tag)))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn sign(pointer: &Pointer, seed: &str) -> Result<Vec<u8>> {
|
||||||
|
use base64::{engine::general_purpose::STANDARD, Engine};
|
||||||
|
use ed25519_dalek::{Signer, SigningKey};
|
||||||
|
let seed: [u8; 32] = STANDARD.decode(seed.trim()).map_err(|_| Error::Invalid("Invalid signing key".into()))?
|
||||||
|
.try_into().map_err(|_| Error::Invalid("Invalid signing key length".into()))?;
|
||||||
|
let payload = serde_json::to_string(pointer).map_err(|e| Error::Invalid(e.to_string()))?;
|
||||||
|
let signature = STANDARD.encode(SigningKey::from_bytes(&seed).sign(payload.as_bytes()).to_bytes());
|
||||||
|
let bytes = serde_json::to_vec(&Envelope { payload, signature }).map_err(|e| Error::Invalid(e.to_string()))?;
|
||||||
|
verify(&bytes, &pointer.channel, crate::signing::EMBEDDED_PUBLIC_KEY)?;
|
||||||
|
Ok(bytes)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use base64::{engine::general_purpose::STANDARD, Engine};
|
||||||
|
use ed25519_dalek::{Signer, SigningKey};
|
||||||
|
|
||||||
|
fn signed(pointer: &Pointer) -> (Vec<u8>, String) {
|
||||||
|
let sk = SigningKey::from_bytes(&[17; 32]);
|
||||||
|
let payload = serde_json::to_string(pointer).unwrap();
|
||||||
|
let signature = STANDARD.encode(sk.sign(payload.as_bytes()).to_bytes());
|
||||||
|
(serde_json::to_vec(&Envelope { payload, signature }).unwrap(), STANDARD.encode(sk.verifying_key().to_bytes()))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn verifies_identity_signature_and_immutable_tag() {
|
||||||
|
let mut p = Pointer { schema: 1, channel: "stable".into(), version: "0.261010.40".into(), release_tag: "server-0.261010.40".into(), snapshot: "a".repeat(64) };
|
||||||
|
let (bytes, key) = signed(&p);
|
||||||
|
assert_eq!(verify(&bytes, "stable", &key).unwrap().version, p.version);
|
||||||
|
assert!(verify(&bytes, "edge", &key).is_err());
|
||||||
|
let mut changed: Envelope = serde_json::from_slice(&bytes).unwrap();
|
||||||
|
changed.payload = changed.payload.replace("40", "41");
|
||||||
|
assert!(verify(&serde_json::to_vec(&changed).unwrap(), "stable", &key).is_err());
|
||||||
|
p.release_tag = "stable".into();
|
||||||
|
let (bytes, key) = signed(&p);
|
||||||
|
assert!(verify(&bytes, "stable", &key).is_err());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -10,7 +10,7 @@ use crate::backup;
|
|||||||
use crate::error::{Error, Result};
|
use crate::error::{Error, Result};
|
||||||
use crate::fsx;
|
use crate::fsx;
|
||||||
use crate::migrations::{apply_pending, status, Status};
|
use crate::migrations::{apply_pending, status, Status};
|
||||||
use crate::release::{collect_bots_sql, collect_core_sql};
|
use crate::release::{collect_bots_sql, collect_core_install_sql};
|
||||||
|
|
||||||
pub struct Params<'a> {
|
pub struct Params<'a> {
|
||||||
pub repack: &'a Path,
|
pub repack: &'a Path,
|
||||||
@@ -177,7 +177,7 @@ pub fn build(p: &Params, say: &dyn Fn(&str)) -> Result<()> {
|
|||||||
}
|
}
|
||||||
fsx::atomic_write_json(&repack_json, &cfg)?;
|
fsx::atomic_write_json(&repack_json, &cfg)?;
|
||||||
|
|
||||||
let mut sql = collect_core_sql(p.core)?;
|
let mut sql = collect_core_install_sql(p.core)?;
|
||||||
if let Some(b) = p.bots {
|
if let Some(b) = p.bots {
|
||||||
sql.extend(collect_bots_sql(b)?);
|
sql.extend(collect_bots_sql(b)?);
|
||||||
}
|
}
|
||||||
@@ -294,7 +294,7 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn scaffolding_keeps_the_launcher_and_drops_runtime_state_and_live_data() {
|
fn scaffolding_keeps_the_launcher_and_drops_runtime_state_and_live_data() {
|
||||||
for keep in ["Runtime/python/python.exe", "Scripts/manage.py", "Settings/worldserver.conf.template", "mysql/bin/mysqld.exe", "mysql/share/english/errmsg.sys", "BugReport/relay.py", "Core/libssl-3-x64.dll", "README.txt"] {
|
for keep in ["Runtime/python/python.exe", "Scripts/manage.py", "Settings/worldserver.conf.template", "mysql/bin/mysqld.exe", "mysql/share/english/errmsg.sys", "mysql/lib/private/icudt.dat", "BugReport/relay.py", "Core/libssl-3-x64.dll", "README.txt"] {
|
||||||
assert!(scaffolding(keep), "{keep}");
|
assert!(scaffolding(keep), "{keep}");
|
||||||
}
|
}
|
||||||
for drop in [".state/world.json", "mysql/data/acore_world/x.ibd", "mysql/logs/error.log", "Core/worldserver.exe", "Core/Logs/Server.log", "BugReport/reports/a.json", "Source/server-source.zip", "Scripts/__pycache__/x.pyc", "Testing/notes.md", "mysql/data.7z"] {
|
for drop in [".state/world.json", "mysql/data/acore_world/x.ibd", "mysql/logs/error.log", "Core/worldserver.exe", "Core/Logs/Server.log", "BugReport/reports/a.json", "Source/server-source.zip", "Scripts/__pycache__/x.pyc", "Testing/notes.md", "mysql/data.7z"] {
|
||||||
|
|||||||
+443
-126
@@ -54,6 +54,85 @@ pub const RACE_MPQS: &[&str] = &[
|
|||||||
"patch-ZZR.MPQ",
|
"patch-ZZR.MPQ",
|
||||||
];
|
];
|
||||||
|
|
||||||
|
pub const EXCLUDED_BOT_RACES_RECOMMENDED: &str =
|
||||||
|
"19,27,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128";
|
||||||
|
|
||||||
|
pub const EXCLUDED_BOT_RACES_EXPERIMENTAL: &str =
|
||||||
|
"16,19,27,32,50,52,53,65,66,67,68,69,70,71,72,74,77,80,81";
|
||||||
|
|
||||||
|
/// Finds all active playerbots.conf files on this server (root, coa-bots folder, and secondary realm).
|
||||||
|
pub fn playerbots_conf_paths(root: &Path) -> Vec<PathBuf> {
|
||||||
|
let mut paths = Vec::new();
|
||||||
|
let candidates = [
|
||||||
|
root.join("Core/configs/modules/playerbots.conf"),
|
||||||
|
root.join("coa-bots/Core/configs/modules/playerbots.conf"),
|
||||||
|
root.join("coa-bots/core/configs/modules/playerbots.conf"),
|
||||||
|
crate::multiworld::root(root).join("Core/configs/modules/playerbots.conf"),
|
||||||
|
];
|
||||||
|
for path in candidates {
|
||||||
|
if path.is_file() {
|
||||||
|
paths.push(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if paths.is_empty() {
|
||||||
|
for dist in [
|
||||||
|
root.join("Core/configs/modules/playerbots.conf.dist"),
|
||||||
|
root.join("coa-bots/Core/configs/modules/playerbots.conf.dist"),
|
||||||
|
] {
|
||||||
|
if dist.is_file() {
|
||||||
|
let target = dist.with_extension("");
|
||||||
|
if fs::copy(&dist, &target).is_ok() {
|
||||||
|
paths.push(target);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
paths
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Checks whether playerbots are configured to allow custom races.
|
||||||
|
/// Returns true if AiPlayerbot.ExcludedBotRaces exists and does not exclude general custom races.
|
||||||
|
pub fn is_bot_custom_races_allowed(root: &Path) -> Option<bool> {
|
||||||
|
for path in playerbots_conf_paths(root) {
|
||||||
|
if let Ok(bytes) = fs::read(&path) {
|
||||||
|
if let Ok(conf) = crate::config::parser::ConfFile::parse_bytes(&bytes) {
|
||||||
|
if let Some(val) = conf.get("AiPlayerbot.ExcludedBotRaces") {
|
||||||
|
let clean = val.trim().trim_matches(['"', '\'']);
|
||||||
|
return Some(!clean.contains("33") && !clean.contains("128"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Sets AiPlayerbot.ExcludedBotRaces in all discovered playerbots.conf files.
|
||||||
|
pub fn sync_bot_races_config(root: &Path, allow_custom_races: bool) -> Result<()> {
|
||||||
|
let excluded = if allow_custom_races {
|
||||||
|
EXCLUDED_BOT_RACES_EXPERIMENTAL
|
||||||
|
} else {
|
||||||
|
EXCLUDED_BOT_RACES_RECOMMENDED
|
||||||
|
};
|
||||||
|
for path in playerbots_conf_paths(root) {
|
||||||
|
if let Ok(bytes) = fs::read(&path) {
|
||||||
|
if let Ok(mut conf) = crate::config::parser::ConfFile::parse_bytes(&bytes) {
|
||||||
|
conf.set(
|
||||||
|
"AiPlayerbot.ExcludedBotRaces",
|
||||||
|
&format!("\"{excluded}\""),
|
||||||
|
&[
|
||||||
|
"CoA Custom: races new random bots never get",
|
||||||
|
"Off (recommended): excludes all added races",
|
||||||
|
"On (experimental): allows stable added races",
|
||||||
|
],
|
||||||
|
);
|
||||||
|
fsx::atomic_write(&path, conf.to_text().as_bytes())?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
#[serde(rename_all = "kebab-case")]
|
#[serde(rename_all = "kebab-case")]
|
||||||
pub enum ClientPatchState {
|
pub enum ClientPatchState {
|
||||||
@@ -73,99 +152,208 @@ pub struct ClientPatchStatus {
|
|||||||
pub client_path: Option<String>,
|
pub client_path: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Inspect the client folder and determine the state of custom races patches.
|
#[derive(Clone, Serialize, Deserialize)]
|
||||||
pub fn client_patch_status(client_path: &Path) -> ClientPatchStatus {
|
struct PatchFile {
|
||||||
let data_dir = client_path.join("Data");
|
path: String,
|
||||||
let mut enabled_count = 0;
|
sha256: String,
|
||||||
let mut disabled_count = 0;
|
|
||||||
|
|
||||||
for mpq in RACE_MPQS {
|
|
||||||
if data_dir.join(format!("{mpq}.disabled")).is_file() {
|
|
||||||
disabled_count += 1;
|
|
||||||
} else if data_dir.join(mpq).is_file() {
|
|
||||||
enabled_count += 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let has_root = client_path.join("EsteriaAppearance.dll").is_file()
|
|
||||||
|| client_path.join("dinput8.dll").is_file()
|
|
||||||
|| client_path.join("dinput8.dll.disabled").is_file();
|
|
||||||
|
|
||||||
let total = RACE_MPQS.len();
|
|
||||||
let current_version = fs::read_to_string(client_path.join(MANIFEST_FILENAME)).ok()
|
|
||||||
.is_some_and(|manifest| manifest.lines().any(|line| line == format!("# CoA Custom {CLIENT_VERSION}")));
|
|
||||||
let state = if enabled_count == total && current_version && client_path.join("dinput8.dll").is_file() {
|
|
||||||
ClientPatchState::Enabled
|
|
||||||
} else if disabled_count == total && current_version && client_path.join("dinput8.dll.disabled").is_file() {
|
|
||||||
ClientPatchState::Disabled
|
|
||||||
} else if (enabled_count + disabled_count) > 0 {
|
|
||||||
ClientPatchState::PartiallyInstalled
|
|
||||||
} else {
|
|
||||||
ClientPatchState::NotInstalled
|
|
||||||
};
|
|
||||||
|
|
||||||
ClientPatchStatus {
|
|
||||||
state,
|
|
||||||
installed_mpqs: enabled_count + disabled_count,
|
|
||||||
total_mpqs: total,
|
|
||||||
has_root_files: has_root,
|
|
||||||
client_path: Some(client_path.to_string_lossy().into_owned()),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Enable or disable client patches by renaming MPQs and `dinput8.dll` with `.disabled`.
|
fn patch_files(client: &Path) -> Result<Vec<PatchFile>> {
|
||||||
pub fn set_client_patch_enabled(client_path: &Path, enabled: bool) -> Result<()> {
|
let bundled: std::collections::BTreeMap<String, String> = serde_json::from_str(include_str!("custom_races_hashes.json"))?;
|
||||||
if !client_path.is_dir() {
|
let manifest = fs::read_to_string(client.join(MANIFEST_FILENAME)).unwrap_or_default();
|
||||||
return Err(Error::Invalid("Game client directory not found.".into()));
|
let mut files = std::collections::BTreeMap::new();
|
||||||
}
|
|
||||||
|
|
||||||
if crate::client::is_running(client_path) {
|
|
||||||
return Err(Error::Invalid("Close the game before changing custom races patches.".into()));
|
|
||||||
}
|
|
||||||
if !client_path.join(MANIFEST_FILENAME).is_file()
|
|
||||||
&& !RACE_MPQS.iter().skip(1).any(|name| client_path.join("Data").join(name).is_file()
|
|
||||||
|| client_path.join("Data").join(format!("{name}.disabled")).is_file()) {
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
let mut paths: Vec<PathBuf> = RACE_MPQS.iter().map(|name| client_path.join("Data").join(name)).collect();
|
|
||||||
if let Ok(manifest) = fs::read_to_string(client_path.join(MANIFEST_FILENAME)) {
|
|
||||||
for line in manifest.lines() {
|
for line in manifest.lines() {
|
||||||
if let Some(name) = line.strip_prefix("MPQ:") {
|
let path = if let Some(name) = line.strip_prefix("MPQ:") {
|
||||||
if name.contains(['/', '\\']) || !name.to_ascii_lowercase().ends_with(".mpq") {
|
if name.contains(['/', '\\']) { return Err(Error::Invalid("Invalid custom races patch manifest.".into())); }
|
||||||
return Err(Error::Invalid("Invalid custom races patch manifest.".into()));
|
Some(format!("Data/{name}"))
|
||||||
}
|
} else if let Some(name) = line.strip_prefix("ROOT:") {
|
||||||
paths.push(fsx::safe_join(&client_path.join("Data"), name)?);
|
if name.contains(['/', '\\']) { return Err(Error::Invalid("Invalid custom races patch manifest.".into())); }
|
||||||
|
Some(name.to_string())
|
||||||
|
} else { None };
|
||||||
|
if let Some(path) = path {
|
||||||
|
fsx::safe_join(client, &path)?;
|
||||||
|
files.insert(path.clone(), bundled.get(&path).cloned().unwrap_or_default());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if files.is_empty() { files = bundled; }
|
||||||
|
for line in manifest.lines().filter_map(|line| line.strip_prefix("SHA256:")) {
|
||||||
|
let (hash, path) = line.split_once(':').ok_or_else(|| Error::Invalid("Invalid custom races checksum.".into()))?;
|
||||||
|
if hash.len() != 64 || !hash.bytes().all(|b| b.is_ascii_hexdigit()) || !files.contains_key(path) {
|
||||||
|
return Err(Error::Invalid("Invalid custom races checksum.".into()));
|
||||||
}
|
}
|
||||||
paths.sort();
|
files.insert(path.into(), hash.into());
|
||||||
paths.dedup();
|
|
||||||
paths.push(client_path.join("dinput8.dll"));
|
|
||||||
paths.push(client_path.join("Ascension.exe"));
|
|
||||||
for active in paths {
|
|
||||||
let disabled = active.with_extension(format!("{}.disabled", active.extension().unwrap_or_default().to_string_lossy()));
|
|
||||||
let original = active.with_extension(format!("{}.original", active.extension().unwrap_or_default().to_string_lossy()));
|
|
||||||
if enabled && disabled.is_file() {
|
|
||||||
if active.is_file() {
|
|
||||||
if !original.is_file() {
|
|
||||||
return Err(Error::Invalid(format!("Cannot replace existing {} without an original backup.", active.display())));
|
|
||||||
}
|
|
||||||
fs::remove_file(&active)?;
|
|
||||||
}
|
|
||||||
fs::rename(&disabled, &active)?;
|
|
||||||
} else if !enabled && active.is_file() && !disabled.is_file() {
|
|
||||||
if active.file_name().is_some_and(|name| name == "Ascension.exe") && !original.is_file() {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
fs::rename(&active, &disabled)?;
|
|
||||||
if original.is_file() {
|
|
||||||
fs::copy(&original, &active)?;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Ok(files.into_iter().map(|(path, sha256)| PatchFile { path, sha256 }).collect())
|
||||||
|
}
|
||||||
|
|
||||||
tracing::info!(enabled, "custom races client patches toggled");
|
fn suffix(path: &Path, extension: &str) -> PathBuf {
|
||||||
|
path.with_file_name(format!("{}.{extension}", path.file_name().unwrap_or_default().to_string_lossy()))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn matches_patch(path: &Path, file: &PatchFile) -> bool {
|
||||||
|
path.is_file() && fsx::sha256_file(path).is_ok_and(|hash| hash == file.sha256)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Only complete, verified payloads are reported as enabled or disabled.
|
||||||
|
pub fn client_patch_status(client_path: &Path) -> ClientPatchStatus {
|
||||||
|
let data = client_path.join("Data");
|
||||||
|
let installed_mpqs = RACE_MPQS.iter().filter(|name| data.join(name).is_file() || suffix(&data.join(name), "disabled").is_file()).count();
|
||||||
|
let has_root_files = client_path.join("EsteriaAppearance.dll").is_file() || client_path.join("dinput8.dll").is_file() || client_path.join("dinput8.dll.disabled").is_file();
|
||||||
|
let manifest = fs::read_to_string(client_path.join(MANIFEST_FILENAME)).unwrap_or_default();
|
||||||
|
let current = manifest.lines().any(|line| line == format!("# CoA Custom {CLIENT_VERSION}"));
|
||||||
|
let state = if !manifest.is_empty() && current && !client_path.join(".coa-races-transaction").exists() {
|
||||||
|
match patch_files(client_path) {
|
||||||
|
Ok(files) if files.iter().all(|f| matches_patch(&client_path.join(&f.path), f) && !suffix(&client_path.join(&f.path), "disabled").exists()) => ClientPatchState::Enabled,
|
||||||
|
Ok(files) if files.iter().all(|f| matches_patch(&suffix(&client_path.join(&f.path), "disabled"), f)) => ClientPatchState::Disabled,
|
||||||
|
_ => ClientPatchState::PartiallyInstalled,
|
||||||
|
}
|
||||||
|
} else if !manifest.is_empty() || patch_files(client_path).is_ok_and(|files| files.iter().filter(|file| file.path.starts_with("Data/") && file.path != "Data/patch-T.MPQ").any(|file| matches_patch(&client_path.join(&file.path), file) || matches_patch(&suffix(&client_path.join(&file.path), "disabled"), file))) {
|
||||||
|
ClientPatchState::PartiallyInstalled
|
||||||
|
} else { ClientPatchState::NotInstalled };
|
||||||
|
ClientPatchStatus { state, installed_mpqs, total_mpqs: RACE_MPQS.len(), has_root_files,
|
||||||
|
client_path: Some(client_path.to_string_lossy().into_owned()) }
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize)]
|
||||||
|
struct SavedFile { path: String, existed: bool }
|
||||||
|
|
||||||
|
struct PatchTransaction<'a> { root: &'a Path, entries: Vec<SavedFile>, finished: bool }
|
||||||
|
impl<'a> PatchTransaction<'a> {
|
||||||
|
fn new(root: &'a Path) -> Result<Self> {
|
||||||
|
recover_patch_transaction(root)?;
|
||||||
|
fs::create_dir(root.join(".coa-races-transaction"))?;
|
||||||
|
Ok(Self { root, entries: Vec::new(), finished: false })
|
||||||
|
}
|
||||||
|
fn save(&mut self, path: &Path) -> Result<()> {
|
||||||
|
let relative = path.strip_prefix(self.root).map_err(|_| Error::Invalid("Patch path escaped the client directory.".into()))?.to_string_lossy().replace('\\', "/");
|
||||||
|
fsx::safe_join(self.root, &relative)?;
|
||||||
|
if self.entries.iter().any(|entry| entry.path == relative) { return Ok(()); }
|
||||||
|
let index = self.entries.len();
|
||||||
|
self.entries.push(SavedFile { path: relative, existed: path.is_file() });
|
||||||
|
fsx::atomic_write_json(&self.root.join(".coa-races-transaction/journal.json"), &self.entries)?;
|
||||||
|
if path.is_file() { fs::rename(path, self.root.join(".coa-races-transaction").join(index.to_string()))?; }
|
||||||
Ok(())
|
Ok(())
|
||||||
|
}
|
||||||
|
fn copy(&mut self, source: &Path, target: &Path) -> Result<()> {
|
||||||
|
self.save(target)?;
|
||||||
|
fs::create_dir_all(target.parent().ok_or_else(|| Error::Invalid("Patch file has no parent directory.".into()))?)?;
|
||||||
|
fs::copy(source, target)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
fn move_file(&mut self, source: &Path, target: &Path) -> Result<()> {
|
||||||
|
self.save(source)?;
|
||||||
|
let index = self.entries.iter().position(|entry| self.root.join(&entry.path) == source).unwrap();
|
||||||
|
// Copy from the journal so rollback retains the previous bytes.
|
||||||
|
let saved = self.root.join(".coa-races-transaction").join(index.to_string());
|
||||||
|
self.copy(&saved, target)
|
||||||
|
}
|
||||||
|
fn finish(mut self) -> Result<()> {
|
||||||
|
fsx::atomic_write(&self.root.join(".coa-races-transaction/committed"), b"committed")?;
|
||||||
|
self.finished = true;
|
||||||
|
fs::remove_dir_all(self.root.join(".coa-races-transaction"))?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
impl Drop for PatchTransaction<'_> {
|
||||||
|
fn drop(&mut self) { if !self.finished { let _ = recover_patch_transaction(self.root); } }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn recover_patch_transaction(root: &Path) -> Result<()> {
|
||||||
|
let directory = root.join(".coa-races-transaction");
|
||||||
|
if !directory.is_dir() { return Ok(()); }
|
||||||
|
if !directory.join("committed").exists() && directory.join("journal.json").exists() {
|
||||||
|
let entries: Vec<SavedFile> = fsx::read_json(&directory.join("journal.json"))?;
|
||||||
|
for (index, entry) in entries.iter().enumerate().rev() {
|
||||||
|
let path = fsx::safe_join(root, &entry.path)?;
|
||||||
|
let saved = directory.join(index.to_string());
|
||||||
|
if saved.is_file() {
|
||||||
|
if path.is_file() { fs::remove_file(&path)?; }
|
||||||
|
fs::rename(saved, path)?;
|
||||||
|
} else if !entry.existed && path.is_file() { fs::remove_file(path)?; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fs::remove_dir_all(directory)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn patch_lock(client: &Path) -> Result<File> {
|
||||||
|
use fs4::fs_std::FileExt;
|
||||||
|
let lock = fs::OpenOptions::new().read(true).write(true).create(true).truncate(false).open(client.join(".coa-races.lock"))?;
|
||||||
|
if !lock.try_lock_exclusive()? { return Err(Error::Invalid("Another custom races operation is using this client.".into())); }
|
||||||
|
Ok(lock)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn preserve_original(tx: &mut PatchTransaction<'_>, active: &Path) -> Result<()> {
|
||||||
|
let original = suffix(active, "original");
|
||||||
|
if original.is_file() && fsx::sha256_file(active)? == fsx::sha256_file(&original)? { return Ok(()); }
|
||||||
|
if original.is_file() {
|
||||||
|
let previous = suffix(active, &format!("original.previous-{}", uuid::Uuid::new_v4().simple()));
|
||||||
|
tx.copy(&original, &previous)?;
|
||||||
|
}
|
||||||
|
tx.copy(active, &original)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Preserve launcher replacements, and switch every file owned by the package.
|
||||||
|
pub fn set_client_patch_enabled(client: &Path, enabled: bool) -> Result<()> {
|
||||||
|
if !client.is_dir() { return Err(Error::Invalid("Game client directory not found.".into())); }
|
||||||
|
if crate::client::is_running(client) { return Err(Error::Invalid("Close the game before changing custom races patches.".into())); }
|
||||||
|
let _lock = patch_lock(client)?;
|
||||||
|
recover_patch_transaction(client)?;
|
||||||
|
if !client.join(MANIFEST_FILENAME).is_file() { return Ok(()); }
|
||||||
|
let files = patch_files(client)?;
|
||||||
|
if enabled {
|
||||||
|
for file in &files {
|
||||||
|
let active = client.join(&file.path);
|
||||||
|
if !matches_patch(&active, file) && !matches_patch(&suffix(&active, "disabled"), file) {
|
||||||
|
return Err(Error::Invalid(format!("Custom races file {} was replaced or is missing. Repair the client patch before enabling it.", file.path)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let mut tx = PatchTransaction::new(client)?;
|
||||||
|
for file in files {
|
||||||
|
let active = client.join(&file.path);
|
||||||
|
let disabled = suffix(&active, "disabled");
|
||||||
|
let original = suffix(&active, "original");
|
||||||
|
if enabled {
|
||||||
|
if active.is_file() && !matches_patch(&active, &file) { preserve_original(&mut tx, &active)?; }
|
||||||
|
if matches_patch(&disabled, &file) { tx.move_file(&disabled, &active)?; }
|
||||||
|
} else if matches_patch(&active, &file) {
|
||||||
|
if disabled.is_file() && !matches_patch(&disabled, &file) {
|
||||||
|
tx.move_file(&disabled, &suffix(&disabled, &format!("replaced-{}", uuid::Uuid::new_v4().simple())))?;
|
||||||
|
}
|
||||||
|
tx.move_file(&active, &disabled)?;
|
||||||
|
if original.is_file() { tx.copy(&original, &active)?; }
|
||||||
|
} else if active.is_file() {
|
||||||
|
preserve_original(&mut tx, &active)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tx.finish()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn uninstall_client_patches(client: &Path) -> Result<()> {
|
||||||
|
if crate::client::is_running(client) { return Err(Error::Invalid("Close the game before removing custom races patches.".into())); }
|
||||||
|
let _lock = patch_lock(client)?;
|
||||||
|
recover_patch_transaction(client)?;
|
||||||
|
if !client.join(MANIFEST_FILENAME).is_file() { return Ok(()); }
|
||||||
|
let mut tx = PatchTransaction::new(client)?;
|
||||||
|
for file in patch_files(client)? {
|
||||||
|
let active = client.join(&file.path);
|
||||||
|
if matches_patch(&active, &file) {
|
||||||
|
tx.save(&active)?;
|
||||||
|
let original = suffix(&active, "original");
|
||||||
|
if original.is_file() { tx.copy(&original, &active)?; }
|
||||||
|
}
|
||||||
|
let disabled = suffix(&active, "disabled");
|
||||||
|
if active.is_file() && !matches_patch(&active, &file) && !suffix(&active, "original").is_file() {
|
||||||
|
tx.move_file(&active, &suffix(&active, &format!("replaced-{}", uuid::Uuid::new_v4().simple())))?;
|
||||||
|
}
|
||||||
|
if disabled.is_file() {
|
||||||
|
if !matches_patch(&disabled, &file) { tx.move_file(&disabled, &suffix(&disabled, &format!("replaced-{}", uuid::Uuid::new_v4().simple())))?; }
|
||||||
|
else { tx.save(&disabled)?; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tx.save(&client.join(MANIFEST_FILENAME))?;
|
||||||
|
tx.finish()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn verify_archive(path: &Path, filename: &str) -> Result<()> {
|
fn verify_archive(path: &Path, filename: &str) -> Result<()> {
|
||||||
@@ -297,30 +485,12 @@ pub fn install_client_patches(
|
|||||||
if crate::client::is_running(client_path) {
|
if crate::client::is_running(client_path) {
|
||||||
return Err(Error::Invalid("Close the game before installing custom races patches.".into()));
|
return Err(Error::Invalid("Close the game before installing custom races patches.".into()));
|
||||||
}
|
}
|
||||||
let data_dir = client_path.join("Data");
|
let _lock = patch_lock(client_path)?;
|
||||||
|
recover_patch_transaction(client_path)?;
|
||||||
|
let staging = tempfile::Builder::new().prefix(".coa-races-stage-").tempdir_in(client_path)?;
|
||||||
|
let data_dir = staging.path().join("Data");
|
||||||
fs::create_dir_all(&data_dir)?;
|
fs::create_dir_all(&data_dir)?;
|
||||||
|
|
||||||
// 1. Back up original Ascension.exe and patch-T.MPQ if they exist and haven't been backed up yet
|
|
||||||
let exe = client_path.join("Ascension.exe");
|
|
||||||
let exe_bak = client_path.join("Ascension.exe.original");
|
|
||||||
if exe.is_file() && !exe_bak.is_file() {
|
|
||||||
report("Backing up original Ascension.exe...", 0.02);
|
|
||||||
fs::copy(&exe, &exe_bak)?;
|
|
||||||
}
|
|
||||||
|
|
||||||
let t_mpq = data_dir.join("patch-T.MPQ");
|
|
||||||
let t_mpq_bak = data_dir.join("patch-T.MPQ.original");
|
|
||||||
if t_mpq.is_file() && !t_mpq_bak.is_file() {
|
|
||||||
report("Backing up original patch-T.MPQ...", 0.04);
|
|
||||||
fs::copy(&t_mpq, &t_mpq_bak)?;
|
|
||||||
}
|
|
||||||
|
|
||||||
let dll = client_path.join("dinput8.dll");
|
|
||||||
let dll_backup = client_path.join("dinput8.dll.original");
|
|
||||||
if dll.is_file() && !dll_backup.is_file() {
|
|
||||||
fs::copy(&dll, &dll_backup)?;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 2. Resolve/download archives (0.05 .. 0.50)
|
// 2. Resolve/download archives (0.05 .. 0.50)
|
||||||
let http = reqwest::blocking::Client::builder()
|
let http = reqwest::blocking::Client::builder()
|
||||||
.user_agent(concat!("CoA-Server-Manager/", env!("CARGO_PKG_VERSION")))
|
.user_agent(concat!("CoA-Server-Manager/", env!("CARGO_PKG_VERSION")))
|
||||||
@@ -391,10 +561,10 @@ pub fn install_client_patches(
|
|||||||
if disabled.is_file() { fs::remove_file(disabled)?; }
|
if disabled.is_file() { fs::remove_file(disabled)?; }
|
||||||
installed_mpqs.push(base);
|
installed_mpqs.push(base);
|
||||||
} else if base.eq_ignore_ascii_case("dinput8.dll") {
|
} else if base.eq_ignore_ascii_case("dinput8.dll") {
|
||||||
let dest = client_path.join(&base);
|
let dest = staging.path().join(&base);
|
||||||
let mut out = File::create(&dest)?;
|
let mut out = File::create(&dest)?;
|
||||||
io::copy(&mut zfile, &mut out)?;
|
io::copy(&mut zfile, &mut out)?;
|
||||||
let disabled = client_path.join(format!("{base}.disabled"));
|
let disabled = staging.path().join(format!("{base}.disabled"));
|
||||||
if disabled.is_file() { fs::remove_file(disabled)?; }
|
if disabled.is_file() { fs::remove_file(disabled)?; }
|
||||||
installed_roots.push(base);
|
installed_roots.push(base);
|
||||||
}
|
}
|
||||||
@@ -405,10 +575,10 @@ pub fn install_client_patches(
|
|||||||
.unwrap_or_default();
|
.unwrap_or_default();
|
||||||
|
|
||||||
if !base.is_empty() {
|
if !base.is_empty() {
|
||||||
let dest = client_path.join(&base);
|
let dest = staging.path().join(&base);
|
||||||
let mut out = File::create(&dest)?;
|
let mut out = File::create(&dest)?;
|
||||||
io::copy(&mut zfile, &mut out)?;
|
io::copy(&mut zfile, &mut out)?;
|
||||||
let disabled = client_path.join(format!("{base}.disabled"));
|
let disabled = staging.path().join(format!("{base}.disabled"));
|
||||||
if disabled.is_file() { fs::remove_file(disabled)?; }
|
if disabled.is_file() { fs::remove_file(disabled)?; }
|
||||||
installed_roots.push(base);
|
installed_roots.push(base);
|
||||||
}
|
}
|
||||||
@@ -437,7 +607,35 @@ pub fn install_client_patches(
|
|||||||
manifest_body.push_str(&format!("ROOT:{r}\n"));
|
manifest_body.push_str(&format!("ROOT:{r}\n"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let bundled: std::collections::BTreeMap<String, String> = serde_json::from_str(include_str!("custom_races_hashes.json"))?;
|
||||||
|
let mut payload = Vec::new();
|
||||||
|
for path in installed_mpqs.iter().map(|name| format!("Data/{name}")).chain(installed_roots.iter().cloned()) {
|
||||||
|
let staged = fsx::safe_join(staging.path(), &path)?;
|
||||||
|
let hash = fsx::sha256_file(&staged)?;
|
||||||
|
if bundled.get(&path) != Some(&hash) { return Err(Error::Invalid(format!("Custom races file {path} failed verification."))); }
|
||||||
|
manifest_body.push_str(&format!("SHA256:{hash}:{path}\n"));
|
||||||
|
payload.push(PatchFile { path, sha256: hash });
|
||||||
|
}
|
||||||
|
if cancel.is_set() { return Err(Error::Invalid("Operation cancelled.".into())); }
|
||||||
|
if payload.len() != bundled.len() { return Err(Error::Invalid("Custom races archives are missing required runtime files.".into())); }
|
||||||
|
let previous = patch_files(client_path)?;
|
||||||
|
let mut tx = PatchTransaction::new(client_path)?;
|
||||||
|
for file in payload {
|
||||||
|
let dest = fsx::safe_join(client_path, &file.path)?;
|
||||||
|
if dest.is_file() && !previous.iter().any(|old| old.path == file.path && matches_patch(&dest, old)) && !matches_patch(&dest, &file) {
|
||||||
|
preserve_original(&mut tx, &dest)?;
|
||||||
|
}
|
||||||
|
tx.copy(&staging.path().join(&file.path), &dest)?;
|
||||||
|
let disabled = suffix(&dest, "disabled");
|
||||||
|
if disabled.is_file() {
|
||||||
|
if !previous.iter().any(|old| old.path == file.path && matches_patch(&disabled, old)) && !matches_patch(&disabled, &file) {
|
||||||
|
tx.move_file(&disabled, &suffix(&disabled, &format!("replaced-{}", uuid::Uuid::new_v4().simple())))?;
|
||||||
|
} else { tx.save(&disabled)?; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tx.save(&manifest_path)?;
|
||||||
fsx::atomic_write(&manifest_path, manifest_body.as_bytes())?;
|
fsx::atomic_write(&manifest_path, manifest_body.as_bytes())?;
|
||||||
|
tx.finish()?;
|
||||||
report("Custom races client patches installed successfully!", 1.0);
|
report("Custom races client patches installed successfully!", 1.0);
|
||||||
tracing::info!(
|
tracing::info!(
|
||||||
mpqs = installed_mpqs.len(),
|
mpqs = installed_mpqs.len(),
|
||||||
@@ -452,23 +650,140 @@ pub fn install_client_patches(
|
|||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
#[test]
|
fn record_files(root: &Path, names: &[&str]) {
|
||||||
fn disabling_restores_original_client_files_and_enabling_restores_custom_files() {
|
let mut manifest = format!("# CoA Custom {CLIENT_VERSION}\n");
|
||||||
let temp = tempfile::tempdir().unwrap();
|
for name in names {
|
||||||
let data = temp.path().join("Data");
|
let (kind, base) = name.strip_prefix("Data/").map_or(("ROOT", *name), |base| ("MPQ", base));
|
||||||
fs::create_dir_all(&data).unwrap();
|
manifest.push_str(&format!("{kind}:{base}\nSHA256:{}:{name}\n", fsx::sha256_file(&root.join(name)).unwrap()));
|
||||||
for path in [data.join("patch-T.MPQ"), temp.path().join("Ascension.exe"), temp.path().join("dinput8.dll")] {
|
|
||||||
fs::write(&path, b"custom").unwrap();
|
|
||||||
let backup = path.with_extension(format!("{}.original", path.extension().unwrap().to_string_lossy()));
|
|
||||||
fs::write(&backup, b"original").unwrap();
|
|
||||||
}
|
}
|
||||||
fs::write(temp.path().join(MANIFEST_FILENAME), "MPQ:patch-T.MPQ\n").unwrap();
|
fs::write(root.join(MANIFEST_FILENAME), manifest).unwrap();
|
||||||
set_client_patch_enabled(temp.path(), false).unwrap();
|
}
|
||||||
assert_eq!(fs::read(data.join("patch-T.MPQ")).unwrap(), b"original");
|
|
||||||
assert_eq!(fs::read(temp.path().join("Ascension.exe")).unwrap(), b"original");
|
#[test]
|
||||||
set_client_patch_enabled(temp.path(), true).unwrap();
|
#[ignore = "Requires the three downloaded release archives"]
|
||||||
assert_eq!(fs::read(data.join("patch-T.MPQ")).unwrap(), b"custom");
|
fn bundled_hashes_match_verified_release_archives() {
|
||||||
assert_eq!(fs::read(temp.path().join("Ascension.exe")).unwrap(), b"custom");
|
use sha2::{Digest, Sha256};
|
||||||
|
let folder = PathBuf::from(std::env::var_os("COA_RACES_ARCHIVE_DIR").expect("COA_RACES_ARCHIVE_DIR"));
|
||||||
|
let expected: std::collections::BTreeMap<String, String> = serde_json::from_str(include_str!("custom_races_hashes.json")).unwrap();
|
||||||
|
let mut actual = std::collections::BTreeMap::new();
|
||||||
|
for (name, _) in ARCHIVES {
|
||||||
|
let path = folder.join(name);
|
||||||
|
verify_archive(&path, name).unwrap();
|
||||||
|
let mut archive = zip::ZipArchive::new(File::open(path).unwrap()).unwrap();
|
||||||
|
for index in 0..archive.len() {
|
||||||
|
let mut entry = archive.by_index(index).unwrap();
|
||||||
|
let name = entry.name().replace('\\', "/");
|
||||||
|
if entry.is_dir() { continue; }
|
||||||
|
let relative = if let Some(name) = name.split("files/client_root/").nth(1) { name.to_string() }
|
||||||
|
else if let Some(name) = name.split("files/client/").nth(1) { if name == "dinput8.dll" { name.to_string() } else { format!("Data/{name}") } }
|
||||||
|
else { continue };
|
||||||
|
let mut hash = Sha256::new();
|
||||||
|
let mut buffer = vec![0; 1024 * 1024];
|
||||||
|
loop { let read = entry.read(&mut buffer).unwrap(); if read == 0 { break; } hash.update(&buffer[..read]); }
|
||||||
|
actual.insert(relative, hex::encode(hash.finalize()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
assert_eq!(actual, expected);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn another_patch_operation_cannot_enter_the_same_client() {
|
||||||
|
let temp = tempfile::tempdir().unwrap();
|
||||||
|
let first = patch_lock(temp.path()).unwrap();
|
||||||
|
assert!(patch_lock(temp.path()).is_err());
|
||||||
|
drop(first);
|
||||||
|
patch_lock(temp.path()).unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn switching_preserves_launcher_updates_for_every_owned_file() {
|
||||||
|
let temp = tempfile::tempdir().unwrap();
|
||||||
|
let root = temp.path();
|
||||||
|
fs::create_dir_all(root.join("Data")).unwrap();
|
||||||
|
let names = ["Data/patch-T.MPQ", "Data/patch-ZE1.MPQ", "Ascension.exe", "dinput8.dll", "EsteriaAppearance.dll"];
|
||||||
|
for name in names { fs::write(root.join(name), b"custom").unwrap(); fs::write(suffix(&root.join(name), "original"), b"old official").unwrap(); }
|
||||||
|
record_files(root, &names);
|
||||||
|
set_client_patch_enabled(root, false).unwrap();
|
||||||
|
for name in names { assert_eq!(fs::read(root.join(name)).unwrap(), b"old official"); fs::write(root.join(name), b"new official").unwrap(); }
|
||||||
|
set_client_patch_enabled(root, true).unwrap();
|
||||||
|
for name in names { assert_eq!(fs::read(root.join(name)).unwrap(), b"custom"); assert_eq!(fs::read(suffix(&root.join(name), "original")).unwrap(), b"new official"); }
|
||||||
|
// An official launcher can also replace a currently enabled file.
|
||||||
|
fs::write(root.join("Ascension.exe"), b"newest official").unwrap();
|
||||||
|
assert_eq!(client_patch_status(root).state, ClientPatchState::PartiallyInstalled);
|
||||||
|
set_client_patch_enabled(root, false).unwrap();
|
||||||
|
assert_eq!(fs::read(root.join("Ascension.exe")).unwrap(), b"newest official");
|
||||||
|
assert!(set_client_patch_enabled(root, true).unwrap_err().to_string().contains("Repair"));
|
||||||
|
uninstall_client_patches(root).unwrap();
|
||||||
|
assert_eq!(fs::read(root.join("Ascension.exe")).unwrap(), b"newest official");
|
||||||
|
assert_eq!(client_patch_status(root).state, ClientPatchState::NotInstalled);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn failed_and_interrupted_transactions_restore_previous_bytes() {
|
||||||
|
let temp = tempfile::tempdir().unwrap();
|
||||||
|
let root = temp.path();
|
||||||
|
let file = root.join("Ascension.exe");
|
||||||
|
fs::write(&file, b"previous").unwrap();
|
||||||
|
{
|
||||||
|
let mut tx = PatchTransaction::new(root).unwrap();
|
||||||
|
tx.save(&file).unwrap();
|
||||||
|
fs::write(&file, b"replacement").unwrap();
|
||||||
|
let staged = root.join("staged.dll");
|
||||||
|
fs::write(&staged, b"new").unwrap();
|
||||||
|
tx.copy(&staged, &root.join("Data/new.dll")).unwrap();
|
||||||
|
assert_eq!(fs::read(root.join("Data/new.dll")).unwrap(), b"new");
|
||||||
|
}
|
||||||
|
assert_eq!(fs::read(&file).unwrap(), b"previous");
|
||||||
|
assert!(!root.join("Data/new.dll").exists());
|
||||||
|
let mut tx = PatchTransaction::new(root).unwrap();
|
||||||
|
tx.save(&file).unwrap();
|
||||||
|
fs::write(&file, b"interrupted").unwrap();
|
||||||
|
std::mem::forget(tx);
|
||||||
|
recover_patch_transaction(root).unwrap();
|
||||||
|
assert_eq!(fs::read(&file).unwrap(), b"previous");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn existing_backups_and_foreign_disabled_files_are_retained() {
|
||||||
|
let temp = tempfile::tempdir().unwrap();
|
||||||
|
let root = temp.path();
|
||||||
|
let file = root.join("dinput8.dll");
|
||||||
|
fs::write(&file, b"custom").unwrap();
|
||||||
|
record_files(root, &["dinput8.dll"]);
|
||||||
|
fs::write(suffix(&file, "disabled"), b"third party").unwrap();
|
||||||
|
fs::write(suffix(&file, "original"), b"original").unwrap();
|
||||||
|
set_client_patch_enabled(root, false).unwrap();
|
||||||
|
assert_eq!(fs::read(&file).unwrap(), b"original");
|
||||||
|
assert!(fs::read_dir(root).unwrap().flatten().any(|entry| entry.file_name().to_string_lossy().contains("replaced-")));
|
||||||
|
fs::write(&file, b"updated original").unwrap();
|
||||||
|
set_client_patch_enabled(root, true).unwrap();
|
||||||
|
assert!(fs::read_dir(root).unwrap().flatten().any(|entry| entry.file_name().to_string_lossy().contains("original.previous-")));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn uninstall_moves_corrupted_custom_only_assets_out_of_the_active_client() {
|
||||||
|
let temp = tempfile::tempdir().unwrap();
|
||||||
|
let root = temp.path();
|
||||||
|
fs::create_dir_all(root.join("Data")).unwrap();
|
||||||
|
let file = root.join("Data/patch-ZE1.MPQ");
|
||||||
|
fs::write(&file, b"custom").unwrap();
|
||||||
|
record_files(root, &["Data/patch-ZE1.MPQ"]);
|
||||||
|
fs::write(&file, b"corrupted custom").unwrap();
|
||||||
|
uninstall_client_patches(root).unwrap();
|
||||||
|
assert!(!file.exists());
|
||||||
|
assert!(fs::read_dir(root.join("Data")).unwrap().flatten().any(|entry| entry.file_name().to_string_lossy().contains("replaced-")));
|
||||||
|
assert_eq!(client_patch_status(root).state, ClientPatchState::NotInstalled);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn unknown_or_corrupt_bytes_are_not_reported_as_enabled() {
|
||||||
|
let temp = tempfile::tempdir().unwrap();
|
||||||
|
let root = temp.path();
|
||||||
|
fs::create_dir_all(root.join("Data")).unwrap();
|
||||||
|
for name in RACE_MPQS { fs::write(root.join("Data").join(name), b"corrupt").unwrap(); }
|
||||||
|
fs::write(root.join("dinput8.dll"), b"corrupt").unwrap();
|
||||||
|
fs::write(root.join(MANIFEST_FILENAME), format!("# CoA Custom {CLIENT_VERSION}\n")).unwrap();
|
||||||
|
assert_eq!(client_patch_status(root).state, ClientPatchState::PartiallyInstalled);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -516,6 +831,8 @@ mod tests {
|
|||||||
fs::write(client_path.join("dinput8.dll"), b"test dll").unwrap();
|
fs::write(client_path.join("dinput8.dll"), b"test dll").unwrap();
|
||||||
fs::write(client_path.join("EsteriaAppearance.dll"), b"test dll").unwrap();
|
fs::write(client_path.join("EsteriaAppearance.dll"), b"test dll").unwrap();
|
||||||
|
|
||||||
|
let names: Vec<String> = RACE_MPQS.iter().map(|name| format!("Data/{name}")).chain(["dinput8.dll".into(), "EsteriaAppearance.dll".into()]).collect();
|
||||||
|
record_files(client_path, &names.iter().map(String::as_str).collect::<Vec<_>>());
|
||||||
let st = client_patch_status(client_path);
|
let st = client_patch_status(client_path);
|
||||||
assert_eq!(st.state, ClientPatchState::Enabled);
|
assert_eq!(st.state, ClientPatchState::Enabled);
|
||||||
assert_eq!(st.installed_mpqs, RACE_MPQS.len());
|
assert_eq!(st.installed_mpqs, RACE_MPQS.len());
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
{
|
||||||
|
"Data/patch-ZE1.MPQ": "69d79dbbea54ec0312c37770debc79c7bc9ce2e21eedef99c03cd8d911955283",
|
||||||
|
"Data/patch-ZE2.MPQ": "1a41cae77ad730e9cf69e8d63fd12ae3a579418bb550d351fff469573a97ac3c",
|
||||||
|
"Data/patch-ZE3.MPQ": "b587202c21b6f580682b601b7c2e905fbfa766276e74733db55c1bddbffb7f87",
|
||||||
|
"Data/patch-ZEA.MPQ": "78fd10ec5262ae2417eba9700d2172553bbc1e5cfb0b597aada8f1753ca46d9d",
|
||||||
|
"Data/patch-ZHA.MPQ": "0fc6ebeafe1d14192dc64bafc90bde3c49230df1297f98bf65900a3bcf953617",
|
||||||
|
"Data/patch-ZZE.MPQ": "4b1e289e12c82644cb78f50170e6b5fd53918eb2de834f9e0cebddd81873a8bb",
|
||||||
|
"Data/patch-ZZR.MPQ": "5a7575e592dc0c8a6913e0d946bbe06fa0ca2e4d817ef1f8548d3d13142bcbd3",
|
||||||
|
"Ascension.exe": "e2c347019d554a59639e5978fd68e50e906973ab313c6573cc56ca82e8e3c547",
|
||||||
|
"EsteriaAppearance.bin": "b3fb7c69b7600c39f888ea1925701be5667097dcb02bb6ddd830e5489306bb50",
|
||||||
|
"EsteriaAppearance.dll": "392c5a2a25f9a69d705bdf841bb899aab768d4a3ee62734d576286c7198710d8",
|
||||||
|
"EsteriaAppearanceGeometry.bin": "c95c53ca19c53c3434e12b99c1966f9c015ec3944c46dff7784d5e4ffc472d5d",
|
||||||
|
"EsteriaAppearanceMaterials.bin": "f72f027f54a55c05aa0f76b457b97b484fe0e1aedc0e068cc0e0ca53e1878cba",
|
||||||
|
"EsteriaCosmeticWings.bin": "57352c28459d073a29b3014d33b70f3b3756afa37fa9583ef6b30d503422ac3f",
|
||||||
|
"EsteriaEarthen.bin": "8a0db93ba2d5c756b44ed84f2f7bc7c15eef13be6a7d87baf1383c6c0c624e02",
|
||||||
|
"EsteriaGnoll.bin": "cfacc8e681bb8e54a4f01ee9c12a91bf0bd23a23527bb548d4dc21ec1b33eea2",
|
||||||
|
"EsteriaGnollTextures.bin": "1ba9133a75dad291d98a068b2dcde01f31a897a1764cd7f3e2c316c288a8f605",
|
||||||
|
"EsteriaHaranir.bin": "59f31d00e372fd2646e1cf0d9d3d5d671b31edd60ff7b862f8d1ce7e53ba1f2f",
|
||||||
|
"EsteriaHaranirTextures.bin": "99948ca570be2d376f0c67e3b8088739b6fa9f9d2c73985e19f68df77689a229",
|
||||||
|
"EsteriaHighmountain.bin": "e83349252ad2687ac23fcfc5623db7401cf32e5faf47a5a7be20c2f94b014938",
|
||||||
|
"EsteriaNaga.bin": "e87547cff5d09500c294f8b06935d134cdd0bbb962e294a72de09404505bd8b3",
|
||||||
|
"EsteriaNagaTextures.bin": "57ec560f99c1d48ac1e8f6a797c156513b99e7d349e3071afe405f812d159ae3",
|
||||||
|
"EsteriaSaberon.bin": "7735c9325c807c5125760d87f323d6b7d4162fb542c1d8b5f435ea2d6b9a4daa",
|
||||||
|
"EsteriaSaberonCoverage.bin": "9cdc227f08329e1245d2b864a996e7a772c96ecdbe5d81925f4d60cdbe4fa11e",
|
||||||
|
"EsteriaSaberonTextures.bin": "1ba9133a75dad291d98a068b2dcde01f31a897a1764cd7f3e2c316c288a8f605",
|
||||||
|
"EsteriaSethrak.bin": "bd14857a8c11fdf8027128763293701586b2102f9a6539d33a727014789fd606",
|
||||||
|
"EsteriaSethrakTextures.bin": "d2b2cf58087a391f00198008fe871edd400ddf28d54a3a05674df74c5198528a",
|
||||||
|
"EsteriaThinHuman.bin": "75794d192ea0c228b3da7bf7d0bdff1119f79d3f9bfef6650cd5e1a2b5d106eb",
|
||||||
|
"EsteriaThinHumanTextures.bin": "02aeb4c05893d06125b8b58fdb7c2a56fe3d66a7d094706a44b43cb503d1731e",
|
||||||
|
"EsteriaTuskarr.bin": "ecbe7ef490ba67eca029a57639192db61238522618491549766fe38529914387",
|
||||||
|
"EsteriaTuskarrTextures.bin": "e2116c2c83adea079126fd5da765d20da24f044d4f161c4124e4368cb3d6bc71",
|
||||||
|
"EsteriaVrykul.bin": "39e2b7b4c67997dbbd34bae840bd606a59290f7f2fc82565a0ba00090335415c",
|
||||||
|
"EsteriaVrykulTextures.bin": "46098750a0e235724c6e9cc8d9d4e26550aa47bef95fd5f0f82efe5e945bf296",
|
||||||
|
"EsteriaVulpera.bin": "c5434993b9af4a17d881965e4735cd2ac379e39c7142aac9844adff9528562d4",
|
||||||
|
"EsteriaVulperaTextures.bin": "1ab844e74684aced2b069f1b91cd563aade45e05bd5e23f866a6c0c301cb098e",
|
||||||
|
"dinput8.dll": "f8de78606c241fb3911dce22faf68f5b9f9885b142b183c1e2c09ddc8f7e380c",
|
||||||
|
"Data/patch-T.MPQ": "9403e0680c74754eb0cb063718119aa6ace3616f7cecf488c8faf46f22505ae5",
|
||||||
|
"Data/patch-ZE5.MPQ": "476b5a1fcf69f64fdb281e3b445362b936d016066ccd12f897acfcf200d6c0cf",
|
||||||
|
"Data/patch-ZE6.MPQ": "762592c9ed950b4a7b6c7d85d45050b30fa3f35d53e348ee1e1516fdbb7e5484",
|
||||||
|
"Data/patch-ZE7.MPQ": "de54b0189d242763d2872223419a259b6b8a4b380c24b50a2ef9c6fa44466248",
|
||||||
|
"Data/patch-ZE8.MPQ": "1bc5691fb84a84f3e7a0a70baaa9192a97b4ec5906ee37c85838ffe08adef934",
|
||||||
|
"Data/patch-ZE9.MPQ": "d49c94463e9548e76378ce2c0454d8f204f0745c8c0de32b6dce7f0b0fd67c4a",
|
||||||
|
"Data/patch-ZES.MPQ": "a2d9348f917f745c7aa25b2eed96efa312f7b2d2f62cb86a4f2eaabc2dfa895f",
|
||||||
|
"Data/patch-ZG.MPQ": "48979e1fda775f8deb47bffa48e0a468595d4c71286fee518f51dc5801c5ca39",
|
||||||
|
"Data/patch-ZH.MPQ": "5e1d2fe287053abba703d7af381e10096c6525ba477ffed3971c2fc4f93e919c",
|
||||||
|
"Data/patch-ZHM.MPQ": "317d3ae00f0bd674b358af07544976acb7804aa6d8b19d1788ad96030e8c9bf0",
|
||||||
|
"Data/patch-ZJ.MPQ": "f821e99add86ef68d108c5ec466328c97677d3ed52f7944e200f3fe38c13b4de",
|
||||||
|
"Data/patch-ZM.MPQ": "424ab1978986e854551633983a94bd15beba6328aabea8c02f98eaa32f6f0b61",
|
||||||
|
"Data/patch-ZVU.MPQ": "c679b85a2e97344395756b54d2cf6abefe4e80e74944cb55b6e573ad17b7d020"
|
||||||
|
}
|
||||||
@@ -247,6 +247,13 @@ impl Db {
|
|||||||
self.query(&sql)?.trim().parse().map_err(|_| Error::Invalid("unexpected reply".into()))
|
self.query(&sql)?.trim().parse().map_err(|_| Error::Invalid("unexpected reply".into()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn recovery_objects(&self, schema: &str) -> Result<Vec<serde_json::Value>> {
|
||||||
|
let schema = self.realm_schema(schema);
|
||||||
|
if !ident_ok(schema) { return Err(Error::Invalid("bad schema name".into())); }
|
||||||
|
let sql = format!("SELECT routine_type,HEX(routine_name) FROM information_schema.routines WHERE routine_schema='{schema}' UNION ALL SELECT 'TRIGGER',HEX(trigger_name) FROM information_schema.triggers WHERE trigger_schema='{schema}' UNION ALL SELECT 'VIEW',HEX(table_name) FROM information_schema.views WHERE table_schema='{schema}' ORDER BY 1,2;");
|
||||||
|
parse_recovery_objects(&schema, &self.query(&sql)?)
|
||||||
|
}
|
||||||
|
|
||||||
/// Consistent dump of one schema, zstd-compressed to `out`. Returns (compressed bytes, sha256 of the file).
|
/// Consistent dump of one schema, zstd-compressed to `out`. Returns (compressed bytes, sha256 of the file).
|
||||||
pub fn dump_to(&self, schema: &str, out: &Path) -> Result<(u64, String)> {
|
pub fn dump_to(&self, schema: &str, out: &Path) -> Result<(u64, String)> {
|
||||||
let schema = self.realm_schema(schema);
|
let schema = self.realm_schema(schema);
|
||||||
@@ -334,6 +341,18 @@ impl Db {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn parse_recovery_objects(schema: &str, text: &str) -> Result<Vec<serde_json::Value>> {
|
||||||
|
text.lines().filter(|line| !line.is_empty()).map(|line| {
|
||||||
|
let (kind, name) = line.split_once('\t').ok_or_else(|| Error::Invalid("unexpected database object reply".into()))?;
|
||||||
|
if !matches!(kind, "PROCEDURE" | "FUNCTION" | "TRIGGER" | "VIEW") {
|
||||||
|
return Err(Error::Invalid("unexpected database object type".into()));
|
||||||
|
}
|
||||||
|
let name = hex::decode(name).ok().and_then(|bytes| String::from_utf8(bytes).ok())
|
||||||
|
.filter(|name| !name.is_empty()).ok_or_else(|| Error::Invalid("unexpected database object name".into()))?;
|
||||||
|
Ok(serde_json::json!({ "database": schema, "kind": kind, "name": name }))
|
||||||
|
}).collect()
|
||||||
|
}
|
||||||
|
|
||||||
/// Name of the service account the Manager uses for the server console (RA). Accounts are stored upper-case.
|
/// Name of the service account the Manager uses for the server console (RA). Accounts are stored upper-case.
|
||||||
pub const SERVICE_ACCOUNT: &str = "COAMANAGER";
|
pub const SERVICE_ACCOUNT: &str = "COAMANAGER";
|
||||||
|
|
||||||
@@ -421,6 +440,19 @@ mod tests {
|
|||||||
const ROOT_PW: &str = "rootpw-ZZ1";
|
const ROOT_PW: &str = "rootpw-ZZ1";
|
||||||
const APP_PW: &str = "apppw-QQ2";
|
const APP_PW: &str = "apppw-QQ2";
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn recovery_object_names_preserve_unicode_and_delimiters() {
|
||||||
|
let name = "view\tперсонажи\n";
|
||||||
|
let text = format!("VIEW\t{}\nTRIGGER\t74726967676572\n", hex::encode(name));
|
||||||
|
let objects = parse_recovery_objects("acore_characters", &text).unwrap();
|
||||||
|
assert_eq!(objects.len(), 2);
|
||||||
|
assert_eq!(objects[0]["name"], name);
|
||||||
|
assert_eq!(objects[1]["kind"], "TRIGGER");
|
||||||
|
assert!(parse_recovery_objects("test", "VIEW\tzz").is_err());
|
||||||
|
assert!(parse_recovery_objects("test", "UNKNOWN\t61").is_err());
|
||||||
|
assert!(parse_recovery_objects("test", "VIEW").is_err());
|
||||||
|
}
|
||||||
|
|
||||||
fn folder(docker: bool) -> (tempfile::TempDir, PathBuf) {
|
fn folder(docker: bool) -> (tempfile::TempDir, PathBuf) {
|
||||||
let d = tempfile::tempdir().unwrap();
|
let d = tempfile::tempdir().unwrap();
|
||||||
let root = d.path().join("srv");
|
let root = d.path().join("srv");
|
||||||
|
|||||||
@@ -401,6 +401,19 @@ pub fn export_package(root: &Path, meta_dir: &Path, manager_log: &Path, meta: &I
|
|||||||
add("processes.txt", processes_report(root, &ports).as_bytes())?;
|
add("processes.txt", processes_report(root, &ports).as_bytes())?;
|
||||||
|
|
||||||
// The newest update journals: the state of each update and the reason it failed.
|
// The newest update journals: the state of each update and the reason it failed.
|
||||||
|
for (path, size, _) in newest_files(&meta_dir.join("diagnostics"), "json", usize::MAX)
|
||||||
|
.into_iter().filter(|(path, _, _)| path.file_name().is_some_and(|name| {
|
||||||
|
let name = name.to_string_lossy();
|
||||||
|
name.starts_with("schema-validation-") || name.starts_with("database-recovery-")
|
||||||
|
|| name.starts_with("database-rehearsal-") || name.starts_with("database-restore-")
|
||||||
|
|| name.starts_with("database-repair-")
|
||||||
|
})).take(10) {
|
||||||
|
if size <= 4 * 1024 * 1024 {
|
||||||
|
if let Ok(text) = fs::read_to_string(&path) {
|
||||||
|
add(&format!("schema/{}", path.file_name().unwrap().to_string_lossy()), redact_json(&text).as_bytes())?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
let mut journals: Vec<_> = fs::read_dir(meta_dir.join("updates")).into_iter().flatten().flatten()
|
let mut journals: Vec<_> = fs::read_dir(meta_dir.join("updates")).into_iter().flatten().flatten()
|
||||||
.filter(|e| e.file_type().is_ok_and(|t| t.is_dir()) && e.file_name().to_string_lossy().chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '-' | '_')))
|
.filter(|e| e.file_type().is_ok_and(|t| t.is_dir()) && e.file_name().to_string_lossy().chars().all(|c| c.is_ascii_alphanumeric() || matches!(c, '-' | '_')))
|
||||||
.collect();
|
.collect();
|
||||||
@@ -586,6 +599,9 @@ real error
|
|||||||
fs::write(root.join("Core/configs/worldserver.conf"), "LoginDatabaseInfo = \"127.0.0.1;3307;acore;SECRETPW;auth\"\nRate.XP.Kill = 1\n").unwrap();
|
fs::write(root.join("Core/configs/worldserver.conf"), "LoginDatabaseInfo = \"127.0.0.1;3307;acore;SECRETPW;auth\"\nRate.XP.Kill = 1\n").unwrap();
|
||||||
let meta_dir = d.path().join("srv.manager");
|
let meta_dir = d.path().join("srv.manager");
|
||||||
fs::create_dir_all(&meta_dir).unwrap();
|
fs::create_dir_all(&meta_dir).unwrap();
|
||||||
|
fs::create_dir_all(meta_dir.join("diagnostics")).unwrap();
|
||||||
|
fs::write(meta_dir.join("diagnostics/schema-validation-CoA-test.json"), r#"{"problems":[{"table":"creature_display_preset","column":"display_id","detail":"default mismatch"}],"password":"schema-secret"}"#).unwrap();
|
||||||
|
fs::write(meta_dir.join("diagnostics/database-recovery-test.json"), r#"{"objects":[{"database":"acore_characters","kind":"TRIGGER","name":"user_character_trigger"}],"password":"recovery-secret"}"#).unwrap();
|
||||||
let meta = InstallMeta::new(InstallKind::Imported, &root);
|
let meta = InstallMeta::new(InstallKind::Imported, &root);
|
||||||
let report = run(&root, &meta);
|
let report = run(&root, &meta);
|
||||||
let zip_path = d.path().join("diag.zip");
|
let zip_path = d.path().join("diag.zip");
|
||||||
@@ -600,6 +616,10 @@ real error
|
|||||||
}
|
}
|
||||||
assert!(all.contains("boom") && all.contains("Rate.XP.Kill"), "keys and ordinary log lines are included");
|
assert!(all.contains("boom") && all.contains("Rate.XP.Kill"), "keys and ordinary log lines are included");
|
||||||
assert!(all.contains("v1.8") && all.contains("48c4786a"));
|
assert!(all.contains("v1.8") && all.contains("48c4786a"));
|
||||||
|
assert!(all.contains("creature_display_preset") && all.contains("default mismatch"));
|
||||||
|
assert!(!all.contains("schema-secret"));
|
||||||
|
assert!(all.contains("user_character_trigger") && all.contains("acore_characters"));
|
||||||
|
assert!(!all.contains("recovery-secret"));
|
||||||
assert!(!all.contains("hunter2") && !all.contains("SECRETPW") && !all.contains("upstream-secret"));
|
assert!(!all.contains("hunter2") && !all.contains("SECRETPW") && !all.contains("upstream-secret"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -107,6 +107,7 @@ fn run_inner(root: &Path, verb: Verb, validating_update: bool) -> Result<DriverO
|
|||||||
}
|
}
|
||||||
if matches!(verb, Verb::StartAll | Verb::StartWorld) { crate::modules::ensure_bot_exclusivity(&root)?; }
|
if matches!(verb, Verb::StartAll | Verb::StartWorld) { crate::modules::ensure_bot_exclusivity(&root)?; }
|
||||||
if crate::docker::is_docker(&root) {
|
if crate::docker::is_docker(&root) {
|
||||||
|
prepare_headless_world(&root, verb)?;
|
||||||
return crate::docker::run(&root, verb);
|
return crate::docker::run(&root, verb);
|
||||||
}
|
}
|
||||||
if verb == Verb::StopAll { crate::multiworld::stop(&root)?; }
|
if verb == Verb::StopAll { crate::multiworld::stop(&root)?; }
|
||||||
@@ -123,6 +124,7 @@ fn run_inner(root: &Path, verb: Verb, validating_update: bool) -> Result<DriverO
|
|||||||
}
|
}
|
||||||
if matches!(verb, Verb::StartAll | Verb::StartWorld) { crate::modules::ensure_bot_exclusivity(&root)?; }
|
if matches!(verb, Verb::StartAll | Verb::StartWorld) { crate::modules::ensure_bot_exclusivity(&root)?; }
|
||||||
let (python, script) = launcher(&root)?;
|
let (python, script) = launcher(&root)?;
|
||||||
|
prepare_headless_world(&root, verb)?;
|
||||||
let original = std::fs::read_to_string(&script)?;
|
let original = std::fs::read_to_string(&script)?;
|
||||||
let patched = patch_launcher_imports(&original)?;
|
let patched = patch_launcher_imports(&original)?;
|
||||||
if original != patched {
|
if original != patched {
|
||||||
@@ -198,6 +200,27 @@ fn run_inner(root: &Path, verb: Verb, validating_update: bool) -> Result<DriverO
|
|||||||
Ok(DriverOutcome { ok, exit_code, code, human: code.map(ErrorCode::human), output })
|
Ok(DriverOutcome { ok, exit_code, code, human: code.map(ErrorCode::human), output })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Background servers receive no interactive stdin. Keep CLI EOF from stopping the world server;
|
||||||
|
/// the Manager's console uses remote access instead. The template survives launcher regeneration.
|
||||||
|
fn prepare_headless_world(root: &Path, verb: Verb) -> Result<()> {
|
||||||
|
if !matches!(verb, Verb::StartAll | Verb::StartWorld) { return Ok(()); }
|
||||||
|
for relative in ["Settings/worldserver.conf.template", "Core/configs/worldserver.conf"] {
|
||||||
|
let path = root.join(relative);
|
||||||
|
let bytes = match std::fs::read(&path) {
|
||||||
|
Ok(bytes) => bytes,
|
||||||
|
Err(e) if e.kind() == std::io::ErrorKind::NotFound => continue,
|
||||||
|
Err(e) => return Err(e.into()),
|
||||||
|
};
|
||||||
|
let mut config = crate::config::parser::ConfFile::parse_bytes(&bytes)?;
|
||||||
|
config.set("Console.Enable", "0", &["Local console is disabled for background startup; the Manager uses remote access."]);
|
||||||
|
let text = config.to_text();
|
||||||
|
if text.as_bytes() != bytes {
|
||||||
|
fsx::atomic_write(&path, text.as_bytes())?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
/// The launcher keeps one JSON record per service in `.state`. A crash or power loss while it writes one can leave
|
/// The launcher keeps one JSON record per service in `.state`. A crash or power loss while it writes one can leave
|
||||||
/// a file of the right length that holds only zero bytes (NTFS keeps the length but not the data), and the launcher
|
/// a file of the right length that holds only zero bytes (NTFS keeps the length but not the data), and the launcher
|
||||||
/// then dies on every start with an unreadable record. Such a file carries no information, so remove it: the
|
/// then dies on every start with an unreadable record. Such a file carries no information, so remove it: the
|
||||||
@@ -264,6 +287,55 @@ pub(crate) fn startup_failure(root: &Path, started: &DriverOutcome) -> String {
|
|||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn background_start_disables_cli_in_template_and_rendered_config() {
|
||||||
|
let folder = tempfile::tempdir().unwrap();
|
||||||
|
let root = folder.path();
|
||||||
|
std::fs::create_dir_all(root.join("Settings")).unwrap();
|
||||||
|
std::fs::create_dir_all(root.join("Core/configs")).unwrap();
|
||||||
|
let template = root.join("Settings/worldserver.conf.template");
|
||||||
|
let rendered = root.join("Core/configs/worldserver.conf");
|
||||||
|
let original = "\u{feff}# Custom settings\r\nConsole.Enable = 1\r\nRa.Enable = 1\r\nPlayerLimit = 42\r\n";
|
||||||
|
std::fs::write(&template, original).unwrap();
|
||||||
|
std::fs::write(&rendered, original).unwrap();
|
||||||
|
let auth = root.join("Core/configs/authserver.conf");
|
||||||
|
std::fs::write(&auth, "custom auth config").unwrap();
|
||||||
|
for verb in [Verb::StartMysql, Verb::StopAll] {
|
||||||
|
prepare_headless_world(root, verb).unwrap();
|
||||||
|
assert_eq!(std::fs::read_to_string(&template).unwrap(), original);
|
||||||
|
assert_eq!(std::fs::read_to_string(&rendered).unwrap(), original);
|
||||||
|
}
|
||||||
|
for verb in [Verb::StartAll, Verb::StartWorld] {
|
||||||
|
std::fs::write(&template, original).unwrap();
|
||||||
|
std::fs::write(&rendered, original).unwrap();
|
||||||
|
prepare_headless_world(root, verb).unwrap();
|
||||||
|
let expected = original.replace("Console.Enable = 1", "Console.Enable = 0");
|
||||||
|
assert_eq!(std::fs::read_to_string(&template).unwrap(), expected);
|
||||||
|
assert_eq!(std::fs::read_to_string(&rendered).unwrap(), expected);
|
||||||
|
prepare_headless_world(root, verb).unwrap();
|
||||||
|
assert_eq!(std::fs::read_to_string(&template).unwrap(), expected);
|
||||||
|
}
|
||||||
|
assert_eq!(std::fs::read_to_string(auth).unwrap(), "custom auth config");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn background_start_overrides_an_absent_or_duplicate_console_setting() {
|
||||||
|
let folder = tempfile::tempdir().unwrap();
|
||||||
|
let root = folder.path();
|
||||||
|
prepare_headless_world(root, Verb::StartAll).unwrap();
|
||||||
|
std::fs::create_dir_all(root.join("Core/configs")).unwrap();
|
||||||
|
let path = root.join("Core/configs/worldserver.conf");
|
||||||
|
for original in ["Ra.Enable = 1\n", "Console.Enable = 0\nConsole.Enable = 1\n"] {
|
||||||
|
std::fs::write(&path, original).unwrap();
|
||||||
|
prepare_headless_world(root, Verb::StartAll).unwrap();
|
||||||
|
let bytes = std::fs::read(&path).unwrap();
|
||||||
|
let config = crate::config::parser::ConfFile::parse_bytes(&bytes).unwrap();
|
||||||
|
assert_eq!(config.get("Console.Enable"), Some("0"));
|
||||||
|
prepare_headless_world(root, Verb::StartAll).unwrap();
|
||||||
|
assert_eq!(std::fs::read(&path).unwrap(), bytes);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn large_squid_provisioning_has_time_to_finish_without_extending_shutdown() {
|
fn large_squid_provisioning_has_time_to_finish_without_extending_shutdown() {
|
||||||
let folder = tempfile::tempdir().unwrap();
|
let folder = tempfile::tempdir().unwrap();
|
||||||
|
|||||||
@@ -44,9 +44,12 @@ pub mod release;
|
|||||||
pub mod report;
|
pub mod report;
|
||||||
pub mod release_schema;
|
pub mod release_schema;
|
||||||
pub mod update;
|
pub mod update;
|
||||||
|
mod update_isolation;
|
||||||
|
mod mysql_snapshot;
|
||||||
pub mod wine;
|
pub mod wine;
|
||||||
pub mod upnp;
|
pub mod upnp;
|
||||||
pub mod signing;
|
pub mod signing;
|
||||||
|
pub mod channels;
|
||||||
pub mod srp6;
|
pub mod srp6;
|
||||||
|
|
||||||
pub use error::{Error, ErrorCode, Result};
|
pub use error::{Error, ErrorCode, Result};
|
||||||
|
|||||||
@@ -78,9 +78,31 @@ pub struct Revision {
|
|||||||
pub commit: Option<String>,
|
pub commit: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
||||||
|
pub struct SourceDatabase {
|
||||||
|
pub manifest_sha256: String,
|
||||||
|
pub schema_sha256: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
||||||
|
pub struct Compatibility {
|
||||||
|
pub schema: u32,
|
||||||
|
pub platform: String,
|
||||||
|
pub core_commit: String,
|
||||||
|
pub module_commits: std::collections::BTreeMap<String, String>,
|
||||||
|
pub client_patch_version: String,
|
||||||
|
pub source_versions: Vec<String>,
|
||||||
|
#[serde(default, skip_serializing_if = "std::collections::BTreeMap::is_empty")]
|
||||||
|
pub source_databases: std::collections::BTreeMap<String, SourceDatabase>,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct Manifest {
|
pub struct Manifest {
|
||||||
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||||
|
pub compatibility: Option<Compatibility>,
|
||||||
pub schema: u32,
|
pub schema: u32,
|
||||||
pub kind: Kind,
|
pub kind: Kind,
|
||||||
pub version: String,
|
pub version: String,
|
||||||
@@ -136,6 +158,26 @@ impl Manifest {
|
|||||||
if parse_version(&self.min_manager_version).is_none() {
|
if parse_version(&self.min_manager_version).is_none() {
|
||||||
return bad(format!("bad minManagerVersion {:?}", self.min_manager_version));
|
return bad(format!("bad minManagerVersion {:?}", self.min_manager_version));
|
||||||
}
|
}
|
||||||
|
if let Some(c) = &self.compatibility {
|
||||||
|
if parse_version(&self.min_manager_version).is_none_or(|v| v < (0, 6, 13)) {
|
||||||
|
return bad("Release compatibility matrices require Manager 0.6.13 or newer".into());
|
||||||
|
}
|
||||||
|
if c.schema != 1 || !matches!(c.platform.as_str(), "windows-x86_64" | "linux-x86_64")
|
||||||
|
|| !is_commit(&c.core_commit) || self.core.commit.as_deref() != Some(&c.core_commit)
|
||||||
|
|| c.module_commits.is_empty() || c.module_commits.values().any(|sha| !is_commit(sha))
|
||||||
|
|| self.bots.as_ref().and_then(|r| r.commit.as_ref()).is_some_and(|sha| c.module_commits.get("bots") != Some(sha))
|
||||||
|
|| parse_version(&c.client_patch_version).is_none()
|
||||||
|
|| c.source_versions.is_empty() || c.source_versions.iter().any(|v| parse_version(v).is_none())
|
||||||
|
|| c.source_versions.iter().collect::<HashSet<_>>().len() != c.source_versions.len() {
|
||||||
|
return bad("Invalid release compatibility matrix".into());
|
||||||
|
}
|
||||||
|
if !c.source_databases.is_empty() && (c.source_databases.len() != c.source_versions.len()
|
||||||
|
|| c.source_versions.iter().any(|v| !c.source_databases.contains_key(v))
|
||||||
|
|| c.source_databases.values().any(|s| !is_sha256(&s.manifest_sha256)
|
||||||
|
|| s.schema_sha256.as_ref().is_some_and(|sha| !is_sha256(sha)))) {
|
||||||
|
return bad("Invalid source database compatibility".into());
|
||||||
|
}
|
||||||
|
}
|
||||||
for migration in &self.migrations {
|
for migration in &self.migrations {
|
||||||
if !is_sha256(&migration.sha256) || migration.compatible_sha256.iter().any(|h| !is_sha256(h) || h == &"0".repeat(64)) {
|
if !is_sha256(&migration.sha256) || migration.compatible_sha256.iter().any(|h| !is_sha256(h) || h == &"0".repeat(64)) {
|
||||||
return bad(format!("{}: invalid migration checksum compatibility", migration.id));
|
return bad(format!("{}: invalid migration checksum compatibility", migration.id));
|
||||||
@@ -232,6 +274,53 @@ mod tests {
|
|||||||
assert!(!m.compatible_with_manager("0.0.9"));
|
assert!(!m.compatible_with_manager("0.0.9"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn compatibility_matrix_binds_core_and_requires_tested_sources() {
|
||||||
|
let mut m = Manifest::parse(sample("").as_bytes()).unwrap();
|
||||||
|
m.min_manager_version = "0.6.13".into();
|
||||||
|
m.compatibility = Some(Compatibility { schema: 1, platform: "windows-x86_64".into(),
|
||||||
|
core_commit: "a".repeat(40), module_commits: [("squid".into(), "b".repeat(40))].into(),
|
||||||
|
source_databases: Default::default(), client_patch_version: "1.5.1".into(), source_versions: vec!["0.261010.32".into()] });
|
||||||
|
m.validate().unwrap();
|
||||||
|
m.compatibility.as_mut().unwrap().core_commit = "c".repeat(40);
|
||||||
|
assert!(m.validate().is_err());
|
||||||
|
m.compatibility.as_mut().unwrap().core_commit = "a".repeat(40);
|
||||||
|
m.compatibility.as_mut().unwrap().source_versions.clear();
|
||||||
|
assert!(m.validate().is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn compatibility_cannot_claim_a_different_packaged_bot_revision() {
|
||||||
|
let mut m = Manifest::parse(sample("").as_bytes()).unwrap();
|
||||||
|
m.min_manager_version = "0.6.13".into();
|
||||||
|
m.bots = Some(Revision { commit: Some("b".repeat(40)) });
|
||||||
|
m.compatibility = Some(Compatibility { schema: 1, platform: "windows-x86_64".into(),
|
||||||
|
core_commit: "a".repeat(40), module_commits: [("bots".into(), "c".repeat(40))].into(),
|
||||||
|
source_databases: Default::default(), client_patch_version: "1.5.1".into(), source_versions: vec!["0.2.0".into()] });
|
||||||
|
assert!(m.validate().is_err());
|
||||||
|
m.compatibility.as_mut().unwrap().module_commits.insert("bots".into(), "b".repeat(40));
|
||||||
|
m.validate().unwrap();
|
||||||
|
m.compatibility.as_mut().unwrap().source_versions.push("0.2.0".into());
|
||||||
|
assert!(m.validate().is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn source_database_contracts_must_cover_the_exact_upgrade_versions() {
|
||||||
|
let mut m = Manifest::parse(sample("").as_bytes()).unwrap();
|
||||||
|
m.min_manager_version = "0.6.13".into();
|
||||||
|
m.compatibility = Some(Compatibility { schema: 1, platform: "windows-x86_64".into(),
|
||||||
|
core_commit: "a".repeat(40), module_commits: [("squid".into(), "b".repeat(40))].into(),
|
||||||
|
client_patch_version: "1.5.1".into(), source_versions: vec!["0.2.0".into()],
|
||||||
|
source_databases: [("0.2.0".into(), SourceDatabase { manifest_sha256: "a".repeat(64), schema_sha256: None })].into() });
|
||||||
|
m.validate().unwrap();
|
||||||
|
m.compatibility.as_mut().unwrap().source_databases.get_mut("0.2.0").unwrap().schema_sha256 = Some("bad".into());
|
||||||
|
assert!(m.validate().is_err());
|
||||||
|
let c = m.compatibility.as_mut().unwrap();
|
||||||
|
c.source_databases.get_mut("0.2.0").unwrap().schema_sha256 = None;
|
||||||
|
c.source_versions = vec!["0.2.1".into()];
|
||||||
|
assert!(m.validate().is_err());
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn rejects_traversal_bad_hash_duplicates_and_short_commit() {
|
fn rejects_traversal_bad_hash_duplicates_and_short_commit() {
|
||||||
let ok = "b".repeat(64);
|
let ok = "b".repeat(64);
|
||||||
|
|||||||
@@ -214,6 +214,16 @@ pub fn set_enabled(root: &Path, meta: &Path, id: &str, on: bool) -> Result<()> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if !on {
|
||||||
|
let _ = crate::custom_races::sync_bot_races_config(root, false);
|
||||||
|
} else {
|
||||||
|
let allow = crate::custom_races::is_bot_custom_races_allowed(root).unwrap_or_else(|| {
|
||||||
|
read(&dir(root).join("coa_custom_races.conf"))
|
||||||
|
.and_then(|c| c.get("CoACustomRaces.BotsEnable").map(truthy))
|
||||||
|
.unwrap_or(false)
|
||||||
|
});
|
||||||
|
let _ = crate::custom_races::sync_bot_races_config(root, allow);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
set_enabled_in(&catalog(), root, meta, id, on)
|
set_enabled_in(&catalog(), root, meta, id, on)
|
||||||
}
|
}
|
||||||
@@ -290,14 +300,27 @@ fn settings_in(cat: &[Entry], root: &Path, id: &str) -> Result<Vec<Setting>> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
let bot_custom_races_allowed = if id == "custom-races" {
|
||||||
|
crate::custom_races::is_bot_custom_races_allowed(root)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
Ok(effective
|
Ok(effective
|
||||||
.entries()
|
.entries()
|
||||||
.map(|(k, v)| Setting {
|
.map(|(k, v)| {
|
||||||
|
let mut val = fields.get(k).and_then(|field| field.default_if_missing.as_ref()).filter(|_| active.get(k).is_none()).and_then(crate::squid::scalar).unwrap_or_else(|| v.to_string());
|
||||||
|
if k == "CoACustomRaces.BotsEnable" {
|
||||||
|
if let Some(allowed) = bot_custom_races_allowed {
|
||||||
|
val = if allowed { "1".into() } else { "0".into() };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Setting {
|
||||||
key: k.to_string(),
|
key: k.to_string(),
|
||||||
value: fields.get(k).and_then(|field| field.default_if_missing.as_ref()).filter(|_| active.get(k).is_none()).and_then(crate::squid::scalar).unwrap_or_else(|| v.to_string()),
|
value: val,
|
||||||
default: fields.get(k).and_then(|field| crate::squid::scalar(&field.default)).or_else(|| dist.as_ref().and_then(|d| d.get(k)).map(str::to_string)),
|
default: fields.get(k).and_then(|field| crate::squid::scalar(&field.default)).or_else(|| dist.as_ref().and_then(|d| d.get(k)).map(str::to_string)),
|
||||||
field: fields.get(k).cloned(),
|
field: fields.get(k).cloned(),
|
||||||
doc: dist.as_ref().map(|d| d.doc_for(k)).filter(|d| !d.is_empty()).unwrap_or_else(|| active.doc_for(k)).join(" "),
|
doc: dist.as_ref().map(|d| d.doc_for(k)).filter(|d| !d.is_empty()).unwrap_or_else(|| active.doc_for(k)).join(" "),
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.collect())
|
.collect())
|
||||||
}
|
}
|
||||||
@@ -353,6 +376,12 @@ fn save_settings_in(cat: &[Entry], root: &Path, meta: &Path, id: &str, changes:
|
|||||||
changed.push((key.clone(), value.to_string()));
|
changed.push((key.clone(), value.to_string()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if id == "custom-races" {
|
||||||
|
if let Some(bots_enable) = changes.get("CoACustomRaces.BotsEnable") {
|
||||||
|
let allow = truthy(bots_enable);
|
||||||
|
crate::custom_races::sync_bot_races_config(root, allow)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
if changed.is_empty() {
|
if changed.is_empty() {
|
||||||
return Ok(Vec::new());
|
return Ok(Vec::new());
|
||||||
}
|
}
|
||||||
@@ -672,4 +701,39 @@ mod tests {
|
|||||||
assert!(fs::read_to_string(dir(&root).join("war_games.conf")).unwrap().contains("WarGames.Enable = 0"));
|
assert!(fs::read_to_string(dir(&root).join("war_games.conf")).unwrap().contains("WarGames.Enable = 0"));
|
||||||
assert!(!list_in(&cat, &root).into_iter().find(|m| m.id == "war-games").unwrap().enabled);
|
assert!(!list_in(&cat, &root).into_iter().find(|m| m.id == "war-games").unwrap().enabled);
|
||||||
}
|
}
|
||||||
|
#[test]
|
||||||
|
fn custom_races_bot_settings_synchronize_playerbots_conf() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let (root, meta) = server(d.path());
|
||||||
|
let cat = catalog();
|
||||||
|
fs::write(dir(&root).join("coa_custom_races.conf.dist"), "CoACustomRaces.Enable = 1\nCoACustomRaces.BotsEnable = 0\n").unwrap();
|
||||||
|
fs::write(dir(&root).join("coa_custom_races.conf"), "CoACustomRaces.Enable = 1\nCoACustomRaces.BotsEnable = 0\n").unwrap();
|
||||||
|
fs::write(dir(&root).join("playerbots.conf"), "AiPlayerbot.Enabled = 1\n").unwrap();
|
||||||
|
|
||||||
|
// 1. Initially CoACustomRaces.BotsEnable is 0
|
||||||
|
let s = settings_in(&cat, &root, "custom-races").unwrap();
|
||||||
|
assert_eq!(s.iter().find(|s| s.key == "CoACustomRaces.BotsEnable").unwrap().value, "0");
|
||||||
|
|
||||||
|
// 2. Enable bots for custom races: should write experimental exclusions to playerbots.conf
|
||||||
|
let change_on = BTreeMap::from([("CoACustomRaces.BotsEnable".into(), "1".into())]);
|
||||||
|
assert_eq!(save_settings_in(&cat, &root, &meta, "custom-races", &change_on).unwrap(), ["CoACustomRaces.BotsEnable"]);
|
||||||
|
let pb = fs::read_to_string(dir(&root).join("playerbots.conf")).unwrap();
|
||||||
|
assert!(pb.contains("AiPlayerbot.ExcludedBotRaces"));
|
||||||
|
assert!(pb.contains(crate::custom_races::EXCLUDED_BOT_RACES_EXPERIMENTAL));
|
||||||
|
|
||||||
|
// Settings view now sees "1"
|
||||||
|
let s = settings_in(&cat, &root, "custom-races").unwrap();
|
||||||
|
assert_eq!(s.iter().find(|s| s.key == "CoACustomRaces.BotsEnable").unwrap().value, "1");
|
||||||
|
|
||||||
|
// 3. Disable bots for custom races: should write recommended exclusions to playerbots.conf
|
||||||
|
let change_off = BTreeMap::from([("CoACustomRaces.BotsEnable".into(), "0".into())]);
|
||||||
|
assert_eq!(save_settings_in(&cat, &root, &meta, "custom-races", &change_off).unwrap(), ["CoACustomRaces.BotsEnable"]);
|
||||||
|
let pb = fs::read_to_string(dir(&root).join("playerbots.conf")).unwrap();
|
||||||
|
assert!(pb.contains(crate::custom_races::EXCLUDED_BOT_RACES_RECOMMENDED));
|
||||||
|
|
||||||
|
// Settings view now sees "0"
|
||||||
|
let s = settings_in(&cat, &root, "custom-races").unwrap();
|
||||||
|
assert_eq!(s.iter().find(|s| s.key == "CoACustomRaces.BotsEnable").unwrap().value, "0");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,493 @@
|
|||||||
|
use std::{collections::{BTreeMap, BTreeSet}, fs, path::{Path, PathBuf}};
|
||||||
|
use std::io::{BufReader, BufWriter, Write};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use crate::{fsx, Error, Result};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub(crate) struct Snapshot {
|
||||||
|
pub path: String,
|
||||||
|
pub files: BTreeMap<String, String>,
|
||||||
|
pub directories: BTreeSet<String>,
|
||||||
|
pub server_sha256: String,
|
||||||
|
#[serde(default)]
|
||||||
|
pub bytes: u64,
|
||||||
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||||
|
pub archive_sha256: Option<String>,
|
||||||
|
#[serde(default)]
|
||||||
|
pub expanded_bytes: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn reject_link(metadata: &fs::Metadata) -> Result<()> {
|
||||||
|
let linked = metadata.file_type().is_symlink();
|
||||||
|
#[cfg(windows)] let linked = { use std::os::windows::fs::MetadataExt; linked || metadata.file_attributes() & 0x400 != 0 };
|
||||||
|
if linked { return Err(Error::Invalid("Recovery copies cannot follow symbolic links or junctions.".into())); }
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn directories(root: &Path) -> Result<BTreeSet<String>> {
|
||||||
|
let canonical = fsx::canonicalize_lenient(root)?;
|
||||||
|
let root = canonical.as_path();
|
||||||
|
let mut result = BTreeSet::new();
|
||||||
|
let mut pending = vec![root.to_path_buf()];
|
||||||
|
while let Some(directory) = pending.pop() {
|
||||||
|
for entry in fs::read_dir(directory)? {
|
||||||
|
let entry = entry?;
|
||||||
|
reject_link(&fs::symlink_metadata(entry.path())?)?;
|
||||||
|
let path = fsx::ensure_within(root, &entry.path())?;
|
||||||
|
if entry.file_type()?.is_dir() {
|
||||||
|
let relative = path.strip_prefix(root).map_err(|e| Error::Invalid(e.to_string()))?.to_string_lossy().replace('\\', "/");
|
||||||
|
result.insert(relative);
|
||||||
|
pending.push(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(result)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn copy_snapshot(point: &Path, snapshot: &Snapshot, target: &Path) -> Result<()> {
|
||||||
|
if snapshot.archive_sha256.is_some() {
|
||||||
|
verify(point, snapshot)?;
|
||||||
|
if target.exists() { return Err(Error::Invalid("The recovery destination already exists.".into())); }
|
||||||
|
let parent = target.parent().ok_or_else(|| Error::Invalid("Invalid recovery destination.".into()))?;
|
||||||
|
fs::create_dir_all(parent)?;
|
||||||
|
fsx::require_space(parent, snapshot.expanded_bytes)?;
|
||||||
|
fs::create_dir(target)?;
|
||||||
|
let input = fsx::ensure_within(point, &fsx::safe_join(point, &snapshot.path)?)?;
|
||||||
|
let decoder = zstd::Decoder::new(BufReader::new(fs::File::open(input)?))?;
|
||||||
|
let mut archive = tar::Archive::new(decoder);
|
||||||
|
let mut seen = BTreeSet::new();
|
||||||
|
let mut expanded = 0u64;
|
||||||
|
for entry in archive.entries()? {
|
||||||
|
let mut entry = entry?;
|
||||||
|
let name = entry.path()?.to_string_lossy().trim_end_matches('/').to_string();
|
||||||
|
if !seen.insert(name.clone()) { return Err(Error::Invalid("Duplicate entry in MySQL recovery archive.".into())); }
|
||||||
|
let output = fsx::ensure_within(target, &fsx::safe_join(target, &name)?)?;
|
||||||
|
if entry.header().entry_type().is_dir() && snapshot.directories.contains(&name) {
|
||||||
|
fs::create_dir_all(output)?;
|
||||||
|
} else if entry.header().entry_type().is_file() && snapshot.files.contains_key(&name) {
|
||||||
|
expanded = expanded.checked_add(entry.size()).filter(|bytes| *bytes <= snapshot.expanded_bytes)
|
||||||
|
.ok_or_else(|| Error::Invalid("MySQL recovery archive exceeds its declared size.".into()))?;
|
||||||
|
fs::create_dir_all(output.parent().unwrap())?;
|
||||||
|
let mut file = fs::OpenOptions::new().write(true).create_new(true).open(output)?;
|
||||||
|
if std::io::copy(&mut entry, &mut file)? != entry.size() { return Err(Error::Invalid("Truncated MySQL recovery file.".into())); }
|
||||||
|
file.flush()?;
|
||||||
|
} else { return Err(Error::Invalid("Unexpected entry in MySQL recovery archive.".into())); }
|
||||||
|
}
|
||||||
|
if expanded != snapshot.expanded_bytes || inventory(target)? != snapshot.files {
|
||||||
|
return Err(Error::Invalid("MySQL recovery files failed verification.".into()));
|
||||||
|
}
|
||||||
|
} else { copy_verified(&point.join(&snapshot.path), target, &snapshot.files)?; }
|
||||||
|
for directory in &snapshot.directories {
|
||||||
|
fs::create_dir_all(fsx::ensure_within(target, &fsx::safe_join(target, directory)?)?)?;
|
||||||
|
}
|
||||||
|
if directories(target)? != snapshot.directories { return Err(Error::Invalid("The recovery directory inventory differs.".into())); }
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn compress(source: &Path, point: &Path, snapshot: &mut Snapshot) -> Result<()> {
|
||||||
|
snapshot.path = "mysql-data.tar.zst".into();
|
||||||
|
let path = fsx::safe_join(point, &snapshot.path)?;
|
||||||
|
fs::create_dir_all(point)?;
|
||||||
|
fsx::require_space(point, snapshot.expanded_bytes)?;
|
||||||
|
let file = fs::OpenOptions::new().write(true).create_new(true).open(&path)?;
|
||||||
|
let encoder = zstd::Encoder::new(BufWriter::new(file), 3)?;
|
||||||
|
let mut archive = tar::Builder::new(encoder);
|
||||||
|
for directory in &snapshot.directories {
|
||||||
|
archive.append_dir(directory, fsx::ensure_within(source, &fsx::safe_join(source, directory)?)?)?;
|
||||||
|
}
|
||||||
|
for name in snapshot.files.keys() {
|
||||||
|
let input = fsx::ensure_within(source, &fsx::safe_join(source, name)?)?;
|
||||||
|
archive.append_file(name, &mut fs::File::open(input)?)?;
|
||||||
|
}
|
||||||
|
archive.into_inner()?.finish()?.flush()?;
|
||||||
|
snapshot.archive_sha256 = Some(fsx::sha256_file(&path)?);
|
||||||
|
snapshot.bytes = fs::metadata(path)?.len();
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn inventory(root: &Path) -> Result<BTreeMap<String, String>> {
|
||||||
|
let canonical = fsx::canonicalize_lenient(root)?;
|
||||||
|
let root = canonical.as_path();
|
||||||
|
let mut files = BTreeMap::new();
|
||||||
|
let mut directories = vec![root.to_path_buf()];
|
||||||
|
while let Some(directory) = directories.pop() {
|
||||||
|
for entry in fs::read_dir(directory)? {
|
||||||
|
let entry = entry?;
|
||||||
|
let metadata = fs::symlink_metadata(entry.path())?;
|
||||||
|
let path = fsx::ensure_within(root, &entry.path())?;
|
||||||
|
reject_link(&metadata)?;
|
||||||
|
if metadata.is_dir() { directories.push(path); continue; }
|
||||||
|
if !metadata.is_file() { return Err(Error::Invalid("Unsupported database snapshot file.".into())); }
|
||||||
|
let relative = path.strip_prefix(root).map_err(|e| Error::Invalid(e.to_string()))?.to_string_lossy().replace('\\', "/");
|
||||||
|
fsx::safe_join(root, &relative)?;
|
||||||
|
if relative.ends_with(".isl") { return Err(Error::Invalid("External MySQL tablespaces require a separate recovery method.".into())); }
|
||||||
|
files.insert(relative, fsx::sha256_file(&path)?);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(files)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn copy_verified(source: &Path, target: &Path, files: &BTreeMap<String, String>) -> Result<()> {
|
||||||
|
if target.exists() { return Err(Error::Invalid("Database snapshot destination already exists.".into())); }
|
||||||
|
let bytes = files.keys().try_fold(0u64, |total, name| -> Result<u64> {
|
||||||
|
let path = fsx::ensure_within(source, &fsx::safe_join(source, name)?)?;
|
||||||
|
total.checked_add(fs::metadata(path)?.len()).ok_or_else(|| Error::Invalid("Snapshot size overflow.".into()))
|
||||||
|
})?;
|
||||||
|
let parent = target.parent().ok_or_else(|| Error::Invalid("Invalid snapshot destination.".into()))?;
|
||||||
|
fs::create_dir_all(parent)?;
|
||||||
|
fsx::require_space(parent, bytes)?;
|
||||||
|
fs::create_dir(target)?;
|
||||||
|
for (relative, expected) in files {
|
||||||
|
let source_file = fsx::ensure_within(source, &fsx::safe_join(source, relative)?)?;
|
||||||
|
let target_file = fsx::ensure_within(target, &fsx::safe_join(target, relative)?)?;
|
||||||
|
fs::create_dir_all(target_file.parent().unwrap())?;
|
||||||
|
fs::copy(&source_file, &target_file)?;
|
||||||
|
if fsx::sha256_file(&target_file)? != *expected { return Err(Error::Invalid(format!("Database snapshot file {relative} failed verification."))); }
|
||||||
|
}
|
||||||
|
if inventory(target)? != *files { return Err(Error::Invalid("Database snapshot inventory differs.".into())); }
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn stop(root: &Path) -> Result<()> {
|
||||||
|
let observed = crate::process::observe(root, &crate::layout::read_ports(root));
|
||||||
|
if [observed.mysql.state, observed.auth.state, observed.world.state].iter().all(|state| *state == crate::process::ServiceState::Stopped)
|
||||||
|
&& !crate::multiworld::is_running(root) { return Ok(()); }
|
||||||
|
let outcome = crate::driver::run(root, crate::driver::Verb::StopAll)?;
|
||||||
|
let status = crate::process::observe(root, &crate::layout::read_ports(root));
|
||||||
|
if !outcome.ok || [status.mysql.state, status.auth.state, status.world.state].iter().any(|state| *state != crate::process::ServiceState::Stopped)
|
||||||
|
|| crate::multiworld::is_running(root) {
|
||||||
|
return Err(Error::Invalid("The complete server must be stopped before copying or restoring MySQL.".into()));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn stop_previous_rehearsals(meta: &Path) -> Result<()> {
|
||||||
|
let location = meta.join("rehearsals");
|
||||||
|
if !location.exists() { return Ok(()); }
|
||||||
|
for entry in fs::read_dir(&location)? {
|
||||||
|
let entry = entry?;
|
||||||
|
let name = entry.file_name().to_string_lossy().into_owned();
|
||||||
|
if name.len() != 32 || !name.bytes().all(|byte| byte.is_ascii_hexdigit()) { continue; }
|
||||||
|
let fixture = fsx::ensure_within(&location, &entry.path().join("server"))?;
|
||||||
|
let metadata = crate::registry::metadata_dir_for(&fixture)?;
|
||||||
|
if !metadata.join("install.json").is_file() { continue; }
|
||||||
|
let (_, installed) = crate::registry::MetaDir::open(&metadata)?;
|
||||||
|
if fsx::canonicalize_lenient(Path::new(&installed.server_path))? != fsx::canonicalize_lenient(&fixture)? {
|
||||||
|
return Err(Error::Invalid("The interrupted rehearsal metadata does not match its private server.".into()));
|
||||||
|
}
|
||||||
|
stop(&fixture)?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn capture(root: &Path, partial: &Path) -> Result<Snapshot> {
|
||||||
|
if crate::docker::is_docker(root) || !cfg!(windows) { return Err(Error::Invalid("Cold MySQL snapshots require a Windows repack.".into())); }
|
||||||
|
crate::backup::with_database(root, |db| {
|
||||||
|
if db.query("SELECT COUNT(*) FROM performance_schema.replication_connection_configuration;")?.trim() != "0" {
|
||||||
|
return Err(Error::Invalid("A replicated MySQL instance requires a separate isolated recovery method.".into()));
|
||||||
|
}
|
||||||
|
let data = fsx::ensure_within(root, &root.join("mysql/data"))?;
|
||||||
|
for path in db.query("SELECT PATH FROM information_schema.INNODB_DATAFILES;")?.lines() {
|
||||||
|
fsx::ensure_within(&data, &data.join(path))?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
})?;
|
||||||
|
stop(root)?;
|
||||||
|
let data = fsx::ensure_within(root, &root.join("mysql/data"))?;
|
||||||
|
if !data.join("mysql").is_dir() || !data.join("ibdata1").is_file() {
|
||||||
|
return Err(Error::Invalid("The bundled MySQL data directory is incomplete.".into()));
|
||||||
|
}
|
||||||
|
let files = inventory(&data)?;
|
||||||
|
let bytes = files.keys().try_fold(0u64, |total, file| -> Result<u64> {
|
||||||
|
total.checked_add(fs::metadata(fsx::safe_join(&data, file)?)?.len()).ok_or_else(|| Error::Invalid("Snapshot size overflow.".into()))
|
||||||
|
})?;
|
||||||
|
let mut snapshot = Snapshot { path: "mysql-data".into(), files, directories:directories(&data)?, server_sha256: fsx::sha256_file(&root.join("mysql/bin/mysqld.exe"))?, bytes, expanded_bytes:bytes, archive_sha256:None };
|
||||||
|
compress(&data, partial, &mut snapshot)?;
|
||||||
|
verify(partial, &snapshot)?;
|
||||||
|
Ok(snapshot)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn verify(point: &Path, snapshot: &Snapshot) -> Result<()> {
|
||||||
|
if snapshot.files.is_empty() || snapshot.server_sha256.len() != 64 {
|
||||||
|
return Err(Error::Invalid("Invalid cold MySQL recovery inventory.".into()));
|
||||||
|
}
|
||||||
|
let data = fsx::ensure_within(point, &fsx::safe_join(point, &snapshot.path)?)?;
|
||||||
|
if let Some(hash) = &snapshot.archive_sha256 {
|
||||||
|
if snapshot.path != "mysql-data.tar.zst" || snapshot.expanded_bytes == 0 || fsx::sha256_file(&data)? != *hash {
|
||||||
|
return Err(Error::Invalid("The compressed MySQL recovery copy is damaged.".into()));
|
||||||
|
}
|
||||||
|
for name in snapshot.files.keys().chain(snapshot.directories.iter()) { fsx::safe_join(point, name)?; }
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
if snapshot.path != "mysql-data" { return Err(Error::Invalid("Unsupported MySQL recovery format.".into())); }
|
||||||
|
if inventory(&data)? != snapshot.files { return Err(Error::Invalid("The cold MySQL recovery copy is damaged or incomplete.".into())); }
|
||||||
|
if directories(&data)? != snapshot.directories { return Err(Error::Invalid("The cold MySQL recovery directories are incomplete.".into())); }
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn rehearsal_copy(root: &Path, meta: &Path, point: &Path, snapshot: &Snapshot) -> Result<PathBuf> {
|
||||||
|
verify(point, snapshot)?;
|
||||||
|
let canonical = fsx::canonicalize_lenient(root)?;
|
||||||
|
let root = canonical.as_path();
|
||||||
|
let destination = meta.join("rehearsals").join(uuid::Uuid::new_v4().simple().to_string()).join("server");
|
||||||
|
let mut files = BTreeMap::new();
|
||||||
|
let mut directories = vec![root.to_path_buf()];
|
||||||
|
while let Some(directory) = directories.pop() {
|
||||||
|
for entry in fs::read_dir(directory)? {
|
||||||
|
let entry = entry?;
|
||||||
|
let raw = entry.path();
|
||||||
|
let relative = raw.strip_prefix(root).map_err(|e| Error::Invalid(e.to_string()))?.to_string_lossy().replace('\\', "/");
|
||||||
|
let lower = relative.to_ascii_lowercase();
|
||||||
|
let first = lower.split('/').next().unwrap();
|
||||||
|
if entry.file_type()?.is_dir() && !relative.contains('/')
|
||||||
|
&& !["core", "data", "scripts", "settings", "runtime", "mysql", ".realms", "bugreport", "extras", "licenses"].contains(&first) { continue; }
|
||||||
|
if lower == "mysql/data" || lower.starts_with("mysql/data-")
|
||||||
|
|| lower.split('/').any(|part| part == ".state")
|
||||||
|
|| lower == "bugreport/reports" || lower == "core/logs" || lower == "mysql/logs" { continue; }
|
||||||
|
let metadata = fs::symlink_metadata(&raw)?;
|
||||||
|
reject_link(&metadata)?;
|
||||||
|
let path = fsx::ensure_within(root, &raw)?;
|
||||||
|
if metadata.is_dir() { directories.push(path); }
|
||||||
|
else if metadata.is_file() { files.insert(relative, fsx::sha256_file(&path)?); }
|
||||||
|
else { return Err(Error::Invalid("Unsupported rehearsal file.".into())); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
copy_verified(root, &destination, &files)?;
|
||||||
|
copy_snapshot(point, snapshot, &destination.join("mysql/data"))?;
|
||||||
|
let (_, mut installed) = crate::registry::MetaDir::open(meta)?;
|
||||||
|
installed.id = uuid::Uuid::new_v4().to_string();
|
||||||
|
installed.server_path = destination.to_string_lossy().into_owned();
|
||||||
|
installed.client_path = None;
|
||||||
|
crate::registry::MetaDir::create(&destination, &installed)?;
|
||||||
|
Ok(destination)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn isolate_connections(root: &Path) -> Result<()> {
|
||||||
|
for relative in ["Settings/worldserver.conf.template", "Settings/authserver.conf.template", "Core/configs/worldserver.conf", "Core/configs/authserver.conf"] {
|
||||||
|
let path = fsx::ensure_within(root, &root.join(relative))?;
|
||||||
|
if !path.is_file() {
|
||||||
|
if relative.ends_with(".template") { return Err(Error::Invalid("The private update copy lacks connection templates.".into())); }
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let mut config = crate::config::parser::ConfFile::parse_bytes(&fs::read(&path)?)?;
|
||||||
|
for key in ["LoginDatabaseInfo", "WorldDatabaseInfo", "CharacterDatabaseInfo"] {
|
||||||
|
if relative.contains("worldserver") || key == "LoginDatabaseInfo" {
|
||||||
|
config.set(key, &format!("\"@{key}@\""), &[]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
config.set("BindIP", "\"127.0.0.1\"", &[]);
|
||||||
|
if relative.contains("worldserver") {
|
||||||
|
config.set("Ra.IP", "\"127.0.0.1\"", &[]);
|
||||||
|
config.set("DataDir", "\"@DATA@\"", &[]);
|
||||||
|
}
|
||||||
|
fsx::atomic_write(&path, config.to_text().as_bytes())?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn unchanged(root: &Path, snapshot: &Snapshot) -> Result<()> {
|
||||||
|
let data = fsx::ensure_within(root, &root.join("mysql/data"))?;
|
||||||
|
if inventory(&data)? != snapshot.files || directories(&data)? != snapshot.directories {
|
||||||
|
return Err(Error::Invalid("The installed database changed during the private rehearsal. Retry after stopping other database access.".into()));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn validate_connections(templates: &Path, installation: &Path) -> Result<()> {
|
||||||
|
let port = crate::layout::read_ports(installation).mysql.to_string();
|
||||||
|
let (_, password) = crate::db::credentials(installation)?;
|
||||||
|
let realm = crate::realms::state(installation)?.active;
|
||||||
|
for relative in ["Settings/worldserver.conf.template", "Settings/authserver.conf.template"] {
|
||||||
|
let path = fsx::ensure_within(templates, &templates.join(relative))?;
|
||||||
|
let config = crate::config::parser::ConfFile::parse_bytes(&fs::read(path)?)?;
|
||||||
|
for (key, kind) in [("LoginDatabaseInfo", "auth"), ("WorldDatabaseInfo", "world"), ("CharacterDatabaseInfo", "characters")] {
|
||||||
|
if relative.contains("authserver") && kind != "auth" { continue; }
|
||||||
|
let value = config.get(key).ok_or_else(|| Error::Invalid(format!("The update cannot isolate the missing {key} connection.")))?.trim().trim_matches('"');
|
||||||
|
if value == format!("@{key}@") { continue; }
|
||||||
|
let fields: Vec<_> = value.split(';').collect();
|
||||||
|
if fields.len() != 5 || !matches!(fields[0], "127.0.0.1" | "localhost") || fields[1] != port || fields[2] != "acore" || fields[3] != password || fields[4] != realm.schema(kind)? {
|
||||||
|
return Err(Error::Invalid(format!("The {key} connection does not use this repack's bundled database. A private update cannot safely qualify an external database.")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
// Keep the replaced data directory. If interrupted between renames, a retry can install a new verified copy.
|
||||||
|
pub(crate) fn swap(root: &Path, meta: &Path, point: &Path, snapshot: &Snapshot, fail_after_move: bool) -> Result<PathBuf> {
|
||||||
|
verify(point, snapshot)?;
|
||||||
|
if fsx::sha256_file(&root.join("mysql/bin/mysqld.exe"))? != snapshot.server_sha256 {
|
||||||
|
return Err(Error::Invalid("The MySQL executable differs from the recovery point.".into()));
|
||||||
|
}
|
||||||
|
let mysql = fsx::ensure_within(root, &root.join("mysql"))?;
|
||||||
|
let token = uuid::Uuid::new_v4().simple().to_string();
|
||||||
|
let staging = fsx::ensure_within(&mysql, &mysql.join(format!("data-restore-{token}")))?;
|
||||||
|
let previous = fsx::ensure_within(&mysql, &mysql.join(format!("data-before-restore-{token}")))?;
|
||||||
|
let live = fsx::ensure_within(&mysql, &mysql.join("data"))?;
|
||||||
|
copy_snapshot(point, snapshot, &staging)?;
|
||||||
|
let journal = meta.join("diagnostics").join(format!("database-restore-{token}.json"));
|
||||||
|
fsx::atomic_write_json(&journal, &serde_json::json!({"schema":1,"state":"prepared","previous":previous,"staging":staging}))?;
|
||||||
|
if live.exists() { fs::rename(&live, &previous)?; }
|
||||||
|
if fail_after_move { return Err(Error::Invalid("Simulated interruption after saving the previous MySQL directory.".into())); }
|
||||||
|
fs::rename(&staging, &live)?;
|
||||||
|
fsx::atomic_write_json(&journal, &serde_json::json!({"schema":1,"state":"restored","previous":previous}))?;
|
||||||
|
Ok(previous)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
#[cfg(windows)]
|
||||||
|
#[test]
|
||||||
|
#[ignore = "requires COA_MYSQL_TEST_BIN pointing to the bundled MySQL tools"]
|
||||||
|
fn real_mysql_restores_objects_users_rows_and_missing_defaults() {
|
||||||
|
use std::process::{Child, Command, Stdio};
|
||||||
|
use std::os::windows::process::CommandExt;
|
||||||
|
struct Server(Child);
|
||||||
|
impl Drop for Server { fn drop(&mut self) { let _ = self.0.kill(); let _ = self.0.wait(); } }
|
||||||
|
let bin = PathBuf::from(std::env::var("COA_MYSQL_TEST_BIN").unwrap());
|
||||||
|
let temp = tempfile::tempdir().unwrap();
|
||||||
|
let root = temp.path().join("server");
|
||||||
|
let meta = temp.path().join("metadata");
|
||||||
|
let point = temp.path().join("point");
|
||||||
|
copy_verified(&bin, &root.join("mysql/bin"), &inventory(&bin).unwrap()).unwrap();
|
||||||
|
let data = root.join("mysql/data");
|
||||||
|
let executable = root.join("mysql/bin/mysqld.exe");
|
||||||
|
let initialized = Command::new(&executable).args(["--no-defaults", "--initialize-insecure"])
|
||||||
|
.arg(format!("--datadir={}", data.display())).creation_flags(0x0800_0000).output().unwrap();
|
||||||
|
assert!(initialized.status.success(), "{}", String::from_utf8_lossy(&initialized.stderr));
|
||||||
|
let port = crate::install::free_port().unwrap();
|
||||||
|
fsx::atomic_write_json(&root.join("Settings/repack.json"), &serde_json::json!({"mysqlPort":port})).unwrap();
|
||||||
|
fsx::atomic_write_json(&root.join("Settings/database.json"), &serde_json::json!({"rootPassword":"","appPassword":""})).unwrap();
|
||||||
|
let db = crate::db::Db::from_repack(&root, crate::db::Account::Admin).unwrap();
|
||||||
|
let start = || {
|
||||||
|
let server = Server(Command::new(&executable).args(["--no-defaults", "--bind-address=127.0.0.1", "--mysqlx=0", "--skip-log-bin"])
|
||||||
|
.arg(format!("--datadir={}", data.display())).arg(format!("--port={port}"))
|
||||||
|
.arg(format!("--log-error={}", root.join("mysql-test.log").display()))
|
||||||
|
.stdout(Stdio::null()).stderr(Stdio::null()).creation_flags(0x0800_0000).spawn().unwrap());
|
||||||
|
let deadline = std::time::Instant::now() + std::time::Duration::from_secs(60);
|
||||||
|
while !db.ping() { assert!(std::time::Instant::now() < deadline, "{}", fs::read_to_string(root.join("mysql-test.log")).unwrap_or_default()); std::thread::sleep(std::time::Duration::from_millis(200)); }
|
||||||
|
server
|
||||||
|
};
|
||||||
|
let mut server = start();
|
||||||
|
db.query("CREATE DATABASE acore_characters; CREATE DATABASE acore_world; CREATE DATABASE acore_auth; CREATE TABLE acore_characters.probe(id INT PRIMARY KEY, note VARCHAR(40)); CREATE TABLE acore_world.probe(id INT NOT NULL DEFAULT 0); INSERT INTO acore_world.probe VALUES(43); CREATE TABLE acore_auth.probe(id INT); INSERT INTO acore_auth.probe VALUES(44); CREATE USER 'fixture_user'@'localhost' IDENTIFIED BY 'fixture'; CREATE TRIGGER acore_characters.probe_insert BEFORE INSERT ON acore_characters.probe FOR EACH ROW SET NEW.note='triggered'; INSERT INTO acore_characters.probe VALUES(42,'original'); CREATE VIEW acore_characters.probe_view AS SELECT c.id,w.id AS world_id FROM acore_characters.probe c CROSS JOIN acore_world.probe w; CREATE PROCEDURE acore_characters.probe_proc() SELECT id FROM acore_characters.probe; CREATE FUNCTION acore_characters.probe_func() RETURNS INT DETERMINISTIC RETURN 73;").unwrap();
|
||||||
|
assert_eq!(db.recovery_objects("acore_characters").unwrap().len(), 4);
|
||||||
|
crate::schema_check::capture(&db, &root).unwrap();
|
||||||
|
let hash = fsx::sha256_file(&root.join(crate::schema_check::CONTRACT)).unwrap();
|
||||||
|
db.query("ALTER TABLE acore_world.probe ALTER COLUMN id DROP DEFAULT;").unwrap();
|
||||||
|
crate::schema_check::repair_missing_defaults(&db, &root, Some(&hash)).unwrap();
|
||||||
|
assert_eq!(db.query("SELECT COLUMN_DEFAULT FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='acore_world' AND TABLE_NAME='probe' AND COLUMN_NAME='id';").unwrap(), "0");
|
||||||
|
assert_eq!(db.query("SELECT id FROM acore_world.probe;").unwrap(), "43");
|
||||||
|
db.query("ALTER TABLE acore_world.probe ALTER COLUMN id SET DEFAULT 99;").unwrap();
|
||||||
|
crate::schema_check::repair_missing_defaults(&db, &root, Some(&hash)).unwrap();
|
||||||
|
assert_eq!(db.query("SELECT COLUMN_DEFAULT FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='acore_world' AND TABLE_NAME='probe' AND COLUMN_NAME='id';").unwrap(), "99");
|
||||||
|
db.query("SHUTDOWN;").unwrap(); server.0.wait().unwrap();
|
||||||
|
let files = inventory(&data).unwrap();
|
||||||
|
copy_verified(&data, &point.join("mysql-data"), &files).unwrap();
|
||||||
|
let expanded_bytes = files.keys().map(|name| fs::metadata(data.join(name)).unwrap().len()).sum();
|
||||||
|
let mut snapshot = Snapshot {path:"mysql-data".into(), files, directories:directories(&data).unwrap(), server_sha256:fsx::sha256_file(&executable).unwrap(), bytes:0, expanded_bytes, archive_sha256:None};
|
||||||
|
for directory in &snapshot.directories { fs::create_dir_all(point.join("mysql-data").join(directory)).unwrap(); }
|
||||||
|
compress(&data, &point, &mut snapshot).unwrap();
|
||||||
|
let mut changed = start();
|
||||||
|
db.query("DROP VIEW acore_characters.probe_view; DROP TRIGGER acore_characters.probe_insert; DROP PROCEDURE acore_characters.probe_proc; DROP FUNCTION acore_characters.probe_func; DELETE FROM acore_characters.probe; DROP USER 'fixture_user'@'localhost';").unwrap();
|
||||||
|
db.query("SHUTDOWN;").unwrap(); changed.0.wait().unwrap();
|
||||||
|
swap(&root, &meta, &point, &snapshot, false).unwrap();
|
||||||
|
let mut restored = start();
|
||||||
|
assert_eq!(db.recovery_objects("acore_characters").unwrap().len(), 4);
|
||||||
|
assert_eq!(db.query("SELECT * FROM acore_characters.probe_view; CALL acore_characters.probe_proc(); SELECT acore_characters.probe_func(); SELECT COUNT(*) FROM mysql.user WHERE user='fixture_user';").unwrap().replace("\r\n", "\n"), "42\t43\n42\n73\n1");
|
||||||
|
db.query("INSERT INTO acore_characters.probe VALUES(45,'check');").unwrap();
|
||||||
|
assert_eq!(db.query("SELECT note FROM acore_characters.probe WHERE id=45;").unwrap(), "triggered");
|
||||||
|
db.query("SHUTDOWN;").unwrap(); restored.0.wait().unwrap();
|
||||||
|
}
|
||||||
|
fn fixture() -> (tempfile::TempDir, PathBuf, PathBuf, PathBuf, Snapshot) {
|
||||||
|
let temp = tempfile::tempdir().unwrap();
|
||||||
|
let root = temp.path().join("server");
|
||||||
|
let meta = temp.path().join("metadata");
|
||||||
|
let point = temp.path().join("point");
|
||||||
|
fsx::atomic_write(&root.join("mysql/bin/mysqld.exe"), b"same-engine").unwrap();
|
||||||
|
fsx::atomic_write(&root.join("mysql/data/characters.ibd"), b"live").unwrap();
|
||||||
|
fsx::atomic_write(&point.join("mysql-data/characters.ibd"), b"saved").unwrap();
|
||||||
|
fs::create_dir_all(point.join("mysql-data/empty_schema")).unwrap();
|
||||||
|
let snapshot = Snapshot { path:"mysql-data".into(), files:inventory(&point.join("mysql-data")).unwrap(), directories:directories(&point.join("mysql-data")).unwrap(), server_sha256:fsx::sha256_file(&root.join("mysql/bin/mysqld.exe")).unwrap(), bytes:5, expanded_bytes:5, archive_sha256:None };
|
||||||
|
(temp, root, meta, point, snapshot)
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn interrupted_directory_swap_is_recoverable_and_keeps_previous_bytes() {
|
||||||
|
let (_temp, root, meta, point, snapshot) = fixture();
|
||||||
|
assert!(swap(&root, &meta, &point, &snapshot, true).is_err());
|
||||||
|
assert!(!root.join("mysql/data").exists());
|
||||||
|
let old = fs::read_dir(root.join("mysql")).unwrap().flatten().find(|e| e.file_name().to_string_lossy().starts_with("data-before-")).unwrap().path();
|
||||||
|
assert_eq!(fs::read(old.join("characters.ibd")).unwrap(), b"live");
|
||||||
|
swap(&root, &meta, &point, &snapshot, false).unwrap();
|
||||||
|
assert_eq!(fs::read(root.join("mysql/data/characters.ibd")).unwrap(), b"saved");
|
||||||
|
assert!(root.join("mysql/data/empty_schema").is_dir());
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn corrupt_or_different_engine_snapshots_do_not_move_live_data() {
|
||||||
|
let (_temp, root, meta, point, snapshot) = fixture();
|
||||||
|
fsx::atomic_write(&point.join("mysql-data/characters.ibd"), b"corrupt").unwrap();
|
||||||
|
assert!(swap(&root, &meta, &point, &snapshot, false).is_err());
|
||||||
|
assert_eq!(fs::read(root.join("mysql/data/characters.ibd")).unwrap(), b"live");
|
||||||
|
fsx::atomic_write(&point.join("mysql-data/characters.ibd"), b"saved").unwrap();
|
||||||
|
fsx::atomic_write(&root.join("mysql/bin/mysqld.exe"), b"new-engine").unwrap();
|
||||||
|
assert!(swap(&root, &meta, &point, &snapshot, false).is_err());
|
||||||
|
assert_eq!(fs::read(root.join("mysql/data/characters.ibd")).unwrap(), b"live");
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn compressed_snapshots_verify_every_file_and_reject_unlisted_entries() {
|
||||||
|
let (_temp, root, meta, point, mut snapshot) = fixture();
|
||||||
|
let source = point.join("mysql-data");
|
||||||
|
compress(&source, &point, &mut snapshot).unwrap();
|
||||||
|
assert!(snapshot.archive_sha256.is_some());
|
||||||
|
swap(&root, &meta, &point, &snapshot, false).unwrap();
|
||||||
|
assert_eq!(fs::read(root.join("mysql/data/characters.ibd")).unwrap(), b"saved");
|
||||||
|
fsx::atomic_write(&root.join("mysql/data/characters.ibd"), b"preserve").unwrap();
|
||||||
|
let archive_path = point.join(&snapshot.path);
|
||||||
|
let encoder = zstd::Encoder::new(fs::File::create(&archive_path).unwrap(), 3).unwrap();
|
||||||
|
let mut archive = tar::Builder::new(encoder);
|
||||||
|
archive.append_file("unlisted.ibd", &mut fs::File::open(source.join("characters.ibd")).unwrap()).unwrap();
|
||||||
|
archive.into_inner().unwrap().finish().unwrap();
|
||||||
|
snapshot.archive_sha256 = Some(fsx::sha256_file(&archive_path).unwrap());
|
||||||
|
assert!(swap(&root, &meta, &point, &snapshot, false).is_err());
|
||||||
|
assert_eq!(fs::read(root.join("mysql/data/characters.ibd")).unwrap(), b"preserve");
|
||||||
|
fsx::atomic_write(&archive_path, b"damaged").unwrap();
|
||||||
|
assert!(verify(&point, &snapshot).is_err());
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn private_rehearsals_reject_external_database_connections() {
|
||||||
|
let (_temp, root, _meta, _point, _snapshot) = fixture();
|
||||||
|
fsx::atomic_write_json(&root.join("Settings/repack.json"), &serde_json::json!({"mysqlPort":3307})).unwrap();
|
||||||
|
fsx::atomic_write_json(&root.join("Settings/database.json"), &serde_json::json!({"rootPassword":"test-root","appPassword":"test-app"})).unwrap();
|
||||||
|
fsx::atomic_write(&root.join("Settings/worldserver.conf.template"), b"LoginDatabaseInfo = \"@LoginDatabaseInfo@\"\nWorldDatabaseInfo = \"@WorldDatabaseInfo@\"\nCharacterDatabaseInfo = \"@CharacterDatabaseInfo@\"\n").unwrap();
|
||||||
|
fsx::atomic_write(&root.join("Settings/authserver.conf.template"), b"LoginDatabaseInfo = \"127.0.0.1;3307;acore;test-app;acore_auth\"\n").unwrap();
|
||||||
|
validate_connections(&root, &root).unwrap();
|
||||||
|
fsx::atomic_write(&root.join("Settings/authserver.conf.template"), b"LoginDatabaseInfo = \"192.0.2.1;3307;acore;test-app;acore_auth\"\n").unwrap();
|
||||||
|
let error = validate_connections(&root, &root).unwrap_err().to_string();
|
||||||
|
assert!(error.contains("external database"));
|
||||||
|
assert!(!error.contains("test-app"));
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn a_changed_live_database_invalidates_the_rehearsal() {
|
||||||
|
let (_temp, root, _meta, _point, snapshot) = fixture();
|
||||||
|
assert!(unchanged(&root, &snapshot).is_err());
|
||||||
|
fsx::atomic_write(&root.join("mysql/data/characters.ibd"), b"saved").unwrap();
|
||||||
|
fs::create_dir_all(root.join("mysql/data/empty_schema")).unwrap();
|
||||||
|
unchanged(&root, &snapshot).unwrap();
|
||||||
|
fsx::atomic_write(&root.join("mysql/data/extra.ibd"), b"new data").unwrap();
|
||||||
|
assert!(unchanged(&root, &snapshot).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn rehearsal_copy_succeeds_with_nested_directories_and_unnormalized_root() {
|
||||||
|
let (_temp, root, meta, point, snapshot) = fixture();
|
||||||
|
let meta_obj = crate::registry::InstallMeta::new(crate::registry::InstallKind::New, &root);
|
||||||
|
fsx::atomic_write_json(&meta.join("install.json"), &meta_obj).unwrap();
|
||||||
|
fsx::atomic_write(&root.join("Core/worldserver.exe"), b"exe").unwrap();
|
||||||
|
fsx::atomic_write(&root.join("Core/configs/worldserver.conf"), b"conf").unwrap();
|
||||||
|
fsx::atomic_write(&root.join("Settings/repack.json"), b"{}").unwrap();
|
||||||
|
let dest = rehearsal_copy(&root, &meta, &point, &snapshot).unwrap();
|
||||||
|
assert_eq!(fs::read(dest.join("Core/configs/worldserver.conf")).unwrap(), b"conf");
|
||||||
|
assert_eq!(fs::read(dest.join("mysql/data/characters.ibd")).unwrap(), b"saved");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -217,6 +217,7 @@ pub fn build(src: &Path, out: &Path, opts: &BuildOptions, progress: &dyn Fn(&str
|
|||||||
split.close_current()?;
|
split.close_current()?;
|
||||||
|
|
||||||
let manifest = Manifest {
|
let manifest = Manifest {
|
||||||
|
compatibility: None,
|
||||||
schema: crate::manifest::SCHEMA,
|
schema: crate::manifest::SCHEMA,
|
||||||
kind: opts.kind,
|
kind: opts.kind,
|
||||||
version: opts.version.clone(),
|
version: opts.version.clone(),
|
||||||
@@ -503,6 +504,7 @@ mod tests {
|
|||||||
fs::write(d.path().join(name), &bytes).unwrap();
|
fs::write(d.path().join(name), &bytes).unwrap();
|
||||||
let ok_sha = fsx::sha256_bytes(b"data");
|
let ok_sha = fsx::sha256_bytes(b"data");
|
||||||
let m = Manifest {
|
let m = Manifest {
|
||||||
|
compatibility: None,
|
||||||
schema: 1,
|
schema: 1,
|
||||||
kind: Kind::Base,
|
kind: Kind::Base,
|
||||||
version: "0.1.0".into(),
|
version: "0.1.0".into(),
|
||||||
|
|||||||
@@ -44,8 +44,17 @@ fn introduction_rank(repo: &Path, pathspecs: &[&str]) -> std::collections::HashM
|
|||||||
rank
|
rank
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Every SQL script of a core checkout (released + pending updates, module base and update scripts), in application order.
|
/// Incremental SQL of a core checkout. Installation-only module bases must never be replayed on a live database.
|
||||||
pub fn collect_core_sql(core: &Path) -> Result<Vec<SqlFile>> {
|
pub fn collect_core_sql(core: &Path) -> Result<Vec<SqlFile>> {
|
||||||
|
collect_core_sql_mode(core, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A clean installation also needs the module tables and initial seed data.
|
||||||
|
pub fn collect_core_install_sql(core: &Path) -> Result<Vec<SqlFile>> {
|
||||||
|
collect_core_sql_mode(core, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn collect_core_sql_mode(core: &Path, include_base: bool) -> Result<Vec<SqlFile>> {
|
||||||
let mut out = Vec::new();
|
let mut out = Vec::new();
|
||||||
let mut push = |db: &str, id: String, abs: PathBuf, origin: String| -> Result<()> {
|
let mut push = |db: &str, id: String, abs: PathBuf, origin: String| -> Result<()> {
|
||||||
let sha256 = fsx::sha256_file(&abs)?;
|
let sha256 = fsx::sha256_file(&abs)?;
|
||||||
@@ -69,7 +78,7 @@ pub fn collect_core_sql(core: &Path) -> Result<Vec<SqlFile>> {
|
|||||||
let mname = name.replace('-', "_");
|
let mname = name.replace('-', "_");
|
||||||
for kind in ["auth", "characters", "world"] {
|
for kind in ["auth", "characters", "world"] {
|
||||||
let base = m.path().join(format!("data/sql/db-{kind}"));
|
let base = m.path().join(format!("data/sql/db-{kind}"));
|
||||||
for f in sql_in(&base.join("base")) {
|
for f in if include_base { sql_in(&base.join("base")) } else { vec![] } {
|
||||||
let stem = f.file_stem().unwrap().to_string_lossy().into_owned();
|
let stem = f.file_stem().unwrap().to_string_lossy().into_owned();
|
||||||
let rel = format!("modules/{name}/data/sql/db-{kind}/base/{}", f.file_name().unwrap().to_string_lossy());
|
let rel = format!("modules/{name}/data/sql/db-{kind}/base/{}", f.file_name().unwrap().to_string_lossy());
|
||||||
push(kind, format!("mod_{mname}__base__{stem}"), f, rel)?;
|
push(kind, format!("mod_{mname}__base__{stem}"), f, rel)?;
|
||||||
@@ -144,6 +153,9 @@ fn walk(root: &Path, dir: &Path, out: &mut Vec<String>) -> Result<()> {
|
|||||||
|
|
||||||
/// Build a cumulative update: every file of `tree` that differs from the base, plus every SQL script. Unsigned.
|
/// Build a cumulative update: every file of `tree` that differs from the base, plus every SQL script. Unsigned.
|
||||||
pub fn pack_update(p: &UpdateParams, progress: &dyn Fn(&str)) -> Result<Manifest> {
|
pub fn pack_update(p: &UpdateParams, progress: &dyn Fn(&str)) -> Result<Manifest> {
|
||||||
|
if let Some(file) = p.sql.iter().find(|file| file.id.starts_with("mod_") && file.id.contains("__base__")) {
|
||||||
|
return Err(Error::Invalid(format!("Module installation SQL {} cannot be included in an update package.", file.id)));
|
||||||
|
}
|
||||||
let base: BTreeMap<String, &str> = p.base_manifest.files.iter().map(|f| (f.path.to_lowercase(), f.sha256.as_str())).collect();
|
let base: BTreeMap<String, &str> = p.base_manifest.files.iter().map(|f| (f.path.to_lowercase(), f.sha256.as_str())).collect();
|
||||||
let work = p.out.with_file_name(format!("{}-staging", p.out.file_name().unwrap().to_string_lossy()));
|
let work = p.out.with_file_name(format!("{}-staging", p.out.file_name().unwrap().to_string_lossy()));
|
||||||
let _ = fs::remove_dir_all(&work);
|
let _ = fs::remove_dir_all(&work);
|
||||||
@@ -218,7 +230,7 @@ mod tests {
|
|||||||
write(c, "data/sql/updates/db_characters/2026_01_02_00.sql", "SELECT 3;");
|
write(c, "data/sql/updates/db_characters/2026_01_02_00.sql", "SELECT 3;");
|
||||||
write(c, "modules/mod-x/data/sql/db-world/base/01_a.sql", "SELECT 4;");
|
write(c, "modules/mod-x/data/sql/db-world/base/01_a.sql", "SELECT 4;");
|
||||||
write(c, "modules/mod-x/data/sql/db-world/2026_02_02_00_b.sql", "SELECT 5;");
|
write(c, "modules/mod-x/data/sql/db-world/2026_02_02_00_b.sql", "SELECT 5;");
|
||||||
let v = collect_core_sql(c).unwrap();
|
let v = collect_core_install_sql(c).unwrap();
|
||||||
let ids: Vec<(&str, &str)> = v.iter().map(|f| (f.db.as_str(), f.id.as_str())).collect();
|
let ids: Vec<(&str, &str)> = v.iter().map(|f| (f.db.as_str(), f.id.as_str())).collect();
|
||||||
assert!(ids.contains(&("world", "2026_01_01_00")) && ids.contains(&("world", "rev_1")) && ids.contains(&("characters", "2026_01_02_00")));
|
assert!(ids.contains(&("world", "2026_01_01_00")) && ids.contains(&("world", "rev_1")) && ids.contains(&("characters", "2026_01_02_00")));
|
||||||
assert!(ids.contains(&("world", "mod_mod_x__base__01_a")) && ids.contains(&("world", "mod_mod_x__2026_02_02_00_b")));
|
assert!(ids.contains(&("world", "mod_mod_x__base__01_a")) && ids.contains(&("world", "mod_mod_x__2026_02_02_00_b")));
|
||||||
@@ -226,6 +238,27 @@ mod tests {
|
|||||||
let base_pos = ids.iter().position(|x| x.1 == "mod_mod_x__base__01_a").unwrap();
|
let base_pos = ids.iter().position(|x| x.1 == "mod_mod_x__base__01_a").unwrap();
|
||||||
let upd_pos = ids.iter().position(|x| x.1 == "mod_mod_x__2026_02_02_00_b").unwrap();
|
let upd_pos = ids.iter().position(|x| x.1 == "mod_mod_x__2026_02_02_00_b").unwrap();
|
||||||
assert!(base_pos < upd_pos, "a module's base script precedes its updates");
|
assert!(base_pos < upd_pos, "a module's base script precedes its updates");
|
||||||
|
let updates = collect_core_sql(c).unwrap();
|
||||||
|
assert!(!updates.iter().any(|f| f.id.contains("__base__")));
|
||||||
|
assert!(updates.iter().any(|f| f.id == "mod_mod_x__2026_02_02_00_b"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn update_packaging_rejects_module_seed_sql_before_creating_output() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let base: Manifest = serde_json::from_value(serde_json::json!({
|
||||||
|
"schema": 1, "kind": "base", "version": "1.0.0", "core": {"commit": null},
|
||||||
|
"builtAt": "test", "minManagerVersion": "0.1.0", "files": []
|
||||||
|
})).unwrap();
|
||||||
|
let out = d.path().join("out");
|
||||||
|
let sql = vec![SqlFile { db: "world".into(), id: "mod_mod_raid__base__03_boss_schedule".into(),
|
||||||
|
origin: "modules/mod-raid/data/sql/db-world/base/03_boss_schedule.sql".into(),
|
||||||
|
abs: d.path().join("seed.sql"), sha256: "a".repeat(64) }];
|
||||||
|
let result = pack_update(&UpdateParams { tree: d.path(), base_manifest: &base, sql: &sql,
|
||||||
|
out: &out, version: "1.1.0".into(), core_commit: None, bots_commit: None, part_size: 1024 }, &|_| {});
|
||||||
|
assert!(result.unwrap_err().to_string().contains("installation SQL"));
|
||||||
|
assert!(!out.exists());
|
||||||
|
assert!(!d.path().join("out-staging").exists());
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|||||||
@@ -5,6 +5,90 @@ use crate::{backup, fsx, install, manifest::{Kind, Migration}, migrations, packa
|
|||||||
|
|
||||||
const MARKER: &str = ".release-schema-fixture";
|
const MARKER: &str = ".release-schema-fixture";
|
||||||
|
|
||||||
|
struct QualificationEnv<'a>(crate::update::RepackEnv<'a>);
|
||||||
|
|
||||||
|
impl crate::update::Env for QualificationEnv<'_> {
|
||||||
|
fn activate(&self) -> Result<()> { Ok(()) }
|
||||||
|
fn ensure_stopped(&self) -> Result<()> { self.0.ensure_stopped() }
|
||||||
|
fn preflight(&self, manifest: &crate::manifest::Manifest) -> Result<()> { self.0.preflight(manifest) }
|
||||||
|
fn snapshot(&self) -> Result<String> { self.0.snapshot() }
|
||||||
|
fn verify_snapshot(&self, id: &str) -> Result<()> { self.0.verify_snapshot(id) }
|
||||||
|
fn rehearse(&self, manifest: &crate::manifest::Manifest, tree: &Path, items: &[crate::update::PlanItem], point: &str) -> Result<()> { self.0.rehearse(manifest, tree, items, point) }
|
||||||
|
fn restore_snapshot(&self, id: &str) -> Result<()> { self.0.restore_snapshot(id) }
|
||||||
|
fn migrate(&self, manifest: &crate::manifest::Manifest, staged: &Path) -> Result<crate::migrations::ApplyReport> { self.0.migrate(manifest, staged) }
|
||||||
|
fn validate(&self) -> Result<()> { self.0.validate() }
|
||||||
|
fn validate_recovery(&self) -> Result<()> { self.0.validate_recovery() }
|
||||||
|
fn recover_validation(&self) -> Result<()> { self.0.recover_validation() }
|
||||||
|
fn automatic_rollback(&self) -> bool { true }
|
||||||
|
// Health checks use the normal private validation; qualification never opens game ports after commit.
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn qualify_upgrade(base: &Path, source: &Path, candidate: &Path, fixture: &Path, trusted_key: &str) -> Result<serde_json::Value> {
|
||||||
|
use crate::update::Env;
|
||||||
|
if !cfg!(windows) { return Err(Error::Invalid("Manager upgrade qualification requires a Windows fixture.".into())); }
|
||||||
|
if fixture.exists() || !fixture.file_name().is_some_and(|name| name.to_string_lossy().starts_with("coa-schema-fixture-")) {
|
||||||
|
return Err(Error::Invalid("Upgrade qualification requires a new disposable coa-schema-fixture-* directory.".into()));
|
||||||
|
}
|
||||||
|
let fixture_root = std::path::absolute(fixture)?;
|
||||||
|
let fixture = fixture_root.as_path();
|
||||||
|
let base_root = fsx::canonicalize_lenient(base)?;
|
||||||
|
let base = base_root.as_path();
|
||||||
|
let source_root = fsx::canonicalize_lenient(source)?;
|
||||||
|
let source = source_root.as_path();
|
||||||
|
let candidate_root = fsx::canonicalize_lenient(candidate)?;
|
||||||
|
let candidate = candidate_root.as_path();
|
||||||
|
let metadata = crate::registry::metadata_dir_for(fixture)?;
|
||||||
|
if metadata.exists() { return Err(Error::Invalid("Upgrade fixture metadata already exists.".into())); }
|
||||||
|
let (base_manifest, base_bytes) = pkgsource::fetch_manifest(&pkgsource::Source::Dir(base.into()), trusted_key)?;
|
||||||
|
let (source_manifest, source_bytes) = pkgsource::fetch_manifest(&pkgsource::Source::Dir(source.into()), trusted_key)?;
|
||||||
|
let (candidate_manifest, _) = pkgsource::fetch_manifest(&pkgsource::Source::Dir(candidate.into()), trusted_key)?;
|
||||||
|
if candidate_manifest.kind != Kind::Update || !matches!(source_manifest.kind, Kind::Base | Kind::Update)
|
||||||
|
|| (source_manifest.kind == Kind::Base && fsx::sha256_bytes(&base_bytes) != fsx::sha256_bytes(&source_bytes)) {
|
||||||
|
return Err(Error::Invalid("Invalid source or candidate package for upgrade qualification.".into()));
|
||||||
|
}
|
||||||
|
extract_base(base, fixture, trusted_key)?;
|
||||||
|
package::extract_selected(base, &base_manifest, fixture, &|path| path.starts_with("Data/"), &|_, _| {})?;
|
||||||
|
let mut meta = crate::registry::InstallMeta::new(crate::registry::InstallKind::New, fixture);
|
||||||
|
meta.core.version = Some(base_manifest.version.clone());
|
||||||
|
meta.core.commit = base_manifest.core.commit.clone();
|
||||||
|
meta.original_hashes = base_manifest.files.iter().map(|file| (file.path.clone(), file.sha256.clone())).collect();
|
||||||
|
crate::registry::MetaDir::create(fixture, &meta)?;
|
||||||
|
let env = QualificationEnv(crate::update::RepackEnv { root: fixture, meta_dir: &metadata });
|
||||||
|
let apply = |package: &Path| -> Result<()> {
|
||||||
|
let outcome = crate::update::apply(&crate::update::Params {
|
||||||
|
root: fixture, meta_dir: &metadata, source: pkgsource::Source::Dir(package.into()),
|
||||||
|
trusted_key, cancel: crate::download::Cancel::default(), resolutions: Default::default(),
|
||||||
|
env: &env, fail_after_ops: None,
|
||||||
|
}, &|_, _| {})?;
|
||||||
|
if outcome.txn.state != crate::update::State::Committed {
|
||||||
|
return Err(Error::Invalid("Upgrade qualification did not commit.".into()));
|
||||||
|
}
|
||||||
|
env.ensure_stopped()
|
||||||
|
};
|
||||||
|
install::with_scratch_ports(fixture, || {
|
||||||
|
if source_manifest.kind == Kind::Update { apply(source)?; }
|
||||||
|
let user_file = fixture.join("Core/configs/coa-qualification-user.conf");
|
||||||
|
let user_bytes = b"Qualification.UserSetting = 7391\r\n";
|
||||||
|
fsx::atomic_write(&user_file, user_bytes)?;
|
||||||
|
apply(candidate)?;
|
||||||
|
if std::fs::read(&user_file)?.as_slice() != user_bytes {
|
||||||
|
return Err(Error::Invalid("The update changed a user configuration file.".into()));
|
||||||
|
}
|
||||||
|
let (_, installed) = crate::registry::MetaDir::open(&metadata)?;
|
||||||
|
if installed.core.version.as_deref() != Some(candidate_manifest.version.as_str())
|
||||||
|
|| crate::update_isolation::pending(&metadata) || crate::update::pending_checked(&metadata)?.is_some() {
|
||||||
|
return Err(Error::Invalid("The update left inconsistent metadata or an unfinished transaction.".into()));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
})?;
|
||||||
|
Ok(serde_json::json!({
|
||||||
|
"schema": 1, "result": "passed", "fromVersion": source_manifest.version,
|
||||||
|
"toVersion": candidate_manifest.version, "fromManifestSha256": fsx::sha256_bytes(&source_bytes),
|
||||||
|
"fromSchemaSha256": source_manifest.files.iter().find(|file| file.path == schema_check::CONTRACT).map(|file| &file.sha256),
|
||||||
|
"checks": ["manager-transaction", "private-user-database-rehearsal", "database-schema", "private-auth-world-startup", "existing-identities", "user-file-preservation"],
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
pub fn collect(core: &Path, bots: Option<&Path>, repairs: Option<&Path>) -> Result<Vec<SqlFile>> {
|
pub fn collect(core: &Path, bots: Option<&Path>, repairs: Option<&Path>) -> Result<Vec<SqlFile>> {
|
||||||
let mut files = release::collect_core_sql(core)?;
|
let mut files = release::collect_core_sql(core)?;
|
||||||
if let Some(bots) = bots { files.extend(release::collect_bots_sql(bots)?); }
|
if let Some(bots) = bots { files.extend(release::collect_bots_sql(bots)?); }
|
||||||
@@ -72,6 +156,69 @@ pub fn capture_release(fixture: &Path, tree: &Path, sql: &[SqlFile]) -> Result<(
|
|||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn validate_startup(fixture: &Path, tree: &Path, base: &Path, trusted_key: &str) -> Result<()> {
|
||||||
|
use crate::update::Env;
|
||||||
|
if !cfg!(windows) {
|
||||||
|
return Err(Error::Invalid("Repack startup qualification requires a Windows runner.".into()));
|
||||||
|
}
|
||||||
|
if !fixture.file_name().is_some_and(|n| n.to_string_lossy().starts_with("coa-schema-fixture-"))
|
||||||
|
|| std::fs::read(fixture.join(MARKER)).ok().as_deref() != Some(b"disposable release-schema fixture") {
|
||||||
|
return Err(Error::Invalid("Startup qualification requires a disposable release-schema fixture.".into()));
|
||||||
|
}
|
||||||
|
let fixture_root = fsx::canonicalize_lenient(fixture)?;
|
||||||
|
let fixture = fixture_root.as_path();
|
||||||
|
let tree_root = fsx::canonicalize_lenient(tree)?;
|
||||||
|
let tree = tree_root.as_path();
|
||||||
|
let metadata = crate::registry::metadata_dir_for(fixture)?;
|
||||||
|
if metadata.exists() { return Err(Error::Invalid("Startup fixture already has Manager metadata; use a fresh fixture.".into())); }
|
||||||
|
schema_check::require_release_contract(tree)?;
|
||||||
|
for name in ["worldserver.exe", "authserver.exe"] {
|
||||||
|
if !tree.join("Core").join(name).is_file() {
|
||||||
|
return Err(Error::Invalid(format!("Startup candidate is missing {name}.")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let (manifest, _) = pkgsource::fetch_manifest(&pkgsource::Source::Dir(base.into()), trusted_key)?;
|
||||||
|
if manifest.kind != Kind::Base { return Err(Error::Invalid("Startup qualification requires a signed base package.".into())); }
|
||||||
|
let mut directories = vec![tree.to_path_buf()];
|
||||||
|
let mut files = Vec::new();
|
||||||
|
while let Some(directory) = directories.pop() {
|
||||||
|
for entry in std::fs::read_dir(directory)? {
|
||||||
|
let entry = entry?;
|
||||||
|
let kind = entry.file_type()?;
|
||||||
|
if kind.is_symlink() { return Err(Error::Invalid("Startup release tree must not contain symbolic links.".into())); }
|
||||||
|
let path = entry.path();
|
||||||
|
fsx::ensure_within(tree, &path)?;
|
||||||
|
if kind.is_dir() { directories.push(path); continue; }
|
||||||
|
if !kind.is_file() { return Err(Error::Invalid("Startup release tree contains an unsupported file type.".into())); }
|
||||||
|
let relative = path.strip_prefix(tree).map_err(|e| Error::Invalid(e.to_string()))?.to_path_buf();
|
||||||
|
let first = relative.components().next().unwrap().as_os_str().to_string_lossy();
|
||||||
|
if !matches!(first.as_ref(), "Core" | "Scripts" | "Data" | "Extras" | "Licenses") {
|
||||||
|
return Err(Error::Invalid("Startup release tree contains installation-specific files.".into()));
|
||||||
|
}
|
||||||
|
fsx::ensure_within(fixture, &fixture.join(&relative))?;
|
||||||
|
files.push(relative);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
package::extract_selected(base, &manifest, fixture, &|path| path.starts_with("Data/"), &|_, _| {})?;
|
||||||
|
for relative in files {
|
||||||
|
let target = fsx::ensure_within(fixture, &fixture.join(&relative))?;
|
||||||
|
fsx::atomic_write(&target, &std::fs::read(tree.join(&relative))?)?;
|
||||||
|
let expected = fsx::sha256_file(&tree.join(relative))?;
|
||||||
|
if fsx::sha256_file(&target)? != expected {
|
||||||
|
return Err(Error::Invalid("Startup candidate copy failed verification.".into()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let meta = crate::registry::InstallMeta::new(crate::registry::InstallKind::New, fixture);
|
||||||
|
crate::registry::MetaDir::create(fixture, &meta)?;
|
||||||
|
let env = crate::update::RepackEnv { root: fixture, meta_dir: &metadata };
|
||||||
|
env.validate()?;
|
||||||
|
env.ensure_stopped()?;
|
||||||
|
if crate::update_isolation::pending(&metadata) {
|
||||||
|
return Err(Error::Invalid("Startup qualification left unfinished isolated validation.".into()));
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
pub fn verify_package(dir: &Path, trusted_key: &str) -> Result<()> {
|
pub fn verify_package(dir: &Path, trusted_key: &str) -> Result<()> {
|
||||||
let (manifest, _) = pkgsource::fetch_manifest(&pkgsource::Source::Dir(dir.into()), trusted_key)?;
|
let (manifest, _) = pkgsource::fetch_manifest(&pkgsource::Source::Dir(dir.into()), trusted_key)?;
|
||||||
if !manifest.files.iter().any(|f| f.path == schema_check::CONTRACT && f.size > 0) {
|
if !manifest.files.iter().any(|f| f.path == schema_check::CONTRACT && f.size > 0) {
|
||||||
@@ -83,12 +230,49 @@ pub fn verify_package(dir: &Path, trusted_key: &str) -> Result<()> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn verify_upgrade_fixture(dir: &Path, trusted_key: &str) -> Result<()> {
|
||||||
|
let (manifest, _) = pkgsource::fetch_manifest(&pkgsource::Source::Dir(dir.into()), trusted_key)?;
|
||||||
|
if !matches!(manifest.kind, Kind::Base | Kind::Update) {
|
||||||
|
return Err(Error::Invalid("Upgrade fixtures must be base or server update packages.".into()));
|
||||||
|
}
|
||||||
|
let scratch = tempfile::tempdir()?;
|
||||||
|
package::extract_selected(dir, &manifest, scratch.path(), &|path| path == schema_check::CONTRACT, &|_, _| {})?;
|
||||||
|
if manifest.kind == Kind::Update || manifest.files.iter().any(|file| file.path == schema_check::CONTRACT) {
|
||||||
|
schema_check::require_release_contract(scratch.path())?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
use base64::{engine::general_purpose::STANDARD, Engine};
|
use base64::{engine::general_purpose::STANDARD, Engine};
|
||||||
use ed25519_dalek::{Signer, SigningKey};
|
use ed25519_dalek::{Signer, SigningKey};
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn relative_startup_fixture_targets_replace_the_original_location() {
|
||||||
|
let directory = tempfile::Builder::new().prefix("coa-schema-fixture-path-test-").tempdir_in(".").unwrap();
|
||||||
|
let current = std::env::current_dir().unwrap();
|
||||||
|
let relative = directory.path().strip_prefix(¤t).unwrap();
|
||||||
|
fsx::atomic_write(&relative.join("Core/worldserver.exe"), b"old").unwrap();
|
||||||
|
let root = fsx::canonicalize_lenient(relative).unwrap();
|
||||||
|
let target = fsx::ensure_within(&root, &root.join("Core/worldserver.exe")).unwrap();
|
||||||
|
fsx::atomic_write(&target, b"candidate").unwrap();
|
||||||
|
assert_eq!(std::fs::read(relative.join("Core/worldserver.exe")).unwrap(), b"candidate");
|
||||||
|
assert!(!root.join(relative).join("Core/worldserver.exe").exists());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn startup_qualification_refuses_real_server_folders_before_writes() {
|
||||||
|
let directory = tempfile::tempdir().unwrap();
|
||||||
|
let server = directory.path().join("live-server");
|
||||||
|
std::fs::create_dir(&server).unwrap();
|
||||||
|
fsx::atomic_write(&server.join("owner-data"), b"untouched").unwrap();
|
||||||
|
assert!(validate_startup(&server, directory.path(), directory.path(), "unused").is_err());
|
||||||
|
assert_eq!(std::fs::read(server.join("owner-data")).unwrap(), b"untouched");
|
||||||
|
assert!(!crate::registry::metadata_dir_for(&server).unwrap().exists());
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn signed_packages_must_carry_a_real_complete_schema_contract() {
|
fn signed_packages_must_carry_a_real_complete_schema_contract() {
|
||||||
let dir = tempfile::tempdir().unwrap();
|
let dir = tempfile::tempdir().unwrap();
|
||||||
@@ -127,6 +311,31 @@ mod tests {
|
|||||||
let dir = tempfile::tempdir().unwrap();
|
let dir = tempfile::tempdir().unwrap();
|
||||||
assert!(extract_base(dir.path(), dir.path(), "irrelevant").is_err());
|
assert!(extract_base(dir.path(), dir.path(), "irrelevant").is_err());
|
||||||
assert!(capture_release(dir.path(), dir.path(), &[]).is_err());
|
assert!(capture_release(dir.path(), dir.path(), &[]).is_err());
|
||||||
|
assert!(qualify_upgrade(dir.path(), dir.path(), dir.path(), dir.path(), "irrelevant").is_err());
|
||||||
assert!(!dir.path().join(schema_check::CONTRACT).exists());
|
assert!(!dir.path().join(schema_check::CONTRACT).exists());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn only_legacy_base_fixtures_may_omit_the_schema_contract() {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let tree = dir.path().join("tree");
|
||||||
|
let out = dir.path().join("package");
|
||||||
|
fsx::atomic_write(&tree.join("Core/example.txt"), b"fixture").unwrap();
|
||||||
|
let key = SigningKey::from_bytes(&[29; 32]);
|
||||||
|
let public = STANDARD.encode(key.verifying_key().as_bytes());
|
||||||
|
let options = package::BuildOptions { kind: Kind::Base, version: "0.2.0".into(), core_commit: None, bots_commit: None, built_at: "test".into(), part_size: 1024 * 1024, migrations: vec![] };
|
||||||
|
package::build(&tree, &out, &options, &|_| {}).unwrap();
|
||||||
|
let sign = || {
|
||||||
|
let bytes = std::fs::read(out.join("manifest.json")).unwrap();
|
||||||
|
fsx::atomic_write(&out.join("manifest.json.sig"), STANDARD.encode(key.sign(&bytes).to_bytes()).as_bytes()).unwrap();
|
||||||
|
};
|
||||||
|
sign();
|
||||||
|
verify_upgrade_fixture(&out, &public).unwrap();
|
||||||
|
assert!(verify_package(&out, &public).is_err());
|
||||||
|
let mut manifest: serde_json::Value = fsx::read_json(&out.join("manifest.json")).unwrap();
|
||||||
|
manifest["kind"] = "update".into();
|
||||||
|
fsx::atomic_write_json(&out.join("manifest.json"), &manifest).unwrap();
|
||||||
|
sign();
|
||||||
|
assert!(verify_upgrade_fixture(&out, &public).is_err());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -39,6 +39,35 @@ pub fn require_release_contract(root: &Path) -> Result<Contract> {
|
|||||||
#[derive(Debug, Serialize)]
|
#[derive(Debug, Serialize)]
|
||||||
pub struct Problem { pub database: String, pub table: String, pub column: String, pub detail: String }
|
pub struct Problem { pub database: String, pub table: String, pub column: String, pub detail: String }
|
||||||
|
|
||||||
|
/// Keep all differences for support; never change a database to match a contract automatically.
|
||||||
|
pub fn check_with_report(db: &Db, root: &Path) -> Result<Vec<Problem>> {
|
||||||
|
let problems = check(db, root)?;
|
||||||
|
if problems.is_empty() { return Ok(problems); }
|
||||||
|
let report = serde_json::json!({
|
||||||
|
"schema": 1, "checkedAt": chrono::Utc::now().to_rfc3339(),
|
||||||
|
"realm": db.realm().name(), "problems": problems,
|
||||||
|
});
|
||||||
|
let path = crate::registry::metadata_dir_for(root)?.join("diagnostics")
|
||||||
|
.join(format!("schema-validation-{}-{}.json", db.realm().name(), uuid::Uuid::new_v4()));
|
||||||
|
// A log write failure must neither hide the original mismatch nor accept an invalid schema.
|
||||||
|
if let Err(error) = fsx::atomic_write_json(&path, &report) {
|
||||||
|
tracing::warn!(%error, path = %path.display(), "Could not save database schema report");
|
||||||
|
}
|
||||||
|
Ok(problems)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn describe_signature(signature: &str) -> String {
|
||||||
|
let fields: Vec<_> = signature.split('|').collect();
|
||||||
|
if fields.len() != 4 { return signature.into(); }
|
||||||
|
let decode = |value: &str| -> String {
|
||||||
|
if value == "<NULL>" { return "no default".into(); }
|
||||||
|
if value == "<NONE>" { return "none".into(); }
|
||||||
|
hex::decode(value).ok().and_then(|bytes| String::from_utf8(bytes).ok())
|
||||||
|
.map(|text| format!("{text:?}")).unwrap_or_else(|| value.into())
|
||||||
|
};
|
||||||
|
format!("type={}, nullable={}, default={}, extra={}", fields[0], fields[1], decode(fields[2]), decode(fields[3]))
|
||||||
|
}
|
||||||
|
|
||||||
fn read_columns(db: &Db, kind: &str) -> Result<BTreeMap<String, BTreeMap<String, String>>> {
|
fn read_columns(db: &Db, kind: &str) -> Result<BTreeMap<String, BTreeMap<String, String>>> {
|
||||||
let schema = db.realm_schema(crate::db::schema_of(kind)?);
|
let schema = db.realm_schema(crate::db::schema_of(kind)?);
|
||||||
let text = db.query(&format!("SELECT TABLE_NAME,COLUMN_NAME,CONCAT(COLUMN_TYPE,'|',IS_NULLABLE,'|',IF(COLUMN_DEFAULT IS NULL,'<NULL>',HEX(COLUMN_DEFAULT)),'|',IF(EXTRA='','<NONE>',HEX(EXTRA))) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='{schema}' ORDER BY TABLE_NAME,ORDINAL_POSITION;"))?;
|
let text = db.query(&format!("SELECT TABLE_NAME,COLUMN_NAME,CONCAT(COLUMN_TYPE,'|',IS_NULLABLE,'|',IF(COLUMN_DEFAULT IS NULL,'<NULL>',HEX(COLUMN_DEFAULT)),'|',IF(EXTRA='','<NONE>',HEX(EXTRA))) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA='{schema}' ORDER BY TABLE_NAME,ORDINAL_POSITION;"))?;
|
||||||
@@ -56,6 +85,46 @@ pub fn capture(db: &Db, root: &Path) -> Result<()> {
|
|||||||
fsx::atomic_write_json(&root.join(CONTRACT), &Contract { schema: 1, columns })
|
fsx::atomic_write_json(&root.join(CONTRACT), &Contract { schema: 1, columns })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn missing_default(expected: &str, actual: &str) -> Option<String> {
|
||||||
|
let expected: Vec<_> = expected.split('|').collect();
|
||||||
|
let actual: Vec<_> = actual.split('|').collect();
|
||||||
|
if expected.len() != 4 || actual.len() != 4 || expected[0] != actual[0]
|
||||||
|
|| expected[1] != "NO" || actual[1] != "NO" || expected[3] != "<NONE>" || actual[3] != "<NONE>"
|
||||||
|
|| actual[2] != "<NULL>" || matches!(expected[2], "<NULL>" | "<NONE>") { return None; }
|
||||||
|
String::from_utf8(hex::decode(expected[2]).ok()?).ok()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Only restore a missing literal default from the exact signed target contract. Never alter data or custom defaults.
|
||||||
|
pub(crate) fn repair_missing_defaults(db: &Db, root: &Path, signed_hash: Option<&str>) -> Result<()> {
|
||||||
|
let Some(signed_hash) = signed_hash else { return Ok(()); };
|
||||||
|
if fsx::sha256_file(&root.join(CONTRACT))? != signed_hash {
|
||||||
|
return Err(crate::Error::Invalid("The target schema contract differs from the signed update.".into()));
|
||||||
|
}
|
||||||
|
let contract = require_release_contract(root)?;
|
||||||
|
let mut repaired = Vec::new();
|
||||||
|
let quote = |identifier: &str| format!("`{}`", identifier.replace('`', "``"));
|
||||||
|
for (kind, tables) in &contract.columns {
|
||||||
|
let schema = db.realm_schema(crate::db::schema_of(kind)?);
|
||||||
|
let actual = read_columns(db, kind)?;
|
||||||
|
let base_tables: BTreeSet<_> = db.tables(crate::db::schema_of(kind)?)?.into_iter().collect();
|
||||||
|
for (table, columns) in tables {
|
||||||
|
if !base_tables.contains(table) { continue; }
|
||||||
|
if matches!(table.as_str(), "updates" | "updates_include" | "coa_manager_migrations") { continue; }
|
||||||
|
for (column, expected) in columns {
|
||||||
|
let Some(found) = actual.get(table).and_then(|columns| columns.get(column)) else { continue; };
|
||||||
|
let Some(value) = missing_default(expected, found) else { continue; };
|
||||||
|
db.query(&format!("SET SESSION sql_mode=CONCAT_WS(',',@@SESSION.sql_mode,'NO_BACKSLASH_ESCAPES'); ALTER TABLE {}.{} ALTER COLUMN {} SET DEFAULT '{}';", quote(schema), quote(table), quote(column), value.replace('\'', "''")))?;
|
||||||
|
repaired.push(serde_json::json!({"database":schema,"table":table,"column":column,"action":"restore-missing-default"}));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !repaired.is_empty() {
|
||||||
|
let path = crate::registry::metadata_dir_for(root)?.join("diagnostics").join(format!("database-repair-{}.json", uuid::Uuid::new_v4()));
|
||||||
|
fsx::atomic_write_json(&path, &serde_json::json!({"schema":1,"checkedAt":chrono::Utc::now().to_rfc3339(),"contractSha256":signed_hash,"repairs":repaired}))?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
pub fn check(db: &Db, root: &Path) -> Result<Vec<Problem>> {
|
pub fn check(db: &Db, root: &Path) -> Result<Vec<Problem>> {
|
||||||
let contract = if root.join(CONTRACT).is_file() {
|
let contract = if root.join(CONTRACT).is_file() {
|
||||||
let contract: Contract = fsx::read_json(&root.join(CONTRACT))?;
|
let contract: Contract = fsx::read_json(&root.join(CONTRACT))?;
|
||||||
@@ -98,7 +167,7 @@ pub fn check(db: &Db, root: &Path) -> Result<Vec<Problem>> {
|
|||||||
for (column, want) in cols {
|
for (column, want) in cols {
|
||||||
let found = actual[table].get(column);
|
let found = actual[table].get(column);
|
||||||
if found.is_none() || (!want.is_empty() && found != Some(want)) {
|
if found.is_none() || (!want.is_empty() && found != Some(want)) {
|
||||||
problems.push(Problem { database: kind.clone(), table: table.clone(), column: column.clone(), detail: found.map(|s| format!("Expected {want}, found {s}")).unwrap_or_else(|| "Missing column".into()) });
|
problems.push(Problem { database: kind.clone(), table: table.clone(), column: column.clone(), detail: found.map(|s| format!("Expected {}, found {}", describe_signature(want), describe_signature(s))).unwrap_or_else(|| "Missing column".into()) });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -146,6 +215,23 @@ fn missing_coa_starts(rows: &str) -> Vec<Problem> {
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
#[test]
|
||||||
|
fn default_repair_only_accepts_missing_literal_defaults_without_other_schema_changes() {
|
||||||
|
assert_eq!(missing_default("int unsigned|NO|30|<NONE>", "int unsigned|NO|<NULL>|<NONE>"), Some("0".into()));
|
||||||
|
for actual in ["int unsigned|NO|3939|<NONE>", "int|NO|<NULL>|<NONE>", "int unsigned|YES|<NULL>|<NONE>", "int unsigned|NO|<NULL>|6175746f5f696e6372656d656e74"] {
|
||||||
|
assert!(missing_default("int unsigned|NO|30|<NONE>", actual).is_none());
|
||||||
|
}
|
||||||
|
assert!(missing_default("timestamp|NO|43555252454e545f54494d455354414d50|44454641554c545f47454e455241544544", "timestamp|NO|<NULL>|<NONE>").is_none());
|
||||||
|
assert!(missing_default("int|NO|zz|<NONE>", "int|NO|<NULL>|<NONE>").is_none());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn schema_defaults_are_readable_and_not_conflated() {
|
||||||
|
assert_eq!(describe_signature("int unsigned|NO|30|<NONE>"), "type=int unsigned, nullable=NO, default=\"0\", extra=none");
|
||||||
|
assert!(describe_signature("int unsigned|NO|<NULL>|<NONE>").contains("default=no default"));
|
||||||
|
assert!(describe_signature("varchar(8)|YES||<NONE>").contains("default=\"\""));
|
||||||
|
assert_eq!(describe_signature("legacy"), "legacy");
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn a_release_cannot_use_a_partial_or_empty_schema_contract() {
|
fn a_release_cannot_use_a_partial_or_empty_schema_contract() {
|
||||||
|
|||||||
+433
-24
@@ -85,9 +85,14 @@ fn legacy_databases_started() -> bool { true }
|
|||||||
|
|
||||||
/// Everything the transaction needs from the outside world; tests provide a fake.
|
/// Everything the transaction needs from the outside world; tests provide a fake.
|
||||||
pub trait Env {
|
pub trait Env {
|
||||||
|
fn activate(&self) -> Result<()> { Ok(()) }
|
||||||
|
fn recover_validation(&self) -> Result<()> { Ok(()) }
|
||||||
|
fn automatic_rollback(&self) -> bool { false }
|
||||||
|
fn validate_recovery(&self) -> Result<()> { self.validate() }
|
||||||
fn ensure_stopped(&self) -> Result<()>;
|
fn ensure_stopped(&self) -> Result<()>;
|
||||||
fn preflight(&self, _manifest: &Manifest) -> Result<()> { Ok(()) }
|
fn preflight(&self, _manifest: &Manifest) -> Result<()> { Ok(()) }
|
||||||
fn verify_snapshot(&self, _id: &str) -> Result<()> { Ok(()) }
|
fn verify_snapshot(&self, _id: &str) -> Result<()> { Ok(()) }
|
||||||
|
fn rehearse(&self, _manifest: &Manifest, _tree: &Path, _items: &[PlanItem], _point: &str) -> Result<()> { Ok(()) }
|
||||||
/// Create a recovery point for the databases and configuration; returns its id.
|
/// Create a recovery point for the databases and configuration; returns its id.
|
||||||
fn snapshot(&self) -> Result<String>;
|
fn snapshot(&self) -> Result<String>;
|
||||||
fn restore_snapshot(&self, id: &str) -> Result<()>;
|
fn restore_snapshot(&self, id: &str) -> Result<()>;
|
||||||
@@ -177,6 +182,9 @@ pub fn unfinished(meta: &Path) -> Option<Txn> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn ensure_recovered(meta: &Path) -> Result<()> {
|
pub fn ensure_recovered(meta: &Path) -> Result<()> {
|
||||||
|
if crate::update_isolation::pending(meta) {
|
||||||
|
return Err(Error::Invalid("Interrupted startup validation must be recovered before starting the server.".into()));
|
||||||
|
}
|
||||||
if let Some(t) = pending_checked(meta)? {
|
if let Some(t) = pending_checked(meta)? {
|
||||||
return Err(Error::Invalid(format!("Resolve unfinished update {} before changing or starting the server.", t.id)));
|
return Err(Error::Invalid(format!("Resolve unfinished update {} before changing or starting the server.", t.id)));
|
||||||
}
|
}
|
||||||
@@ -360,6 +368,15 @@ fn launcher_already_integrated(root: &Path, meta_dir: &Path, meta: &InstallMeta,
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn reject_downgrade(meta: &InstallMeta, manifest: &Manifest) -> Result<()> {
|
fn reject_downgrade(meta: &InstallMeta, manifest: &Manifest) -> Result<()> {
|
||||||
|
if let Some(c) = &manifest.compatibility {
|
||||||
|
let platform = if cfg!(windows) { "windows-x86_64" } else { "linux-x86_64" };
|
||||||
|
if c.platform != platform {
|
||||||
|
return Err(Error::Invalid(format!("This package targets {} rather than {platform}.", c.platform)));
|
||||||
|
}
|
||||||
|
if meta.core.version.as_ref().is_none_or(|version| !c.source_versions.contains(version)) {
|
||||||
|
return Err(Error::Invalid("This server version is outside the release's tested compatibility matrix.".into()));
|
||||||
|
}
|
||||||
|
}
|
||||||
if let Some(installed) = meta.core.version.as_deref() {
|
if let Some(installed) = meta.core.version.as_deref() {
|
||||||
if let (Some(have), Some(candidate)) = (crate::manifest::parse_version(installed), crate::manifest::parse_version(&manifest.version)) {
|
if let (Some(have), Some(candidate)) = (crate::manifest::parse_version(installed), crate::manifest::parse_version(&manifest.version)) {
|
||||||
if candidate < have {
|
if candidate < have {
|
||||||
@@ -380,6 +397,11 @@ fn check_manifest(m: &Manifest) -> Result<()> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn validate_candidate(meta: &InstallMeta, manifest: &Manifest) -> Result<()> {
|
||||||
|
check_manifest(manifest)?;
|
||||||
|
reject_downgrade(meta, manifest)
|
||||||
|
}
|
||||||
|
|
||||||
pub struct Params<'a> {
|
pub struct Params<'a> {
|
||||||
pub root: &'a Path,
|
pub root: &'a Path,
|
||||||
pub meta_dir: &'a Path,
|
pub meta_dir: &'a Path,
|
||||||
@@ -472,6 +494,14 @@ pub fn apply(p: &Params, report: &dyn Fn(&str, u8)) -> Result<Outcome> {
|
|||||||
txn.recovery_point = Some(p.env.snapshot().map_err(|e| Error::Invalid(format!("The update was not applied because the safety backup failed: {e}")))?);
|
txn.recovery_point = Some(p.env.snapshot().map_err(|e| Error::Invalid(format!("The update was not applied because the safety backup failed: {e}")))?);
|
||||||
let point_meta = crate::backup::point_json(meta_dir, txn.recovery_point.as_deref().unwrap())?;
|
let point_meta = crate::backup::point_json(meta_dir, txn.recovery_point.as_deref().unwrap())?;
|
||||||
if point_meta.is_file() { txn.recovery_hashes.insert("@point".into(), fsx::sha256_file(&point_meta)?); }
|
if point_meta.is_file() { txn.recovery_hashes.insert("@point".into(), fsx::sha256_file(&point_meta)?); }
|
||||||
|
save(meta_dir, &txn)?;
|
||||||
|
step(report, "Testing the update on a private copy of your server", 54);
|
||||||
|
if let Err(error) = p.env.rehearse(&m, &tree, &items, txn.recovery_point.as_deref().unwrap()) {
|
||||||
|
txn.state = State::Failed;
|
||||||
|
txn.message = Some(format!("The private update rehearsal failed: {error}. The installed server was not updated."));
|
||||||
|
save(meta_dir, &txn)?;
|
||||||
|
return Err(Error::Invalid(txn.message.unwrap()));
|
||||||
|
}
|
||||||
|
|
||||||
txn.ops = items
|
txn.ops = items
|
||||||
.iter()
|
.iter()
|
||||||
@@ -495,7 +525,7 @@ pub fn apply(p: &Params, report: &dyn Fn(&str, u8)) -> Result<Outcome> {
|
|||||||
|
|
||||||
// MySQL DDL can commit before a later statement fails. Restore the full recovery point on failure.
|
// MySQL DDL can commit before a later statement fails. Restore the full recovery point on failure.
|
||||||
let mut migrated = None;
|
let mut migrated = None;
|
||||||
if !m.migrations.is_empty() {
|
if !m.migrations.is_empty() || m.files.iter().any(|file| file.path == crate::schema_check::CONTRACT) {
|
||||||
step(report, "Updating the database", 75);
|
step(report, "Updating the database", 75);
|
||||||
txn.databases_started = true;
|
txn.databases_started = true;
|
||||||
save(meta_dir, &txn)?;
|
save(meta_dir, &txn)?;
|
||||||
@@ -514,7 +544,14 @@ pub fn apply(p: &Params, report: &dyn Fn(&str, u8)) -> Result<Outcome> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
step(report, "Starting the updated server", 85);
|
step(report, "Starting the updated server", 85);
|
||||||
|
// Core startup can apply SQL and write character data even when the package has no explicit migrations.
|
||||||
|
txn.databases_started = true;
|
||||||
|
save(meta_dir, &txn)?;
|
||||||
if let Err(e) = p.env.validate() {
|
if let Err(e) = p.env.validate() {
|
||||||
|
if p.env.automatic_rollback() {
|
||||||
|
return fail_after_apply(p, &mut txn, &before, &tree,
|
||||||
|
format!("The updated server did not start correctly: {e}"), migrated);
|
||||||
|
}
|
||||||
txn.state = State::NeedsDecision;
|
txn.state = State::NeedsDecision;
|
||||||
txn.message = Some(format!("The updated server did not start correctly: {e}"));
|
txn.message = Some(format!("The updated server did not start correctly: {e}"));
|
||||||
save(meta_dir, &txn)?;
|
save(meta_dir, &txn)?;
|
||||||
@@ -522,6 +559,7 @@ pub fn apply(p: &Params, report: &dyn Fn(&str, u8)) -> Result<Outcome> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
finish(root, meta_dir, &mut meta, &m, &tree, &mut txn)?;
|
finish(root, meta_dir, &mut meta, &m, &tree, &mut txn)?;
|
||||||
|
p.env.activate()?;
|
||||||
step(report, "Done", 100);
|
step(report, "Done", 100);
|
||||||
let _ = archive;
|
let _ = archive;
|
||||||
Ok(Outcome { txn, migrations: migrated })
|
Ok(Outcome { txn, migrations: migrated })
|
||||||
@@ -594,17 +632,24 @@ pub fn retry_validation(root: &Path, meta_dir: &Path, id: &str, fallback: &Sourc
|
|||||||
}
|
}
|
||||||
let (_, mut meta) = MetaDir::open(meta_dir)?;
|
let (_, mut meta) = MetaDir::open(meta_dir)?;
|
||||||
finish(root, meta_dir, &mut meta, &manifest, &dir.join("tree"), &mut txn)?;
|
finish(root, meta_dir, &mut meta, &manifest, &dir.join("tree"), &mut txn)?;
|
||||||
|
env.activate()?;
|
||||||
Ok(txn)
|
Ok(txn)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn fail_after_apply(p: &Params, txn: &mut Txn, before: &Path, tree: &Path, why: String, report: Option<ApplyReport>) -> Result<Outcome> {
|
fn fail_after_apply(p: &Params, txn: &mut Txn, before: &Path, tree: &Path, why: String, report: Option<ApplyReport>) -> Result<Outcome> {
|
||||||
tracing::error!(transaction = %txn.id, databases_started = txn.databases_started, "server update failed; restoring recovery point");
|
tracing::error!(transaction = %txn.id, databases_started = txn.databases_started, "server update failed; restoring recovery point");
|
||||||
let restored = restore_transaction(p.root, p.meta_dir, before, txn, p.env);
|
let restored = restore_transaction(p.root, p.meta_dir, before, txn, p.env).and_then(|()| {
|
||||||
|
if p.env.automatic_rollback() { p.env.validate_recovery() } else { Ok(()) }
|
||||||
|
});
|
||||||
|
if restored.is_err() { let _ = p.env.ensure_stopped(); }
|
||||||
tracing::info!(transaction = %txn.id, recovered = restored.is_ok(), "server update recovery finished");
|
tracing::info!(transaction = %txn.id, recovered = restored.is_ok(), "server update recovery finished");
|
||||||
txn.state = if restored.is_ok() { State::RolledBack } else { State::Failed };
|
txn.state = if restored.is_ok() { State::RolledBack } else { State::Failed };
|
||||||
txn.message = Some(match &restored { Ok(()) => why.clone(), Err(e) => format!("{why} Recovery failed: {e}") });
|
txn.message = Some(match &restored { Ok(()) => why.clone(), Err(e) => format!("{why} Recovery failed: {e}") });
|
||||||
save(p.meta_dir, txn)?;
|
save(p.meta_dir, txn)?;
|
||||||
if restored.is_ok() { let _ = fs::remove_dir_all(tree); }
|
if restored.is_ok() {
|
||||||
|
let _ = fs::remove_dir_all(tree);
|
||||||
|
if p.env.automatic_rollback() { p.env.activate()?; }
|
||||||
|
}
|
||||||
let _ = report;
|
let _ = report;
|
||||||
Err(Error::Invalid(match restored {
|
Err(Error::Invalid(match restored {
|
||||||
Ok(()) if txn.databases_started => format!("{why} The server files and databases were restored to the recovery point."),
|
Ok(()) if txn.databases_started => format!("{why} The server files and databases were restored to the recovery point."),
|
||||||
@@ -628,6 +673,7 @@ fn restore_transaction(root: &Path, meta: &Path, before: &Path, txn: &mut Txn, e
|
|||||||
}
|
}
|
||||||
if !before.join("manager-install.json").is_file() { return Err(Error::Invalid("The saved installation metadata is missing; no restoration was started.".into())); }
|
if !before.join("manager-install.json").is_file() { return Err(Error::Invalid("The saved installation metadata is missing; no restoration was started.".into())); }
|
||||||
env.ensure_stopped()?;
|
env.ensure_stopped()?;
|
||||||
|
env.recover_validation()?;
|
||||||
if txn.databases_started {
|
if txn.databases_started {
|
||||||
let id = txn.recovery_point.as_deref().ok_or_else(|| Error::Invalid("The database recovery point is missing.".into()))?;
|
let id = txn.recovery_point.as_deref().ok_or_else(|| Error::Invalid("The database recovery point is missing.".into()))?;
|
||||||
env.restore_snapshot(id)?;
|
env.restore_snapshot(id)?;
|
||||||
@@ -641,6 +687,25 @@ fn restore_transaction(root: &Path, meta: &Path, before: &Path, txn: &mut Txn, e
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn apply_ops(root: &Path, tree: &Path, before: &Path, files: &[FileEntry], txn: &mut Txn, meta_dir: &Path, fail_after: Option<usize>) -> Result<()> {
|
fn apply_ops(root: &Path, tree: &Path, before: &Path, files: &[FileEntry], txn: &mut Txn, meta_dir: &Path, fail_after: Option<usize>) -> Result<()> {
|
||||||
|
if fail_after == Some(0) && !txn.ops.is_empty() {
|
||||||
|
return Err(Error::Invalid("simulated failure".into()));
|
||||||
|
}
|
||||||
|
let entries: BTreeMap<_, _> = files.iter().map(|entry| (entry.path.as_str(), entry)).collect();
|
||||||
|
// Prepare every recovery copy before changing any destination. One durable journal
|
||||||
|
// can then cover the entire file phase: recovery restores old files even if their
|
||||||
|
// replacement was not reached, and removes newly created files only by exact hash.
|
||||||
|
// Rewriting the full journal twice per file makes large navigation updates quadratic.
|
||||||
|
for op in &txn.ops {
|
||||||
|
let target = fsx::ensure_within(root, &fsx::safe_join(root, &op.path)?)?;
|
||||||
|
if op.had_previous {
|
||||||
|
let keep = fsx::safe_join(before, &op.path)?;
|
||||||
|
fs::create_dir_all(keep.parent().unwrap())?;
|
||||||
|
fsx::atomic_write(&keep, &fs::read(&target)?)?;
|
||||||
|
txn.recovery_hashes.insert(op.path.clone(), fsx::sha256_file(&keep)?);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for op in &mut txn.ops { op.started = true; }
|
||||||
|
save(meta_dir, txn)?;
|
||||||
let mut completed = 0usize;
|
let mut completed = 0usize;
|
||||||
for i in 0..txn.ops.len() {
|
for i in 0..txn.ops.len() {
|
||||||
if fail_after == Some(completed) {
|
if fail_after == Some(completed) {
|
||||||
@@ -649,17 +714,7 @@ fn apply_ops(root: &Path, tree: &Path, before: &Path, files: &[FileEntry], txn:
|
|||||||
let (path, action) = (txn.ops[i].path.clone(), txn.ops[i].action);
|
let (path, action) = (txn.ops[i].path.clone(), txn.ops[i].action);
|
||||||
let target = fsx::ensure_within(root, &fsx::safe_join(root, &path)?)?;
|
let target = fsx::ensure_within(root, &fsx::safe_join(root, &path)?)?;
|
||||||
let staged = fsx::safe_join(tree, &path)?;
|
let staged = fsx::safe_join(tree, &path)?;
|
||||||
let entry = files.iter().find(|f| f.path == path).expect("listed");
|
let entry = entries.get(path.as_str()).expect("listed");
|
||||||
if target.is_file() {
|
|
||||||
let keep = fsx::safe_join(before, &path)?;
|
|
||||||
fs::create_dir_all(keep.parent().unwrap())?;
|
|
||||||
fsx::atomic_write(&keep, &fs::read(&target)?)?;
|
|
||||||
txn.recovery_hashes.insert(path.clone(), fsx::sha256_file(&keep)?);
|
|
||||||
}
|
|
||||||
// Journal only after the old bytes are safely saved; a crash during backup must not
|
|
||||||
// turn an untouched file into a rollback operation with a missing saved copy.
|
|
||||||
txn.ops[i].started = true;
|
|
||||||
save(meta_dir, txn)?;
|
|
||||||
fs::create_dir_all(target.parent().unwrap())?;
|
fs::create_dir_all(target.parent().unwrap())?;
|
||||||
match action {
|
match action {
|
||||||
Action::Create | Action::Replace => {
|
Action::Create | Action::Replace => {
|
||||||
@@ -684,10 +739,9 @@ fn apply_ops(root: &Path, tree: &Path, before: &Path, files: &[FileEntry], txn:
|
|||||||
Action::Skip | Action::Conflict => {}
|
Action::Skip | Action::Conflict => {}
|
||||||
}
|
}
|
||||||
txn.ops[i].done = true;
|
txn.ops[i].done = true;
|
||||||
save(meta_dir, txn)?;
|
|
||||||
completed += 1;
|
completed += 1;
|
||||||
}
|
}
|
||||||
Ok(())
|
save(meta_dir, txn)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Put every touched file back the way it was. Files created by the update (no previous version) are removed only if
|
/// Put every touched file back the way it was. Files created by the update (no previous version) are removed only if
|
||||||
@@ -815,13 +869,27 @@ impl RepackEnv<'_> {
|
|||||||
return Err(Error::Invalid("The update recovery point does not contain every required database and configuration.".into()));
|
return Err(Error::Invalid("The update recovery point does not contain every required database and configuration.".into()));
|
||||||
}
|
}
|
||||||
if !crate::backup::verify(self.meta_dir, &point.id)?.ok { return Err(Error::Invalid("The recovery point failed verification.".into())); }
|
if !crate::backup::verify(self.meta_dir, &point.id)?.ok { return Err(Error::Invalid("The recovery point failed verification.".into())); }
|
||||||
|
if let Some(snapshot) = &point.mysql_snapshot {
|
||||||
|
if fsx::sha256_file(&self.root.join("mysql/bin/mysqld.exe"))? != snapshot.server_sha256 {
|
||||||
|
return Err(Error::Invalid("The MySQL executable differs from the recovery point.".into()));
|
||||||
|
}
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
crate::backup::with_database(self.root, |db| {
|
crate::backup::with_database(self.root, |db| {
|
||||||
let db = db.clone().for_realm(crate::realms::Mode::Coa);
|
let db = db.clone().for_realm(crate::realms::Mode::Coa);
|
||||||
|
let mut objects = Vec::new();
|
||||||
for component in point.components.iter().filter(|c| c.sha256.is_some()) {
|
for component in point.components.iter().filter(|c| c.sha256.is_some()) {
|
||||||
let schema = if component.name.contains('-') || component.name == "playerbots" { crate::db::schema_of(&component.name)? } else { point.realm.schema(&component.name)? };
|
let schema = if component.name.contains('-') || component.name == "playerbots" { crate::db::schema_of(&component.name)? } else { point.realm.schema(&component.name)? };
|
||||||
if db.extra_objects(schema)? != 0 {
|
objects.extend(db.recovery_objects(schema)?);
|
||||||
return Err(Error::Invalid(format!("Database {schema} has routines, triggers or views that automatic recovery cannot restore. The update was not started.")));
|
|
||||||
}
|
}
|
||||||
|
if !objects.is_empty() {
|
||||||
|
let path = self.meta_dir.join("diagnostics").join(format!("database-recovery-{}.json", uuid::Uuid::new_v4()));
|
||||||
|
let report = serde_json::json!({ "schema": 1, "checkedAt": chrono::Utc::now().to_rfc3339(), "recoveryPoint": point.id, "objects": objects });
|
||||||
|
if let Err(error) = fsx::atomic_write_json(&path, &report) {
|
||||||
|
tracing::warn!(%error, "Could not save database recovery compatibility report");
|
||||||
|
}
|
||||||
|
let sample = objects.iter().take(3).map(|object| format!("{}.{} ({})", object["database"].as_str().unwrap_or("?"), object["name"].as_str().unwrap_or("?"), object["kind"].as_str().unwrap_or("?"))).collect::<Vec<_>>().join(", ");
|
||||||
|
return Err(Error::Invalid(format!("Automatic recovery does not support {} database objects: {sample}. Export diagnostics for the complete list. The update was not started.", objects.len())));
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
})
|
})
|
||||||
@@ -839,7 +907,116 @@ impl RepackEnv<'_> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Env for RepackEnv<'_> {
|
impl Env for RepackEnv<'_> {
|
||||||
|
fn recover_validation(&self) -> Result<()> {
|
||||||
|
crate::update_isolation::restore(self.root, self.meta_dir)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn activate(&self) -> Result<()> {
|
||||||
|
ensure_recovered(self.meta_dir)?;
|
||||||
|
let outcome = crate::driver::validate_update(self.root)?;
|
||||||
|
if outcome.ok { Ok(()) } else {
|
||||||
|
Err(Error::Invalid(format!("The update transaction finished, but the server could not start: {}", crate::driver::startup_failure(self.root, &outcome))))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn automatic_rollback(&self) -> bool { true }
|
||||||
|
fn rehearse(&self, manifest: &Manifest, tree: &Path, items: &[PlanItem], id: &str) -> Result<()> {
|
||||||
|
if items.iter().any(|item| item.action != Action::Skip && item.path.to_ascii_lowercase().starts_with("mysql/")) {
|
||||||
|
return Err(Error::Invalid("A server update cannot replace MySQL while using a cold recovery copy; a separate database engine upgrade is required.".into()));
|
||||||
|
}
|
||||||
|
let point = crate::backup::get(self.meta_dir, id)?;
|
||||||
|
let Some(snapshot) = &point.mysql_snapshot else {
|
||||||
|
// Docker uses its separate experimental release channel until its clone runner is qualified.
|
||||||
|
if crate::docker::is_docker(self.root) { return Ok(()); }
|
||||||
|
return Err(Error::Invalid("This installation has no complete MySQL recovery copy for an update rehearsal.".into()));
|
||||||
|
};
|
||||||
|
crate::mysql_snapshot::validate_connections(self.root, self.root)?;
|
||||||
|
crate::mysql_snapshot::stop(self.root)?;
|
||||||
|
let point_dir = crate::backup::point_json(self.meta_dir, id)?.parent().unwrap().to_path_buf();
|
||||||
|
let fixture = crate::mysql_snapshot::rehearsal_copy(self.root, self.meta_dir, &point_dir, snapshot)?;
|
||||||
|
let metadata = crate::registry::metadata_dir_for(&fixture)?;
|
||||||
|
let env = RepackEnv { root: &fixture, meta_dir: &metadata };
|
||||||
|
let result = crate::install::with_scratch_ports(&fixture, || {
|
||||||
|
let mut txn = Txn { id: "rehearsal".into(), state: State::Applying, from_version: None,
|
||||||
|
to_version: manifest.version.clone(), recovery_point: None, databases_started: false,
|
||||||
|
ops: items.iter().filter(|item| item.action != Action::Skip).map(|item| Op {
|
||||||
|
path: item.path.clone(), action: item.action, reason: item.reason.clone(),
|
||||||
|
new_sha256: manifest.files.iter().find(|file| file.path == item.path).unwrap().sha256.clone(),
|
||||||
|
had_previous: fsx::safe_join(&fixture, &item.path).is_ok_and(|path| path.is_file()), started:false, done:false,
|
||||||
|
}).collect(), message:None, recovery_hashes:BTreeMap::new() };
|
||||||
|
let before = txn_dir(&metadata, &txn.id)?.join("before");
|
||||||
|
fs::create_dir_all(&before)?;
|
||||||
|
apply_ops(&fixture, tree, &before, &manifest.files, &mut txn, &metadata, None)?;
|
||||||
|
crate::mysql_snapshot::validate_connections(&fixture, self.root)?;
|
||||||
|
crate::mysql_snapshot::isolate_connections(&fixture)?;
|
||||||
|
let identities = crate::backup::with_database(&fixture, |db| {
|
||||||
|
let identities = database_identities(db)?;
|
||||||
|
let realms = crate::realms::state(&fixture)?;
|
||||||
|
let mut modes = vec![realms.active];
|
||||||
|
if realms.wildcard_created { modes.push(if realms.active == crate::realms::Mode::Coa { crate::realms::Mode::Wildcard } else { crate::realms::Mode::Coa }); }
|
||||||
|
for (index, mode) in modes.into_iter().enumerate() {
|
||||||
|
let db = db.clone().for_realm(mode);
|
||||||
|
crate::schema_check::repair_missing_defaults(&db, &fixture, manifest.files.iter().find(|file| file.path == crate::schema_check::CONTRACT).map(|file| file.sha256.as_str()))?;
|
||||||
|
let list: Vec<_> = manifest.migrations.iter().filter(|migration| index == 0 || migration.db != "auth").cloned().collect();
|
||||||
|
let report = crate::migrations::apply_pending(&db, &list, &tree.join("_migrations"), &|| Ok("private rehearsal".into()))?;
|
||||||
|
if let Some((migration, error)) = report.failed { return Err(Error::Invalid(format!("Rehearsal migration {migration} failed: {error}"))); }
|
||||||
|
crate::schema_check::repair_missing_defaults(&db, &fixture, manifest.files.iter().find(|file| file.path == crate::schema_check::CONTRACT).map(|file| file.sha256.as_str()))?;
|
||||||
|
}
|
||||||
|
verify_database_identities(db, &identities)?;
|
||||||
|
Ok(identities)
|
||||||
|
})?;
|
||||||
|
env.validate()?;
|
||||||
|
crate::backup::with_database(&fixture, |db| verify_database_identities(db, &identities))?;
|
||||||
|
env.ensure_stopped()
|
||||||
|
});
|
||||||
|
let stopped = crate::mysql_snapshot::stop(&fixture);
|
||||||
|
let live_state = if result.is_ok() { crate::mysql_snapshot::stop(self.root).and_then(|()| crate::mysql_snapshot::unchanged(self.root, snapshot)) } else { Ok(()) };
|
||||||
|
let logs: BTreeMap<_, _> = ["Core/Logs/auth-console.log", "Core/Logs/world-console.log", "Core/Logs/supervisor.log", "mysql/logs/mysql-error.log"].into_iter()
|
||||||
|
.map(|path| (path, crate::diag::redact(&crate::health::tail(&fixture.join(path), 32768)))).collect();
|
||||||
|
let mut schema_reports = Vec::<serde_json::Value>::new();
|
||||||
|
if let Ok(entries) = fs::read_dir(metadata.join("diagnostics")) {
|
||||||
|
for entry in entries.flatten().filter(|entry| entry.file_name().to_string_lossy().starts_with("schema-validation-")) {
|
||||||
|
let path = fsx::ensure_within(&metadata, &entry.path())?;
|
||||||
|
if fs::metadata(&path)?.len() <= 4 * 1024 * 1024 { schema_reports.push(fsx::read_json(&path)?); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let report = serde_json::json!({"schema":1,"checkedAt":chrono::Utc::now().to_rfc3339(),"toVersion":manifest.version,"recoveryPoint":id,
|
||||||
|
"result":if result.is_ok() && stopped.is_ok() && live_state.is_ok() {"passed"} else {"failed"}, "error":result.as_ref().err().map(ToString::to_string), "stopError":stopped.as_ref().err().map(ToString::to_string), "liveStateError":live_state.as_ref().err().map(ToString::to_string), "logs":logs,"schemaReports":schema_reports,"fixture":fixture});
|
||||||
|
let report_path = self.meta_dir.join("diagnostics").join(format!("database-rehearsal-{}.json", uuid::Uuid::new_v4()));
|
||||||
|
fsx::atomic_write_json(&report_path, &report)?;
|
||||||
|
stopped?;
|
||||||
|
let parent = fixture.parent().unwrap();
|
||||||
|
let owned = fsx::ensure_within(&self.meta_dir.join("rehearsals"), parent)?;
|
||||||
|
fs::remove_dir_all(owned)?;
|
||||||
|
live_state?;
|
||||||
|
result
|
||||||
|
}
|
||||||
fn preflight(&self, manifest: &Manifest) -> Result<()> {
|
fn preflight(&self, manifest: &Manifest) -> Result<()> {
|
||||||
|
crate::mysql_snapshot::stop_previous_rehearsals(self.meta_dir)?;
|
||||||
|
if let Some(compatibility) = &manifest.compatibility {
|
||||||
|
let (_, meta) = MetaDir::open(self.meta_dir)?;
|
||||||
|
if let Some(source) = meta.core.version.as_ref().and_then(|v| compatibility.source_databases.get(v)) {
|
||||||
|
if let Some(expected) = &source.schema_sha256 {
|
||||||
|
let contract = self.root.join("Scripts/database-schema.json");
|
||||||
|
if fsx::sha256_file(&contract)? != *expected {
|
||||||
|
return Err(Error::Invalid("The installed database schema contract differs from the qualified upgrade source; repair the installation first.".into()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
crate::backup::with_database(self.root, |db| {
|
||||||
|
let mut modes = vec![crate::realms::Mode::Coa];
|
||||||
|
if crate::realms::state(self.root)?.wildcard_created { modes.push(crate::realms::Mode::Wildcard); }
|
||||||
|
for mode in modes {
|
||||||
|
if let Some(problem) = crate::schema_check::check_with_report(&db.clone().for_realm(mode), self.root)?.first() {
|
||||||
|
if crate::docker::is_docker(self.root) {
|
||||||
|
return Err(Error::Invalid(format!("The installed {} database does not match its upgrade source: {}.{}: {}", mode.name(), problem.database, problem.table, problem.detail)));
|
||||||
|
}
|
||||||
|
tracing::warn!(realm = mode.name(), table = %problem.table, "Installed schema differs; the private candidate rehearsal must qualify this database");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
})?;
|
||||||
|
}
|
||||||
|
}
|
||||||
self.pending_migrations(manifest).map(|_| ())
|
self.pending_migrations(manifest).map(|_| ())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -873,6 +1050,13 @@ impl Env for RepackEnv<'_> {
|
|||||||
if !["characters", "auth", "world", "configs"].iter().all(|name| point.components.iter().any(|c| c.name == *name)) || !crate::backup::verify(self.meta_dir, id)?.ok {
|
if !["characters", "auth", "world", "configs"].iter().all(|name| point.components.iter().any(|c| c.name == *name)) || !crate::backup::verify(self.meta_dir, id)?.ok {
|
||||||
return Err(Error::Invalid("The full database recovery point is incomplete or damaged.".into()));
|
return Err(Error::Invalid("The full database recovery point is incomplete or damaged.".into()));
|
||||||
}
|
}
|
||||||
|
if let Some(snapshot) = &point.mysql_snapshot {
|
||||||
|
crate::mysql_snapshot::stop(self.root)?;
|
||||||
|
let point_dir = crate::backup::point_json(self.meta_dir, id)?.parent().unwrap().to_path_buf();
|
||||||
|
crate::mysql_snapshot::swap(self.root, self.meta_dir, &point_dir, snapshot, false)?;
|
||||||
|
crate::backup::restore_configs(self.root, self.meta_dir, id)?;
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
for component in point.components.iter().filter(|c| c.sha256.is_some()) {
|
for component in point.components.iter().filter(|c| c.sha256.is_some()) {
|
||||||
crate::backup::restore_database(self.root, self.meta_dir, id, &component.name)?;
|
crate::backup::restore_database(self.root, self.meta_dir, id, &component.name)?;
|
||||||
}
|
}
|
||||||
@@ -884,12 +1068,17 @@ impl Env for RepackEnv<'_> {
|
|||||||
let root = self.root;
|
let root = self.root;
|
||||||
crate::backup::with_database(root, |db| {
|
crate::backup::with_database(root, |db| {
|
||||||
let realms = crate::realms::state(root)?;
|
let realms = crate::realms::state(root)?;
|
||||||
|
if let Some(contract) = manifest.files.iter().find(|file| file.path == crate::schema_check::CONTRACT) {
|
||||||
|
self.migration_snapshot()?;
|
||||||
|
crate::schema_check::repair_missing_defaults(db, root, Some(&contract.sha256))?;
|
||||||
|
}
|
||||||
let mut result = crate::migrations::apply_pending(db, &manifest.migrations, staged, &|| {
|
let mut result = crate::migrations::apply_pending(db, &manifest.migrations, staged, &|| {
|
||||||
self.migration_snapshot()
|
self.migration_snapshot()
|
||||||
})?;
|
})?;
|
||||||
if realms.wildcard_created && result.failed.is_none() {
|
if realms.wildcard_created && result.failed.is_none() {
|
||||||
let other = if realms.active == crate::realms::Mode::Coa { crate::realms::Mode::Wildcard } else { crate::realms::Mode::Coa };
|
let other = if realms.active == crate::realms::Mode::Coa { crate::realms::Mode::Wildcard } else { crate::realms::Mode::Coa };
|
||||||
let other_db = db.clone().for_realm(other);
|
let other_db = db.clone().for_realm(other);
|
||||||
|
crate::schema_check::repair_missing_defaults(&other_db, root, manifest.files.iter().find(|file| file.path == crate::schema_check::CONTRACT).map(|file| file.sha256.as_str()))?;
|
||||||
let shared_snapshot = result.snapshot.clone();
|
let shared_snapshot = result.snapshot.clone();
|
||||||
let migrations: Vec<_> = manifest.migrations.iter().filter(|m| m.db != "auth").cloned().collect();
|
let migrations: Vec<_> = manifest.migrations.iter().filter(|m| m.db != "auth").cloned().collect();
|
||||||
let extra = crate::migrations::apply_pending(&other_db, &migrations, staged, &|| {
|
let extra = crate::migrations::apply_pending(&other_db, &migrations, staged, &|| {
|
||||||
@@ -900,13 +1089,15 @@ impl Env for RepackEnv<'_> {
|
|||||||
result.failed = extra.failed;
|
result.failed = extra.failed;
|
||||||
if result.snapshot.is_none() { result.snapshot = extra.snapshot; }
|
if result.snapshot.is_none() { result.snapshot = extra.snapshot; }
|
||||||
if result.failed.is_none() {
|
if result.failed.is_none() {
|
||||||
if let Some(p) = crate::schema_check::check(&other_db, root)?.first() {
|
crate::schema_check::repair_missing_defaults(&other_db, root, manifest.files.iter().find(|file| file.path == crate::schema_check::CONTRACT).map(|file| file.sha256.as_str()))?;
|
||||||
|
if let Some(p) = crate::schema_check::check_with_report(&other_db, root)?.first() {
|
||||||
return Err(Error::Invalid(format!("Database validation failed on {}: {}.{}: {}", other.name(), p.table, p.column, p.detail)));
|
return Err(Error::Invalid(format!("Database validation failed on {}: {}.{}: {}", other.name(), p.table, p.column, p.detail)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if result.failed.is_none() {
|
if result.failed.is_none() {
|
||||||
let problems = crate::schema_check::check(db, root)?;
|
crate::schema_check::repair_missing_defaults(db, root, manifest.files.iter().find(|file| file.path == crate::schema_check::CONTRACT).map(|file| file.sha256.as_str()))?;
|
||||||
|
let problems = crate::schema_check::check_with_report(db, root)?;
|
||||||
if let Some(p) = problems.first() {
|
if let Some(p) = problems.first() {
|
||||||
return Err(Error::Invalid(format!("Database validation failed: {}.{}.{}: {} ({} problems).", p.database, p.table, p.column, p.detail, problems.len())));
|
return Err(Error::Invalid(format!("Database validation failed: {}.{}.{}: {} ({} problems).", p.database, p.table, p.column, p.detail, problems.len())));
|
||||||
}
|
}
|
||||||
@@ -916,17 +1107,33 @@ impl Env for RepackEnv<'_> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn validate(&self) -> Result<()> {
|
fn validate(&self) -> Result<()> {
|
||||||
|
self.validate_server(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn validate_recovery(&self) -> Result<()> {
|
||||||
|
self.validate_server(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl RepackEnv<'_> {
|
||||||
|
fn validate_server(&self, check_schema: bool) -> Result<()> {
|
||||||
|
let stopped = crate::driver::run(self.root, crate::driver::Verb::StopAll)?;
|
||||||
|
if !stopped.ok { return Err(Error::Invalid("Could not stop the server before isolated validation.".into())); }
|
||||||
|
self.ensure_stopped()?;
|
||||||
|
self.recover_validation()?;
|
||||||
|
let result = (|| -> Result<()> {
|
||||||
|
crate::update_isolation::begin(self.root, self.meta_dir)?;
|
||||||
use crate::process::{observe, ServiceState};
|
use crate::process::{observe, ServiceState};
|
||||||
crate::backup::with_database(self.root, |db| {
|
if check_schema { crate::backup::with_database(self.root, |db| {
|
||||||
let mut modes = vec![crate::realms::Mode::Coa];
|
let mut modes = vec![crate::realms::Mode::Coa];
|
||||||
if crate::realms::state(self.root)?.wildcard_created { modes.push(crate::realms::Mode::Wildcard); }
|
if crate::realms::state(self.root)?.wildcard_created { modes.push(crate::realms::Mode::Wildcard); }
|
||||||
for mode in modes {
|
for mode in modes {
|
||||||
if let Some(p) = crate::schema_check::check(&db.clone().for_realm(mode), self.root)?.first() {
|
if let Some(p) = crate::schema_check::check_with_report(&db.clone().for_realm(mode), self.root)?.first() {
|
||||||
return Err(Error::Invalid(format!("Database validation failed on {}: {}.{}: {}", mode.name(), p.database, p.table, p.detail)));
|
return Err(Error::Invalid(format!("Database validation failed on {}: {}.{}: {}", mode.name(), p.database, p.table, p.detail)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
})?;
|
})?; }
|
||||||
// The check start is the first start of the new build: give the module configs the settings the update added
|
// The check start is the first start of the new build: give the module configs the settings the update added
|
||||||
// (as a normal start does), or the server logs a "missing property" line for every one of them.
|
// (as a normal start does), or the server logs a "missing property" line for every one of them.
|
||||||
match crate::registry::MetaDir::open(self.meta_dir) {
|
match crate::registry::MetaDir::open(self.meta_dir) {
|
||||||
@@ -970,7 +1177,41 @@ impl Env for RepackEnv<'_> {
|
|||||||
// Leave the files unlocked so that a rollback can replace them.
|
// Leave the files unlocked so that a rollback can replace them.
|
||||||
let _ = crate::driver::run(self.root, crate::driver::Verb::StopAll);
|
let _ = crate::driver::run(self.root, crate::driver::Verb::StopAll);
|
||||||
Err(Error::Invalid(cause))
|
Err(Error::Invalid(cause))
|
||||||
|
})();
|
||||||
|
let stopped = crate::driver::run(self.root, crate::driver::Verb::StopAll)?;
|
||||||
|
if !stopped.ok {
|
||||||
|
return Err(Error::Invalid("Isolated validation could not stop the server; recovery configurations were preserved.".into()));
|
||||||
}
|
}
|
||||||
|
self.ensure_stopped()?;
|
||||||
|
self.recover_validation()?;
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
fn database_identities(db: &crate::db::Db) -> Result<BTreeMap<String, std::collections::BTreeSet<String>>> {
|
||||||
|
let db = db.clone().for_realm(crate::realms::Mode::Coa);
|
||||||
|
let mut identities = BTreeMap::new();
|
||||||
|
for (schema, table, columns) in [
|
||||||
|
("acore_characters", "characters", "guid,account,HEX(name)"),
|
||||||
|
("acore_characters_wildcard", "characters", "guid,account,HEX(name)"),
|
||||||
|
("acore_auth", "account", "id,HEX(username)"),
|
||||||
|
] {
|
||||||
|
if !db.schema_exists(schema)? || !db.tables(schema)?.iter().any(|name| name == table) { continue; }
|
||||||
|
let rows = db.query(&format!("SELECT {columns} FROM `{schema}`.`{table}`;"))?;
|
||||||
|
identities.insert(schema.into(), rows.lines().map(str::to_string).collect());
|
||||||
|
}
|
||||||
|
Ok(identities)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn verify_database_identities(db: &crate::db::Db, before: &BTreeMap<String, std::collections::BTreeSet<String>>) -> Result<()> {
|
||||||
|
let after = database_identities(db)?;
|
||||||
|
for (schema, expected) in before {
|
||||||
|
if after.get(schema).is_none_or(|actual| !expected.is_subset(actual)) {
|
||||||
|
return Err(Error::Invalid(format!("The private update changed or removed existing character or account identities in {schema}.")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
@@ -983,6 +1224,11 @@ mod tests {
|
|||||||
use std::cell::{Cell, RefCell};
|
use std::cell::{Cell, RefCell};
|
||||||
|
|
||||||
struct Fake {
|
struct Fake {
|
||||||
|
activation_expected: RefCell<Option<(PathBuf, String)>>,
|
||||||
|
activation_failed: Cell<bool>,
|
||||||
|
activated: Cell<bool>,
|
||||||
|
automatic_rollback: Cell<bool>,
|
||||||
|
recovery_healthy: Cell<bool>,
|
||||||
stopped: Cell<bool>,
|
stopped: Cell<bool>,
|
||||||
healthy: Cell<bool>,
|
healthy: Cell<bool>,
|
||||||
snapshot_ok: Cell<bool>,
|
snapshot_ok: Cell<bool>,
|
||||||
@@ -990,15 +1236,32 @@ mod tests {
|
|||||||
migrate_fail: Cell<bool>,
|
migrate_fail: Cell<bool>,
|
||||||
preflight_fail: Cell<bool>,
|
preflight_fail: Cell<bool>,
|
||||||
restore_fail: Cell<bool>,
|
restore_fail: Cell<bool>,
|
||||||
|
rehearsal_fail: Cell<bool>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Fake {
|
impl Fake {
|
||||||
fn ok() -> Fake {
|
fn ok() -> Fake {
|
||||||
Fake { stopped: Cell::new(true), healthy: Cell::new(true), snapshot_ok: Cell::new(true), calls: Default::default(), migrate_fail: Cell::new(false), preflight_fail: Cell::new(false), restore_fail: Cell::new(false) }
|
Fake { activation_expected: RefCell::new(None), activation_failed: Cell::new(false), activated: Cell::new(false), automatic_rollback: Cell::new(false), recovery_healthy: Cell::new(true), stopped: Cell::new(true), healthy: Cell::new(true), snapshot_ok: Cell::new(true), calls: Default::default(), migrate_fail: Cell::new(false), preflight_fail: Cell::new(false), restore_fail: Cell::new(false), rehearsal_fail: Cell::new(false) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Env for Fake {
|
impl Env for Fake {
|
||||||
|
fn rehearse(&self, _: &Manifest, _: &Path, _: &[PlanItem], _: &str) -> Result<()> {
|
||||||
|
if self.rehearsal_fail.get() { Err(Error::Invalid("SQL failed in the private copy".into())) } else { Ok(()) }
|
||||||
|
}
|
||||||
|
fn activate(&self) -> Result<()> {
|
||||||
|
if let Some((meta, version)) = self.activation_expected.borrow().as_ref() {
|
||||||
|
ensure_recovered(meta)?;
|
||||||
|
assert_eq!(MetaDir::open(meta)?.1.core.version.as_ref(), Some(version));
|
||||||
|
}
|
||||||
|
self.activated.set(true);
|
||||||
|
if self.activation_failed.get() { Err(Error::Invalid("Public startup failed".into())) } else { Ok(()) }
|
||||||
|
}
|
||||||
|
fn automatic_rollback(&self) -> bool { self.automatic_rollback.get() }
|
||||||
|
fn validate_recovery(&self) -> Result<()> {
|
||||||
|
self.calls.borrow_mut().push("validate-recovery");
|
||||||
|
if self.recovery_healthy.get() { Ok(()) } else { Err(Error::Invalid("Restored server is unhealthy".into())) }
|
||||||
|
}
|
||||||
fn preflight(&self, _: &Manifest) -> Result<()> {
|
fn preflight(&self, _: &Manifest) -> Result<()> {
|
||||||
if self.preflight_fail.get() { Err(Error::Invalid("Conflicting migration history".into())) } else { Ok(()) }
|
if self.preflight_fail.get() { Err(Error::Invalid("Conflicting migration history".into())) } else { Ok(()) }
|
||||||
}
|
}
|
||||||
@@ -1195,6 +1458,26 @@ mod tests {
|
|||||||
assert!(!w.root.join("Core/worldserver.exe.coa-new").exists());
|
assert!(!w.root.join("Core/worldserver.exe.coa-new").exists());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn public_startup_requires_a_completed_transaction_and_saved_version() {
|
||||||
|
let w = world(&[], false);
|
||||||
|
let env = Fake::ok();
|
||||||
|
*env.activation_expected.borrow_mut() = Some((w.meta.clone(), "2.0.0".into()));
|
||||||
|
run(&w, &env, BTreeMap::new(), None).unwrap();
|
||||||
|
assert!(env.activated.get());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn startup_failure_after_commit_does_not_restore_a_live_database() {
|
||||||
|
let w = world(&[], true);
|
||||||
|
let env = Fake::ok();
|
||||||
|
env.activation_failed.set(true);
|
||||||
|
assert!(run(&w, &env, BTreeMap::new(), None).is_err());
|
||||||
|
assert!(ensure_recovered(&w.meta).is_ok());
|
||||||
|
assert_eq!(MetaDir::open(&w.meta).unwrap().1.core.version.as_deref(), Some("2.0.0"));
|
||||||
|
assert!(!env.calls.borrow().contains(&"restore-databases"));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn an_integrated_launcher_is_current_but_user_edits_and_new_package_bytes_are_not() {
|
fn an_integrated_launcher_is_current_but_user_edits_and_new_package_bytes_are_not() {
|
||||||
let source = b"import sys\nfrom pathlib import Path\nfrom squid_playerbots import configure\nROOT = Path(__file__).resolve().parents[1]\n";
|
let source = b"import sys\nfrom pathlib import Path\nfrom squid_playerbots import configure\nROOT = Path(__file__).resolve().parents[1]\n";
|
||||||
@@ -1269,6 +1552,46 @@ mod tests {
|
|||||||
assert_eq!(fs::read(saved).unwrap(), b"my-custom-build", "the replaced custom build is kept for rollback");
|
assert_eq!(fs::read(saved).unwrap(), b"my-custom-build", "the replaced custom build is kept for rollback");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn power_loss_during_bulk_files_restores_written_and_unwritten_files() {
|
||||||
|
let d = tempfile::tempdir().unwrap();
|
||||||
|
let root = d.path().join("root");
|
||||||
|
let meta = d.path().join("meta");
|
||||||
|
let tree = d.path().join("tree");
|
||||||
|
let before = meta.join("updates/bulk/before");
|
||||||
|
let mut files = Vec::new();
|
||||||
|
let mut ops = Vec::new();
|
||||||
|
for (path, previous) in [("Data/maps/first.map", true), ("Data/maps/new.map", false), ("Data/maps/last.map", true)] {
|
||||||
|
if previous { write(&root, path, b"old"); }
|
||||||
|
write(&tree, path, b"new");
|
||||||
|
let hash = fsx::sha256_file(&tree.join(path)).unwrap();
|
||||||
|
files.push(FileEntry { path: path.into(), sha256: hash.clone(), size: 3, policy: ReplacePolicy::Replace, owner: crate::manifest::Owner::Core });
|
||||||
|
ops.push(Op { path: path.into(), action: if previous { Action::Replace } else { Action::Create }, reason: None,
|
||||||
|
new_sha256: hash, had_previous: previous, started: false, done: false });
|
||||||
|
}
|
||||||
|
let mut txn = Txn { id: "bulk".into(), state: State::Applying, from_version: Some("1".into()), to_version: "2".into(),
|
||||||
|
recovery_point: None, databases_started: false, ops, message: None, recovery_hashes: BTreeMap::new() };
|
||||||
|
fs::create_dir_all(before.parent().unwrap()).unwrap();
|
||||||
|
assert!(apply_ops(&root, &tree, &before, &files, &mut txn, &meta, Some(2)).is_err());
|
||||||
|
// A power loss sees the pre-write checkpoint, not the in-memory completed flags.
|
||||||
|
let mut durable = load(&meta, "bulk").unwrap();
|
||||||
|
assert!(durable.ops.iter().all(|op| op.started && !op.done));
|
||||||
|
assert_eq!(fs::read(root.join("Data/maps/last.map")).unwrap(), b"old");
|
||||||
|
restore_files(&root, &before, &mut durable).unwrap();
|
||||||
|
assert_eq!(fs::read(root.join("Data/maps/first.map")).unwrap(), b"old");
|
||||||
|
assert_eq!(fs::read(root.join("Data/maps/last.map")).unwrap(), b"old");
|
||||||
|
assert!(!root.join("Data/maps/new.map").exists());
|
||||||
|
// If preparing any recovery copy fails, no destination may be changed.
|
||||||
|
for op in &mut durable.ops { op.started = false; op.done = false; }
|
||||||
|
durable.recovery_hashes.clear();
|
||||||
|
save(&meta, &durable).unwrap();
|
||||||
|
fs::remove_file(root.join("Data/maps/last.map")).unwrap();
|
||||||
|
assert!(apply_ops(&root, &tree, &before, &files, &mut durable, &meta, None).is_err());
|
||||||
|
assert_eq!(fs::read(root.join("Data/maps/first.map")).unwrap(), b"old");
|
||||||
|
assert!(!root.join("Data/maps/new.map").exists());
|
||||||
|
assert!(load(&meta, "bulk").unwrap().ops.iter().all(|op| !op.started));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn failure_in_the_middle_of_applying_restores_every_file_byte_for_byte() {
|
fn failure_in_the_middle_of_applying_restores_every_file_byte_for_byte() {
|
||||||
for fail_after in [0usize, 1, 2] {
|
for fail_after in [0usize, 1, 2] {
|
||||||
@@ -1304,6 +1627,75 @@ mod tests {
|
|||||||
assert!(rollback(&w.root, &w.meta, &out.txn.id, &env).is_err(), "already rolled back");
|
assert!(rollback(&w.root, &w.meta, &out.txn.id, &env).is_err(), "already rolled back");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn automatic_health_failure_restores_databases_files_and_checks_recovery() {
|
||||||
|
let w = world(&[], true);
|
||||||
|
let env = Fake::ok();
|
||||||
|
env.automatic_rollback.set(true);
|
||||||
|
env.healthy.set(false);
|
||||||
|
assert!(run(&w, &env, BTreeMap::new(), None).unwrap_err().to_string().contains("restored"));
|
||||||
|
assert_eq!(read(&w, "Core/worldserver.exe"), b"world-v1");
|
||||||
|
assert!(!w.root.join("Core/newfile.dll").exists());
|
||||||
|
assert!(env.calls.borrow().contains(&"restore-databases"));
|
||||||
|
assert!(env.calls.borrow().contains(&"validate-recovery"));
|
||||||
|
assert!(unfinished(&w.meta).is_none());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn incompatible_source_or_platform_is_rejected_without_touching_installation() {
|
||||||
|
let w = world(&[], false);
|
||||||
|
let (_, meta) = MetaDir::open(&w.meta).unwrap();
|
||||||
|
let mut manifest = Manifest::parse(&fs::read(w.pkg.join("manifest.json")).unwrap()).unwrap();
|
||||||
|
manifest.min_manager_version = "0.6.13".into();
|
||||||
|
manifest.core.commit = Some("a".repeat(40));
|
||||||
|
manifest.compatibility = Some(crate::manifest::Compatibility { schema: 1,
|
||||||
|
platform: if cfg!(windows) { "windows-x86_64" } else { "linux-x86_64" }.into(),
|
||||||
|
core_commit: "a".repeat(40), module_commits: [("squid".into(), "b".repeat(40))].into(),
|
||||||
|
source_databases: Default::default(), client_patch_version: "1.5.1".into(), source_versions: vec!["1.0.0".into()] });
|
||||||
|
manifest.validate().unwrap();
|
||||||
|
validate_candidate(&meta, &manifest).unwrap();
|
||||||
|
manifest.compatibility.as_mut().unwrap().source_versions = vec!["0.9.0".into()];
|
||||||
|
assert!(validate_candidate(&meta, &manifest).unwrap_err().to_string().contains("compatibility matrix"));
|
||||||
|
manifest.compatibility.as_mut().unwrap().source_versions = vec!["1.0.0".into()];
|
||||||
|
manifest.compatibility.as_mut().unwrap().platform = if cfg!(windows) { "linux-x86_64" } else { "windows-x86_64" }.into();
|
||||||
|
assert!(validate_candidate(&meta, &manifest).unwrap_err().to_string().contains("targets"));
|
||||||
|
assert_eq!(read(&w, "Core/worldserver.exe"), b"world-v1");
|
||||||
|
assert!(unfinished(&w.meta).is_none());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn changed_installed_schema_contract_blocks_before_database_access() {
|
||||||
|
let w = world(&[], false);
|
||||||
|
write(&w.root, "Scripts/database-schema.json", b"modified schema contract");
|
||||||
|
let mut manifest = Manifest::parse(&fs::read(w.pkg.join("manifest.json")).unwrap()).unwrap();
|
||||||
|
manifest.compatibility = Some(crate::manifest::Compatibility { schema: 1,
|
||||||
|
platform: "windows-x86_64".into(), core_commit: "a".repeat(40),
|
||||||
|
module_commits: [("squid".into(), "b".repeat(40))].into(), client_patch_version: "1.5.1".into(),
|
||||||
|
source_versions: vec!["1.0.0".into()],
|
||||||
|
source_databases: [("1.0.0".into(), crate::manifest::SourceDatabase {
|
||||||
|
manifest_sha256: "a".repeat(64), schema_sha256: Some("b".repeat(64)) })].into() });
|
||||||
|
let env = RepackEnv { root: &w.root, meta_dir: &w.meta };
|
||||||
|
let error = env.preflight(&manifest).unwrap_err().to_string();
|
||||||
|
assert!(error.contains("schema contract differs"), "{error}");
|
||||||
|
assert!(!w.root.join("Runtime/python/python.exe").exists());
|
||||||
|
assert_eq!(read(&w, "Core/worldserver.exe"), b"world-v1");
|
||||||
|
assert!(unfinished(&w.meta).is_none());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn unhealthy_restoration_preserves_recovery_and_blocks_startup() {
|
||||||
|
let w = world(&[], true);
|
||||||
|
let env = Fake::ok();
|
||||||
|
env.automatic_rollback.set(true);
|
||||||
|
env.healthy.set(false);
|
||||||
|
env.recovery_healthy.set(false);
|
||||||
|
assert!(run(&w, &env, BTreeMap::new(), None).unwrap_err().to_string().contains("Recovery failed"));
|
||||||
|
let pending = unfinished(&w.meta).unwrap();
|
||||||
|
assert_eq!(pending.state, State::Failed);
|
||||||
|
assert!(txn_dir(&w.meta, &pending.id).unwrap().join("before").exists());
|
||||||
|
assert!(ensure_recovered(&w.meta).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn retrying_startup_commits_without_reapplying_sql_or_restoring_databases() {
|
fn retrying_startup_commits_without_reapplying_sql_or_restoring_databases() {
|
||||||
let w = world(&[], true);
|
let w = world(&[], true);
|
||||||
@@ -1497,6 +1889,23 @@ mod tests {
|
|||||||
assert!(fs::read_dir(w.meta.join("updates")).unwrap().next().is_none());
|
assert!(fs::read_dir(w.meta.join("updates")).unwrap().next().is_none());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn failed_rehearsal_preserves_installed_files_version_and_recovery_point() {
|
||||||
|
let w = world(&[], true);
|
||||||
|
let env = Fake::ok();
|
||||||
|
env.rehearsal_fail.set(true);
|
||||||
|
let original = fsx::sha256_file(&w.meta.join("install.json")).unwrap();
|
||||||
|
let error = run(&w, &env, BTreeMap::new(), None).unwrap_err();
|
||||||
|
assert!(error.to_string().contains("installed server was not updated"));
|
||||||
|
assert_eq!(read(&w, "Core/worldserver.exe"), b"world-v1");
|
||||||
|
assert_eq!(fsx::sha256_file(&w.meta.join("install.json")).unwrap(), original);
|
||||||
|
assert_eq!(&*env.calls.borrow(), &["stop", "snapshot"]);
|
||||||
|
assert!(pending_checked(&w.meta).unwrap().is_none());
|
||||||
|
let journal = journals(&w.meta).unwrap().remove(0);
|
||||||
|
assert_eq!(journal.recovery_point.as_deref(), Some("rp-1"));
|
||||||
|
assert!(!journal.databases_started && journal.ops.is_empty());
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn missing_and_semantically_corrupt_journals_block_operations() {
|
fn missing_and_semantically_corrupt_journals_block_operations() {
|
||||||
let w = world(&[], false);
|
let w = world(&[], false);
|
||||||
|
|||||||
@@ -0,0 +1,163 @@
|
|||||||
|
use std::{collections::BTreeMap, fs, path::Path};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use crate::{config::parser::ConfFile, fsx, Error, Result};
|
||||||
|
|
||||||
|
const FILES: &[&str] = &[
|
||||||
|
"Settings/repack.json", "Settings/realm-profile.json",
|
||||||
|
"Settings/worldserver.conf.template", "Settings/authserver.conf.template",
|
||||||
|
"Core/configs/worldserver.conf", "Core/configs/authserver.conf",
|
||||||
|
"Settings/realm-profiles/coa.json", "Settings/realm-profiles/wildcard.json",
|
||||||
|
".realms/secondary/Settings/repack.json", ".realms/secondary/Settings/realm-profile.json",
|
||||||
|
".realms/secondary/Settings/worldserver.conf.template", ".realms/secondary/Settings/authserver.conf.template",
|
||||||
|
".realms/secondary/Core/configs/worldserver.conf", ".realms/secondary/Core/configs/authserver.conf",
|
||||||
|
];
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
struct Saved { bytes: Option<Vec<u8>>, sha256: Option<String> }
|
||||||
|
|
||||||
|
pub(crate) fn pending(meta: &Path) -> bool { meta.join("validation-configs.json").exists() }
|
||||||
|
|
||||||
|
pub(crate) fn begin(root: &Path, meta: &Path) -> Result<()> {
|
||||||
|
if pending(meta) { return Err(Error::Invalid("Interrupted isolated validation must be recovered first.".into())); }
|
||||||
|
let mut saved = BTreeMap::new();
|
||||||
|
for rel in FILES {
|
||||||
|
let path = fsx::ensure_within(root, &fsx::safe_join(root, rel)?)?;
|
||||||
|
let bytes = if path.exists() { Some(fs::read(path)?) } else { None };
|
||||||
|
let sha256 = bytes.as_ref().map(|b| fsx::sha256_bytes(b));
|
||||||
|
saved.insert(*rel, Saved { bytes, sha256 });
|
||||||
|
}
|
||||||
|
let mut settings: serde_json::Value = fsx::read_json(&root.join("Settings/repack.json"))?;
|
||||||
|
let mut realm: Option<serde_json::Value> = if root.join("Settings/realm-profile.json").exists() {
|
||||||
|
Some(fsx::read_json(&root.join("Settings/realm-profile.json"))?)
|
||||||
|
} else { None };
|
||||||
|
let mut excluded: std::collections::BTreeSet<u64> = ["mysqlPort", "authPort", "worldPort", "raPort"].iter()
|
||||||
|
.filter_map(|key| settings[*key].as_u64()).collect();
|
||||||
|
if let Some(state) = &realm {
|
||||||
|
excluded.extend(["secondary_world_port", "secondary_ra_port"].iter().filter_map(|key| state[*key].as_u64()));
|
||||||
|
}
|
||||||
|
let mut sockets = Vec::new();
|
||||||
|
let mut reserve = || -> Result<u16> {
|
||||||
|
loop {
|
||||||
|
let socket = std::net::TcpListener::bind("127.0.0.1:0")?;
|
||||||
|
let port = socket.local_addr()?.port();
|
||||||
|
if excluded.insert(u64::from(port)) {
|
||||||
|
sockets.push(socket);
|
||||||
|
return Ok(port);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
for key in ["authPort", "worldPort", "raPort"] { settings[key] = reserve()?.into(); }
|
||||||
|
if let Some(state) = &mut realm {
|
||||||
|
for key in ["secondary_world_port", "secondary_ra_port"] {
|
||||||
|
state[key] = reserve()?.into();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let mut configs = Vec::new();
|
||||||
|
for rel in ["Settings/worldserver.conf.template", "Settings/authserver.conf.template", "Core/configs/worldserver.conf", "Core/configs/authserver.conf"] {
|
||||||
|
let path = root.join(rel);
|
||||||
|
if !path.exists() && rel.ends_with(".template") {
|
||||||
|
return Err(Error::Invalid(format!("Cannot isolate validation without {rel}.")));
|
||||||
|
}
|
||||||
|
if path.exists() {
|
||||||
|
let mut conf = ConfFile::parse_bytes(&fs::read(&path)?)?;
|
||||||
|
conf.set("BindIP", "\"127.0.0.1\"", &[]);
|
||||||
|
if rel.contains("worldserver") { conf.set("Ra.IP", "\"127.0.0.1\"", &[]); }
|
||||||
|
configs.push((path, conf.to_text()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fsx::atomic_write_json(&meta.join("validation-configs.json"), &saved)?;
|
||||||
|
fsx::atomic_write_json(&root.join("Settings/repack.json"), &settings)?;
|
||||||
|
if let Some(state) = realm { fsx::atomic_write_json(&root.join("Settings/realm-profile.json"), &state)?; }
|
||||||
|
for (path, text) in configs { fsx::atomic_write(&path, text.as_bytes())?; }
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
fn fixture() -> (tempfile::TempDir, std::path::PathBuf, std::path::PathBuf) {
|
||||||
|
let dir = tempfile::tempdir().unwrap();
|
||||||
|
let root = dir.path().join("server");
|
||||||
|
let meta = dir.path().join("metadata");
|
||||||
|
fs::create_dir_all(root.join("Settings")).unwrap();
|
||||||
|
fs::create_dir_all(&meta).unwrap();
|
||||||
|
fsx::atomic_write_json(&root.join(FILES[0]), &serde_json::json!({"mysqlPort":3306,"authPort":3724,"worldPort":8085,"raPort":3443})).unwrap();
|
||||||
|
fsx::atomic_write_json(&root.join(FILES[1]), &serde_json::json!({"simultaneous":true,"secondary_world_port":8086,"secondary_ra_port":3444})).unwrap();
|
||||||
|
for rel in [FILES[2], FILES[3]] {
|
||||||
|
fsx::atomic_write(&root.join(rel), b"BindIP = \"0.0.0.0\"\r\nRa.IP = \"0.0.0.0\"\r\n").unwrap();
|
||||||
|
}
|
||||||
|
(dir, root, meta)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn interrupted_validation_restores_original_bytes_and_absent_files() {
|
||||||
|
let (_dir, root, meta) = fixture();
|
||||||
|
let original: Vec<_> = FILES.iter().map(|p| fs::read(root.join(p)).ok()).collect();
|
||||||
|
begin(&root, &meta).unwrap();
|
||||||
|
assert!(crate::update::ensure_recovered(&meta).is_err());
|
||||||
|
assert!(begin(&root, &meta).is_err());
|
||||||
|
let settings: serde_json::Value = fsx::read_json(&root.join(FILES[0])).unwrap();
|
||||||
|
assert_eq!(settings["mysqlPort"], 3306);
|
||||||
|
let realm: serde_json::Value = fsx::read_json(&root.join(FILES[1])).unwrap();
|
||||||
|
let ports: std::collections::BTreeSet<_> = [settings["authPort"].as_u64(), settings["worldPort"].as_u64(), settings["raPort"].as_u64(), realm["secondary_world_port"].as_u64(), realm["secondary_ra_port"].as_u64()].into_iter().collect();
|
||||||
|
assert_eq!(ports.len(), 5);
|
||||||
|
let config = ConfFile::parse_bytes(&fs::read(root.join(FILES[2])).unwrap()).unwrap();
|
||||||
|
assert_eq!(config.get("BindIP"), Some("\"127.0.0.1\""));
|
||||||
|
fsx::atomic_write(&root.join(FILES[4]), b"rendered temporary configuration").unwrap();
|
||||||
|
restore(&root, &meta).unwrap();
|
||||||
|
for (rel, bytes) in FILES.iter().zip(original) { assert_eq!(fs::read(root.join(rel)).ok(), bytes); }
|
||||||
|
assert!(!pending(&meta));
|
||||||
|
restore(&root, &meta).unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn damaged_recovery_copy_blocks_all_restoration() {
|
||||||
|
let (_dir, root, meta) = fixture();
|
||||||
|
begin(&root, &meta).unwrap();
|
||||||
|
let journal = meta.join("validation-configs.json");
|
||||||
|
let mut saved: BTreeMap<String, Saved> = fsx::read_json(&journal).unwrap();
|
||||||
|
saved.get_mut(FILES[0]).unwrap().bytes = Some(b"damaged".to_vec());
|
||||||
|
fsx::atomic_write_json(&journal, &saved).unwrap();
|
||||||
|
let before = fs::read(root.join(FILES[2])).unwrap();
|
||||||
|
assert!(restore(&root, &meta).is_err());
|
||||||
|
assert_eq!(fs::read(root.join(FILES[2])).unwrap(), before);
|
||||||
|
assert!(pending(&meta));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn missing_template_fails_before_any_configuration_changes() {
|
||||||
|
let (_dir, root, meta) = fixture();
|
||||||
|
fs::remove_file(root.join(FILES[3])).unwrap();
|
||||||
|
let before = fs::read(root.join(FILES[0])).unwrap();
|
||||||
|
assert!(begin(&root, &meta).is_err());
|
||||||
|
assert!(!pending(&meta));
|
||||||
|
assert_eq!(fs::read(root.join(FILES[0])).unwrap(), before);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn restore(root: &Path, meta: &Path) -> Result<()> {
|
||||||
|
if !pending(meta) { return Ok(()); }
|
||||||
|
let journal = meta.join("validation-configs.json");
|
||||||
|
let saved: BTreeMap<String, Saved> = fsx::read_json(&journal)?;
|
||||||
|
if saved.len() != FILES.len() || FILES.iter().any(|rel| !saved.contains_key(*rel)) {
|
||||||
|
return Err(Error::Invalid("Isolated validation configuration journal is incomplete.".into()));
|
||||||
|
}
|
||||||
|
for (rel, file) in &saved {
|
||||||
|
fsx::ensure_within(root, &fsx::safe_join(root, rel)?)?;
|
||||||
|
if file.bytes.as_ref().map(|b| fsx::sha256_bytes(b)) != file.sha256 {
|
||||||
|
return Err(Error::Invalid(format!("Isolated validation recovery copy {rel} is damaged.")));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (rel, file) in saved {
|
||||||
|
let path = fsx::ensure_within(root, &fsx::safe_join(root, &rel)?)?;
|
||||||
|
match file.bytes {
|
||||||
|
Some(bytes) => fsx::atomic_write(&path, &bytes)?,
|
||||||
|
None if path.exists() => fs::remove_file(path)?,
|
||||||
|
None => {},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fs::remove_file(journal)?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -47,6 +47,36 @@ fn run() -> Result<(), String> {
|
|||||||
let e = |x: coa_core::Error| x.to_string();
|
let e = |x: coa_core::Error| x.to_string();
|
||||||
let part = a.get("part-size").and_then(|v| v.parse().ok()).unwrap_or(DEFAULT_PART_SIZE);
|
let part = a.get("part-size").and_then(|v| v.parse().ok()).unwrap_or(DEFAULT_PART_SIZE);
|
||||||
match cmd.as_str() {
|
match cmd.as_str() {
|
||||||
|
"qualify-upgrade" => {
|
||||||
|
let report = coa_core::release_schema::qualify_upgrade(
|
||||||
|
&PathBuf::from(need(&a, "base")?), &PathBuf::from(need(&a, "source")?),
|
||||||
|
&PathBuf::from(need(&a, "candidate")?), &PathBuf::from(need(&a, "fixture")?),
|
||||||
|
coa_core::signing::EMBEDDED_PUBLIC_KEY,
|
||||||
|
).map_err(e)?;
|
||||||
|
coa_core::fsx::atomic_write_json(&PathBuf::from(need(&a, "report")?), &report).map_err(e)?;
|
||||||
|
println!("Manager upgrade transaction passed isolated qualification");
|
||||||
|
}
|
||||||
|
"qualify-startup" => {
|
||||||
|
coa_core::release_schema::validate_startup(
|
||||||
|
&PathBuf::from(need(&a, "fixture")?), &PathBuf::from(need(&a, "tree")?),
|
||||||
|
&PathBuf::from(need(&a, "base")?), coa_core::signing::EMBEDDED_PUBLIC_KEY,
|
||||||
|
).map_err(e)?;
|
||||||
|
println!("authserver and worldserver passed isolated startup qualification");
|
||||||
|
}
|
||||||
|
"verify-channel" => {
|
||||||
|
let bytes = std::fs::read(need(&a, "file")?).map_err(|x| x.to_string())?;
|
||||||
|
let pointer = coa_core::channels::verify(&bytes, need(&a, "channel")?, coa_core::signing::EMBEDDED_PUBLIC_KEY).map_err(e)?;
|
||||||
|
println!("{}", serde_json::to_string(&pointer).map_err(|x| x.to_string())?);
|
||||||
|
}
|
||||||
|
"verify-manifest" => {
|
||||||
|
let source = coa_core::pkgsource::Source::Dir(PathBuf::from(need(&a, "dir")?));
|
||||||
|
let (manifest, _) = coa_core::pkgsource::fetch_manifest(&source, coa_core::signing::EMBEDDED_PUBLIC_KEY).map_err(e)?;
|
||||||
|
println!("verified signed manifest {}", manifest.version);
|
||||||
|
}
|
||||||
|
"verify-upgrade-fixture" => {
|
||||||
|
coa_core::release_schema::verify_upgrade_fixture(&PathBuf::from(need(&a, "dir")?), coa_core::signing::EMBEDDED_PUBLIC_KEY).map_err(e)?;
|
||||||
|
println!("verified signed upgrade fixture and every archive file");
|
||||||
|
}
|
||||||
"extract-schema-base" => {
|
"extract-schema-base" => {
|
||||||
coa_core::release_schema::extract_base(
|
coa_core::release_schema::extract_base(
|
||||||
&PathBuf::from(need(&a, "package")?), &PathBuf::from(need(&a, "fixture")?),
|
&PathBuf::from(need(&a, "package")?), &PathBuf::from(need(&a, "fixture")?),
|
||||||
@@ -112,6 +142,16 @@ fn run() -> Result<(), String> {
|
|||||||
coa_core::release_schema::verify_package(&dir, coa_core::signing::EMBEDDED_PUBLIC_KEY).map_err(e)?;
|
coa_core::release_schema::verify_package(&dir, coa_core::signing::EMBEDDED_PUBLIC_KEY).map_err(e)?;
|
||||||
println!("signature, archive contents and database schema contract OK");
|
println!("signature, archive contents and database schema contract OK");
|
||||||
}
|
}
|
||||||
|
"sign-channel" => {
|
||||||
|
let pointer = coa_core::channels::Pointer {
|
||||||
|
schema: 1, channel: need(&a, "channel")?.clone(),
|
||||||
|
version: need(&a, "version")?.clone(),
|
||||||
|
release_tag: format!("server-{}", need(&a, "version")?),
|
||||||
|
snapshot: need(&a, "snapshot")?.clone(),
|
||||||
|
};
|
||||||
|
let bytes = coa_core::channels::sign(&pointer, &signing_key()?).map_err(e)?;
|
||||||
|
coa_core::fsx::atomic_write(&PathBuf::from(need(&a, "out")?), &bytes).map_err(e)?;
|
||||||
|
}
|
||||||
other => return Err(format!("unknown command {other}")),
|
other => return Err(format!("unknown command {other}")),
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "coa-server-manager",
|
"name": "coa-server-manager",
|
||||||
"version": "0.6.10",
|
"version": "0.6.15",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "coa-server-manager",
|
"name": "coa-server-manager",
|
||||||
"version": "0.6.10",
|
"version": "0.6.15",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tauri-apps/api": "^2.12.0",
|
"@tauri-apps/api": "^2.12.0",
|
||||||
"@tauri-apps/plugin-dialog": "^2.8.0",
|
"@tauri-apps/plugin-dialog": "^2.8.0",
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "coa-server-manager",
|
"name": "coa-server-manager",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.6.10",
|
"version": "0.6.15",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
+29
-13
@@ -39,12 +39,16 @@ struct AppState {
|
|||||||
/// Where signed update packages are published; override with COA_UPDATE_SOURCE (URL or local package folder).
|
/// Where signed update packages are published; override with COA_UPDATE_SOURCE (URL or local package folder).
|
||||||
const DEFAULT_UPDATE_URL: &str = "https://github.com/Corfirean/coa-server-build/releases/download/stable";
|
const DEFAULT_UPDATE_URL: &str = "https://github.com/Corfirean/coa-server-build/releases/download/stable";
|
||||||
|
|
||||||
fn update_source(custom: Option<String>) -> Source {
|
fn update_source(custom: Option<String>) -> Result<Source> {
|
||||||
let pick = custom.filter(|s| !s.trim().is_empty()).or_else(|| std::env::var("COA_UPDATE_SOURCE").ok());
|
let pick = custom.filter(|s| !s.trim().is_empty()).or_else(|| std::env::var("COA_UPDATE_SOURCE").ok());
|
||||||
match pick {
|
match pick {
|
||||||
Some(p) if p.to_ascii_lowercase().starts_with("http") => Source::Url(p),
|
Some(p) if p.to_ascii_lowercase().starts_with("http") => Ok(Source::Url(p)),
|
||||||
Some(p) => Source::Dir(PathBuf::from(p)),
|
Some(p) => Ok(Source::Dir(PathBuf::from(p))),
|
||||||
None => Source::Url(DEFAULT_UPDATE_URL.into()),
|
None => match coa_core::channels::resolve("stable") {
|
||||||
|
Ok(source) => Ok(source),
|
||||||
|
Err(Error::PackageNotPublished(_)) => Ok(Source::Url(DEFAULT_UPDATE_URL.into())),
|
||||||
|
Err(error) => Err(error),
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -645,7 +649,7 @@ async fn repair_server(app: AppHandle, state: State<'_, AppState>, id: String) -
|
|||||||
let _guard = BusyGuard::acquire(&state, &id)?;
|
let _guard = BusyGuard::acquire(&state, &id)?;
|
||||||
blocking(move || {
|
blocking(move || {
|
||||||
let dir = meta_dir(&root)?;
|
let dir = meta_dir(&root)?;
|
||||||
coa_core::repair::run(&root, &dir, &package_source(None), &update_source(None), coa_core::signing::EMBEDDED_PUBLIC_KEY, &|step,percent| {
|
coa_core::repair::run(&root, &dir, &package_source(None), &update_source(None)?, coa_core::signing::EMBEDDED_PUBLIC_KEY, &|step,percent| {
|
||||||
let _ = app.emit("repair-progress", serde_json::json!({ "id": id, "step": step, "percent": percent }));
|
let _ = app.emit("repair-progress", serde_json::json!({ "id": id, "step": step, "percent": percent }));
|
||||||
})
|
})
|
||||||
}).await
|
}).await
|
||||||
@@ -664,9 +668,9 @@ async fn module_set_enabled(state: State<'_, AppState>, id: String, module: Stri
|
|||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn custom_races_status(state: State<'_, AppState>, id: String) -> std::result::Result<Option<coa_core::custom_races::ClientPatchStatus>, UiError> {
|
async fn custom_races_status(state: State<'_, AppState>, id: String) -> std::result::Result<Option<coa_core::custom_races::ClientPatchStatus>, UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let ctx = client_context(&state, &id)?;
|
||||||
blocking(move || {
|
blocking(move || {
|
||||||
let client = linked_client(&root)?;
|
let client = ctx.linked();
|
||||||
Ok(client.as_deref().map(coa_core::custom_races::client_patch_status))
|
Ok(client.as_deref().map(coa_core::custom_races::client_patch_status))
|
||||||
})
|
})
|
||||||
.await
|
.await
|
||||||
@@ -674,12 +678,12 @@ async fn custom_races_status(state: State<'_, AppState>, id: String) -> std::res
|
|||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn custom_races_install(app: AppHandle, state: State<'_, AppState>, id: String) -> std::result::Result<(), UiError> {
|
async fn custom_races_install(app: AppHandle, state: State<'_, AppState>, id: String) -> std::result::Result<(), UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let ctx = client_context(&state, &id)?;
|
||||||
let _guard = BusyGuard::acquire(&state, &id)?;
|
let _guard = BusyGuard::acquire(&state, &id)?;
|
||||||
let cancel = begin_client_job(&state)?;
|
let cancel = begin_client_job(&state)?;
|
||||||
let sid = id.clone();
|
let sid = id.clone();
|
||||||
let result = blocking(move || {
|
let result = blocking(move || {
|
||||||
let client = linked_client(&root)?.ok_or_else(|| Error::Invalid("No game client is linked to this server.".into()))?;
|
let client = ctx.require()?;
|
||||||
coa_core::custom_races::install_client_patches(&client, &cancel, &|step, percent| {
|
coa_core::custom_races::install_client_patches(&client, &cancel, &|step, percent| {
|
||||||
let _ = app.emit("custom-races-progress", serde_json::json!({
|
let _ = app.emit("custom-races-progress", serde_json::json!({
|
||||||
"id": sid,
|
"id": sid,
|
||||||
@@ -687,7 +691,7 @@ async fn custom_races_install(app: AppHandle, state: State<'_, AppState>, id: St
|
|||||||
"percent": percent,
|
"percent": percent,
|
||||||
}));
|
}));
|
||||||
})?;
|
})?;
|
||||||
let enabled = coa_core::modules::list(&root).iter().any(|module| module.id == "custom-races" && module.enabled);
|
let enabled = ctx.root.as_ref().map_or(true, |root| coa_core::modules::list(root).iter().any(|module| module.id == "custom-races" && module.enabled));
|
||||||
coa_core::custom_races::set_client_patch_enabled(&client, enabled)
|
coa_core::custom_races::set_client_patch_enabled(&client, enabled)
|
||||||
})
|
})
|
||||||
.await;
|
.await;
|
||||||
@@ -695,6 +699,13 @@ async fn custom_races_install(app: AppHandle, state: State<'_, AppState>, id: St
|
|||||||
result
|
result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
async fn custom_races_uninstall(state: State<'_, AppState>, id: String) -> std::result::Result<(), UiError> {
|
||||||
|
let ctx = client_context(&state, &id)?;
|
||||||
|
let _guard = BusyGuard::acquire(&state, &id)?;
|
||||||
|
blocking(move || coa_core::custom_races::uninstall_client_patches(&ctx.require()?)).await
|
||||||
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn custom_races_toggle_client(state: State<'_, AppState>, id: String, enabled: bool) -> std::result::Result<(), UiError> {
|
async fn custom_races_toggle_client(state: State<'_, AppState>, id: String, enabled: bool) -> std::result::Result<(), UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let root = path_of(&state, &id)?;
|
||||||
@@ -797,11 +808,12 @@ fn install_meta(root: &std::path::Path) -> Result<(PathBuf, InstallMeta)> {
|
|||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
async fn check_update(state: State<'_, AppState>, id: String, source: Option<String>, background: Option<bool>) -> std::result::Result<update::Preview, UiError> {
|
async fn check_update(state: State<'_, AppState>, id: String, source: Option<String>, background: Option<bool>) -> std::result::Result<update::Preview, UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let root = path_of(&state, &id)?;
|
||||||
let src = update_source(source);
|
|
||||||
// The check that repeats every few minutes must not start and stop the database of a stopped server.
|
// The check that repeats every few minutes must not start and stop the database of a stopped server.
|
||||||
let access = if background.unwrap_or(false) { update::DatabaseAccess::OnlyIfRunning } else { update::DatabaseAccess::Start };
|
let access = if background.unwrap_or(false) { update::DatabaseAccess::OnlyIfRunning } else { update::DatabaseAccess::Start };
|
||||||
blocking(move || {
|
blocking(move || {
|
||||||
let (_, meta) = install_meta(&root)?;
|
let (_, meta) = install_meta(&root)?;
|
||||||
|
let src = update_source(source)?;
|
||||||
update::preview_with(&root, &meta, &src, coa_core::signing::EMBEDDED_PUBLIC_KEY, &Default::default(), access)
|
update::preview_with(&root, &meta, &src, coa_core::signing::EMBEDDED_PUBLIC_KEY, &Default::default(), access)
|
||||||
})
|
})
|
||||||
.await
|
.await
|
||||||
@@ -822,10 +834,13 @@ async fn apply_update(
|
|||||||
resolutions: BTreeMap<String, Resolution>,
|
resolutions: BTreeMap<String, Resolution>,
|
||||||
) -> std::result::Result<update::Outcome, UiError> {
|
) -> std::result::Result<update::Outcome, UiError> {
|
||||||
let root = path_of(&state, &id)?;
|
let root = path_of(&state, &id)?;
|
||||||
let src = update_source(source);
|
|
||||||
let _guard = BusyGuard::acquire(&state, &id)?;
|
let _guard = BusyGuard::acquire(&state, &id)?;
|
||||||
blocking(move || {
|
blocking(move || {
|
||||||
let (dir, _) = install_meta(&root)?;
|
let src = update_source(source)?;
|
||||||
|
let (dir, meta) = install_meta(&root)?;
|
||||||
|
let (manifest, _) = coa_core::pkgsource::fetch_manifest(&src, coa_core::signing::EMBEDDED_PUBLIC_KEY)?;
|
||||||
|
update::validate_candidate(&meta, &manifest)?;
|
||||||
// Files cannot be replaced while the server runs: stop it first (gracefully), like the Stop button.
|
// Files cannot be replaced while the server runs: stop it first (gracefully), like the Stop button.
|
||||||
let observed = coa_core::process::observe(&root, &layout::read_ports(&root));
|
let observed = coa_core::process::observe(&root, &layout::read_ports(&root));
|
||||||
if observed.world.state != coa_core::process::ServiceState::Stopped || observed.auth.state != coa_core::process::ServiceState::Stopped || coa_core::multiworld::is_running(&root) {
|
if observed.world.state != coa_core::process::ServiceState::Stopped || observed.auth.state != coa_core::process::ServiceState::Stopped || coa_core::multiworld::is_running(&root) {
|
||||||
@@ -1756,6 +1771,7 @@ pub fn run() {
|
|||||||
console_command,
|
console_command,
|
||||||
custom_races_status,
|
custom_races_status,
|
||||||
custom_races_install,
|
custom_races_install,
|
||||||
|
custom_races_uninstall,
|
||||||
custom_races_toggle_client
|
custom_races_toggle_client
|
||||||
])
|
])
|
||||||
.run(tauri::generate_context!())
|
.run(tauri::generate_context!())
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
"$schema": "https://schema.tauri.app/config/2",
|
||||||
"productName": "CoA Server Manager",
|
"productName": "CoA Server Manager",
|
||||||
"version": "0.6.10",
|
"version": "0.6.15",
|
||||||
"identifier": "com.coa.servermanager",
|
"identifier": "com.coa.servermanager",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "npm run dev",
|
"beforeDevCommand": "npm run dev",
|
||||||
|
|||||||
@@ -195,6 +195,7 @@ const de: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"comp.saved": "Gespeichert. {n} Begleiter werden beim Serverstart erstellt.",
|
"comp.saved": "Gespeichert. {n} Begleiter werden beim Serverstart erstellt.",
|
||||||
|
|
||||||
// Client
|
// Client
|
||||||
|
"client.races.install": "Patch für benutzerdefinierte Völker installieren",
|
||||||
"client.title": "Spielclient",
|
"client.title": "Spielclient",
|
||||||
"client.looking": "Suche …",
|
"client.looking": "Suche …",
|
||||||
"client.intro": "Sag dem Manager, wo dein Spiel installiert ist, um einen SPIELEN-Button zu erhalten. Deine Spieldateien werden nie geändert, außer der Serveradresse und dem Begleiter-Addon.",
|
"client.intro": "Sag dem Manager, wo dein Spiel installiert ist, um einen SPIELEN-Button zu erhalten. Deine Spieldateien werden nie geändert, außer der Serveradresse und dem Begleiter-Addon.",
|
||||||
|
|||||||
@@ -238,6 +238,7 @@ const en = {
|
|||||||
"comp.saved": "Saved. {n} companions will be created when the server starts.",
|
"comp.saved": "Saved. {n} companions will be created when the server starts.",
|
||||||
|
|
||||||
// Client
|
// Client
|
||||||
|
"client.races.install": "Install custom race patch",
|
||||||
"client.title": "Game client",
|
"client.title": "Game client",
|
||||||
"client.looking": "Looking…",
|
"client.looking": "Looking…",
|
||||||
"client.intro": "Tell Manager where your game is installed to get a PLAY button. Your game files are never changed except the server address and the companion addon.",
|
"client.intro": "Tell Manager where your game is installed to get a PLAY button. Your game files are never changed except the server address and the companion addon.",
|
||||||
|
|||||||
@@ -195,6 +195,7 @@ const es: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"comp.saved": "Guardado. Se crearán {n} compañeros cuando se inicie el servidor.",
|
"comp.saved": "Guardado. Se crearán {n} compañeros cuando se inicie el servidor.",
|
||||||
|
|
||||||
// Client
|
// Client
|
||||||
|
"client.races.install": "Instalar parche de razas personalizadas",
|
||||||
"client.title": "Cliente del juego",
|
"client.title": "Cliente del juego",
|
||||||
"client.looking": "Buscando…",
|
"client.looking": "Buscando…",
|
||||||
"client.intro": "Indica al Manager dónde está instalado el juego para obtener un botón JUGAR. Tus archivos del juego nunca se modifican, salvo la dirección del servidor y el addon de compañeros.",
|
"client.intro": "Indica al Manager dónde está instalado el juego para obtener un botón JUGAR. Tus archivos del juego nunca se modifican, salvo la dirección del servidor y el addon de compañeros.",
|
||||||
|
|||||||
@@ -195,6 +195,7 @@ const fr: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"comp.saved": "Enregistré. {n} compagnons seront créés au démarrage du serveur.",
|
"comp.saved": "Enregistré. {n} compagnons seront créés au démarrage du serveur.",
|
||||||
|
|
||||||
// Client
|
// Client
|
||||||
|
"client.races.install": "Installer le patch des races personnalisées",
|
||||||
"client.title": "Client du jeu",
|
"client.title": "Client du jeu",
|
||||||
"client.looking": "Recherche…",
|
"client.looking": "Recherche…",
|
||||||
"client.intro": "Indiquez au Manager où le jeu est installé pour obtenir un bouton JOUER. Vos fichiers de jeu ne sont jamais modifiés, sauf l’adresse du serveur et l’addon des compagnons.",
|
"client.intro": "Indiquez au Manager où le jeu est installé pour obtenir un bouton JOUER. Vos fichiers de jeu ne sont jamais modifiés, sauf l’adresse du serveur et l’addon des compagnons.",
|
||||||
|
|||||||
@@ -228,6 +228,7 @@ const ru: Partial<Record<keyof typeof en, string>> = {
|
|||||||
"comp.saved": "Сохранено. Компаньоны ({n}) будут созданы при запуске сервера.",
|
"comp.saved": "Сохранено. Компаньоны ({n}) будут созданы при запуске сервера.",
|
||||||
|
|
||||||
// Client
|
// Client
|
||||||
|
"client.races.install": "Установить патч кастомных рас",
|
||||||
"client.title": "Клиент игры",
|
"client.title": "Клиент игры",
|
||||||
"client.looking": "Ищу…",
|
"client.looking": "Ищу…",
|
||||||
"client.intro": "Укажите, где установлена игра, чтобы появилась кнопка «Играть». Файлы игры не изменяются, кроме адреса сервера и аддона компаньонов.",
|
"client.intro": "Укажите, где установлена игра, чтобы появилась кнопка «Играть». Файлы игры не изменяются, кроме адреса сервера и аддона компаньонов.",
|
||||||
|
|||||||
@@ -207,6 +207,7 @@ const zh = {
|
|||||||
"comp.saved": "已保存。{n} 名随从将在服务器启动时创建。",
|
"comp.saved": "已保存。{n} 名随从将在服务器启动时创建。",
|
||||||
|
|
||||||
// Client
|
// Client
|
||||||
|
"client.races.install": "安装自定义种族补丁",
|
||||||
"client.title": "游戏客户端",
|
"client.title": "游戏客户端",
|
||||||
"client.looking": "正在寻找…",
|
"client.looking": "正在寻找…",
|
||||||
"client.intro": "指定游戏客户端安装路径即可启用“开始游戏”按钮。除服务器地址和随从插件外,你的游戏文件绝不会被修改。",
|
"client.intro": "指定游戏客户端安装路径即可启用“开始游戏”按钮。除服务器地址和随从插件外,你的游戏文件绝不会被修改。",
|
||||||
|
|||||||
@@ -186,6 +186,7 @@ export interface RecoveryPoint {
|
|||||||
label: string | null;
|
label: string | null;
|
||||||
created_at: string;
|
created_at: string;
|
||||||
components: { name: string; path: string; bytes: number; tables: number | null; files: string[] | null }[];
|
components: { name: string; path: string; bytes: number; tables: number | null; files: string[] | null }[];
|
||||||
|
mysql_snapshot?: { bytes: number } | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface DbRestore {
|
export interface DbRestore {
|
||||||
@@ -546,6 +547,7 @@ export const api = {
|
|||||||
clientDownload: (id: string, parent: string) => invoke<ClientInfo>("client_download", { id, parent }),
|
clientDownload: (id: string, parent: string) => invoke<ClientInfo>("client_download", { id, parent }),
|
||||||
clientCancel: () => invoke<void>("client_cancel"),
|
clientCancel: () => invoke<void>("client_cancel"),
|
||||||
customRacesStatus: (id: string) => invoke<CustomRacesClientStatus | null>("custom_races_status", { id }),
|
customRacesStatus: (id: string) => invoke<CustomRacesClientStatus | null>("custom_races_status", { id }),
|
||||||
|
customRacesUninstall: (id: string) => invoke<void>("custom_races_uninstall", { id }),
|
||||||
customRacesInstall: (id: string) => invoke<void>("custom_races_install", { id }),
|
customRacesInstall: (id: string) => invoke<void>("custom_races_install", { id }),
|
||||||
customRacesToggleClient: (id: string, enabled: boolean) => invoke<void>("custom_races_toggle_client", { id, enabled }),
|
customRacesToggleClient: (id: string, enabled: boolean) => invoke<void>("custom_races_toggle_client", { id, enabled }),
|
||||||
play: (id: string) => invoke<DriverOutcome>("play", { id }),
|
play: (id: string) => invoke<DriverOutcome>("play", { id }),
|
||||||
|
|||||||
@@ -87,7 +87,14 @@ for (let n = 1; n <= 3; n++) add(`EC.P${n}`, "string", [`NPC phrase ${n}`, `Ре
|
|||||||
|
|
||||||
add("CoACustomRaces.BotsEnable", "bool",
|
add("CoACustomRaces.BotsEnable", "bool",
|
||||||
["Bots can be custom races", "Боты кастомных рас", "Bots benutzerdefinierter Völker", "Bots de races personnalisées", "Bots de razas personalizadas", "允许机器人为自定义种族"],
|
["Bots can be custom races", "Боты кастомных рас", "Bots benutzerdefinierter Völker", "Bots de races personnalisées", "Bots de razas personalizadas", "允许机器人为自定义种族"],
|
||||||
["Allow Playerbots to spawn as custom races.", "Разрешает ботам-игрокам появляться кастомными расами.", "Erlaubt Spieler-Bots, benutzerdefinierte Völker zu nutzen.", "Autorise les bots joueurs à s’incarner avec des races personnalisées.", "Permite a los bots jugadores crearse con razas personalizadas.", "允许玩家机器人扮演自定义种族。"]
|
[
|
||||||
|
"Allow Playerbots to spawn as custom races (experimental). Off excludes all custom races; on allows stable custom races.",
|
||||||
|
"Разрешает ботам-игрокам появляться кастомными расами (экспериментально). Выключено — исключает все кастомные расы, включено — разрешает стабильные.",
|
||||||
|
"Erlaubt Spieler-Bots, benutzerdefinierte Völker zu nutzen (experimentell). Aus schließt alle benutzerdefinierten Völker aus; An erlaubt stabile.",
|
||||||
|
"Autorise les bots joueurs à s’incarner avec des races personnalisées (expérimental). Désactivé exclut toutes les races personnalisées ; activé autorise les stables.",
|
||||||
|
"Permite a los bots jugadores crearse con razas personalizadas (experimental). Desactivado excluye todas las razas personalizadas; activado permite las estables.",
|
||||||
|
"允许玩家机器人扮演自定义种族(实验性)。关闭将排除所有自定义种族,开启允许稳定的自定义种族。"
|
||||||
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
const ah = "AuctionHouseBot.";
|
const ah = "AuctionHouseBot.";
|
||||||
|
|||||||
@@ -198,7 +198,7 @@ export function BackupsPage({ serverId }: { serverId: string }) {
|
|||||||
<div>
|
<div>
|
||||||
<p className="font-medium">{p.label && p.trigger === "manual" && p.label !== "e2e" ? p.label : trigger(p.trigger)}</p>
|
<p className="font-medium">{p.label && p.trigger === "manual" && p.label !== "e2e" ? p.label : trigger(p.trigger)}</p>
|
||||||
<p className="text-sm text-muted">
|
<p className="text-sm text-muted">
|
||||||
{w(p.created_at)} · {p.realm === "wildcard" ? "Wildcard" : "CoA"} · {t(`bk.kind.${p.kind}` as Key)} · {size(p.components.reduce((a, c) => a + c.bytes, 0))}
|
{w(p.created_at)} · {p.realm === "wildcard" ? "Wildcard" : "CoA"} · {t(`bk.kind.${p.kind}` as Key)} · {size(p.components.reduce((a, c) => a + c.bytes, p.mysql_snapshot?.bytes ?? 0))}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex shrink-0 gap-1">
|
<div className="flex shrink-0 gap-1">
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
|
import { listen } from "@tauri-apps/api/event";
|
||||||
import { open } from "@tauri-apps/plugin-dialog";
|
import { open } from "@tauri-apps/plugin-dialog";
|
||||||
import { api, asUiError, type ClientInfo, type ClientStatus, type UiError } from "@/lib/api";
|
import { api, asUiError, type ClientInfo, type ClientStatus, type UiError } from "@/lib/api";
|
||||||
import { checkClient } from "@/lib/clientUpdate";
|
import { checkClient } from "@/lib/clientUpdate";
|
||||||
@@ -16,6 +17,7 @@ export function ClientCard({ serverId, remote = false }: { serverId: string; rem
|
|||||||
const [note, setNote] = useState<string | null>(null);
|
const [note, setNote] = useState<string | null>(null);
|
||||||
const [busy, setBusy] = useState(false);
|
const [busy, setBusy] = useState(false);
|
||||||
const [status, setStatus] = useState<ClientStatus | null>(null);
|
const [status, setStatus] = useState<ClientStatus | null>(null);
|
||||||
|
const [patchProgress, setPatchProgress] = useState<string | null>(null);
|
||||||
const [dialog, setDialog] = useState<ClientDialogMode | null>(null);
|
const [dialog, setDialog] = useState<ClientDialogMode | null>(null);
|
||||||
const [playAfter, setPlayAfter] = useStartAfterUpdate("client", serverId);
|
const [playAfter, setPlayAfter] = useStartAfterUpdate("client", serverId);
|
||||||
|
|
||||||
@@ -25,6 +27,10 @@ export function ClientCard({ serverId, remote = false }: { serverId: string; rem
|
|||||||
};
|
};
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
void refresh();
|
void refresh();
|
||||||
|
const unlisten = listen<{ id: string; step: string; percent: number }>("custom-races-progress", e => {
|
||||||
|
if (e.payload.id === serverId) setPatchProgress(`${e.payload.step} (${Math.round(e.payload.percent * 100)}%)`);
|
||||||
|
});
|
||||||
|
return () => { void unlisten.then(f => f()); };
|
||||||
}, [serverId]); // eslint-disable-line react-hooks/exhaustive-deps
|
}, [serverId]); // eslint-disable-line react-hooks/exhaustive-deps
|
||||||
|
|
||||||
async function run(fn: () => Promise<string | void>) {
|
async function run(fn: () => Promise<string | void>) {
|
||||||
@@ -40,6 +46,7 @@ export function ClientCard({ serverId, remote = false }: { serverId: string; rem
|
|||||||
setError(asUiError(e));
|
setError(asUiError(e));
|
||||||
} finally {
|
} finally {
|
||||||
setBusy(false);
|
setBusy(false);
|
||||||
|
setPatchProgress(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -111,11 +118,13 @@ export function ClientCard({ serverId, remote = false }: { serverId: string; rem
|
|||||||
{status && !status.managed && (
|
{status && !status.managed && (
|
||||||
<Button size="sm" disabled={busy} onClick={() => setDialog("track")}>{t("client.track.button")}</Button>
|
<Button size="sm" disabled={busy} onClick={() => setDialog("track")}>{t("client.track.button")}</Button>
|
||||||
)}
|
)}
|
||||||
|
{remote && <Button size="sm" disabled={busy} onClick={() => void run(() => api.customRacesInstall(serverId))}>{t("client.races.install")}</Button>}
|
||||||
<Button size="sm" variant="ghost" disabled={busy} onClick={() => void choose()}>{t("client.changeFolder")}</Button>
|
<Button size="sm" variant="ghost" disabled={busy} onClick={() => void choose()}>{t("client.changeFolder")}</Button>
|
||||||
<Button size="sm" variant="ghost" disabled={busy} onClick={() => setDialog("setup")}>{t("client.downloadInstead")}</Button>
|
<Button size="sm" variant="ghost" disabled={busy} onClick={() => setDialog("setup")}>{t("client.downloadInstead")}</Button>
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
|
{patchProgress && <p className="mt-3 text-sm text-muted" role="status">{patchProgress}</p>}
|
||||||
{note && <p className="mt-3 text-sm text-ok" role="status">{note}</p>}
|
{note && <p className="mt-3 text-sm text-ok" role="status">{note}</p>}
|
||||||
{error && <p className="mt-3 text-sm text-bad" role="alert">{error.human.code === "unknown" ? error.technical : human(error.human).message}</p>}
|
{error && <p className="mt-3 text-sm text-bad" role="alert">{error.human.code === "unknown" ? error.technical : human(error.human).message}</p>}
|
||||||
{dialog && (
|
{dialog && (
|
||||||
|
|||||||
@@ -144,6 +144,17 @@ export function ModulesPage({ serverId, onChanged, onRegisterGuard }: { serverId
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function uninstallClientPatch() {
|
||||||
|
setRacesInstalling(true);
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
await api.customRacesUninstall(serverId);
|
||||||
|
await load();
|
||||||
|
onChanged?.();
|
||||||
|
} catch (e) { setError(asUiError(e)); }
|
||||||
|
finally { setRacesInstalling(false); }
|
||||||
|
}
|
||||||
|
|
||||||
async function toggle(m: ModuleView) {
|
async function toggle(m: ModuleView) {
|
||||||
setError(null);
|
setError(null);
|
||||||
try {
|
try {
|
||||||
@@ -252,7 +263,8 @@ export function ModulesPage({ serverId, onChanged, onRegisterGuard }: { serverId
|
|||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
{(!racesPatchStatus || racesPatchStatus.state === "not-installed" || racesPatchStatus.state === "partially-installed") && (
|
{racesPatchStatus?.state === "partially-installed" && <p className="text-xs text-warn">{locale === "ru" ? "Файлы отсутствуют или изменены. Восстановите патч клиента." : "Files are missing or changed. Repair the client patch."}</p>}
|
||||||
|
{(
|
||||||
<Button
|
<Button
|
||||||
size="sm"
|
size="sm"
|
||||||
variant="secondary"
|
variant="secondary"
|
||||||
@@ -261,9 +273,11 @@ export function ModulesPage({ serverId, onChanged, onRegisterGuard }: { serverId
|
|||||||
onClick={() => void installClientPatch()}
|
onClick={() => void installClientPatch()}
|
||||||
>
|
>
|
||||||
{racesInstalling && <Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" />}
|
{racesInstalling && <Loader2 className="mr-1.5 h-3.5 w-3.5 animate-spin" />}
|
||||||
{locale === "ru" ? "Установить патч клиента" : "Install Client Patch 1.5"}
|
{racesPatchStatus?.state === "not-installed" ? (locale === "ru" ? "Установить патч клиента" : "Install Client Patch") : (locale === "ru" ? "Восстановить патч клиента" : "Repair Client Patch")}
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
|
{racesPatchStatus && racesPatchStatus.state !== "not-installed" && <Button size="sm" variant="ghost" disabled={racesInstalling} onClick={() => void uninstallClientPatch()}>{locale === "ru" ? "Удалить патч клиента" : "Uninstall Client Patch"}</Button>}
|
||||||
|
<p className="text-xs text-muted">{locale === "ru" ? (m.enabled ? "После установки патч будет включён." : "После установки патч останется отключённым: модуль сервера выключен или отсутствует.") : (m.enabled ? "The patch will be enabled after installation." : "The patch will stay disabled after installation: the server module is off or missing.")}</p>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -243,6 +243,24 @@ export function SettingsPage(props: {
|
|||||||
});
|
});
|
||||||
const pending = dirtyKeys.length + Object.keys(rawEdits).length + Object.keys(colEdits).length;
|
const pending = dirtyKeys.length + Object.keys(rawEdits).length + Object.keys(colEdits).length;
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (pending > 0) {
|
||||||
|
props.onRegisterGuard?.({
|
||||||
|
isDirty: () => pending > 0,
|
||||||
|
save: () => saveEverything(),
|
||||||
|
discard: () => {
|
||||||
|
setDraft({});
|
||||||
|
setErrors({});
|
||||||
|
setRawEdits({});
|
||||||
|
setColEdits({});
|
||||||
|
},
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
props.onRegisterGuard?.(null);
|
||||||
|
}
|
||||||
|
return () => props.onRegisterGuard?.(null);
|
||||||
|
}, [pending, props.onRegisterGuard]);
|
||||||
|
|
||||||
if (fatal) {
|
if (fatal) {
|
||||||
return (
|
return (
|
||||||
<div className="max-w-xl">
|
<div className="max-w-xl">
|
||||||
@@ -354,24 +372,6 @@ export function SettingsPage(props: {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (pending > 0) {
|
|
||||||
props.onRegisterGuard?.({
|
|
||||||
isDirty: () => pending > 0,
|
|
||||||
save: () => saveEverything(),
|
|
||||||
discard: () => {
|
|
||||||
setDraft({});
|
|
||||||
setErrors({});
|
|
||||||
setRawEdits({});
|
|
||||||
setColEdits({});
|
|
||||||
},
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
props.onRegisterGuard?.(null);
|
|
||||||
}
|
|
||||||
return () => props.onRegisterGuard?.(null);
|
|
||||||
}, [pending, props.onRegisterGuard]);
|
|
||||||
|
|
||||||
async function openPreset(id: string) {
|
async function openPreset(id: string) {
|
||||||
setSaved(null);
|
setSaved(null);
|
||||||
if (squid) {
|
if (squid) {
|
||||||
|
|||||||
@@ -4,7 +4,8 @@ param(
|
|||||||
[string]$Source = 'C:\games\CoA-Repack',
|
[string]$Source = 'C:\games\CoA-Repack',
|
||||||
[string]$Target = 'C:\games\coa-fixture',
|
[string]$Target = 'C:\games\coa-fixture',
|
||||||
[int]$PortBase = 13000,
|
[int]$PortBase = 13000,
|
||||||
[string]$DatabaseArchive = ''
|
[string]$DatabaseArchive = '',
|
||||||
|
[switch]$CopyData
|
||||||
)
|
)
|
||||||
$ErrorActionPreference = 'Stop'
|
$ErrorActionPreference = 'Stop'
|
||||||
if ((Resolve-Path $Source).Path -eq $Target) { throw 'source and target are the same' }
|
if ((Resolve-Path $Source).Path -eq $Target) { throw 'source and target are the same' }
|
||||||
@@ -32,7 +33,8 @@ if (-not $DatabaseArchive) { $DatabaseArchive = "$Source\mysql\data.7z" }
|
|||||||
& 'C:\Program Files\7-Zip\7z.exe' x $DatabaseArchive "-o$Target\mysql" -y | Out-Null
|
& 'C:\Program Files\7-Zip\7z.exe' x $DatabaseArchive "-o$Target\mysql" -y | Out-Null
|
||||||
if (-not (Test-Path "$Target\mysql\data\acore_characters")) { throw 'database extraction failed' }
|
if (-not (Test-Path "$Target\mysql\data\acore_characters")) { throw 'database extraction failed' }
|
||||||
|
|
||||||
New-Item -ItemType Junction -Path "$Target\Data" -Target "$Source\Data" | Out-Null
|
if ($CopyData) { Copy-Tree 'Data' }
|
||||||
|
else { New-Item -ItemType Junction -Path "$Target\Data" -Target "$Source\Data" | Out-Null }
|
||||||
|
|
||||||
$ports = @{ mysqlPort = $PortBase + 307; authPort = $PortBase + 724; worldPort = $PortBase + 85; raPort = $PortBase + 443 }
|
$ports = @{ mysqlPort = $PortBase + 307; authPort = $PortBase + 724; worldPort = $PortBase + 85; raPort = $PortBase + 443 }
|
||||||
$cfg = Get-Content "$Target\Settings\repack.json" -Raw | ConvertFrom-Json
|
$cfg = Get-Content "$Target\Settings\repack.json" -Raw | ConvertFrom-Json
|
||||||
|
|||||||
@@ -0,0 +1,98 @@
|
|||||||
|
"""Exercise raid module initialization against disposable MySQL data only."""
|
||||||
|
import argparse
|
||||||
|
import socket
|
||||||
|
import subprocess
|
||||||
|
import tempfile
|
||||||
|
import time
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
parser = argparse.ArgumentParser()
|
||||||
|
parser.add_argument('--mysql-bin', required=True, type=Path)
|
||||||
|
parser.add_argument('--core', required=True, type=Path)
|
||||||
|
parser.add_argument('--before', required=True)
|
||||||
|
parser.add_argument('--display-repair', type=Path)
|
||||||
|
args = parser.parse_args()
|
||||||
|
suffix = '.exe' if (args.mysql_bin / 'mysqld.exe').exists() else ''
|
||||||
|
server = args.mysql_bin / ('mysqld' + suffix)
|
||||||
|
client = args.mysql_bin / ('mysql' + suffix)
|
||||||
|
admin = args.mysql_bin / ('mysqladmin' + suffix)
|
||||||
|
relative = 'modules/mod-coa-raid-difficulty/data/sql/db-world/base/03_boss_schedule.sql'
|
||||||
|
original = subprocess.check_output(['git', '-C', str(args.core), 'show', args.before + ':' + relative], text=True)
|
||||||
|
current = (args.core / relative).read_text()
|
||||||
|
split = (args.core / 'data/sql/updates/pending_db_world/rev_20261001_g1_molten_core_shazzrah_nova_area.sql').read_text()
|
||||||
|
with tempfile.TemporaryDirectory(prefix='coa-module-sql-fixture-') as temp:
|
||||||
|
data = Path(temp) / 'data'
|
||||||
|
flags = subprocess.CREATE_NO_WINDOW if hasattr(subprocess, 'CREATE_NO_WINDOW') else 0
|
||||||
|
subprocess.run([str(server), '--no-defaults', '--initialize-insecure', '--datadir=' + str(data)],
|
||||||
|
check=True, capture_output=True, creationflags=flags)
|
||||||
|
with socket.socket() as sock:
|
||||||
|
sock.bind(('127.0.0.1', 0))
|
||||||
|
port = sock.getsockname()[1]
|
||||||
|
process = subprocess.Popen([str(server), '--no-defaults', '--datadir=' + str(data),
|
||||||
|
'--bind-address=127.0.0.1', '--port=' + str(port), '--mysqlx=0',
|
||||||
|
'--skip-log-bin', '--log-error=' + str(Path(temp) / 'mysql.log')],
|
||||||
|
creationflags=flags, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
|
||||||
|
connection = ['--no-defaults', '--protocol=TCP', '--host=127.0.0.1', '--port=' + str(port), '--user=root']
|
||||||
|
|
||||||
|
def sql(statement, schema=None, check=True):
|
||||||
|
result = subprocess.run([str(client), *connection, '--batch', '--skip-column-names', *([schema] if schema else [])],
|
||||||
|
input=statement, text=True, capture_output=True, creationflags=flags)
|
||||||
|
if check and result.returncode:
|
||||||
|
raise RuntimeError(result.stderr)
|
||||||
|
return result
|
||||||
|
|
||||||
|
try:
|
||||||
|
deadline = time.monotonic() + 60
|
||||||
|
while sql('SELECT 1;', check=False).returncode:
|
||||||
|
if process.poll() is not None or time.monotonic() > deadline:
|
||||||
|
raise RuntimeError('Disposable MySQL did not start: ' + (Path(temp) / 'mysql.log').read_text())
|
||||||
|
time.sleep(0.5)
|
||||||
|
regex = sql("SELECT REGEXP_LIKE(CONVERT(0xD0AF USING utf8mb4), '^[[:alpha:]]$'), REGEXP_REPLACE('abc123', '[0-9]+', '');").stdout.strip()
|
||||||
|
assert regex == '1\tabc', regex
|
||||||
|
print('PASS: packaged MySQL starts on fresh data and supports Unicode regular expressions')
|
||||||
|
for schema in ('fresh', 'old', 'upgraded'):
|
||||||
|
sql('CREATE DATABASE `' + schema + '`;')
|
||||||
|
sql('CREATE TABLE creature_template (entry INT PRIMARY KEY, ScriptName VARCHAR(128));', schema)
|
||||||
|
sql(original, 'old')
|
||||||
|
sql('CREATE TABLE coa_spell_damage_info (spell_id INT); CREATE TABLE spell_script_names (spell_id INT, ScriptName VARCHAR(128));', 'old')
|
||||||
|
sql(split, 'old')
|
||||||
|
broken = sql(original, 'old', check=False)
|
||||||
|
assert broken.returncode and '1136' in broken.stderr, broken.stderr
|
||||||
|
sql(current, 'fresh')
|
||||||
|
sql(current, 'fresh')
|
||||||
|
sql(original, 'upgraded')
|
||||||
|
sql(current, 'upgraded')
|
||||||
|
for schema in ('fresh', 'upgraded'):
|
||||||
|
count = sql("SELECT COUNT(*) FROM information_schema.columns WHERE table_schema=DATABASE() AND table_name='coa_boss_schedule';", schema).stdout.strip()
|
||||||
|
assert count == '15', count
|
||||||
|
effects = sql('SELECT effect_d0,effect_d1,effect_d2,effect_d3 FROM coa_boss_schedule WHERE entry=12264 AND idx=6;', schema).stdout.strip()
|
||||||
|
assert effects == '2105613\t2105614\t2105615\t2105616', effects
|
||||||
|
print('PASS: original SQL reproduces ERROR 1136 after migration; fixed SQL supports fresh, repeated and old-layout initialization')
|
||||||
|
if args.display_repair:
|
||||||
|
repair = args.display_repair.read_text()
|
||||||
|
sql('CREATE DATABASE display_fixture;')
|
||||||
|
sql(repair, 'display_fixture') # An absent table is not created by a default repair.
|
||||||
|
sql('CREATE TABLE creature_display_preset (entry INT UNSIGNED NOT NULL, display_id INT UNSIGNED NOT NULL, PRIMARY KEY(entry,display_id)); INSERT INTO creature_display_preset VALUES(42,123);', 'display_fixture')
|
||||||
|
before_rows = sql('SELECT * FROM creature_display_preset;', 'display_fixture').stdout
|
||||||
|
sql(repair, 'display_fixture')
|
||||||
|
sql(repair, 'display_fixture')
|
||||||
|
default = sql("SELECT COLUMN_DEFAULT FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='creature_display_preset' AND COLUMN_NAME='display_id';", 'display_fixture').stdout.strip()
|
||||||
|
assert default == '0', default
|
||||||
|
assert sql('SELECT * FROM creature_display_preset;', 'display_fixture').stdout == before_rows
|
||||||
|
sql('ALTER TABLE creature_display_preset ALTER COLUMN display_id SET DEFAULT 99;', 'display_fixture')
|
||||||
|
sql(repair, 'display_fixture')
|
||||||
|
assert sql("SELECT COLUMN_DEFAULT FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() AND TABLE_NAME='creature_display_preset' AND COLUMN_NAME='display_id';", 'display_fixture').stdout.strip() == '99'
|
||||||
|
print('PASS: display default repair is repeatable, keeps rows and custom defaults, and tolerates absent tables')
|
||||||
|
finally:
|
||||||
|
subprocess.run([str(admin), *connection, 'shutdown'], capture_output=True, creationflags=flags)
|
||||||
|
try:
|
||||||
|
process.wait(timeout=15)
|
||||||
|
except subprocess.TimeoutExpired:
|
||||||
|
process.kill()
|
||||||
|
process.wait()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
main()
|
||||||
Reference in new issue
Block a user