Compare commits

..
4 changed files with 27 additions and 89 deletions

View file

@ -149,34 +149,11 @@
nixosConfigurations = nixosConfigurations =
let let
# Values the agent modules require but that only a real
# deployment can know. Real containers are built from the
# generated meta flake, where hive-c0re renders these per
# agent from the host's `HIVE_FORGE_URL` (see meta.rs's
# `SERVICE_URL_OPTIONS`) — they never evaluate through
# `self.nixosConfigurations`, so nothing here can reach a
# running agent. These two configs exist only to typecheck
# the modules and to pre-build the container closure
# (`system.extraDependencies`, see hive-c0re/default.nix).
#
# Deliberately a `.invalid` host (RFC 2606: guaranteed not to
# resolve) rather than something plausible like a loopback
# port. If this value ever *did* escape into a runtime path,
# it must fail loudly at DNS instead of quietly connecting to
# whatever happens to be listening — which is the entire
# point of removing the `http://localhost:3000` default this
# replaces.
evalOnlyPlaceholders = {
hyperhive.forge.url = "http://forge.invalid";
};
mkContainer = mkContainer =
module: module:
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [ module ];
module
evalOnlyPlaceholders
];
}; };
in in
{ {

View file

@ -37,25 +37,15 @@ use users::{
const FORGE_CONTAINER: &str = "hive-forge"; const FORGE_CONTAINER: &str = "hive-forge";
/// Base HTTP URL for the local Forgejo instance, from `HIVE_FORGE_URL` /// Base HTTP URL for the local Forgejo instance. Reads `HIVE_FORGE_URL`
/// (set unconditionally by `hive-c0re.nix` to `http://<forge.domain>`). /// from the environment (set unconditionally by `hive-c0re.nix` to
/// /// `http://<forge.domain>`) so the forge port is never hardcoded.
/// # Panics /// Falls back to `http://localhost:3000` for bare runs outside the
/// /// NixOS module (tests, manual invocation).
/// When `HIVE_FORGE_URL` is unset. That is deliberate: this daemon only
/// runs under the NixOS module, which always sets it, so an unset var
/// means the deployment is broken. There is no loopback fallback,
/// because a guess is wrong in exactly the cases that matter — the
/// forge may live on a different host from the daemon, and a fallback
/// turns "misconfigured" into "silently talking to the wrong machine"
/// or, worse, "connection refused" surfacing far from its cause.
pub(crate) fn forge_http_base() -> &'static str { pub(crate) fn forge_http_base() -> &'static str {
static BASE: OnceLock<String> = OnceLock::new(); static BASE: OnceLock<String> = OnceLock::new();
BASE.get_or_init(|| { BASE.get_or_init(|| {
std::env::var("HIVE_FORGE_URL").expect( std::env::var("HIVE_FORGE_URL").unwrap_or_else(|_| "http://localhost:3000".to_string())
"HIVE_FORGE_URL is unset — hive-c0re.nix sets it unconditionally, \
so this process was started outside the NixOS module",
)
}) })
} }
@ -63,24 +53,15 @@ pub(crate) fn forge_http_base() -> &'static str {
/// `core:<token>` credentials between the scheme and authority of /// `core:<token>` credentials between the scheme and authority of
/// [`forge_http_base()`] — the form git accepts for inline auth. /// [`forge_http_base()`] — the form git accepts for inline auth.
pub(crate) fn forge_git_url(token: &str, repo: &str) -> String { pub(crate) fn forge_git_url(token: &str, repo: &str) -> String {
git_url_with_base(forge_http_base(), token, repo) let base = forge_http_base();
} // Split on "://" to isolate scheme + authority. The base URL always
// contains "://" (validated fallback + `HIVE_FORGE_URL` is
/// The credential-insertion half of [`forge_git_url`], split out so it // operator-set and expected to be well-formed).
/// can be tested without a process-wide env var (which would race every if let Some((scheme, host)) = base.split_once("://") {
/// other test in this binary). format!("{scheme}://core:{token}@{host}/{repo}.git")
/// } else {
/// # Panics format!("http://core:{token}@localhost:3000/{repo}.git")
/// }
/// When `base` has no `://`. Previously this fell back to
/// `http://core:<token>@localhost:3000` — a guess that would have sent
/// a *credentialed* push at whatever answers on the local port. A
/// malformed base is a broken deployment; failing on it is the point.
fn git_url_with_base(base: &str, token: &str, repo: &str) -> String {
let (scheme, host) = base
.split_once("://")
.unwrap_or_else(|| panic!("HIVE_FORGE_URL is not a URL (no \"://\"): {base}"));
format!("{scheme}://core:{token}@{host}/{repo}.git")
} }
/// Forgejo org grouping every agent's config repo. Core is a site admin /// Forgejo org grouping every agent's config repo. Core is a site admin

View file

@ -253,7 +253,7 @@ pub async fn post_pr_comment(repo: &str, pr: u64, body: &str) -> Result<(), Forg
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::repo_agent_name; use super::repo_agent_name;
use crate::forge::git_url_with_base; use crate::forge::forge_git_url;
#[test] #[test]
fn repo_agent_name_takes_trailing_segment() { fn repo_agent_name_takes_trailing_segment() {
@ -264,23 +264,13 @@ mod tests {
#[test] #[test]
fn forge_git_url_shape() { fn forge_git_url_shape() {
// Tests the pure half: credentials go between scheme and // Credentials are inserted between scheme and authority; fallback
// authority. Deliberately not via `forge_git_url`, which reads // base is `http://localhost:3000` when HIVE_FORGE_URL is unset.
// HIVE_FORGE_URL — setting that here would race every other let url = forge_git_url("tok", "agent-configs/iris");
// test in this binary, and there is no fallback to lean on any assert!(url.contains("core:tok@"), "must embed credentials: {url}");
// more (a guessed base is the bug this issue removes).
let url = git_url_with_base("http://forge.example.test", "tok", "a/iris");
assert_eq!(url, "http://core:tok@forge.example.test/a/iris.git");
}
#[test]
fn forge_git_url_preserves_https() {
// The scheme is carried through rather than assumed: a swarm
// whose forge is behind TLS must not be downgraded to http.
let url = git_url_with_base("https://forge.example.test", "tok", "a/iris");
assert!( assert!(
url.starts_with("https://core:tok@"), url.ends_with("/agent-configs/iris.git"),
"https must survive: {url}" "must end with repo path: {url}"
); );
} }
} }

View file

@ -21,6 +21,7 @@ in
{ {
options.hyperhive.forge.url = lib.mkOption { options.hyperhive.forge.url = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = "http://localhost:3000";
example = "http://forge.internal:3000"; example = "http://forge.internal:3000";
description = '' description = ''
Base URL of the hyperhive-managed Forgejo. Used at container Base URL of the hyperhive-managed Forgejo. Used at container
@ -30,27 +31,16 @@ in
shell out to `tea` without an extra auth dance. No-op when the shell out to `tea` without an extra auth dance. No-op when the
forge-token file is missing (i.e. hive-forge isn't running on forge-token file is missing (i.e. hive-forge isn't running on
the host). the host).
**Required, deliberately undefaulted.** hive-c0re renders it into
every agent's config from the host's `HIVE_FORGE_URL`, which
`hive-c0re.nix` sets unconditionally --- the forge is mandatory.
A loopback default would be a guess: the forge may run on a
different host from the agents, and inside an agent's network
namespace `localhost` reaches the agent, not the forge. An
unevaluatable config is better than one that builds and then
talks to the wrong machine.
''; '';
}; };
config = { config = {
assertions = [ assertions = [
# The empty string is the one value the type permits that cannot # hyperhive.forge.url must look like an HTTP URL when non-default.
# be a URL, and it is what a caller supplies when they have
# nothing --- exactly the case the removed loopback default used
# to paper over. Reject it here so the failure names the option.
{ {
assertion = assertion =
lib.hasPrefix "http://" config.hyperhive.forge.url config.hyperhive.forge.url == ""
|| lib.hasPrefix "http://" config.hyperhive.forge.url
|| lib.hasPrefix "https://" config.hyperhive.forge.url; || lib.hasPrefix "https://" config.hyperhive.forge.url;
message = "hyperhive.forge.url must be an http:// or https:// URL (got: \"${config.hyperhive.forge.url}\")"; message = "hyperhive.forge.url must be an http:// or https:// URL (got: \"${config.hyperhive.forge.url}\")";
} }