commit b915f0c5c0307c82f7834d683cf81414ce73d01b · pyrox.dev/nixpkgs

+1 -25

nixos/lib/utils.nix

···

       119
       119
        
               )

     

       120
       120
        
             );

     

       121
       121
        
       

     

       122
       122
       -
           # Quotes an argument for use in Exec* service lines.

     

       123
       123
       -
           # systemd accepts "-quoted strings with escape sequences, toJSON produces

     

       124
       124
       -
           # a subset of these.

     

       125
       125
       -
           # Additionally we escape % to disallow expansion of % specifiers. Any lone ;

     

       126
       126
       -
           # in the input will be turned it ";" and thus lose its special meaning.

     

       127
       127
       -
           # Every $ is escaped to $$, this makes it unnecessary to disable environment

     

       128
       128
       -
           # substitution for the directive.

     

       129
       129
       -
           escapeSystemdExecArg =

     

       130
       130
       -
             arg:

     

       131
       131
       -
             let

     

       132
       132
       -
               s =

     

       133
       133
       -
                 if isPath arg then

     

       134
       134
       -
                   "${arg}"

     

       135
       135
       -
                 else if isString arg then

     

       136
       136
       -
                   arg

     

       137
       137
       -
                 else if isInt arg || isFloat arg || isDerivation arg then

     

       138
       138
       -
                   toString arg

     

       139
       139
       -
                 else

     

       140
       140
       -
                   throw "escapeSystemdExecArg only allows strings, paths, numbers and derivations";

     

       141
       141
       -
             in

     

       142
       142
       -
             replaceStrings [ "%" "$" ] [ "%%" "$$" ] (toJSON s);

     

       143
       143
       -
       

     

       144
       144
       -
           # Quotes a list of arguments into a single string for use in a Exec*

     

       145
       145
       -
           # line.

     

       146
       146
       -
           escapeSystemdExecArgs = concatMapStringsSep " " escapeSystemdExecArg;

     

       122
       122
       +
           inherit (config.systemd.package.functions) escapeSystemdExecArg escapeSystemdExecArgs;

     

       147
       123
        
       

     

       148
       124
        
           # Returns a system path for a given shell package

     

       149
       125
        
           toShellPath =

+11

pkgs/os-specific/linux/systemd/default.nix

···

       897
       897
        
           # needed - and therefore `interfaceVersion` should be incremented.

     

       898
       898
        
           interfaceVersion = 2;

     

       899
       899
        
       

     

       900
       900
       +
           functions = import ./functions/default.nix {

     

       901
       901
       +
             inherit lib;

     

       902
       902
       +
             systemd = finalAttrs.finalPackage;

     

       903
       903
       +
           };

     

       904
       904
       +
       

     

       900
       905
        
           inherit

     

       901
       906
        
             withBootloader

     

       902
       907
        
             withCryptsetup

     
···

       1022
       1027
        
                 pkgsCross.${systemString}.systemd;

     

       1023
       1028
        
       

     

       1024
       1029
        
               pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

     

       1030
       1030
       +
       

     

       1031
       1031
       +
               functions = import ./functions/test.nix {

     

       1032
       1032
       +
                 inherit lib;

     

       1033
       1033
       +
                 systemd = finalAttrs.finalPackage;

     

       1034
       1034
       +
                 ok = buildPackages.emptyFile;

     

       1035
       1035
       +
               };

     

       1025
       1036
        
             };

     

       1026
       1037
        
         };

     

       1027
       1038

+55

pkgs/os-specific/linux/systemd/functions/default.nix

