refactor(ssh): centralize identity file logic and optimize host selection

Refactor the SSH configuration generation to reduce duplication and
improve efficiency.

- Extract `IdentityFile` line generation into a shared variable in
  `ssh-inventory.nix` to ensure consistency between per-host and
  gitea blocks.
- Optimize `selectedHosts` resolution in `home-manager/default.nix`
  by reusing `activeHosts` when the "all" wildcard is used.
- Tighten IPv4 regex matching in `ssh-inventory.nix` using anchors.
- Update `users-merge.nix` to propagate `extraIdentities` to the
  rbw outbound configuration.
- Set default `authorizedHosts` to "all" for inbound SSH users.
This commit is contained in:
2026-07-15 18:20:40 -03:00
parent 524abb9ceb
commit db88a44435
4 changed files with 16 additions and 4 deletions
+6 -3
View File
@@ -57,7 +57,7 @@
# parses as an IPv4 dotted-quad. Filters out scratchpad/non-routable # parses as an IPv4 dotted-quad. Filters out scratchpad/non-routable
# entries (e.g. `hostName = "test"`). # entries (e.g. `hostName = "test"`).
activeHosts = lib.filterAttrs activeHosts = lib.filterAttrs
(_: h: lib.match "[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+" h.hostName != null) (_: h: lib.match "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$" h.hostName != null)
hosts; hosts;
# .pub filename convention. OpenSSH 7.3+ accepts a `.pub` file as # .pub filename convention. OpenSSH 7.3+ accepts a `.pub` file as
@@ -78,6 +78,10 @@
identityAgent ? "SSH_AUTH_SOCK", identityAgent ? "SSH_AUTH_SOCK",
}: }:
let let
# Shared `IdentityFile` filter line (when `user` is set). Used by
# both the per-host and gitea blocks so the two can't drift apart.
idLine = lib.optionalString (user != null) " IdentityFile ~/${mkIdentityFileName user}\n";
# Match blocks for cross-account SSH. Filter out cfg.user since # Match blocks for cross-account SSH. Filter out cfg.user since
# the matching pub is already loaded via the Host block's # the matching pub is already loaded via the Host block's
# IdentityFile line — re-emitting it would just duplicate. # IdentityFile line — re-emitting it would just duplicate.
@@ -97,7 +101,6 @@
let let
e = selectedHosts.${hostName}; e = selectedHosts.${hostName};
hostPatterns = lib.concatStringsSep " " (e.aliases ++ [ e.hostName ]); hostPatterns = lib.concatStringsSep " " (e.aliases ++ [ e.hostName ]);
idLine = if user == null then "" else " IdentityFile ~/${mkIdentityFileName user}\n";
in '' in ''
Host ${hostPatterns} Host ${hostPatterns}
HostName ${e.hostName} HostName ${e.hostName}
@@ -114,7 +117,7 @@
HostName 192.168.2.238 HostName 192.168.2.238
Port 222 Port 222
User git User git
${if user == null then "" else " IdentityFile ~/${mkIdentityFileName user}\n"} IdentityAgent ${identityAgent} ${idLine} IdentityAgent ${identityAgent}
IdentitiesOnly yes IdentitiesOnly yes
''; '';
+1
View File
@@ -60,6 +60,7 @@
chiasson.ssh.outbound.rbw.user = name; chiasson.ssh.outbound.rbw.user = name;
chiasson.ssh.outbound.rbw.hosts = chiasson.ssh.outbound.rbw.hosts =
if (outboundCfg.hosts or "all") == "all" then [ "all" ] else outboundCfg.hosts; if (outboundCfg.hosts or "all") == "all" then [ "all" ] else outboundCfg.hosts;
chiasson.ssh.outbound.rbw.extraIdentities = outboundCfg.extraIdentities or [ ];
}; };
mkHmUserModule = mkHmUserModule =
+8 -1
View File
@@ -12,6 +12,13 @@
else else
cfg.hosts; cfg.hosts;
missingHosts = builtins.filter (name: !(builtins.hasAttr name inventory.hosts)) selectedHostNames; missingHosts = builtins.filter (name: !(builtins.hasAttr name inventory.hosts)) selectedHostNames;
# Resolve to the actual host attrs for the template. The "all" case
# reuses `activeHosts` directly instead of rebuilding the same attrset.
selectedHosts =
if cfg.hosts == [ "all" ] then
inventory.activeHosts
else
builtins.listToAttrs (map (n: { name = n; value = inventory.hosts.${n}; }) selectedHostNames);
# All identities this HM user may authenticate AS: cfg.user # All identities this HM user may authenticate AS: cfg.user
# extraIdentities. `cfg.user` can be null (e.g. user not in inventory # extraIdentities. `cfg.user` can be null (e.g. user not in inventory
# yet) — in that case the Host-block IdentityFile line is suppressed # yet) — in that case the Host-block IdentityFile line is suppressed
@@ -112,7 +119,7 @@
} }
(lib.mkIf cfg.manageSshConfig { (lib.mkIf cfg.manageSshConfig {
home.file.".ssh/config".text = inventory.mkSshConfigTemplate { home.file.".ssh/config".text = inventory.mkSshConfigTemplate {
selectedHosts = builtins.listToAttrs (map (n: { name = n; value = inventory.hosts.${n}; }) selectedHostNames); inherit selectedHosts;
user = cfg.user; user = cfg.user;
inherit (cfg) extraIdentities; inherit (cfg) extraIdentities;
}; };
+1
View File
@@ -156,6 +156,7 @@
createHome = false; createHome = false;
homeManager = { enable = false; module = null; }; homeManager = { enable = false; module = null; };
ssh.inbound.enable = true; ssh.inbound.enable = true;
ssh.inbound.authorizedHosts = "all";
}; };
}; };