- backported !653, Fix #4808

Author: Marius Burkard

server/plugins-available/shelluser_base_plugin.inc.php

@@ -461,7 +461,7 @@ private function _setup_ssh_rsa() {
 			if(is_file('/root/.ssh/authorized_keys')) $app->system->file_put_contents($sshkeys, $app->system->file_get_contents('/root/.ssh/authorized_keys'));
 
 			// Remove duplicate keys
-			$existing_keys = @file($sshkeys);
+			$existing_keys = @file($sshkeys, FILE_IGNORE_NEW_LINES);
 			$new_keys = explode("\n", $userkey);
 			$final_keys_arr = @array_merge($existing_keys, $new_keys);
 			$new_final_keys_arr = array();
@@ -479,15 +479,17 @@ private function _setup_ssh_rsa() {
 		}
 
 		//* Get the keys
-		$existing_keys = file($sshkeys);
+		$existing_keys = file($sshkeys, FILE_IGNORE_NEW_LINES);
 		$new_keys = explode("\n", $sshrsa);
 		$old_keys = explode("\n", $this->data['old']['ssh_rsa']);
 
 		//* Remove all old keys
 		if(is_array($old_keys)) {
 			foreach($old_keys as $key => $val) {
 				$k = array_search(trim($val), $existing_keys);
-				unset($existing_keys[$k]);
+				if ($k !== false) {
+					unset($existing_keys[$k]);
+				}
 			}
 		}
 

server/plugins-available/shelluser_jailkit_plugin.inc.php

@@ -480,7 +480,7 @@ private function _setup_ssh_rsa() {
 			if(is_file('/root/.ssh/authorized_keys')) $app->system->file_put_contents($sshkeys, $app->system->file_get_contents('/root/.ssh/authorized_keys'));
 
 			// Remove duplicate keys
-			$existing_keys = @file($sshkeys);
+			$existing_keys = @file($sshkeys, FILE_IGNORE_NEW_LINES);
 			$new_keys = explode("\n", $userkey);
 			$final_keys_arr = @array_merge($existing_keys, $new_keys);
 			$new_final_keys_arr = array();
@@ -497,15 +497,17 @@ private function _setup_ssh_rsa() {
 			$this->app->log("ssh-rsa authorisation keyfile created in ".$sshkeys, LOGLEVEL_DEBUG);
 		}
 		//* Get the keys
-		$existing_keys = file($sshkeys);
+		$existing_keys = file($sshkeys, FILE_IGNORE_NEW_LINES);
 		$new_keys = explode("\n", $sshrsa);
 		$old_keys = explode("\n", $this->data['old']['ssh_rsa']);
 
 		//* Remove all old keys
 		if(is_array($old_keys)) {
 			foreach($old_keys as $key => $val) {
 				$k = array_search(trim($val), $existing_keys);
-				unset($existing_keys[$k]);
+				if ($k !== false) {
+					unset($existing_keys[$k]);
+				}
 			}
 		}