movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 06:00:33 +03:00
Code Activity

nixos/dokuwiki: don’t use lib.escapeShellArg (#340309)

Browse source
This commit is contained in:
Emily 2024-09-11 00:34:05 +01:00 • committed by GitHub
commit 1a55636200
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
nixos/modules/services/web-apps/dokuwiki.nix
View file

@ -17,6 +17,10 @@ let
extraConfig = mkPhpIni cfg.phpOptions; extraConfig = mkPhpIni cfg.phpOptions;
}; };
# "you're escaped" -> "'you\'re escaped'"
# https://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single
toPhpString = s: "'${escape [ "'" "\\" ] s}'";
dokuwikiAclAuthConfig = hostName: cfg: let dokuwikiAclAuthConfig = hostName: cfg: let
inherit (cfg) acl; inherit (cfg) acl;
acl_gen = concatMapStringsSep "\n" (l: "${l.page} \t ${l.actor} \t ${toString l.level}"); acl_gen = concatMapStringsSep "\n" (l: "${l.page} \t ${l.actor} \t ${toString l.level}");
@ -43,12 +47,12 @@ let
mkPhpValue = v: let mkPhpValue = v: let
isHasAttr = s: isAttrs v && hasAttr s v; isHasAttr = s: isAttrs v && hasAttr s v;
in in
if isString v then escapeShellArg v if isString v then toPhpString v
# NOTE: If any value contains a , (comma) this will not get escaped # NOTE: If any value contains a , (comma) this will not get escaped
else if isList v && any lib.strings.isCoercibleToString v then escapeShellArg (concatMapStringsSep "," toString v) else if isList v && any lib.strings.isCoercibleToString v then toPhpString (concatMapStringsSep "," toString v)
else if isInt v then toString v else if isInt v then toString v
else if isBool v then toString (if v then 1 else 0) else if isBool v then toString (if v then 1 else 0)
else if isHasAttr "_file" then "trim(file_get_contents(${lib.escapeShellArg v._file}))" else if isHasAttr "_file" then "trim(file_get_contents(${toPhpString v._file}))"
else if isHasAttr "_raw" then v._raw else if isHasAttr "_raw" then v._raw
else abort "The dokuwiki localConf value ${lib.generators.toPretty {} v} can not be encoded." else abort "The dokuwiki localConf value ${lib.generators.toPretty {} v} can not be encoded."
; ;
@ -59,7 +63,7 @@ let
[" = ${mkPhpValue v};"] [" = ${mkPhpValue v};"]
else else
mkPhpAttrVals v; mkPhpAttrVals v;
in map (e: "[${escapeShellArg k}]${e}") (flatten values); in map (e: "[${toPhpString k}]${e}") (flatten values);
dokuwikiLocalConfig = hostName: cfg: let dokuwikiLocalConfig = hostName: cfg: let
conf_gen = c: map (v: "$conf${v}") (mkPhpAttrVals c); conf_gen = c: map (v: "$conf${v}") (mkPhpAttrVals c);