system: improve ssh key newline write; closes #1648

src/etc/inc/auth.inc

@@ -479,6 +479,9 @@ function local_user_set(&$user, $force_password = false)
         @mkdir("{$user_home}/.ssh", 0700);
         @chown("{$user_home}/.ssh", $user_name);
         $keys = base64_decode($user['authorizedkeys']);
+        $keys = preg_split('/[\n\r]+/', $keys);
+        $keys[] = '';
+        $keys = implode($keys, "\n");
         @file_put_contents("{$user_home}/.ssh/authorized_keys", $keys);
         @chown("{$user_home}/.ssh/authorized_keys", $user_name);
     } else {

src/www/system_usermanager.php

@@ -319,7 +319,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             $userent['name'] = $pconfig['usernamefld'];
             $userent['descr'] = $pconfig['descr'];
             $userent['expires'] = $pconfig['expires'];
-            $userent['authorizedkeys'] = base64_encode($pconfig['authorizedkeys']);
+            $userent['authorizedkeys'] = base64_encode(trim($pconfig['authorizedkeys']));
             $userent['ipsecpsk'] = $pconfig['ipsecpsk'];
             if (!empty($pconfig['gen_otp_seed'])) {
                 // generate 160bit base32 encoded secret