Commit 07bdbdfa authored by tbrehm's avatar tbrehm
Browse files

Security mode fixes for jailkit.

parent 1c40af89
...@@ -67,6 +67,7 @@ function getClientName($dataRecord) { ...@@ -67,6 +67,7 @@ function getClientName($dataRecord) {
$client_group_id = $dataRecord['sys_groupid']; $client_group_id = $dataRecord['sys_groupid'];
} }
} }
/* get the name of the client */ /* get the name of the client */
$tmp = $app->db->queryOneRecord("SELECT name FROM sys_group WHERE groupid = " . $client_group_id); $tmp = $app->db->queryOneRecord("SELECT name FROM sys_group WHERE groupid = " . $client_group_id);
$clientName = $tmp['name']; $clientName = $tmp['name'];
......
...@@ -85,14 +85,16 @@ class shelluser_jailkit_plugin { ...@@ -85,14 +85,16 @@ class shelluser_jailkit_plugin {
$this->app = $app; $this->app = $app;
$this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit'); $this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
$this->_update_website_security_level();
$this->_setup_jailkit_chroot();
$command .= 'usermod -U '.escapeshellcmd($data['new']['username']); $command .= 'usermod -U '.escapeshellcmd($data['new']['username']);
exec($command); exec($command);
$this->_update_website_security_level();
$this->_add_jailkit_user(); $this->_add_jailkit_user();
$this->_setup_jailkit_chroot();
$this->_update_website_security_level();
} }
$app->log("Jailkit Plugin -> insert username:".$data['new']['username'],LOGLEVEL_DEBUG); $app->log("Jailkit Plugin -> insert username:".$data['new']['username'],LOGLEVEL_DEBUG);
...@@ -126,6 +128,8 @@ class shelluser_jailkit_plugin { ...@@ -126,6 +128,8 @@ class shelluser_jailkit_plugin {
$this->_setup_jailkit_chroot(); $this->_setup_jailkit_chroot();
$this->_add_jailkit_user(); $this->_add_jailkit_user();
$this->_update_website_security_level();
} }
$app->log("Jailkit Plugin -> update username:".$data['new']['username'],LOGLEVEL_DEBUG); $app->log("Jailkit Plugin -> update username:".$data['new']['username'],LOGLEVEL_DEBUG);
...@@ -161,6 +165,7 @@ class shelluser_jailkit_plugin { ...@@ -161,6 +165,7 @@ class shelluser_jailkit_plugin {
exec($command); exec($command);
$app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG); $app->log("Jailkit Plugin -> delete chroot home:".$data['old']['dir'].$jailkit_chroot_userhome,LOGLEVEL_DEBUG);
} }
} }
$app->log("Jailkit Plugin -> delete username:".$data['old']['username'],LOGLEVEL_DEBUG); $app->log("Jailkit Plugin -> delete username:".$data['old']['username'],LOGLEVEL_DEBUG);
...@@ -280,13 +285,18 @@ class shelluser_jailkit_plugin { ...@@ -280,13 +285,18 @@ class shelluser_jailkit_plugin {
//* If the security level is set to high //* If the security level is set to high
if($web_config['security_level'] == 20) { if($web_config['security_level'] == 20) {
exec("chmod 755 ".escapeshellcmd($web["document_root"]."/")); $this->_exec("chmod 755 ".escapeshellcmd($web["document_root"]));
exec("chown root:root ".escapeshellcmd($web["document_root"]."/")); $this->_exec("chown root:root ".escapeshellcmd($web["document_root"]));
} }
} }
//* Wrapper for exec function for easier debugging
private function _exec($command) {
global $app;
$app->log("exec: ".$command,LOGLEVEL_DEBUG);
exec($command);
}
} // end class } // end class
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment