git.iko.soy/typeable/nixpkgs
on master help sign in
wireguard module: Quote all command line arguments correctly.
aaffc64Niklas Hambüchen
nixos/modules/services/networking/wireguard.nix+20−16
@@ -286,16 +286,18 @@ let
286 };
286 };
287
287
288 script = let
288 script = let
289+ wg_setup = concatStringsSep " " (
289− wg_setup = "${wg} set ${interfaceName} peer ${peer.publicKey}" +
290+ [ ''${wg} set ${interfaceName} peer "${peer.publicKey}"'' ]
290− optionalString (psk != null) " preshared-key ${psk}" +
291+ ++ optional (psk != null) ''preshared-key "${psk}"''
291− optionalString (peer.endpoint != null) " endpoint ${peer.endpoint}" +
292+ ++ optional (peer.endpoint != null) ''endpoint "${peer.endpoint}"''
292− optionalString (peer.persistentKeepalive != null) " persistent-keepalive ${toString peer.persistentKeepalive}" +
293+ ++ optional (peer.persistentKeepalive != null) ''persistent-keepalive "${toString peer.persistentKeepalive}"''
293− optionalString (peer.allowedIPs != []) " allowed-ips ${concatStringsSep "," peer.allowedIPs}";
294+ ++ optional (peer.allowedIPs != []) ''allowed-ips "${concatStringsSep "," peer.allowedIPs}"''
295+ );
294 route_setup =
296 route_setup =
295 optionalString interfaceCfg.allowedIPsAsRoutes
297 optionalString interfaceCfg.allowedIPsAsRoutes
296 (concatMapStringsSep "\n"
298 (concatMapStringsSep "\n"
297 (allowedIP:
299 (allowedIP:
298− "${ip} route replace ${allowedIP} dev ${interfaceName} table ${interfaceCfg.table}"
300+ ''${ip} route replace "${allowedIP}" dev "${interfaceName}" table "${interfaceCfg.table}"''
299 ) peer.allowedIPs);
301 ) peer.allowedIPs);
300 in ''
302 in ''
301 ${wg_setup}
303 ${wg_setup}
@@ -306,10 +308,10 @@ let
306 route_destroy = optionalString interfaceCfg.allowedIPsAsRoutes
308 route_destroy = optionalString interfaceCfg.allowedIPsAsRoutes
307 (concatMapStringsSep "\n"
309 (concatMapStringsSep "\n"
308 (allowedIP:
310 (allowedIP:
309− "${ip} route delete ${allowedIP} dev ${interfaceName} table ${interfaceCfg.table}"
311+ ''${ip} route delete "${allowedIP}" dev "${interfaceName}" table "${interfaceCfg.table}"''
310 ) peer.allowedIPs);
312 ) peer.allowedIPs);
311 in ''
313 in ''
312− ${wg} set ${interfaceName} peer ${peer.publicKey} remove
314+ ${wg} set "${interfaceName}" peer "${peer.publicKey}" remove
313 ${route_destroy}
315 ${route_destroy}
314 '';
316 '';
315 };
317 };
@@ -345,23 +347,25 @@ let
345
347
346 ${values.preSetup}
348 ${values.preSetup}
347
349
348− ${ipPreMove} link add dev ${name} type wireguard
350+ ${ipPreMove} link add dev "${name}" type wireguard
349− ${optionalString (values.interfaceNamespace != null && values.interfaceNamespace != values.socketNamespace) "${ipPreMove} link set ${name} netns ${ns}"}
351+ ${optionalString (values.interfaceNamespace != null && values.interfaceNamespace != values.socketNamespace) ''${ipPreMove} link set "${name}" netns "${ns}"''}
350
352
351 ${concatMapStringsSep "\n" (ip:
353 ${concatMapStringsSep "\n" (ip:
352− "${ipPostMove} address add ${ip} dev ${name}"
354+ ''${ipPostMove} address add "${ip}" dev "${name}"''
353 ) values.ips}
355 ) values.ips}
354
356
357+ ${concatStringsSep " " (
355− ${wg} set ${name} private-key ${privKey} ${
358+ [ ''${wg} set "${name}" private-key "${privKey}"'' ]
356− optionalString (values.listenPort != null) " listen-port ${toString values.listenPort}"}
359+ ++ optional (values.listenPort != null) ''listen-port "${toString values.listenPort}"''
360+ )}
357
361
358− ${ipPostMove} link set up dev ${name}
362+ ${ipPostMove} link set up dev "${name}"
359
363
360 ${values.postSetup}
364 ${values.postSetup}
361 '';
365 '';
362
366
363 postStop = ''
367 postStop = ''
364− ${ipPostMove} link del dev ${name}
368+ ${ipPostMove} link del dev "${name}"
365 ${values.postShutdown}
369 ${values.postShutdown}
366 '';
370 '';
367 };
371 };
@@ -371,7 +375,7 @@ let
371 nsList = filter (ns: ns != null) [ src dst ];
375 nsList = filter (ns: ns != null) [ src dst ];
372 ns = last nsList;
376 ns = last nsList;
373 in
377 in
374− if (length nsList > 0 && ns != "init") then "ip netns exec ${ns} ${cmd}" else cmd;
378+ if (length nsList > 0 && ns != "init") then ''ip netns exec "${ns}" "${cmd}"'' else cmd;
375in
379in
376
380
377{
381{