From 615a0a96618fa99e7e452523145d6c0f238d4473 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 31 Jul 2013 09:33:43 -0400
Subject: [PATCH] Merged revisions 3960-4065 from stable branch.
---
interface/web/sites/ftp_user_edit.php | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/interface/web/sites/ftp_user_edit.php b/interface/web/sites/ftp_user_edit.php
index 455d126..798233d 100644
--- a/interface/web/sites/ftp_user_edit.php
+++ b/interface/web/sites/ftp_user_edit.php
@@ -177,6 +177,23 @@
$app->db->query($sql);
}
+ //* 2. check to ensure that the FTP user path is not changed to a path outside of the docroot by a normal user
+ if(isset($this->dataRecord['dir']) && $this->dataRecord['dir'] != $this->oldDataRecord['dir'] && !$app->auth->is_admin()) {
+ $vd = new validate_ftpuser;
+ $error_message = $vd->ftp_dir('dir', $this->dataRecord['dir'], '');
+ //* This check should normally never be triggered
+ //* Set the path to a safe path (web doc root).
+ if($error_message != '') {
+ $ftp_data = $app->db->queryOneRecord("SELECT parent_domain_id FROM ftp_user WHERE ftp_user_id = '".$app->db->quote($app->tform->primary_id)."'");
+ $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$app->functions->intval($ftp_data["parent_domain_id"]));
+ $dir = $web["document_root"];
+ $sql = "UPDATE ftp_user SET dir = '$dir' WHERE ftp_user_id = ".$this->id;
+ $app->db->query($sql);
+ $app->log("Error in FTP path settings of FTP user ".$this->dataRecord['username'], 1);
+ }
+
+ }
+
}
}
--
Gitblit v1.9.1