maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fixed deletion of default-ftp-user possible via API (not through the interface though); refs #741

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2019-10-27 16:02:32 +01:00
parent 88ee76e4c9
commit 822bb2bd4d
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Froxlor/Api/Commands/Ftps.php
View File

@@ -541,6 +541,9 @@ class Ftps extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEntit
"username" => $customer_data['loginname'] "username" => $customer_data['loginname']
); );
Database::pexecute($stmt, $params, true, true); Database::pexecute($stmt, $params, true, true);
} else {
// do not allow removing default ftp-account
\Froxlor\UI\Response::standard_error('ftp_cantdeletemainaccount', '', true);
} }
// remove all quotatallies // remove all quotatallies

17
tests/Ftps/FtpsTest.php
View File

@@ -277,4 +277,21 @@ class FtpsTest extends TestCase
$result = json_decode($json_result, true)['data']; $result = json_decode($json_result, true)['data'];
$this->assertEquals('test1ftp2', $result['username']); $this->assertEquals('test1ftp2', $result['username']);
} }
public function testCustomerFtpsDeleteDefaultUser()
{
global $admin_userdata;
// get customer
$json_result = Customers::getLocal($admin_userdata, array(
'loginname' => 'test1'
))->get();
$customer_userdata = json_decode($json_result, true)['data'];
$data = [
'username' => 'test1'
];
$this->expectExceptionCode(400);
$this->expectExceptionMessage('You cannot delete your main FTP account');
Ftps::getLocal($customer_userdata, $data)->delete();
}
} }