mirror of
https://github.com/Corfirean/coa-server-manager.git
synced 2026-11-21 11:25:56 +00:00
fix: sharing with friends and the other screens work on a Docker server
Second part of the audit of every screen for a Docker server. What it found, and what now happens: - Play with friends. "Servers open" read the BindIP of the configuration files, which the containers force to 0.0.0.0, so it was green on a fresh server while who can connect is decided by the address the ports are published on (bindAddress in docker.json). Opening and closing now edit bindAddress (and set CoA.AllowRemoteClients), the open state is read from it, and enabling a mode no longer fails on netsh / PowerShell after it already rewrote the files. There is no firewall row on Linux (Docker publishes the ports itself); the Windows reply is unchanged. - The "private services" check (Friends and Diagnostics) could never fail on Linux: it reads the Windows listener table. For a Docker server it is computed from how the ports are published: the database never, the console only on 127.0.0.1, the game servers on bindAddress. - Console, Database tab: read a mysql log file that does not exist; it shows `docker logs` of the database container. - The Overview showed a service that had stopped by itself as "Stopped"; it now says "Stopped unexpectedly". - Settings: a Docker server that was added but never started had no worldserver.conf and the page failed; it is created from its template. A talent file path outside the Core folder is refused (the container cannot see it). - Backups of configuration now include docker.json; verifying the files of an imported Docker server looked for worldserver.exe and reported it missing. - Linux locations: the friend package and the diagnostics go to the desktop folder (from the user directories file) instead of /tmp, the problem report names the distribution, and the size advice for companions reads /proc/meminfo instead of assuming 8 GB. Every Windows branch is the code that was there; the dispatch is the early return on docker::is_docker (or the host flavor for the firewall).
This commit is contained in:
1 parent
90c308615b
commit
dfd8a50975
15 files changed
+360
-14
No files matched your search
@@ -18,9 +18,12 @@ mod cli;
|
||||
pub mod fixture;
|
||||
pub mod install;
|
||||
mod lifecycle;
|
||||
pub mod logs;
|
||||
pub mod sharing;
|
||||
|
||||
pub use cli::{Call, Docker, Output, SystemDocker};
|
||||
pub use lifecycle::{check_docker, observe, observe_with, run, run_with};
|
||||
pub use sharing::{bind_is_open, exposure, set_open};
|
||||
pub(crate) use lifecycle::destroy;
|
||||
|
||||
use std::net::IpAddr;
|
||||
@@ -186,6 +189,15 @@ pub(crate) fn env_name(key: &str) -> String {
|
||||
out
|
||||
}
|
||||
|
||||
/// A reason a value cannot work on a Docker server, for settings that name a path: the server runs in a container that sees only
|
||||
/// its own `Core` folder (as `/srv/core`, its working directory), so a path elsewhere on this computer does not exist for it.
|
||||
pub fn setting_problem(key: &str, raw: &str) -> Option<&'static str> {
|
||||
let raw = raw.trim().trim_matches('"');
|
||||
let outside = Path::new(raw).is_absolute() && !raw.starts_with("/srv/core/");
|
||||
(key.eq_ignore_ascii_case("CoaBots.TalentBuildsPath") && !raw.is_empty() && outside)
|
||||
.then_some("must be a path inside the server's Core folder (for example reference/ascensionsidekick-level-builds.json), because the server runs in a container that cannot see other folders")
|
||||
}
|
||||
|
||||
/// Name of the runtime image: it follows the content of its Dockerfile, so changing the libraries builds a new image.
|
||||
pub(crate) fn runtime_image() -> String {
|
||||
format!("coa-runtime:{}", &fsx::sha256_bytes(RUNTIME_DOCKERFILE.as_bytes())[..12])
|
||||
@@ -252,6 +264,17 @@ mod tests {
|
||||
use super::*;
|
||||
use std::fs;
|
||||
|
||||
#[cfg(unix)]
|
||||
#[test]
|
||||
fn a_path_outside_the_core_folder_is_refused_for_a_docker_server() {
|
||||
let key = "CoaBots.TalentBuildsPath";
|
||||
assert!(setting_problem(key, "reference/builds.json").is_none());
|
||||
assert!(setting_problem(key, "").is_none());
|
||||
assert!(setting_problem(key, "\"/srv/core/reference/builds.json\"").is_none());
|
||||
assert!(setting_problem(key, "/home/ana/builds.json").is_some());
|
||||
assert!(setting_problem("Rate.XP.Kill", "/home/ana/x").is_none(), "only settings that name a path");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn setting_names_become_the_variables_the_core_reads() {
|
||||
for (key, var) in [
|
||||
|
||||
Reference in new issue
Block a user