From 2992771c7e4a875683bbb327a090c221ae75f29e Mon Sep 17 00:00:00 2001
From: Daniel Barlow <dan@telent.net>
Date: Wed, 21 Aug 2024 00:17:22 +0100
Subject: [PATCH] pppoe allow secrets for username/password

---
 modules/ppp/default.nix | 10 ++++++++--
 modules/ppp/pppoe.nix   | 16 ++++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/modules/ppp/default.nix b/modules/ppp/default.nix
index 8cef94f..3cea2ae 100644
--- a/modules/ppp/default.nix
+++ b/modules/ppp/default.nix
@@ -33,8 +33,14 @@ in {
         type = liminix.lib.types.service;
         description = "ethernet interface to run PPPoE over";
       };
-      username = mkStringOption "username";
-      password = mkStringOption "password";
+      username = mkOption {
+        type = liminix.lib.types.replacable;
+        description = "username";
+      };
+      password = mkOption {
+        type = liminix.lib.types.replacable;
+        description = "password";
+      };
       lcpEcho = {
         adaptive = mkOption {
           description = "send LCP echo-request frames only if no traffic was received from the peer since the last echo-request was sent";
diff --git a/modules/ppp/pppoe.nix b/modules/ppp/pppoe.nix
index d2beb92..ed1b235 100644
--- a/modules/ppp/pppoe.nix
+++ b/modules/ppp/pppoe.nix
@@ -16,7 +16,7 @@
 }:
 let
   inherit (liminix.services) longrun;
-  inherit (lib) optional optionals concatStringsSep;
+  inherit (lib) optional optionals escapeShellArgs concatStringsSep;
   name = "${interface.name}.pppoe";
   ip-up = writeAshScript "ip-up" {} ''
     . ${serviceFns} 
@@ -39,10 +39,18 @@ let
     )
     echo >/proc/self/fd/10
   '';
+
+  literal_or_output =
+    let v = o: ({
+          string = builtins.toJSON;
+          int = builtins.toJSON;
+          set = (o: "output(${builtins.toJSON o.service}, ${builtins.toJSON o.path})");
+        }.${builtins.typeOf o}) o;
+    in  o: "{{ ${v o} }}";
   ppp-options' = ["+ipv6" "noauth"]
     ++ optional debug "debug"
-    ++ optionals (username != null) ["name" username]
-    ++ optionals (password != null) ["password" password]
+    ++ optionals (username != null) ["name" (literal_or_output username)]
+    ++ optionals (password != null) ["password" (literal_or_output password)]
     ++ optional lcpEcho.adaptive "lcp-echo-adaptive"
     ++ optionals (lcpEcho.interval != null)
       ["lcp-echo-interval" (builtins.toString lcpEcho.interval)]
@@ -64,7 +72,7 @@ longrun {
     . ${serviceFns}
     mkdir -p /run/${name}
     chmod 0700 /run/${name}
-    echo ${concatStringsSep " " ppp-options'} | ${output-template}/bin/output-template '{{' '}}' > /run/${name}/${name}.conf
+    echo ${escapeShellArgs ppp-options'} | ${output-template}/bin/output-template '{{' '}}' > /run/${name}/${name}.conf
     echo Starting pppoe, pppd pid is $$
     exec ${ppp}/bin/pppd pty "${pppoe}/bin/pppoe ${timeoutOpt}  -I $(output ${interface} ifname)" file /run/${name}/${name}.conf
   '';