diff options
author | Lucas Savva <lucas@m1cr0man.com> | 2020-12-13 20:22:33 +0000 |
---|---|---|
committer | Lucas Savva <lucas@m1cr0man.com> | 2020-12-28 00:35:18 +0000 |
commit | 85769a8cd8012e5dfb907f49555ccc7c3c5a9d35 (patch) | |
tree | 9dbeb446579333533fa994655b0d73d51972d501 /nixos/modules/security/acme.nix | |
parent | e5e7c9b0f92bb1007a0a13a75b51422d85bdf084 (diff) | |
download | nixpkgs-85769a8cd8012e5dfb907f49555ccc7c3c5a9d35.tar nixpkgs-85769a8cd8012e5dfb907f49555ccc7c3c5a9d35.tar.gz nixpkgs-85769a8cd8012e5dfb907f49555ccc7c3c5a9d35.tar.bz2 nixpkgs-85769a8cd8012e5dfb907f49555ccc7c3c5a9d35.tar.lz nixpkgs-85769a8cd8012e5dfb907f49555ccc7c3c5a9d35.tar.xz nixpkgs-85769a8cd8012e5dfb907f49555ccc7c3c5a9d35.tar.zst nixpkgs-85769a8cd8012e5dfb907f49555ccc7c3c5a9d35.zip |
nixos/acme: prevent mass account creation
Closes #106565 When generating multiple certificates which all share the same server + email, lego will attempt to create an account multiple times. By adding an account creation target certificates which share an account will wait for one service (chosen at config build time) to complete first.
Diffstat (limited to 'nixos/modules/security/acme.nix')
-rw-r--r-- | nixos/modules/security/acme.nix | 46 |
1 files changed, 33 insertions, 13 deletions
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 8e646ae1567..4a5ffb7ba19 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -7,6 +7,11 @@ let numCerts = length (builtins.attrNames cfg.certs); _24hSecs = 60 * 60 * 24; + # Used to make unique paths for each cert/account config set + mkHash = with builtins; val: substring 0 20 (hashString "sha256" val); + mkAccountHash = acmeServer: data: mkHash "${toString acmeServer} ${data.keyType} ${data.email}"; + accountDirRoot = "/var/lib/acme/.lego/accounts/"; + # There are many services required to make cert renewals work. # They all follow a common structure: # - They inherit this commonServiceConfig @@ -101,11 +106,10 @@ let ${toString acmeServer} ${toString data.dnsProvider} ${toString data.ocspMustStaple} ${data.keyType} ''; - mkHash = with builtins; val: substring 0 20 (hashString "sha256" val); certDir = mkHash hashData; domainHash = mkHash "${concatStringsSep " " extraDomains} ${data.domain}"; - othersHash = mkHash "${toString acmeServer} ${data.keyType} ${data.email}"; - accountDir = "/var/lib/acme/.lego/accounts/" + othersHash; + accountHash = (mkAccountHash acmeServer data); + accountDir = accountDirRoot + accountHash; protocolOpts = if useDns then ( [ "--dns" data.dnsProvider ] @@ -142,7 +146,7 @@ let ); in { - inherit accountDir selfsignedDeps; + inherit accountHash accountDir cert selfsignedDeps; webroot = data.webroot; group = data.group; @@ -253,8 +257,7 @@ let echo '${domainHash}' > domainhash.txt # Check if we can renew - # Certificates and account credentials must exist - if [ -e 'certificates/${keyName}.key' -a -e 'certificates/${keyName}.crt' -a "$(ls -1 accounts)" ]; then + if [ -e 'certificates/${keyName}.key' -a -e 'certificates/${keyName}.crt' -a -n "$(ls -1 accounts)" ]; then # When domains are updated, there's no need to do a full # Lego run, but it's likely renew won't work if days is too low. @@ -670,15 +673,32 @@ in { "d /var/lib/acme/.lego/accounts - acme acme" ] ++ (unique (concatMap (conf: [ "d ${conf.accountDir} - acme acme" - ] ++ (optional (conf.webroot != null) "d ${conf.webroot}/.well-known/acme-challenge - acme ${conf.group}") + ] ++ (optionals (conf.webroot != null) [ + "d ${conf.webroot} - acme ${conf.group}" + "d ${conf.webroot}/.well-known - acme ${conf.group}" + "d ${conf.webroot}/.well-known/acme-challenge - acme ${conf.group}" + ]) ) (attrValues certConfigs))); - # Create some targets which can be depended on to be "active" after cert renewals - systemd.targets = mapAttrs' (cert: conf: nameValuePair "acme-finished-${cert}" { - wantedBy = [ "default.target" ]; - requires = [ "acme-${cert}.service" ] ++ conf.selfsignedDeps; - after = [ "acme-${cert}.service" ] ++ conf.selfsignedDeps; - }) certConfigs; + systemd.targets = let + # Create some targets which can be depended on to be "active" after cert renewals + finishedTargets = mapAttrs' (cert: conf: nameValuePair "acme-finished-${cert}" { + wantedBy = [ "default.target" ]; + requires = [ "acme-${cert}.service" ] ++ conf.selfsignedDeps; + after = [ "acme-${cert}.service" ] ++ conf.selfsignedDeps; + }) certConfigs; + + # Create targets to limit the number of simultaneous account creations + accountTargets = mapAttrs' (hash: confs: let + leader = "acme-${(builtins.head confs).cert}.service"; + dependantServices = map (conf: "acme-${conf.cert}.service") (builtins.tail confs); + in nameValuePair "acme-account-${hash}" { + requiredBy = dependantServices; + before = dependantServices; + requires = [ leader ]; + after = [ leader ]; + }) (groupBy (conf: conf.accountHash) (attrValues certConfigs)); + in finishedTargets // accountTargets; }) ]; |