Merge branch '6703-shelluser-dedupe-code' into 'develop'

Sync common code between shelluser_jailkit_plugin and shelluser_base_plugin

See merge request ispconfig/ispconfig3!1898

Author: Till Brehm

server/plugins-available/shelluser_base_plugin.inc.php

@@ -30,6 +30,7 @@
 
 class shelluser_base_plugin {
 
+	//* $plugin_name and $class_name have to be the same then the name of this class
 	var $plugin_name = 'shelluser_base_plugin';
 	var $class_name = 'shelluser_base_plugin';
 	var $min_uid = 499;
@@ -67,7 +68,7 @@ function onLoad() {
 
 	}
 
-
+	//* This function is called, when a shell user is inserted in the database
 	function insert($event_name, $data) {
 		global $app, $conf;
 
@@ -190,6 +191,7 @@ function insert($event_name, $data) {
 		}
 	}
 
+	//* This function is called, when a shell user is updated in the database
 	function update($event_name, $data) {
 		global $app, $conf;
 
@@ -471,11 +473,12 @@ private function _setup_ssh_rsa() {
 		if (!file_exists($sshkeys)){
 			// add root's key
 			$app->file->mkdirs($sshdir, '0700');
+
 			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, FILE_IGNORE_NEW_LINES);
-			$new_keys = explode("\n", $userkey);
+			$new_keys = (!is_null($userkey))?explode("\n", $userkey):array();
 			if(is_array($existing_keys)) {
 				$final_keys_arr = @array_merge($existing_keys, $new_keys);
 			} else {
@@ -497,6 +500,9 @@ private function _setup_ssh_rsa() {
 
 		//* Get the keys
 		$existing_keys = file($sshkeys, FILE_IGNORE_NEW_LINES);
+		if(!$existing_keys) {
+			$existing_keys = array();
+		}
 		$new_keys = explode("\n", $sshrsa);
 		$old_keys = explode("\n", $this->data['old']['ssh_rsa']);
 

server/plugins-available/shelluser_jailkit_plugin.inc.php

@@ -101,6 +101,7 @@ function insert($event_name, $data) {
 
 
 		if($app->system->is_user($data['new']['puser'])) {
+
 			// Get the UID of the parent user
 			$uid = intval($app->system->getuid($data['new']['puser']));
 			if($uid > $this->min_uid) {
@@ -159,7 +160,6 @@ function insert($event_name, $data) {
 		} else {
 			$app->log("Skipping insertion of user:".$data['new']['username'].", parent user ".$data['new']['puser']." does not exist.", LOGLEVEL_WARN);
 		}
-
 	}
 
 	//* This function is called, when a shell user is updated in the database
@@ -518,19 +518,18 @@ private function _setup_ssh_rsa() {
 			//Generate ssh-rsa-keys
 			$app->uses('functions');
 			$app->functions->generate_ssh_key($id, $username);
-
 			$app->log("ssh-rsa keypair generated for ".$username, LOGLEVEL_DEBUG);
 		};
 
 		if (!file_exists($sshkeys)){
 			// add root's key
-			$app->file->mkdirs($sshdir, '0755');
+			$app->file->mkdirs($sshdir, '0700');
 			$authorized_keys_template = $this->jailkit_config['jailkit_chroot_authorized_keys_template'];
 			if(is_file($authorized_keys_template)) $app->system->file_put_contents($sshkeys, $app->system->file_get_contents($authorized_keys_template));
 
 			// Remove duplicate keys
 			$existing_keys = @file($sshkeys, FILE_IGNORE_NEW_LINES);
-			$new_keys = (!is_null($userkey))?explode("\n", $userkey):'';
+			$new_keys = (!is_null($userkey))?explode("\n", $userkey):array();
 			if(is_array($existing_keys)) {
 				$final_keys_arr = @array_merge($existing_keys, $new_keys);
 			} else {
@@ -545,10 +544,11 @@ private function _setup_ssh_rsa() {
 			$final_keys = implode("\n", array_flip(array_flip($new_final_keys_arr))) . "\n";
 
 			// add the user's key
-			file_put_contents($sshkeys, $final_keys);
+			$app->system->file_put_contents($sshkeys, $final_keys);
 			$app->file->remove_blank_lines($sshkeys);
 			$app->log("ssh-rsa authorisation keyfile created in ".$sshkeys, LOGLEVEL_DEBUG);
 		}
+
 		//* Get the keys
 		$existing_keys = file($sshkeys, FILE_IGNORE_NEW_LINES);
 		if(!$existing_keys) {
@@ -589,7 +589,6 @@ private function _setup_ssh_rsa() {
 
 		// set proper file permissions
 		$app->system->exec_safe("chown -R ?:? ?", $this->data['new']['puser'], $this->data['new']['pgroup'], $sshdir);
-		$app->system->exec_safe("chmod 700 ?", $sshdir);
 		$app->system->exec_safe("chmod 600 ?", $sshkeys);
 
 	}