From 37b29231e47a0c4458dc1c15d98588f16f07e1e2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 06 Aug 2015 03:18:44 -0400
Subject: [PATCH] - don't set password via remoting if field is empty
---
server/plugins-available/shelluser_base_plugin.inc.php | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/server/plugins-available/shelluser_base_plugin.inc.php b/server/plugins-available/shelluser_base_plugin.inc.php
index 0897a84..8a51b10 100755
--- a/server/plugins-available/shelluser_base_plugin.inc.php
+++ b/server/plugins-available/shelluser_base_plugin.inc.php
@@ -96,6 +96,8 @@
return false;
}
+ if($data['new']['active'] != 'y') $data['new']['shell'] = '/bin/false';
+
if($app->system->is_user($data['new']['puser'])) {
// Get the UID of the parent user
@@ -147,6 +149,12 @@
$app->system->chown(escapeshellcmd($homedir).'/.bash_history', $data['new']['username']);
$app->system->chgrp(escapeshellcmd($homedir).'/.bash_history', $data['new']['pgroup']);
+ //* Create .profile file
+ $app->system->touch(escapeshellcmd($homedir).'/.profile');
+ $app->system->chmod(escapeshellcmd($homedir).'/.profile', 0644);
+ $app->system->chown(escapeshellcmd($homedir).'/.profile', $data['new']['username']);
+ $app->system->chgrp(escapeshellcmd($homedir).'/.profile', $data['new']['pgroup']);
+
//* Disable shell user temporarily if we use jailkit
if($data['new']['chroot'] == 'jailkit') {
$command = 'usermod -s /bin/false -L '.escapeshellcmd($data['new']['username']).' 2>/dev/null';
@@ -194,6 +202,8 @@
return false;
}
+ if($data['new']['active'] != 'y') $data['new']['shell'] = '/bin/false';
+
if($app->system->is_user($data['new']['puser'])) {
// Get the UID of the parent user
$uid = intval($app->system->getuid($data['new']['puser']));
@@ -210,6 +220,9 @@
// Check if the user that we want to update exists, if not, we insert it
if($app->system->is_user($data['old']['username'])) {
+ //* Remove webfolder protection
+ $app->system->web_folder_protection($web['document_root'], false);
+
/*
$command = 'usermod';
$command .= ' --home '.escapeshellcmd($data['new']['dir']);
@@ -233,7 +246,7 @@
$app->system->chgrp(escapeshellcmd($data['new']['dir'].'/home'),escapeshellcmd($data['new']['pgroup']));
}
$app->file->mkdirs(escapeshellcmd($homedir), '0750');
- $app->system->chown(escapeshellcmd($homedir),escapeshellcmd($data['new']['username']));
+ $app->system->chown(escapeshellcmd($homedir),escapeshellcmd($data['new']['puser']));
$app->system->chgrp(escapeshellcmd($homedir),escapeshellcmd($data['new']['pgroup']));
$app->system->web_folder_protection($web['document_root'], true);
} else {
@@ -266,7 +279,17 @@
$app->system->chown(escapeshellcmd($homedir).'/.bash_history', escapeshellcmd($data['new']['username']));
$app->system->chgrp(escapeshellcmd($homedir).'/.bash_history', escapeshellcmd($data['new']['pgroup']));
}
+
+ //* Create .profile file
+ if(!is_file($data['new']['dir']).'/.profile') {
+ $app->system->touch(escapeshellcmd($homedir).'/.profile');
+ $app->system->chmod(escapeshellcmd($homedir).'/.profile', 0644);
+ $app->system->chown(escapeshellcmd($homedir).'/.profile', escapeshellcmd($data['new']['username']));
+ $app->system->chgrp(escapeshellcmd($homedir).'/.profile', escapeshellcmd($data['new']['pgroup']));
+ }
+ //* Add webfolder protection again
+ $app->system->web_folder_protection($web['document_root'], true);
} else {
// The user does not exist, so we insert it now
$this->insert($event_name, $data);
@@ -403,6 +426,12 @@
}
$sshrsa = trim($sshrsa);
$usrdir = escapeshellcmd($this->data['new']['dir']);
+ //* Home directory of the new shell user
+ if($this->data['new']['chroot'] == 'jailkit') {
+ $usrdir = escapeshellcmd($this->data['new']['dir']);
+ } else {
+ $usrdir = escapeshellcmd($this->data['new']['dir'].'/home/'.$this->data['new']['username']);
+ }
$sshdir = $usrdir.'/.ssh';
$sshkeys= $usrdir.'/.ssh/authorized_keys';
--
Gitblit v1.9.1