commit 7b3486bdc39d5b70e59215c7a0b23e5ff75101f3 · pyrox.dev/nixpkgs

+4 -4

nixos/modules/services/security/kanidm.nix

···

       185
       185
        
       

     

       186
       186
        
         finalJson =

     

       187
       187
        
           if cfg.provision.extraJsonFile != null then

     

       188
       188
       -
             "<(${lib.getExe pkgs.jq} -s '.[0] * .[1]' ${provisionStateJson} ${cfg.provision.extraJsonFile})"

     

       188
       188
       +
             ''

     

       189
       189
       +
               <(${lib.getExe pkgs.yq-go} '. *+ load("${cfg.provision.extraJsonFile}") | (.. | select(type == "!!seq")) |= unique' ${provisionStateJson})

     

       190
       190
       +
             ''

     

       189
       191
        
           else

     

       190
       192
        
             provisionStateJson;

     

       191
       193
        
       

     
···

       442
       444
        
               description = ''

     

       443
       445
        
                 A JSON file for provisioning persons, groups & systems.

     

       444
       446
        
                 Options set in this file take precedence over values set using the other options.

     

       445
       445
       -
                 In the case of duplicates, `jq` will remove all but the last one

     

       446
       446
       -
                 when merging this file with the options.

     

       447
       447
       +
                 The files get deeply merged, and deduplicated.

     

       447
       448
        
                 The accepted JSON schema can be found at <https://github.com/oddlama/kanidm-provision#json-schema>.

     

       448
       448
       -
                 Note: theoretically `jq` cannot merge nested types, but this does not pose an issue as kanidm-provision's JSON scheme does not use nested types.

     

       449
       449
        
               '';

     

       450
       450
        
               type = types.nullOr types.path;

     

       451
       451
        
               default = null;

+42

nixos/tests/kanidm-provisioning.nix

···

       234
       234
        
                 };

     

       235
       235
        
               };

     

       236
       236
        
       

     

       237
       237
       +
             specialisation.extraJsonFile.configuration =

     

       238
       238
       +
               { ... }:

     

       239
       239
       +
               {

     

       240
       240
       +
                 services.kanidm.provision = lib.mkForce {

     

       241
       241
       +
                   enable = true;

     

       242
       242
       +
                   idmAdminPasswordFile = pkgs.writeText "idm-admin-pw" provisionIdmAdminPassword;

     

       243
       243
       +
       

     

       244
       244
       +
                   extraJsonFile = pkgs.writeText "extra-json.json" (

     

       245
       245
       +
                     builtins.toJSON {

     

       246
       246
       +
                       persons.testuser2.displayName = "Test User 2";

     

       247
       247
       +
                       groups.testgroup1.members = [ "testuser2" ];

     

       248
       248
       +
                     }

     

       249
       249
       +
                   );

     

       250
       250
       +
       

     

       251
       251
       +
                   groups.testgroup1 = { };

     

       252
       252
       +
       

     

       253
       253
       +
                   persons.testuser1 = {

     

       254
       254
       +
                     displayName = "Test User 1";

     

       255
       255
       +
                     groups = [ "testgroup1" ];

     

       256
       256
       +
                   };

     

       257
       257
       +
                 };

     

       258
       258
       +
               };

     

       259
       259
       +
       

     

       237
       260
        
             security.pki.certificateFiles = [ certs.ca.cert ];

     

       238
       261
        
       

     

       239
       262
        
             networking.hosts."::1" = [ serverDomain ];

     
···

       514
       537
        
       

     

       515
       538
        
                 out = provision.succeed("kanidm system oauth2 get service2")

     

       516
       539
        
                 assert_lacks(out, "name: service2")

     

       540
       540
       +
       

     

       541
       541
       +
                 provision.succeed("kanidm logout -D idm_admin")

     

       542
       542
       +
       

     

       543
       543
       +
             with subtest("Test Provisioning - extraJsonFile"):

     

       544
       544
       +
                 provision.succeed('${specialisations}/extraJsonFile/bin/switch-to-configuration test')

     

       545
       545
       +
                 provision_login("${provisionIdmAdminPassword}")

     

       546
       546
       +
       

     

       547
       547
       +
                 out = provision.succeed("kanidm group get testgroup1")

     

       548
       548
       +
                 assert_contains(out, "name: testgroup1")

     

       549
       549
       +
       

     

       550
       550
       +
                 out = provision.succeed("kanidm person get testuser1")

     

       551
       551
       +
                 assert_contains(out, "name: testuser1")

     

       552
       552
       +
       

     

       553
       553
       +
                 out = provision.succeed("kanidm person get testuser2")

     

       554
       554
       +
                 assert_contains(out, "name: testuser2")

     

       555
       555
       +
       

     

       556
       556
       +
                 out = provision.succeed("kanidm group get testgroup1")

     

       557
       557
       +
                 assert_contains(out, "member: testuser1")

     

       558
       558
       +
                 assert_contains(out, "member: testuser2")

     

       517
       559
        
       

     

       518
       560
        
                 provision.succeed("kanidm logout -D idm_admin")

     

       519
       561
        
           '';