Merge branch '6697-missing-newline' into 'develop'

Till Brehm · Till Brehm · commit 55b5fb27ac0f · 2024-04-29T16:52:01.000Z
Add final newline to the autorized_keys file, #6697

See merge request ispconfig/ispconfig3!1892
diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php
@@ -487,7 +487,7 @@ private function _setup_ssh_rsa() {
 					$new_final_keys_arr[$key] = trim($val);
 				}
 			}
-			$final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr)));
+			$final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr))) . "\n";
 
 			// add the user's key
 			$app->system->file_put_contents($sshkeys, $final_keys);
diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php
@@ -542,7 +542,7 @@ private function _setup_ssh_rsa() {
 					$new_final_keys_arr[$key] = trim($val);
 				}
 			}
-			$final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr)));
+			$final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr))) . "\n";
 
 			// add the user's key
 			file_put_contents($sshkeys, $final_keys);

Original file line number	Diff line number	Diff line change
`@@ -487,7 +487,7 @@ private function _setup_ssh_rsa() {`
`487`	`487`	`$new_final_keys_arr[$key] = trim($val);`
`488`	`488`	`}`
`489`	`489`	`}`
`490`		`- $final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr)));`
	`490`	`+ $final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr))) . "\n";`
`491`	`491`
`492`	`492`	`// add the user's key`
`493`	`493`	`$app->system->file_put_contents($sshkeys, $final_keys);`
Original file line number	Diff line number	Diff line change
`@@ -542,7 +542,7 @@ private function _setup_ssh_rsa() {`
`542`	`542`	`$new_final_keys_arr[$key] = trim($val);`
`543`	`543`	`}`
`544`	`544`	`}`
`545`		`- $final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr)));`
	`545`	`+ $final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr))) . "\n";`
`546`	`546`
`547`	`547`	`// add the user's key`
`548`	`548`	`file_put_contents($sshkeys, $final_keys);`