From 613fa20813c25150695001dd3f15624cb9e4a5de Mon Sep 17 00:00:00 2001
From: DavHau <42246742+DavHau@users.noreply.github.com>
Date: Thu, 20 Feb 2020 06:22:02 +0700
Subject: [PATCH] improve authorized_keys parsing (#46)

---
 nixos-infect | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/nixos-infect b/nixos-infect
index aca4417..8ce708a 100755
--- a/nixos-infect
+++ b/nixos-infect
@@ -10,7 +10,12 @@ makeConf() {
   # NB <<"EOF" quotes / $ ` in heredocs, <<EOF does not
   mkdir -p /etc/nixos
   # Prevent grep for sending error code 1 (and halting execution) when no lines are selected : https://www.unix.com/man-page/posix/1P/grep
-  local IFS=$'\n'; keys=($(grep -vE '^[[:space:]]*(#|$)' /root/.ssh/authorized_keys || [[ $? == 1 ]])) 
+  local IFS=$'\n' 
+  for trypath in /root/.ssh/authorized_keys $HOME/.ssh/authorized_keys; do 
+      [[ -r "$trypath" ]] \
+      && keys=$(sed -E 's/^.*((ssh|ecdsa)-[^[:space:]]+)[[:space:]]+([^[:space:]]+)([[:space:]]*.*)$/\1 \3\4/' "$trypath") \
+      && break
+  done
   local network_import=""
 
   [ "$PROVIDER" = "digitalocean" ] && network_import="./networking.nix # generated at runtime by nixos-infect"
@@ -26,8 +31,8 @@ makeConf() {
   networking.hostName = "$(hostname)";
   networking.firewall.allowPing = true;
   services.openssh.enable = true;
-  users.users.root.openssh.authorizedKeys.keys = [$(for key in "${keys[@]}"; do echo -n "
-    \"$key\""; done)
+  users.users.root.openssh.authorizedKeys.keys = [$(while read -r line; do echo -n "
+    \"$line\" "; done <<< "$keys")
   ];
 }
 EOF