···

       1
       1
       +
       /**

     

       2
       2
       +
         Build the `systemd.functions` library (where `systemd` is the package)

     

       3
       3
       +
       */

     

       4
       4
       +
       { lib, systemd }:

     

       5
       5
       +
       let

     

       6
       6
       +
         inherit (lib)

     

       7
       7
       +
           concatMapStringsSep

     

       8
       8
       +
           isDerivation

     

       9
       9
       +
           isFloat

     

       10
       10
       +
           isInt

     

       11
       11
       +
           isPath

     

       12
       12
       +
           isString

     

       13
       13
       +
           replaceStrings

     

       14
       14
       +
           ;

     

       15
       15
       +
         inherit (builtins)

     

       16
       16
       +
           toJSON

     

       17
       17
       +
           ;

     

       18
       18
       +
       

     

       19
       19
       +
         /**

     

       20
       20
       +
           Quotes an argument for use in `Exec*` service lines.

     

       21
       21
       +
           Additionally we escape `%` to disallow expansion of `%` specifiers. Any lone `;`

     

       22
       22
       +
           in the input will be turned into `";"` and thus lose its special meaning.

     

       23
       23
       +
           Every `$` is escaped to `$$`, this makes it unnecessary to disable environment

     

       24
       24
       +
           substitution for the directive.

     

       25
       25
       +
         */

     

       26
       26
       +
         escapeSystemdExecArg =

     

       27
       27
       +
           arg:

     

       28
       28
       +
           let

     

       29
       29
       +
             s =

     

       30
       30
       +
               if isPath arg then

     

       31
       31
       +
                 "${arg}"

     

       32
       32
       +
               else if isString arg then

     

       33
       33
       +
                 arg

     

       34
       34
       +
               else if isInt arg || isFloat arg || isDerivation arg then

     

       35
       35
       +
                 toString arg

     

       36
       36
       +
               else

     

       37
       37
       +
                 throw "escapeSystemdExecArg only allows strings, paths, numbers and derivations";

     

       38
       38
       +
           in

     

       39
       39
       +
           # systemd accepts "-quoted strings with escape sequences, toJSON produces

     

       40
       40
       +
           # a subset of these.

     

       41
       41
       +
           replaceStrings [ "%" "$" ] [ "%%" "$$" ] (toJSON s);

     

       42
       42
       +
       

     

       43
       43
       +
         /**

     

       44
       44
       +
           Quotes a list of arguments into a single string for use in a Exec* line.

     

       45
       45
       +
         */

     

       46
       46
       +
         escapeSystemdExecArgs = concatMapStringsSep " " escapeSystemdExecArg;

     

       47
       47
       +
       in

     

       48
       48
       +
       # Instead of requiring v2, we can make this library conditional on the version as needed.

     

       49
       49
       +
       assert systemd.interfaceVersion == 2;

     

       50
       50
       +
       {

     

       51
       51
       +
         inherit

     

       52
       52
       +
           escapeSystemdExecArg

     

       53
       53
       +
           escapeSystemdExecArgs

     

       54
       54
       +
           ;

     

       55
       55
       +
       }

+23

pkgs/os-specific/linux/systemd/functions/test.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         systemd,

     

       4
       4
       +
         ok,

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       # This function is also tested in nixosTests.systemd-escaping

     

       8
       8
       +
       assert systemd.functions.escapeSystemdExecArg "hi" == ''"hi"'';

     

       9
       9
       +
       assert systemd.functions.escapeSystemdExecArg "hi there" == ''"hi there"'';

     

       10
       10
       +
       assert systemd.functions.escapeSystemdExecArg ''"hi there"'' == ''"\"hi there\""'';

     

       11
       11
       +
       assert systemd.functions.escapeSystemdExecArg ''"%$'' == ''"\"%%$$"'';

     

       12
       12
       +
       assert

     

       13
       13
       +
         systemd.functions.escapeSystemdExecArgs [

     

       14
       14
       +
           "hi"

     

       15
       15
       +
           "there"

     

       16
       16
       +
         ] == ''"hi" "there"'';

     

       17
       17
       +
       assert

     

       18
       18
       +
         systemd.functions.escapeSystemdExecArgs [

     

       19
       19
       +
           "hi"

     

       20
       20
       +
           "%"

     

       21
       21
       +
           "there"

     

       22
       22
       +
         ] == ''"hi" "%%" "there"'';

     

       23
       23
       +
       ok