Commit d20a5749 authored by Robert Hensing's avatar Robert Hensing
Browse files

Revert "systemd: Add functions.escapeSystemdExecArg[s]" 

This reverts commit 121c0d9e.
parent af04a80c

nixos/lib/utils.nix

+25 −1
Original line number Diff line number Diff line
@@ -119,7 +119,31 @@ let 
        )

      );



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

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

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

    # a subset of these.

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

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

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

    # substitution for the directive.

    escapeSystemdExecArg =

      arg:

      let

        s =

          if isPath arg then

            "${arg}"

          else if isString arg then

            arg

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

            toString arg

          else

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

      in

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



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

    # line.

    escapeSystemdExecArgs = concatMapStringsSep " " escapeSystemdExecArg;



    # Returns a system path for a given shell package

    toShellPath =

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

+0 −11
Original line number Diff line number Diff line
@@ -897,11 +897,6 @@ stdenv.mkDerivation (finalAttrs: { 
    # needed - and therefore `interfaceVersion` should be incremented.

    interfaceVersion = 2;



    functions = import ./functions/default.nix {

      inherit lib;

      systemd = finalAttrs.finalPackage;

    };



    inherit

      withBootloader

      withCryptsetup
@@ -1027,12 +1022,6 @@ stdenv.mkDerivation (finalAttrs: { 
          pkgsCross.${systemString}.systemd;



        pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;



        functions = import ./functions/test.nix {

          inherit lib;

          systemd = finalAttrs.finalPackage;

          ok = buildPackages.emptyFile;

        };

      };

  };

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

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
/**

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

*/

{ lib, systemd }:

let

  inherit (lib)

    concatMapStringsSep

    isDerivation

    isFloat

    isInt

    isPath

    isString

    replaceStrings

    ;

  inherit (builtins)

    toJSON

    ;



  /**

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

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

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

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

    substitution for the directive.

  */

  escapeSystemdExecArg =

    arg:

    let

      s =

        if isPath arg then

          "${arg}"

        else if isString arg then

          arg

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

          toString arg

        else

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

    in

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

    # a subset of these.

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



  /**

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

  */

  escapeSystemdExecArgs = concatMapStringsSep " " escapeSystemdExecArg;

in

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

assert systemd.interfaceVersion == 2;

{

  inherit

    escapeSystemdExecArg

    escapeSystemdExecArgs

    ;

}

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

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
{

  lib,

  systemd,

  ok,

}:



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

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

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

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

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

assert

  systemd.functions.escapeSystemdExecArgs [

    "hi"

    "there"

  ] == ''"hi" "there"'';

assert

  systemd.functions.escapeSystemdExecArgs [

    "hi"

    "%"

    "there"

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

ok